summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-10-25 01:02:49 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-10-25 01:02:49 +0000
commit5b0d579d3cd42d64ff748683297657821ab353ab (patch)
tree0d4ba7dd85265e3c39c53fa21e3cc6ffb8e06895
parentd1070dd752bae7f60ca97ef593eafa2249919629 (diff)
downloadnuttx-5b0d579d3cd42d64ff748683297657821ab353ab.tar.gz
nuttx-5b0d579d3cd42d64ff748683297657821ab353ab.tar.bz2
nuttx-5b0d579d3cd42d64ff748683297657821ab353ab.zip
Fixes from last changes when built with CodeSourcery, STM32, LCD, 16-bit color
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4063 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/configs/stm3210e-eval/RIDE/Make.defs4
-rwxr-xr-xnuttx/configs/stm3210e-eval/RIDE/defconfig4
-rw-r--r--nuttx/configs/stm3210e-eval/buttons/Make.defs4
-rw-r--r--nuttx/configs/stm3210e-eval/buttons/defconfig4
-rw-r--r--nuttx/configs/stm3210e-eval/nsh/Make.defs4
-rwxr-xr-xnuttx/configs/stm3210e-eval/nsh/defconfig4
-rw-r--r--nuttx/configs/stm3210e-eval/nsh2/Make.defs4
-rw-r--r--nuttx/configs/stm3210e-eval/nsh2/defconfig4
-rw-r--r--nuttx/configs/stm3210e-eval/nx/Make.defs4
-rw-r--r--nuttx/configs/stm3210e-eval/nx/defconfig4
-rw-r--r--nuttx/configs/stm3210e-eval/nxlines/Make.defs4
-rw-r--r--nuttx/configs/stm3210e-eval/nxlines/defconfig4
-rw-r--r--nuttx/configs/stm3210e-eval/nxtext/Make.defs4
-rw-r--r--nuttx/configs/stm3210e-eval/nxtext/defconfig4
-rw-r--r--nuttx/configs/stm3210e-eval/ostest/Make.defs4
-rwxr-xr-xnuttx/configs/stm3210e-eval/ostest/defconfig4
-rw-r--r--nuttx/configs/stm3210e-eval/usbserial/Make.defs4
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbserial/defconfig4
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbstorage/Make.defs4
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbstorage/defconfig4
-rw-r--r--nuttx/graphics/nxbe/nxbe.h2
-rw-r--r--nuttx/graphics/nxbe/nxbe_getrectangle.c4
-rw-r--r--nuttx/graphics/nxglib/lcd/nxglib_getrectangle.c2
-rw-r--r--nuttx/graphics/nxmu/nx_getrectangle.c17
-rw-r--r--nuttx/graphics/nxsu/nx_getrectangle.c12
-rw-r--r--nuttx/graphics/nxtk/nxtk_gettoolbar.c6
-rw-r--r--nuttx/graphics/nxtk/nxtk_getwindow.c9
-rw-r--r--nuttx/include/nuttx/nx/nx.h6
-rw-r--r--nuttx/include/nuttx/nx/nxglib.h14
-rw-r--r--nuttx/include/nuttx/nx/nxtk.h12
-rw-r--r--nuttx/include/nuttx/rgbcolors.h2
31 files changed, 93 insertions, 73 deletions
diff --git a/nuttx/configs/stm3210e-eval/RIDE/Make.defs b/nuttx/configs/stm3210e-eval/RIDE/Make.defs
index 9a437b422..c47b270b6 100644
--- a/nuttx/configs/stm3210e-eval/RIDE/Make.defs
+++ b/nuttx/configs/stm3210e-eval/RIDE/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/RIDE/Make.defs
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -110,7 +110,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig
index 4733a438d..72402443a 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/defconfig
+++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/RIDE/defconfig
#
# Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -237,6 +237,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -325,6 +326,7 @@ CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
CONFIG_DEBUG_SCHED=y
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/buttons/Make.defs b/nuttx/configs/stm3210e-eval/buttons/Make.defs
index 61562c7d4..17899c069 100644
--- a/nuttx/configs/stm3210e-eval/buttons/Make.defs
+++ b/nuttx/configs/stm3210e-eval/buttons/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/buttons/Make.defs
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -110,7 +110,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig
index 7a9e636d9..ecd3b37a0 100644
--- a/nuttx/configs/stm3210e-eval/buttons/defconfig
+++ b/nuttx/configs/stm3210e-eval/buttons/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/buttons/defconfig
#
# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -251,6 +251,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -338,6 +339,7 @@ CONFIG_HAVE_LIBM=n
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/nsh/Make.defs b/nuttx/configs/stm3210e-eval/nsh/Make.defs
index 9f8ea4e33..51d0761fc 100644
--- a/nuttx/configs/stm3210e-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nsh/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nsh/Make.defs
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -110,7 +110,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig
index 97b155ff8..aa1eec2f0 100755
--- a/nuttx/configs/stm3210e-eval/nsh/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nsh/defconfig
#
# Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -247,6 +247,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -334,6 +335,7 @@ CONFIG_HAVE_LIBM=n
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/nsh2/Make.defs b/nuttx/configs/stm3210e-eval/nsh2/Make.defs
index 2b396c434..9234a26b6 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nsh2/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nsh2/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -110,7 +110,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index d92fd3773..1b9ce28b8 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nsh2/defconfig
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -247,6 +247,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -336,6 +337,7 @@ CONFIG_DEBUG_GRAPHICS=n
CONFIG_DEBUG_LCD=n
CONFIG_DEBUG_USB=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/nx/Make.defs b/nuttx/configs/stm3210e-eval/nx/Make.defs
index 1c40df9ef..b222f6116 100644
--- a/nuttx/configs/stm3210e-eval/nx/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nx/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nx/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -110,7 +110,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index 082452881..f3e146e38 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nx/defconfig
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -247,6 +247,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -333,6 +334,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_GRAPHICS=n
CONFIG_DEBUG_LCD=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/nxlines/Make.defs b/nuttx/configs/stm3210e-eval/nxlines/Make.defs
index 8a7a8e5ea..46c730693 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxlines/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nxlines/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -112,7 +112,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig
index d41e60415..259a8e4df 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nxlines/defconfig
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -247,6 +247,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -333,6 +334,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_GRAPHICS=n
CONFIG_DEBUG_LCD=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/nxtext/Make.defs b/nuttx/configs/stm3210e-eval/nxtext/Make.defs
index 110edb2d7..904d7f6f8 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxtext/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nxtext/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -112,7 +112,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index 9193dd084..6f7605814 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/nxtext/defconfig
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -247,6 +247,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -333,6 +334,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_GRAPHICS=n
CONFIG_DEBUG_LCD=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/ostest/Make.defs b/nuttx/configs/stm3210e-eval/ostest/Make.defs
index fb7e2ac48..ddda17fb2 100644
--- a/nuttx/configs/stm3210e-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3210e-eval/ostest/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/ostest/Make.defs
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -110,7 +110,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index 41aeb41d8..384c6cec0 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/ostest/defconfig
#
# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -249,6 +249,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -336,6 +337,7 @@ CONFIG_HAVE_LIBM=n
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/usbserial/Make.defs b/nuttx/configs/stm3210e-eval/usbserial/Make.defs
index e7071b837..8def16ce9 100644
--- a/nuttx/configs/stm3210e-eval/usbserial/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbserial/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/usbserial/Make.defs
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -110,7 +110,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig
index 228c70b20..1dee227f1 100755
--- a/nuttx/configs/stm3210e-eval/usbserial/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/usbserial/defconfig
#
# Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -249,6 +249,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -337,6 +338,7 @@ CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_USB=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
index 4753d5b40..f5d055c4d 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/usbstorage/Make.defs
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -110,7 +110,7 @@ else
endif
ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
index 5ad7be2eb..52ad47608 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
@@ -2,7 +2,7 @@
# configs/stm3210e-eval/usbstorage/defconfig
#
# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
@@ -247,6 +247,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
# debug symbols (needed for use with a debugger).
+# CONFIG_HAVE_CXX - Enable support for C++S
# CONFIG_MM_REGIONS - If the architecture includes multiple
# regions of memory to allocate from, this specifies the
# number of memory regions that the memory manager must
@@ -333,6 +334,7 @@ CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_FS=n
CONFIG_DEBUG_USB=n
CONFIG_DEBUG_SYMBOLS=n
+CONFIG_HAVE_CXX=n
CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200
diff --git a/nuttx/graphics/nxbe/nxbe.h b/nuttx/graphics/nxbe/nxbe.h
index 877754782..089196fdd 100644
--- a/nuttx/graphics/nxbe/nxbe.h
+++ b/nuttx/graphics/nxbe/nxbe.h
@@ -90,7 +90,7 @@ struct nxbe_plane_s
void (*fillrectangle)(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
nxgl_mxpixel_t color);
- void (*getrectangle)(FAR struct fb_planeinfo_s *pinfo,
+ void (*getrectangle)(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride);
void (*filltrapezoid)(FAR NX_PLANEINFOTYPE *pinfo,
diff --git a/nuttx/graphics/nxbe/nxbe_getrectangle.c b/nuttx/graphics/nxbe/nxbe_getrectangle.c
index fa3178eb3..1b3941bbb 100644
--- a/nuttx/graphics/nxbe/nxbe_getrectangle.c
+++ b/nuttx/graphics/nxbe/nxbe_getrectangle.c
@@ -39,6 +39,9 @@
#include <nuttx/config.h>
+#include <errno.h>
+#include <debug.h>
+
#include <nuttx/nx/nxglib.h>
#include "nxbe.h"
@@ -103,6 +106,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
#ifdef CONFIG_DEBUG
if (!wnd || !rect || ! rect || plane >= wnd->be->vinfo.nplanes)
{
+ gvdbg("Invalid parameters\n");
return;
}
#endif
diff --git a/nuttx/graphics/nxglib/lcd/nxglib_getrectangle.c b/nuttx/graphics/nxglib/lcd/nxglib_getrectangle.c
index 432d5531c..9318426ba 100644
--- a/nuttx/graphics/nxglib/lcd/nxglib_getrectangle.c
+++ b/nuttx/graphics/nxglib/lcd/nxglib_getrectangle.c
@@ -80,7 +80,7 @@
****************************************************************************/
void NXGL_FUNCNAME(nxgl_getrectangle,NXGLIB_SUFFIX)
-(FAR struct fb_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect,
+(FAR struct lcd_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride)
{
FAR uint8_t *dline;
diff --git a/nuttx/graphics/nxmu/nx_getrectangle.c b/nuttx/graphics/nxmu/nx_getrectangle.c
index 19acae44a..85393f7d2 100644
--- a/nuttx/graphics/nxmu/nx_getrectangle.c
+++ b/nuttx/graphics/nxmu/nx_getrectangle.c
@@ -92,9 +92,9 @@
*
****************************************************************************/
-void nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
- unsigned int plane, FAR uint8_t *dest,
- unsigned int deststride)
+int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
+ unsigned int plane, FAR uint8_t *dest,
+ unsigned int deststride)
{
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_getrectangle_s outmsg;
@@ -103,15 +103,8 @@ void nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
#ifdef CONFIG_DEBUG
if (!hwnd || !rect || !dest)
{
- errno = EINVAL;
- return ERROR;
- }
-#endif
-
-#ifdef CONFIG_DEBUG
- if (!wnd || !wnd->conn || !rect || !color)
- {
- errno = EINVAL;
+ gvdbg("Invalid parameters\n");
+ set_errno(EINVAL);
return ERROR;
}
#endif
diff --git a/nuttx/graphics/nxsu/nx_getrectangle.c b/nuttx/graphics/nxsu/nx_getrectangle.c
index 2c3c589b7..472ff4c6c 100644
--- a/nuttx/graphics/nxsu/nx_getrectangle.c
+++ b/nuttx/graphics/nxsu/nx_getrectangle.c
@@ -92,17 +92,19 @@
*
****************************************************************************/
-void nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
- unsigned int plane, FAR uint8_t *dest,
- unsigned int deststride)
+int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
+ unsigned int plane, FAR uint8_t *dest,
+ unsigned int deststride)
{
#ifdef CONFIG_DEBUG
if (!hwnd || !rect || !dest)
{
- errno = EINVAL;
+ set_errno(EINVAL);
return ERROR;
}
#endif
- return nxbe_getrectangle((FAR struct nxbe_window_s *)hwnd, rect, plane, dest, deststride);
+ nxbe_getrectangle((FAR struct nxbe_window_s *)hwnd, rect, plane,
+ dest, deststride);
+ return OK;
}
diff --git a/nuttx/graphics/nxtk/nxtk_gettoolbar.c b/nuttx/graphics/nxtk/nxtk_gettoolbar.c
index c5908f53b..70adb0cce 100644
--- a/nuttx/graphics/nxtk/nxtk_gettoolbar.c
+++ b/nuttx/graphics/nxtk/nxtk_gettoolbar.c
@@ -94,7 +94,7 @@
*
****************************************************************************/
-void nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
+int nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
unsigned int plane, FAR uint8_t *dest,
unsigned int deststride)
{
@@ -105,8 +105,8 @@ void nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
if (!hfwnd || !rect || !dest)
{
gvdbg("Invalid parameters\n");
- errno = EINVAL;
- return;
+ set_errno(EINVAL);
+ return ERROR;
}
#endif
diff --git a/nuttx/graphics/nxtk/nxtk_getwindow.c b/nuttx/graphics/nxtk/nxtk_getwindow.c
index f6df2c3ad..121c7702a 100644
--- a/nuttx/graphics/nxtk/nxtk_getwindow.c
+++ b/nuttx/graphics/nxtk/nxtk_getwindow.c
@@ -94,9 +94,9 @@
*
****************************************************************************/
-void nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
- unsigned int plane, FAR uint8_t *dest,
- unsigned int deststride)
+int nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
+ unsigned int plane, FAR uint8_t *dest,
+ unsigned int deststride)
{
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
struct nxgl_rect_s getrect;
@@ -105,7 +105,8 @@ void nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
if (!hfwnd || !rect || !dest)
{
gvdbg("Invalid parameters\n");
- return;
+ set_errno(EINVAL);
+ return ERROR;
}
#endif
diff --git a/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h
index a4e9f5baf..0e908f7c5 100644
--- a/nuttx/include/nuttx/nx/nx.h
+++ b/nuttx/include/nuttx/nx/nx.h
@@ -639,9 +639,9 @@ EXTERN int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
*
****************************************************************************/
-EXTERN void nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
- unsigned int plane, FAR uint8_t *dest,
- unsigned int deststride);
+EXTERN int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
+ unsigned int plane, FAR uint8_t *dest,
+ unsigned int deststride);
/****************************************************************************
* Name: nx_filltrapezoid
diff --git a/nuttx/include/nuttx/nx/nxglib.h b/nuttx/include/nuttx/nx/nxglib.h
index d94d6fe76..4dec40070 100644
--- a/nuttx/include/nuttx/nx/nxglib.h
+++ b/nuttx/include/nuttx/nx/nxglib.h
@@ -289,25 +289,25 @@ EXTERN void nxgl_fillrectangle_32bpp(FAR NX_PLANEINFOTYPE *pinfo,
*
****************************************************************************/
-EXTERN void nxgl_getrectangle_1bpp(FAR struct fb_planeinfo_s *pinfo,
+EXTERN void nxgl_getrectangle_1bpp(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride);
-EXTERN void nxgl_getrectangle_2bpp(FAR struct fb_planeinfo_s *pinfo,
+EXTERN void nxgl_getrectangle_2bpp(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride);
-EXTERN void nxgl_getrectangle_4bpp(FAR struct fb_planeinfo_s *pinfo,
+EXTERN void nxgl_getrectangle_4bpp(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride);
-EXTERN void nxgl_getrectangle_8bpp(FAR struct fb_planeinfo_s *pinfo,
+EXTERN void nxgl_getrectangle_8bpp(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride);
-EXTERN void nxgl_getrectangle_16bpp(FAR struct fb_planeinfo_s *pinfo,
+EXTERN void nxgl_getrectangle_16bpp(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride);
-EXTERN void nxgl_getrectangle_24bpp(FAR struct fb_planeinfo_s *pinfo,
+EXTERN void nxgl_getrectangle_24bpp(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride);
-EXTERN void nxgl_getrectangle_32bpp(FAR struct fb_planeinfo_s *pinfo,
+EXTERN void nxgl_getrectangle_32bpp(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride);
diff --git a/nuttx/include/nuttx/nx/nxtk.h b/nuttx/include/nuttx/nx/nxtk.h
index c2f6c270d..5273ef54c 100644
--- a/nuttx/include/nuttx/nx/nxtk.h
+++ b/nuttx/include/nuttx/nx/nxtk.h
@@ -241,9 +241,9 @@ EXTERN int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
*
****************************************************************************/
-EXTERN void nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
- unsigned int plane, FAR uint8_t *dest,
- unsigned int deststride);
+EXTERN int nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
+ unsigned int plane, FAR uint8_t *dest,
+ unsigned int deststride);
/****************************************************************************
* Name: nxtk_filltrapwindow
@@ -462,9 +462,9 @@ EXTERN int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect
*
****************************************************************************/
-EXTERN void nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
- unsigned int plane, FAR uint8_t *dest,
- unsigned int deststride);
+EXTERN int nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
+ unsigned int plane, FAR uint8_t *dest,
+ unsigned int deststride);
/****************************************************************************
* Name: nxtk_filltraptoolbar
diff --git a/nuttx/include/nuttx/rgbcolors.h b/nuttx/include/nuttx/rgbcolors.h
index 0a154a8b5..d2fcba8f1 100644
--- a/nuttx/include/nuttx/rgbcolors.h
+++ b/nuttx/include/nuttx/rgbcolors.h
@@ -59,7 +59,7 @@
/* This macro creates RGB16 (5:6:5) from 8:8:8 RGB */
#define RGBTO16(r,g,b) \
- ((((uint16_t)(r) << 11) & 0xf800) | (((uint16_t)(r) << 5) & 0x07e0) | ((uint16_t)(r) & 0x001f))
+ ((((uint16_t)(r) << 11) & 0xf800) | (((uint16_t)(g) << 5) & 0x07e0) | ((uint16_t)(b) & 0x001f))
/* And these macros perform the inverse transformation */