diff --git a/configs/sim/mount/Make.defs b/configs/sim/mount/Make.defs
index 1ae07a201fbb5c8b8004d98c8ca8f95676577929..498291077d57571ae5868864ba35bdfbe25787ec 100644
--- a/configs/sim/mount/Make.defs
+++ b/configs/sim/mount/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/mount/Make.defs
#
# Copyright (C) 2008, 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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/nettest/Make.defs b/configs/sim/nettest/Make.defs
index 41a9e93784c892e53c4dd4d1f57fe3df64e90480..cf0134b9b001dc45af637fb31c2cf67aeb32eeb5 100644
--- a/configs/sim/nettest/Make.defs
+++ b/configs/sim/nettest/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/Make.defs
#
# Copyright (C) 2007-2008, 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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/nsh/Make.defs b/configs/sim/nsh/Make.defs
index 4da1545cf7cc107537032b22a038271c715fcf2e..1330ade1e0783aef37d76d42cbf9020dc87564db 100644
--- a/configs/sim/nsh/Make.defs
+++ b/configs/sim/nsh/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/nsh/Make.defs
#
# Copyright (C) 2008, 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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/nsh2/Make.defs b/configs/sim/nsh2/Make.defs
index d36c3438fa357ab7171ae9de058dfff22d773fd9..b127e0a209e388234327e07629524005aa77cf20 100644
--- a/configs/sim/nsh2/Make.defs
+++ b/configs/sim/nsh2/Make.defs
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/nx/Make.defs b/configs/sim/nx/Make.defs
index dc00e533976db3c7bf174695ca50550c97b3406c..70f6066e19794b24e86460e9ccd093339ded97b4 100644
--- a/configs/sim/nx/Make.defs
+++ b/configs/sim/nx/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/nx/Make.defs
#
# Copyright (C) 2008, 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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/nx11/Make.defs b/configs/sim/nx11/Make.defs
index 437a6e663a23e33b0544f86584a718fc779de574..2dfda3e6597fd30ab4949603896a065e80965eaf 100644
--- a/configs/sim/nx11/Make.defs
+++ b/configs/sim/nx11/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/nx11/Make.defs
#
# Copyright (C) 2008, 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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/nxffs/Make.defs b/configs/sim/nxffs/Make.defs
index d5274e7d5ce14da70eb23057ecc24cc4a246f631..9010d2bb4627da7a3df96929a3032f3a8d127874 100644
--- a/configs/sim/nxffs/Make.defs
+++ b/configs/sim/nxffs/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/nxffs/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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/ostest/Make.defs b/configs/sim/ostest/Make.defs
index 41a9e93784c892e53c4dd4d1f57fe3df64e90480..cf0134b9b001dc45af637fb31c2cf67aeb32eeb5 100644
--- a/configs/sim/ostest/Make.defs
+++ b/configs/sim/ostest/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/Make.defs
#
# Copyright (C) 2007-2008, 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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/pashello/Make.defs b/configs/sim/pashello/Make.defs
index ac0d4c0576fa8ba07c5c9cfc69b339acb7dcdd20..40dc5acb153e319af47bed3295b9a1f52a43a486 100644
--- a/configs/sim/pashello/Make.defs
+++ b/configs/sim/pashello/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/pashello/Make.defs
#
# Copyright (C) 2007-2008, 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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/configs/sim/touchscreen/Make.defs b/configs/sim/touchscreen/Make.defs
index e52d09de2b129c8bb40ab236be47d8fea7dd1cf5..599b37432796ef7ea3dfb05c8a9a8ac1e9027591 100644
--- a/configs/sim/touchscreen/Make.defs
+++ b/configs/sim/touchscreen/Make.defs
@@ -2,7 +2,7 @@
# configs/sim/touchscreen/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
@@ -44,7 +44,7 @@ else
endif
ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
diff --git a/include/nuttx/rgbcolors.h b/include/nuttx/rgbcolors.h
index dad6008d4f5e6338f00001d9f470fbdb31e5dfc5..7dc6ef42ddea65f53e1d6be1f47f18211a7da1b1 100644
--- a/include/nuttx/rgbcolors.h
+++ b/include/nuttx/rgbcolors.h
@@ -2,8 +2,8 @@
* include/nuttx/rgbcolors.h
* User-friendly RGB color definitions
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2010-2011 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
@@ -44,8 +44,23 @@
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
+/* Color Creation and Conversion Macros *************************************/
+/* This macro creates RGB24 from 8:8:8 RGB */
-/* Color conversions. This macros converts RGB24 (8:8:8) to RGB16 (5:6:5):
+#define RGBTO24(r,g,b) \
+ ((uint32_t)((r) & 0xff) << 16 | (uint32_t)((g) & 0xff) << 8 | (uint32_t)((b) & 0xff))
+
+/* 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))
+
+/* This macro creates RGB8 (3:3:2) from 8:8:8 RGB */
+
+#define RGBTO8(r,g,b) \
+ ((((uint8_t)(r) << 5) & 0xe0) | (((uint8_t)(r) << 2) & 0x1c) | ((uint8_t)(r) & 0x03))
+
+/* This macro converts RGB24 (8:8:8) to RGB16 (5:6:5):
*
* 00000000 RRRRRRRR BBBBBBBB GGGGGGGG -> RRRRRBBB BBBGGGGG
*/
@@ -53,7 +68,7 @@
#define RGB24TO16(rgb24) \
(((rgb24 >> 8) & 0xf800) | ((rgb24 >> 5) & 0x07e0) | ((rgb24 >> 3) & 0x001f))
-/* This macros converts RGB16 (5:6:5) to RGB24 (8:8:8):
+/* This macro converts RGB16 (5:6:5) to RGB24 (8:8:8):
*
* RRRRRBBB BBBGGGGG -> 00000000 RRRRRRRR BBBBBBBB GGGGGGGG
*/
@@ -61,6 +76,7 @@
#define RGB16TO24(rgb16) \
(((rgb16 & 0xf800) << 8) | ((rgb16 & 0x07e0) << 5) | ((rgb16 & 0x001f) << 3))
+/* Standard Color Definitions ***********************************************/
/* RGB24-888: 00000000 RRRRRRRR GGGGGGGG BBBBBBBB */
#define RGB24_BLACK 0x00000000
diff --git a/libxx/libxx_cxapurevirtual.cxx b/libxx/libxx_cxapurevirtual.cxx
index 4a0ca3671778ed4a965124e6f851e2eab50a587b..e8912558a5ed889ea7d7478feb33b4c63a39306f 100755
--- a/libxx/libxx_cxapurevirtual.cxx
+++ b/libxx/libxx_cxapurevirtual.cxx
@@ -1,8 +1,8 @@
//***************************************************************************
// libxx/libxx_cxapurevirtual.cxx
//
-// Copyright (C) 2009 Gregory Nutt. All rights reserved.
-// Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+// Copyright (C) 2009 2011 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
@@ -37,6 +37,8 @@
// Included Files
//***************************************************************************
+#include <cassert>
+
//***************************************************************************
// Definitions
//***************************************************************************
@@ -53,12 +55,15 @@
// Name: __cxa_pure_virtual
//
// Description:
-// Do nothing when a pure virtual function is called
+// Crash when an un-implemented pure virtual function is called
//
//***************************************************************************
-int __cxa_pure_virtual(void)
+extern "C"
{
- return 0;
+ void __cxa_pure_virtual(void)
+ {
+ PANIC(100);
+ }
}
diff --git a/sched/os_internal.h b/sched/os_internal.h
index 4ad8f087b5e1f3d28db858df902f3d91249ff01d..16eb176e198d79d263ec336a12709686cbb997d5 100644
--- a/sched/os_internal.h
+++ b/sched/os_internal.h
@@ -2,7 +2,7 @@
* sched/os_internal.h
*
* Copyright (C) 2007-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
@@ -52,7 +52,7 @@
* Pre-processor Definitions
****************************************************************************/
-/* OS CRASH CODES */
+/* OS CRASH CODES: All must lie in the range 0-99 */
enum os_crash_codes_e
{