diff --git a/configs/sim/mount/Make.defs b/configs/sim/mount/Make.defs index 1ae07a201fb..498291077d5 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 +# Author: Gregory Nutt # # 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 41a9e93784c..cf0134b9b00 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 +# Author: Gregory Nutt # # 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 4da1545cf7c..1330ade1e07 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 +# Author: Gregory Nutt # # 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 d36c3438fa3..b127e0a209e 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 dc00e533976..70f6066e197 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 +# Author: Gregory Nutt # # 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 437a6e663a2..2dfda3e6597 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 +# Author: Gregory Nutt # # 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 d5274e7d5ce..9010d2bb462 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 +# Author: Gregory Nutt # # 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 41a9e93784c..cf0134b9b00 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 +# Author: Gregory Nutt # # 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 ac0d4c0576f..40dc5acb153 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 +# Author: Gregory Nutt # # 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 e52d09de2b1..599b3743279 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 +# Author: Gregory Nutt # # 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 dad6008d4f5..7dc6ef42dde 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 + * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * 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 4a0ca367177..e8912558a5e 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 +// Copyright (C) 2009 2011 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt // // 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 + //*************************************************************************** // 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 4ad8f087b5e..16eb176e198 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 + * Author: Gregory Nutt * * 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 {