diff options
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 7 | ||||
| -rw-r--r-- | nuttx/configs/sim/README.txt | 8 | ||||
| -rw-r--r-- | nuttx/configs/sim/nxwm/defconfig | 4 | ||||
| -rw-r--r-- | nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c | 8 |
4 files changed, 19 insertions, 8 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index a01b93c44..84f349a46 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2696,4 +2696,9 @@ * include/cxx/cunistd: C++ header file to make sure that everything in unistd.h is in the std:: namespace. * configs/sim/nxwm: Added a configuration for testing the NuttX Window Manager - (NxWM)
\ No newline at end of file + (NxWM) + * fs/fs_fcntl.h: On success, always returned OK. However, some fcntl commands + require returning other values on success. + * Various files. Fix warnings about variables that were initialized by not used. + * configs/sim/*/defconfig: Changes to build a 32-bit simulation on a 32-bit + platform did not make into all of the Make.defs files. diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt index f02f44258..4886a4295 100644 --- a/nuttx/configs/sim/README.txt +++ b/nuttx/configs/sim/README.txt @@ -111,11 +111,17 @@ http://tech.groups.yahoo.com/group/nuttx/files. Compiler differences -------------------- -operator new +operator new: Problem: "'operator new' takes size_t ('...') as first parameter" Workaround: Add -fpermissive to the compilation flags +Continue up_setjmp() issues: + + With some newer compilers, I am now getting segmentation faults in + up_setjmp.S (even when built with the -m32 option). I have not looked into + this yet. + Stack Size Issues ----------------- When you run the NuttX simulation, it uses stacks allocated by NuttX from the diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig index 74b5aea15..5fead7bb8 100644 --- a/nuttx/configs/sim/nxwm/defconfig +++ b/nuttx/configs/sim/nxwm/defconfig @@ -524,8 +524,8 @@ CONFIG_NX_PACKEDMSFIRST=n CONFIG_NX_MOUSE=y CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERWIDTH=4 -#CONFIG_NXTK_BORDERCOLOR1 -#CONFIG_NXTK_BORDERCOLOR2 +CONFIG_NXTK_BORDERCOLOR1=0x00a9a9a9 +CONFIG_NXTK_BORDERCOLOR2=0x00696969 CONFIG_NXTK_AUTORAISE=n CONFIG_NXFONT_SANS22X29=n CONFIG_NXFONT_SANS23X27=y diff --git a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c index 6a2063a26..50bd5aff4 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxtk/nxtk_bitmaptoolbar.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -122,7 +122,7 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, * Temporarily, position the origin in absolute screen coordinates */ - nxgl_vectoradd(&wndorigin, origin, &fwnd->fwrect.pt1); + nxgl_vectoradd(&wndorigin, origin, &fwnd->tbrect.pt1); /* Then move the origin so that is relative to the containing window, not the * client subwindow @@ -132,6 +132,6 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, /* Then copy the bitmap */ - nx_bitmap((NXWINDOW)hfwnd, &clipdest, src, origin, stride); + nx_bitmap((NXWINDOW)hfwnd, &clipdest, src, &wndorigin, stride); return OK; } |