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 /nuttx/arch/sim/src/up_initialize.c | |
| 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
Diffstat (limited to 'nuttx/arch/sim/src/up_initialize.c')
| -rw-r--r-- | nuttx/arch/sim/src/up_initialize.c | 15 |
1 files changed, 12 insertions, 3 deletions
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) */ |