diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-24 07:17:49 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-24 07:17:49 -0600 |
commit | 3abdc6aa5c3dca639e5d73d23bf93fe8d9259937 (patch) | |
tree | 88f92ba35acfc270e8183818b3114627c9e5ed32 | |
parent | 3a69874e3fc195aa7a0986801efb2d9f28966b90 (diff) | |
download | px4-nuttx-3abdc6aa5c3dca639e5d73d23bf93fe8d9259937.tar.gz px4-nuttx-3abdc6aa5c3dca639e5d73d23bf93fe8d9259937.tar.bz2 px4-nuttx-3abdc6aa5c3dca639e5d73d23bf93fe8d9259937.zip |
Adding missing registration of /dev/zero; Condition registration of /dev/null. From Ken Petit
-rw-r--r-- | nuttx/ChangeLog | 5 | ||||
-rw-r--r-- | nuttx/arch/arm/src/common/up_initialize.c | 8 | ||||
-rw-r--r-- | nuttx/arch/avr/src/common/up_initialize.c | 8 | ||||
-rw-r--r-- | nuttx/arch/hc/src/common/up_initialize.c | 8 | ||||
-rw-r--r-- | nuttx/arch/mips/src/common/up_initialize.c | 10 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_initialize.c | 8 | ||||
-rw-r--r-- | nuttx/arch/sim/src/up_initialize.c | 15 | ||||
-rw-r--r-- | nuttx/arch/x86/src/common/up_initialize.c | 8 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_initialize.c | 8 | ||||
-rw-r--r-- | nuttx/arch/z80/src/common/up_initialize.c | 8 |
10 files changed, 82 insertions, 4 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 1f9f200ed..51928c9c7 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -4606,3 +4606,8 @@ conditional logic in the lower end of the eixt logic kicked off by _exit() to prohibit blocking after the task has been torn down and is no longer cabable of blocking (2014-4-23). + * arch/arm/src/common/up_initialize.c: Add missing registration + of /dev/zero. Registration of /dev/null should depend upon + conditional compilation. From Ken Pettit (2014-4-24). + * arch/*/src/common/up_initialize.c: Same change required to other + architectures (2014-4-24). diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c index f4f37c8e3..8a1311d59 100644 --- a/nuttx/arch/arm/src/common/up_initialize.c +++ b/nuttx/arch/arm/src/common/up_initialize.c @@ -158,9 +158,17 @@ void up_initialize(void) /* Register devices */ #if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) devnull_register(); /* Standard /dev/null */ #endif +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c index 684dab09d..d63833de7 100644 --- a/nuttx/arch/avr/src/common/up_initialize.c +++ b/nuttx/arch/avr/src/common/up_initialize.c @@ -193,9 +193,17 @@ void up_initialize(void) /* Register devices */ #if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) devnull_register(); /* Standard /dev/null */ #endif +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/nuttx/arch/hc/src/common/up_initialize.c b/nuttx/arch/hc/src/common/up_initialize.c index 885e79905..e929dab0b 100644 --- a/nuttx/arch/hc/src/common/up_initialize.c +++ b/nuttx/arch/hc/src/common/up_initialize.c @@ -146,9 +146,17 @@ void up_initialize(void) /* Register devices */ #if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) devnull_register(); /* Standard /dev/null */ #endif +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/nuttx/arch/mips/src/common/up_initialize.c b/nuttx/arch/mips/src/common/up_initialize.c index a0f0ca9d5..eb03cf931 100644 --- a/nuttx/arch/mips/src/common/up_initialize.c +++ b/nuttx/arch/mips/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/mips/src/common/up_initialize.c * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -148,9 +148,17 @@ void up_initialize(void) /* Register devices */ #if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) devnull_register(); /* Standard /dev/null */ #endif +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/nuttx/arch/sh/src/common/up_initialize.c b/nuttx/arch/sh/src/common/up_initialize.c index 727dc1352..6f75106b2 100644 --- a/nuttx/arch/sh/src/common/up_initialize.c +++ b/nuttx/arch/sh/src/common/up_initialize.c @@ -133,9 +133,17 @@ void up_initialize(void) /* Register devices */ #if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) devnull_register(); /* Standard /dev/null */ #endif +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/nuttx/arch/sim/src/up_initialize.c b/nuttx/arch/sim/src/up_initialize.c index f8ae563e0..16fff605b 100644 --- a/nuttx/arch/sim/src/up_initialize.c +++ b/nuttx/arch/sim/src/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * up_initialize.c * - * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -96,8 +96,17 @@ void up_initialize(void) /* Register devices */ - devnull_register(); /* Standard /dev/null */ - devzero_register(); /* Standard /dev/zero */ +#if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) + devnull_register(); /* Standard /dev/null */ +#endif + +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ /* Register a console (or not) */ diff --git a/nuttx/arch/x86/src/common/up_initialize.c b/nuttx/arch/x86/src/common/up_initialize.c index b49dd55b4..cb8fe79ca 100644 --- a/nuttx/arch/x86/src/common/up_initialize.c +++ b/nuttx/arch/x86/src/common/up_initialize.c @@ -148,9 +148,17 @@ void up_initialize(void) /* Register devices */ #if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) devnull_register(); /* Standard /dev/null */ #endif +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c index 5c5e50999..27784101c 100644 --- a/nuttx/arch/z16/src/common/up_initialize.c +++ b/nuttx/arch/z16/src/common/up_initialize.c @@ -152,9 +152,17 @@ void up_initialize(void) /* Register devices */ #if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) devnull_register(); /* Standard /dev/null */ #endif +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER diff --git a/nuttx/arch/z80/src/common/up_initialize.c b/nuttx/arch/z80/src/common/up_initialize.c index a5623a63a..9d9cd956b 100644 --- a/nuttx/arch/z80/src/common/up_initialize.c +++ b/nuttx/arch/z80/src/common/up_initialize.c @@ -145,9 +145,17 @@ void up_initialize(void) /* Register devices */ #if CONFIG_NFILE_DESCRIPTORS > 0 + +#if defined(CONFIG_DEV_NULL) devnull_register(); /* Standard /dev/null */ #endif +#if defined(CONFIG_DEV_ZERO) + devzero_register(); /* Standard /dev/zero */ +#endif + +#endif /* CONFIG_NFILE_DESCRIPTORS */ + /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER |