From 91e6580aff00bd7deffaae18863189c68225960e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 24 Apr 2013 07:17:49 -0600 Subject: [PATCH] Adding missing registration of /dev/zero; Condition registration of /dev/null. From Ken Petit --- arch/arm/src/common/up_initialize.c | 8 ++++++++ arch/avr/src/common/up_initialize.c | 8 ++++++++ arch/hc/src/common/up_initialize.c | 8 ++++++++ arch/mips/src/common/up_initialize.c | 10 +++++++++- arch/sh/src/common/up_initialize.c | 8 ++++++++ arch/sim/src/up_initialize.c | 15 ++++++++++++--- arch/x86/src/common/up_initialize.c | 8 ++++++++ arch/z16/src/common/up_initialize.c | 8 ++++++++ arch/z80/src/common/up_initialize.c | 8 ++++++++ 9 files changed, 77 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index f4f37c8e31..8a1311d591 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/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/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 684dab09d5..d63833de70 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/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/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index 885e79905a..e929dab0bf 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/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/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index a0f0ca9d5e..eb03cf9312 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/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 * * 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/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c index 727dc13527..6f75106b2c 100644 --- a/arch/sh/src/common/up_initialize.c +++ b/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/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c index f8ae563e09..16fff605b1 100644 --- a/arch/sim/src/up_initialize.c +++ b/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 * * 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/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index b49dd55b44..cb8fe79cad 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/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/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index 5c5e509995..27784101c8 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/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/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index a5623a63a3..9d9cd956b2 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/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