diff options
43 files changed, 90 insertions, 379 deletions
diff --git a/apps/examples/dhcpd/target.c b/apps/examples/dhcpd/target.c index 1878c2bc8..d394da02e 100644 --- a/apps/examples/dhcpd/target.c +++ b/apps/examples/dhcpd/target.c @@ -86,19 +86,6 @@ ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does not support weak - * functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/hello/main.c b/apps/examples/hello/main.c index 44c8384eb..308603f33 100644 --- a/apps/examples/hello/main.c +++ b/apps/examples/hello/main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/hello/main.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -53,19 +53,6 @@ ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does not support weak - * functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/helloxx/main.cxx b/apps/examples/helloxx/main.cxx index df84375a2..9470edf14 100755 --- a/apps/examples/helloxx/main.cxx +++ b/apps/examples/helloxx/main.cxx @@ -1,7 +1,7 @@ //*************************************************************************** // examples/helloxx/main.c // -// Copyright (C) 2009 Gregory Nutt. All rights reserved. +// Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. // Author: Gregory Nutt <spudmonkey@racsa.co.cr> // // Redistribution and use in source and binary forms, with or without @@ -87,18 +87,6 @@ static CHelloWorld g_HelloWorld; //*************************************************************************** //*************************************************************************** -// user_initialize -//*************************************************************************** - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - // Stub that must be provided only if the toolchain does not support weak - // functions. -} -#endif - -//*************************************************************************** // user_start //*************************************************************************** diff --git a/apps/examples/hidkbd/hidkbd_main.c b/apps/examples/hidkbd/hidkbd_main.c index 0a082f67c..96864b9f9 100644 --- a/apps/examples/hidkbd/hidkbd_main.c +++ b/apps/examples/hidkbd/hidkbd_main.c @@ -141,14 +141,6 @@ static int hidkbd_waiter(int argc, char *argv[]) } /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c index 734a7e599..7f2a8099c 100755 --- a/apps/examples/igmp/igmp.c +++ b/apps/examples/igmp/igmp.c @@ -78,19 +78,6 @@ ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does - * not support weak functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/mm/mm_main.c b/apps/examples/mm/mm_main.c index 0e23e0cfb..036c39047 100644 --- a/apps/examples/mm/mm_main.c +++ b/apps/examples/mm/mm_main.c @@ -267,14 +267,6 @@ static void do_frees(void **mem, const int *size, const int *seq, int n) ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/mount/mount_main.c b/apps/examples/mount/mount_main.c index 05bda8150..00070b94c 100644 --- a/apps/examples/mount/mount_main.c +++ b/apps/examples/mount/mount_main.c @@ -1,7 +1,7 @@ /**************************************************************************** - * mount_main.c + * examples/mount/mount_main.c * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -567,14 +567,6 @@ static void succeed_stat(const char *path) ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c index c7492fff6..a6b3cda14 100644 --- a/apps/examples/nettest/nettest.c +++ b/apps/examples/nettest/nettest.c @@ -62,19 +62,6 @@ ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does - * not support weak functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/nsh/nsh_main.c b/apps/examples/nsh/nsh_main.c index 1bd09e8a3..53235a835 100644 --- a/apps/examples/nsh/nsh_main.c +++ b/apps/examples/nsh/nsh_main.c @@ -76,22 +76,6 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -/* In order to support user_initialize if CONFIG_PAGING is defined, this - * function (and only this function) would need to get moved to the locked - * text region. - */ - -#ifndef CONFIG_PAGING -void user_initialize(void) -{ - /* stub */ -} -#endif - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/null/null_main.c b/apps/examples/null/null_main.c index fa0a1473d..10fc1bf1e 100644 --- a/apps/examples/null/null_main.c +++ b/apps/examples/null/null_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/null/null_main.c * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -58,14 +58,6 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c index d35ea4ff0..48f4a11d5 100644 --- a/apps/examples/nx/nx_main.c +++ b/apps/examples/nx/nx_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/nx/nx_main.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -610,14 +610,6 @@ static int nxeg_initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/nxflat/nxflat_main.c b/apps/examples/nxflat/nxflat_main.c index a710112c3..12d88c3d5 100644 --- a/apps/examples/nxflat/nxflat_main.c +++ b/apps/examples/nxflat/nxflat_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/nxflat/nxflat_main.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -145,14 +145,6 @@ static inline void testheader(FAR const char *progname) ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/ostest/main.c b/apps/examples/ostest/main.c index 53be10764..327ec60e1 100644 --- a/apps/examples/ostest/main.c +++ b/apps/examples/ostest/main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/ostest/main.c * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -450,15 +450,6 @@ static void stdio_test(void) ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ - /* stub */ -} - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/pashello/pashello.c b/apps/examples/pashello/pashello.c index 8bdefe702..9ebe68a27 100644 --- a/apps/examples/pashello/pashello.c +++ b/apps/examples/pashello/pashello.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/pashello/pashello.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -99,16 +99,6 @@ static void prun(FAR struct pexec_s *st) ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/pipe/pipe_main.c b/apps/examples/pipe/pipe_main.c index 97e728eb7..1f0f73032 100644 --- a/apps/examples/pipe/pipe_main.c +++ b/apps/examples/pipe/pipe_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/pipe/pipe_main.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -69,14 +69,6 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/poll/poll_main.c b/apps/examples/poll/poll_main.c index d66e7f269..3db0150e7 100644 --- a/apps/examples/poll/poll_main.c +++ b/apps/examples/poll/poll_main.c @@ -74,14 +74,6 @@ ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/romfs/romfs_main.c b/apps/examples/romfs/romfs_main.c index 2e231a31c..32b3d2654 100644 --- a/apps/examples/romfs/romfs_main.c +++ b/apps/examples/romfs/romfs_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/romfs/romfs_main.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -452,14 +452,6 @@ static void checkdirectories(struct node_s *entry) ****************************************************************************/ /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/apps/examples/sendmail/target.c b/apps/examples/sendmail/target.c index d8643106b..ab4da14b1 100644 --- a/apps/examples/sendmail/target.c +++ b/apps/examples/sendmail/target.c @@ -97,18 +97,6 @@ static const char g_msg_body[] = CONFIG_EXAMPLE_SENDMAIL_BODY "\r\n"; /**************************************************************************** * Public Functions ****************************************************************************/ -/**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does not support weak - * functions. - */ -} -#endif /**************************************************************************** * user_start diff --git a/apps/examples/serloop/main.c b/apps/examples/serloop/main.c index a9bdbe7ea..3c635fe88 100644 --- a/apps/examples/serloop/main.c +++ b/apps/examples/serloop/main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/serloop/main.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -56,19 +56,6 @@ ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does not support weak - * functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/thttpd/main.c b/apps/examples/thttpd/main.c index e2fdda4f4..be30876cb 100644 --- a/apps/examples/thttpd/main.c +++ b/apps/examples/thttpd/main.c @@ -166,19 +166,6 @@ int g_thttpdnsymbols; ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does not support weak - * functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c index 5e31fdb36..07fec0e75 100644 --- a/apps/examples/udp/target.c +++ b/apps/examples/udp/target.c @@ -59,19 +59,6 @@ ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does - * not support weak functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/uip/main.c b/apps/examples/uip/main.c index 21a01998b..fd2da4b8e 100644 --- a/apps/examples/uip/main.c +++ b/apps/examples/uip/main.c @@ -105,19 +105,6 @@ ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does - * not support weak functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/usbserial/main.c b/apps/examples/usbserial/main.c index 17aef1c79..d84c063e1 100644 --- a/apps/examples/usbserial/main.c +++ b/apps/examples/usbserial/main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/usbserial/main.c * - * Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008, 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -188,19 +188,6 @@ static void dumptrace(void) ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does not support weak - * functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/usbstorage/usbstrg_main.c b/apps/examples/usbstorage/usbstrg_main.c index 47d79fbb4..3f0cf57e5 100644 --- a/apps/examples/usbstorage/usbstrg_main.c +++ b/apps/examples/usbstorage/usbstrg_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/usbstorage/usbstrg_main.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -284,19 +284,6 @@ static int usbstrg_enumerate(struct usbtrace_s *trace, void *arg) ****************************************************************************/ /**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does not support weak - * functions. - */ -} -#endif - -/**************************************************************************** * user_start ****************************************************************************/ diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c index b378e9944..9c55746b3 100644 --- a/apps/examples/wget/target.c +++ b/apps/examples/wget/target.c @@ -104,18 +104,6 @@ static void callback(FAR char **buffer, int offset, int datend, /**************************************************************************** * Public Functions ****************************************************************************/ -/**************************************************************************** - * user_initialize - ****************************************************************************/ - -#ifndef CONFIG_HAVE_WEAKFUNCTIONS -void user_initialize(void) -{ - /* Stub that must be provided only if the toolchain does not support weak - * functions. - */ -} -#endif /**************************************************************************** * user_start diff --git a/apps/examples/wlan/wlan_main.c b/apps/examples/wlan/wlan_main.c index fd1bd9322..652d8269c 100755 --- a/apps/examples/wlan/wlan_main.c +++ b/apps/examples/wlan/wlan_main.c @@ -142,14 +142,6 @@ static int wlan_waiter(int argc, char *argv[]) } /**************************************************************************** - * Name: user_initialize - ****************************************************************************/ - -void user_initialize(void) -{ -} - -/**************************************************************************** * Name: user_start ****************************************************************************/ diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 13e40f303..2605cf699 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1648,6 +1648,12 @@ separately linked images: (1) a kernel-mode RTOS image, and (2) a user- mode application image that communicates to the RTOS kernel via system calls. A lot more still must be done. + * user_initialize(): Eliminated the user_initialize() initialization hook. + It is difficult to maintain and redundant: Board level initialization + an up_initialize() provide the same kind of capability. + * arch/*/include/*/type.h: On some compilers, char defaults as unsigned. + Explicitly add signed to integer types if signed is what is required. + diff --git a/nuttx/arch/8051/include/types.h b/nuttx/arch/8051/include/types.h index 7495513b2..2d195631a 100644 --- a/nuttx/arch/8051/include/types.h +++ b/nuttx/arch/8051/include/types.h @@ -67,20 +67,20 @@ * long long and double are not supported. */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef int _int16_t; +typedef signed int _int16_t; typedef unsigned int _uint16_t; -typedef long _int32_t; +typedef signed long _int32_t; typedef unsigned long _uint32_t; /* For SDCC, a Generic pointer is 3 bytes in length with the * first byte holding data space information. */ -typedef long _intptr_t; +typedef signed long _intptr_t; typedef unsigned long _uintptr_t; /* This is the size of the interrupt state save returned by diff --git a/nuttx/arch/arm/include/types.h b/nuttx/arch/arm/include/types.h index 9a45fcb75..c3471ca59 100644 --- a/nuttx/arch/arm/include/types.h +++ b/nuttx/arch/arm/include/types.h @@ -63,22 +63,22 @@ * files */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; -typedef int _int32_t; +typedef signed int _int32_t; typedef unsigned int _uint32_t; -typedef long long _int64_t; +typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED /* A pointer is 4 bytes */ -typedef int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by irqsave(). For @@ -87,9 +87,9 @@ typedef unsigned int _uintptr_t; */ #ifdef __thumb2__ -typedef unsigned short irqstate_t; +typedef unsigned short irqstate_t; #else /* __thumb2__ */ -typedef unsigned int irqstate_t; +typedef unsigned int irqstate_t; #endif /* __thumb2__ */ #endif /* __ASSEMBLY__ */ diff --git a/nuttx/arch/avr/include/types.h b/nuttx/arch/avr/include/types.h index fd8c394c4..c93e70df4 100644 --- a/nuttx/arch/avr/include/types.h +++ b/nuttx/arch/avr/include/types.h @@ -63,27 +63,27 @@ * files */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; -typedef int _int32_t; +typedef signed int _int32_t; typedef unsigned int _uint32_t; -typedef long long _int64_t; +typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED /* A pointer is 4 bytes */ -typedef int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by irqsave(). */ -typedef unsigned int irqstate_t; +typedef unsigned int irqstate_t; #endif /* __ASSEMBLY__ */ diff --git a/nuttx/arch/hc/include/hc12/types.h b/nuttx/arch/hc/include/hc12/types.h index f29be6394..d676e3d27 100755 --- a/nuttx/arch/hc/include/hc12/types.h +++ b/nuttx/arch/hc/include/hc12/types.h @@ -63,9 +63,9 @@ * files */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; /* Normally, mc68hc1x code is compiled with the -mshort option @@ -74,20 +74,20 @@ typedef unsigned short _uint16_t; */ # if __INT__ == 16 -typedef long _int32_t; +typedef signed long _int32_t; typedef unsigned long _uint32_t; #else -typedef int _int32_t; +typedef signed int _int32_t; typedef unsigned int _uint32_t; #endif -typedef long long _int64_t; +typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED /* A pointer is two bytes */ -typedef short _intptr_t; +typedef signed short _intptr_t; typedef unsigned short _uintptr_t; /* This is the size of the interrupt state save returned by irqsave()*/ diff --git a/nuttx/arch/hc/include/hcs12/types.h b/nuttx/arch/hc/include/hcs12/types.h index 71b311fb7..739ddef21 100755 --- a/nuttx/arch/hc/include/hcs12/types.h +++ b/nuttx/arch/hc/include/hcs12/types.h @@ -63,10 +63,10 @@ * files */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; /* Normally, mc68hc1x code is compiled with the -mshort option @@ -75,20 +75,20 @@ typedef unsigned short _uint16_t; */ # if __INT__ == 16 -typedef long _int32_t; +typedef signed long _int32_t; typedef unsigned long _uint32_t; #else -typedef int _int32_t; +typedef signed int _int32_t; typedef unsigned int _uint32_t; #endif -typedef long long _int64_t; +typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED /* A pointer is two bytes */ -typedef short _intptr_t; +typedef signed short _intptr_t; typedef unsigned short _uintptr_t; /* This is the size of the interrupt state save returned by irqsave()*/ diff --git a/nuttx/arch/sh/include/m16c/types.h b/nuttx/arch/sh/include/m16c/types.h index d14812860..4f84a3113 100644 --- a/nuttx/arch/sh/include/m16c/types.h +++ b/nuttx/arch/sh/include/m16c/types.h @@ -65,22 +65,22 @@ * int is 16-bits and long is 32-bits */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef int _int16_t; +typedef signed int _int16_t; typedef unsigned int _uint16_t; -typedef long _int32_t; +typedef signed long _int32_t; typedef unsigned long _uint32_t; -typedef long long _int64_t; +typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED /* A pointer is 2 bytes */ -typedef unsigned int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by diff --git a/nuttx/arch/sh/include/sh1/types.h b/nuttx/arch/sh/include/sh1/types.h index 79ed1a181..ac0769ecd 100644 --- a/nuttx/arch/sh/include/sh1/types.h +++ b/nuttx/arch/sh/include/sh1/types.h @@ -63,22 +63,22 @@ * files */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; -typedef int _int32_t; +typedef signed int _int32_t; typedef unsigned int _uint32_t; -typedef long long _int64_t; +typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED /* A pointer is 4 bytes */ -typedef int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by diff --git a/nuttx/arch/sim/include/types.h b/nuttx/arch/sim/include/types.h index 214fbb91b..5b58264e6 100644 --- a/nuttx/arch/sim/include/types.h +++ b/nuttx/arch/sim/include/types.h @@ -63,22 +63,22 @@ * files */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; -typedef int _int32_t; +typedef signed int _int32_t; typedef unsigned int _uint32_t; -typedef long long _int64_t; +typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED /* A pointer is 4 bytes */ -typedef unsigned int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by diff --git a/nuttx/arch/x86/include/i486/types.h b/nuttx/arch/x86/include/i486/types.h index 88379fd0f..d6f25f3e0 100755 --- a/nuttx/arch/x86/include/i486/types.h +++ b/nuttx/arch/x86/include/i486/types.h @@ -64,22 +64,22 @@ * files */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; -typedef int _int32_t; +typedef signed int _int32_t; typedef unsigned int _uint32_t; -typedef long long _int64_t; +typedef signed long long _int64_t; typedef unsigned long long _uint64_t; #define __INT64_DEFINED /* A pointer is 4 bytes */ -typedef unsigned int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by diff --git a/nuttx/arch/z16/include/types.h b/nuttx/arch/z16/include/types.h index b83a6070d..536cb52a7 100644 --- a/nuttx/arch/z16/include/types.h +++ b/nuttx/arch/z16/include/types.h @@ -63,18 +63,18 @@ * files */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; -typedef int _int32_t; +typedef signed int _int32_t; typedef unsigned int _uint32_t; /* A pointer is 4 bytes */ -typedef int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by diff --git a/nuttx/arch/z80/include/ez80/types.h b/nuttx/arch/z80/include/ez80/types.h index 4ca48e697..f3569d9ba 100644 --- a/nuttx/arch/z80/include/ez80/types.h +++ b/nuttx/arch/z80/include/ez80/types.h @@ -72,17 +72,17 @@ * float - 32-bits */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef short _int16_t; +typedef signed short _int16_t; typedef unsigned short _uint16_t; -typedef int _int24_t; +typedef signed int _int24_t; typedef unsigned int _uint24_t; #define __INT24_DEFINED -typedef long _int32_t; +typedef signed long _int32_t; typedef unsigned long _uint32_t; /* A pointer is 2 or 3 bytes, depending upon if the ez80 is in z80 @@ -93,10 +93,10 @@ typedef unsigned long _uint32_t; */ #ifdef CONFIG_EZ80_Z80MODE -typedef short _intptr_t; +typedef signed short _intptr_t; typedef unsigned short _uintptr_t; #else -typedef int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; #endif diff --git a/nuttx/arch/z80/include/z8/types.h b/nuttx/arch/z80/include/z8/types.h index 0e269a5de..324ca236c 100644 --- a/nuttx/arch/z80/include/z8/types.h +++ b/nuttx/arch/z80/include/z8/types.h @@ -79,18 +79,18 @@ * rom pointer - 16-bits */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef int _int16_t; +typedef signed int _int16_t; typedef unsigned int _uint16_t; -typedef long _int32_t; +typedef signed long _int32_t; typedef unsigned long _uint32_t; /* A pointer is 2 bytes */ -typedef unsigned int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by irqsave() */ diff --git a/nuttx/arch/z80/include/z80/types.h b/nuttx/arch/z80/include/z80/types.h index 652ea5adf..42bba5ac8 100644 --- a/nuttx/arch/z80/include/z80/types.h +++ b/nuttx/arch/z80/include/z80/types.h @@ -72,18 +72,18 @@ * space information. */ -typedef char _int8_t; +typedef signed char _int8_t; typedef unsigned char _uint8_t; -typedef int _int16_t; +typedef signed int _int16_t; typedef unsigned int _uint16_t; -typedef long _int32_t; +typedef signed long _int32_t; typedef unsigned long _uint32_t; /* A pointer is 2 bytes */ -typedef int _intptr_t; +typedef signed int _intptr_t; typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by irqsave() */ diff --git a/nuttx/configs/ea3131/locked/mklocked.sh b/nuttx/configs/ea3131/locked/mklocked.sh index 3bfd0726d..8457ab818 100755 --- a/nuttx/configs/ea3131/locked/mklocked.sh +++ b/nuttx/configs/ea3131/locked/mklocked.sh @@ -2,7 +2,7 @@ ########################################################################### # configs/ea3131/locked/mklocked.sh # -# Copyright (C) 2010 Gregory Nutt. All rights reserved. +# Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -163,7 +163,6 @@ fi echo "EXTERN(mm_initialize)" >>ld-locked.inc echo "EXTERN(irq_initialize)" >>ld-locked.inc -#echo "EXTERN(user_initialize)" >>ld-locked.inc echo "EXTERN(wd_initialize)" >>ld-locked.inc answer=$(checkconfig CONFIG_DISABLE_CLOCK) diff --git a/nuttx/include/nuttx/init.h b/nuttx/include/nuttx/init.h index 3dd75209b..722db85a4 100644 --- a/nuttx/include/nuttx/init.h +++ b/nuttx/include/nuttx/init.h @@ -1,7 +1,7 @@ /**************************************************************************** * include/nuttx/init.h * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -66,9 +66,8 @@ extern "C" { #define EXTERN extern #endif -/* These are functions that must be supplied by the application */ +/* This entry point must be supplied by the application */ -EXTERN void weak_function user_initialize(void); EXTERN int user_start(int argc, char *argv[]); /* Functions contained in os_task.c *****************************************/ diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c index 0e44099c8..da34ad895 100644 --- a/nuttx/sched/os_start.c +++ b/nuttx/sched/os_start.c @@ -311,18 +311,6 @@ void os_start(void) irq_initialize(); } - /* Provide an access point to initialize any user-specific logic very - * early in the initialization sequence. Note that user_ininitialize() - * is called only if it is provided in the link. - */ - -#ifdef CONFIG_HAVE_WEAKFUNCTIONS - if (user_initialize != NULL) -#endif - { - user_initialize(); - } - /* Initialize the watchdog facility (if included in the link) */ #ifdef CONFIG_HAVE_WEAKFUNCTIONS |