Hi
I haven't updated in a while on this. Attached is the current
patch. In trying to make a user distinction between static drivers
which are configured by name and the "maximum drivers" which
was supposed to include the static and dynamic, I uncovered
a bug in which you ended up with only 1 extra slot maximum
no matter what.
This attempts to:
+ make the number of dynamic drivers explicit
+ fix the bug
+ add any error checks I could think of
Eventually we may want a different scheme but we have to
fix what we have.
Please help review this so I can commit it.
--
Joel Sherrill, Ph.D. Director of Research & Development
joel.sherr...@oarcorp.com On-Line Applications Research
Ask me about RTEMS: a free RTOS Huntsville AL 35805
Support Available (256) 722-9985
>From 81cb8b1a1caf9dca38e066f3cfea9efbf6810c67 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherr...@oarcorp.com>
Date: Mon, 9 Sep 2013 14:00:26 -0500
Subject: [PATCH] configuration: Separate static from dynamic drivers
Prior to this patch, when the user dynamically registered device
drivers, they had to account for the number of statically installed
drivers and add their dynamic ones on top of that.
With this patch, the number of static drivers is calculated and not
modifiable by the user. They configure the number of dynamically
registered ones.
Adds: CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS
Obsoletes: CONFIGURE_MAXIMUM_DRIVERS
The user will get a compile time error for using CONFIGURE_MAXIMUM_DRIVERS.
---
cpukit/sapi/include/confdefs.h | 241 +++++++++++++++++++----
doc/user/conf.t | 70 +++-----
testsuites/fstests/fsbdpart01/init.c | 1 +
testsuites/fstests/fsdosfsname01/init.c | 3 +-
testsuites/fstests/fsdosfssync01/init.c | 1 +
testsuites/fstests/fsrofs01/init.c | 1 +
testsuites/fstests/mdosfs_support/fs_support.c | 4 +-
testsuites/fstests/mrfs_support/fs_support.c | 4 +-
testsuites/libtests/block01/init.c | 2 +-
testsuites/libtests/block02/init.c | 2 +-
testsuites/libtests/block03/init.c | 2 +-
testsuites/libtests/block04/init.c | 2 +-
testsuites/libtests/block05/init.c | 2 +-
testsuites/libtests/block06/init.c | 2 +-
testsuites/libtests/block07/init.c | 2 +-
testsuites/libtests/block08/system.h | 2 +-
testsuites/libtests/block09/init.c | 2 +-
testsuites/libtests/block10/init.c | 2 +-
testsuites/libtests/block11/init.c | 2 +-
testsuites/libtests/devfs04/init.c | 5 +-
testsuites/libtests/deviceio01/init.c | 5 +-
testsuites/libtests/flashdisk01/init.c | 1 +
testsuites/libtests/ftp01/init.c | 2 -
testsuites/libtests/mouse01/init.c | 3 +-
testsuites/libtests/syscall01/init.c | 3 +-
testsuites/libtests/termios01/init.c | 4 +-
testsuites/libtests/termios03/init.c | 8 +-
testsuites/libtests/termios04/init.c | 8 +-
testsuites/libtests/termios05/init.c | 8 +-
testsuites/libtests/termios06/init.c | 3 +-
testsuites/libtests/termios07/init.c | 8 +-
testsuites/libtests/termios08/init.c | 3 +-
testsuites/psxtests/psxconfig01/init.c | 2 -
testsuites/samples/fileio/system.h | 3 +-
testsuites/samples/pppd/system.h | 1 +
testsuites/sptests/sp21/init.c | 6 +-
testsuites/sptests/sp40/init.c | 4 +-
testsuites/sptests/spfatal16/testcase.h | 6 +-
testsuites/sptests/spfatal17/testcase.h | 6 +-
testsuites/sptests/spfatal18/testcase.h | 6 +-
testsuites/sptests/spfatal19/testcase.h | 6 +-
testsuites/sptests/spfatal20/testcase.h | 6 +-
testsuites/sptests/spheapprot/init.c | 1 -
testsuites/sptests/spmkdir/init.c | 1 -
testsuites/sptests/spnsext01/init.c | 1 -
45 files changed, 296 insertions(+), 161 deletions(-)
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 24c768f..5e05495 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -29,7 +29,7 @@
*/
/*
- * COPYRIGHT (c) 1989-2011.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -1091,61 +1091,244 @@ const rtems_libio_helper rtems_fs_init_helper =
#endif
/*
- * Default Device Driver Table. Each driver needed by the test is explicitly
- * choosen by that test. There is always a null driver entry.
- */
-
-#define NULL_DRIVER_TABLE_ENTRY \
- { NULL, NULL, NULL, NULL, NULL, NULL }
+ * Include the header files for the configured device drivers and
+ * define the number of device driver slots required.
+ */
+/**
+ * This constant is used internally to account for slots for the
+ * Console Device Driver when sizing the Device Driver table.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#include <rtems/console.h>
+ #define CONFIGURE_DEVICE_TABLE_CONSOLE_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_CONSOLE_SLOTS 0
#endif
+/**
+ * This constant is used internally to account for slots for the
+ * Clock Device Driver when sizing the Device Driver table.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#include <rtems/clockdrv.h>
+ #define CONFIGURE_DEVICE_TABLE_CLOCK_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_CLOCK_SLOTS 0
#endif
+/*
+ * The Timer Driver does not require any Device Driver slots.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
#include <rtems/timerdrv.h>
#endif
+/**
+ * This constant is used internally to account for slots for the
+ * Real-Time Clock Device Driver when sizing the Device Driver table.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
#include <rtems/rtc.h>
+ #define CONFIGURE_DEVICE_TABLE_RTC_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_RTC_SLOTS 0
#endif
+/**
+ * This constant is used internally to account for slots for the
+ * Watchdog Device Driver when sizing the Device Driver table.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_WATCHDOG_DRIVER
#include <rtems/watchdogdrv.h>
+ #define CONFIGURE_DEVICE_TABLE_WATCHDOG_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_WATCHDOG_SLOTS 0
#endif
+/**
+ * This constant is used internally to account for slots for the
+ * Frame Buffer Device Driver when sizing the Device Driver table.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_FRAME_BUFFER_DRIVER
#include <rtems/framebuffer.h>
+ #define CONFIGURE_DEVICE_TABLE_FRAME_BUFFER_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_FRAME_BUFFER_SLOTS 0
#endif
-#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
+/**
+ * This constant is used internally to account for slots for the
+ * /dev/null Device Driver when sizing the Device Driver table.
+ */
+#if defined(CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER) || \
+ defined(CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER)
#include <rtems/devnull.h>
+ #define CONFIGURE_DEVICE_TABLE_DEV_NULL_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_DEV_NULL_SLOTS 0
#endif
+/**
+ * This constant is used internally to account for slots for the
+ * /dev/zero Device Driver when sizing the Device Driver table.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER
#include <rtems/devzero.h>
+ #define CONFIGURE_DEVICE_TABLE_DEV_ZERO_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_DEV_ZERO_SLOTS 0
#endif
+/**
+ * This constant is used internally to account for slots for the
+ * IDE Device Driver when sizing the Device Driver table.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_IDE_DRIVER
/* the ide driver needs the ATA driver */
#ifndef CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER
#endif
#include <libchip/ide_ctrl.h>
+ #define CONFIGURE_DEVICE_TABLE_IDE_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_IDE_SLOTS 0
#endif
+/**
+ * This constant is used internally to account for slots for the
+ * ATA Device Driver when sizing the Device Driver table.
+ */
#ifdef CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER
#include <libchip/ata.h>
+ #define CONFIGURE_DEVICE_TABLE_ATA_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_ATA_SLOTS 0
#endif
+/*
+ * Default Device Driver Table. Each driver needed by the test is explicitly
+ * choosen by that test. There is always a null driver entry.
+ */
+#define NULL_DRIVER_TABLE_ENTRY \
+ { NULL, NULL, NULL, NULL, NULL, NULL }
+
+/*
+ * If the application doesn't end up with any device drivers configured
+ * then include the NULL driver table entry.
+ */
+#if !defined(CONFIGURE_BSP_PREREQUISITE_DRIVERS) && \
+ !defined(CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_IDE_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_NEEDS_FRAME_BUFFER_DRIVER) && \
+ !defined(CONFIGURE_APPLICATION_EXTRA_DRIVERS)
+ #define CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER_TABLE_ENTRY
+ #define CONFIGURE_DEVICE_TABLE_NULL_DRIVER_TABLE_ENTRY_SLOTS 1
+#else
+ #define CONFIGURE_DEVICE_TABLE_NULL_DRIVER_TABLE_ENTRY_SLOTS 0
+#endif
+
+/*
+ * If the BSP has prerequisite drivers, then we need to know how
+ * many slots to size the Device Driver table for to include them.
+ */
+#if defined(CONFIGURE_BSP_PREREQUISITE_DRIVERS) && \
+ !defined(CONFIGURE_BSP_PREREQUISITE_NUMBER_OF_DRIVERS)
+ #error "CONFIGURE_BSP_PREREQUISITE_DRIVERS defined but CONFIGURE_BSP_PREREQUISITE_NUMBER_OF_DRIVERS is not"
+#endif
+
+/**
+ * Provide a default for the number of application extra drivers.
+ */
+#if !defined(CONFIGURE_BSP_PREREQUISITE_DRIVERS)
+ #define CONFIGURE_BSP_PREREQUISITE_NUMBER_OF_DRIVERS 0
+#endif
+
+/*
+ * If the application has prerequisite drivers, then we need to know how
+ * many slots to size the Device Driver table for to include them.
+ */
+#if defined(CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS) && \
+ !defined(CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS)
+ #error "CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS defined but CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS is not"
+#endif
+
+/**
+ * Provide a default for the number of application extra drivers.
+ */
+#if !defined(CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS)
+ #define CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS 0
+#endif
+
+/*
+ * If the application defines extra drivers, then we need to know how
+ * many slots to size the Device Driver table for to include them.
+ */
+#if defined(CONFIGURE_APPLICATION_EXTRA_DRIVERS) && \
+ !defined(CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS)
+ #error "CONFIGURE_APPLICATION_EXTRA_DRIVERS defined but CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS is not"
+#endif
+
+/**
+ * Provide a default for the number of application extra drivers.
+ */
+#if !defined(CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS)
+ #define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 0
+#endif
+
+/*
+ * Default the number of drivers per node. This value may be
+ * overridden by the user.
+ */
+#define CONFIGURE_NUMBER_OF_STATIC_DRIVERS \
+ ( \
+ CONFIGURE_BSP_PREREQUISITE_NUMBER_OF_DRIVERS + \
+ CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS + \
+ CONFIGURE_DEVICE_TABLE_CONSOLE_SLOTS + \
+ CONFIGURE_DEVICE_TABLE_CLOCK_SLOTS + \
+ CONFIGURE_DEVICE_TABLE_RTC_SLOTS + \
+ CONFIGURE_DEVICE_TABLE_WATCHDOG_SLOTS + \
+ CONFIGURE_DEVICE_TABLE_DEV_NULL_SLOTS + \
+ CONFIGURE_DEVICE_TABLE_DEV_ZERO_SLOTS + \
+ CONFIGURE_DEVICE_TABLE_IDE_SLOTS + \
+ CONFIGURE_DEVICE_TABLE_ATA_SLOTS + \
+ CONFIGURE_DEVICE_TABLE_FRAME_BUFFER_SLOTS + \
+ CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS + \
+ CONFIGURE_DEVICE_TABLE_NULL_DRIVER_TABLE_ENTRY_SLOTS \
+ )
+
+/**
+ * The CONFIGURE_MAXIMUM_DRIVERS parameter is obsolete.
+ * Users should use the CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS
+ * to specify the number of dynamically installed drivers.
+ */
+#ifdef CONFIGURE_MAXIMUM_DRIVERS
+ #error "CONFIGURE_MAXIMUM_DRIVERS is obsolete. Use CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS instead"
+#endif
+
+/**
+ * This specifies the maximum number of device drivers that
+ * can be dynamically installed in the system at one time.
+ */
+#ifndef CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS
+ #define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 0
+#endif
+
+/*
+ * Instantiate the device driver table.
+ */
#ifndef CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE
#ifdef CONFIGURE_INIT
- rtems_driver_address_table Device_drivers[] = {
+ rtems_driver_address_table Device_drivers
+ [CONFIGURE_NUMBER_OF_STATIC_DRIVERS + CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS] = {
#ifdef CONFIGURE_BSP_PREREQUISITE_DRIVERS
CONFIGURE_BSP_PREREQUISITE_DRIVERS,
#endif
@@ -1164,7 +1347,8 @@ const rtems_libio_helper rtems_fs_init_helper =
#ifdef CONFIGURE_APPLICATION_NEEDS_WATCHDOG_DRIVER
WATCHDOG_DRIVER_TABLE_ENTRY,
#endif
- #ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
+ #if defined(CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER) || \
+ defined(CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER)
DEVNULL_DRIVER_TABLE_ENTRY,
#endif
#ifdef CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER
@@ -1182,17 +1366,7 @@ const rtems_libio_helper rtems_fs_init_helper =
#ifdef CONFIGURE_APPLICATION_EXTRA_DRIVERS
CONFIGURE_APPLICATION_EXTRA_DRIVERS,
#endif
- #ifdef CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER
- NULL_DRIVER_TABLE_ENTRY
- #elif !defined(CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER) && \
- !defined(CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER) && \
- !defined(CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER) && \
- !defined(CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER) && \
- !defined(CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER) && \
- !defined(CONFIGURE_APPLICATION_NEEDS_IDE_DRIVER) && \
- !defined(CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER) && \
- !defined(CONFIGURE_APPLICATION_NEEDS_FRAME_BUFFER_DRIVER) && \
- !defined(CONFIGURE_APPLICATION_EXTRA_DRIVERS)
+ #ifdef CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER_TABLE_ENTRY
NULL_DRIVER_TABLE_ENTRY
#endif
};
@@ -1200,24 +1374,6 @@ const rtems_libio_helper rtems_fs_init_helper =
#endif /* CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE */
-/*
- * Default the number of drivers per node. This value may be
- * overridden by the user.
- */
-
-#define CONFIGURE_NUMBER_OF_DRIVERS \
- RTEMS_ARRAY_SIZE(Device_drivers)
-
-/**
- * This specifies the maximum number of device drivers that
- * can be installed in the system at one time. It must account
- * for both the statically and dynamically installed drivers.
- */
-#ifndef CONFIGURE_MAXIMUM_DRIVERS
- #define CONFIGURE_MAXIMUM_DRIVERS CONFIGURE_NUMBER_OF_DRIVERS
-#endif
-
-
#ifdef CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER
/*
* configure the priority of the ATA driver task
@@ -2401,9 +2557,10 @@ const rtems_libio_helper rtems_fs_init_helper =
false,
#endif
#endif
- CONFIGURE_MAXIMUM_DRIVERS, /* maximum device drivers */
- CONFIGURE_NUMBER_OF_DRIVERS, /* static device drivers */
- Device_drivers, /* pointer to driver table */
+ CONFIGURE_NUMBER_OF_STATIC_DRIVERS + /* maximum device drivers */
+ CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS,
+ CONFIGURE_NUMBER_OF_STATIC_DRIVERS, /* number of static drivers */
+ Device_drivers, /* static driver table */
CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS, /* number of static extensions */
CONFIGURE_INITIAL_EXTENSION_TABLE, /* pointer to static extensions */
#if defined(RTEMS_MULTIPROCESSING)
diff --git a/doc/user/conf.t b/doc/user/conf.t
index 94d523f..5d7b877 100644
--- a/doc/user/conf.t
+++ b/doc/user/conf.t
@@ -3197,8 +3197,11 @@ then this BSP specific maximum device count will be used.
@subheading NOTES:
This option is specific to the device file system (devFS) and should not be
-confused with the @code{CONFIGURE_MAXIMUM_DRIVERS} option. This parameter only
-impacts the devFS and thus is only used by @code{<rtems/confdefs.h>} when
+confused with the @code{CONFIGURE_MAXIMUM_DRIVERS} or
+@code{CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS} configuration parameters.
+
+This parameter only impacts the devFS and thus
+is only used by @code{<rtems/confdefs.h>} when
@code{CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM} is specified.
@c
@@ -3536,43 +3539,6 @@ This scheduler may be explicitly selected by defining
None.
@c
-@c === CONFIGURE_SCHEDULER_PRIORITY_SMP ===
-@c
-@subsection Use Deterministic Priority SMP Scheduler
-
-@findex CONFIGURE_SCHEDULER_PRIORITY_SMP
-
-@table @b
-@item CONSTANT:
-@code{CONFIGURE_SCHEDULER_PRIORITY_SMP}
-
-@item DATA TYPE:
-Boolean feature macro.
-
-@item RANGE:
-Defined or undefined.
-
-@item DEFAULT VALUE:
-This is not defined by default.
-
-@end table
-
-@subheading DESCRIPTION:
-The Deterministic Priority SMP Scheduler is derived from the Deterministic
-Priority Scheduler but is capable of scheduling threads across multiple
-processors.
-
-In a configuration with SMP enabled at configure time, it may be
-explicitly selected by defining @code{CONFIGURE_SCHEDULER_PRIORITY_SMP}.
-
-@subheading NOTES:
-This scheduler is only available when RTEMS is configured with SMP
-support enabled.
-
-This scheduler is currently the default in SMP configurations and is
-only selected when @code{CONFIGURE_SMP_APPLICATION} is defined.
-
-@c
@c === CONFIGURE_SCHEDULER_SIMPLE_SMP ===
@c
@subsection Use Simple SMP Priority Scheduler
@@ -3615,6 +3581,9 @@ explicitly selected by defining @code{CONFIGURE_SCHEDULER_SIMPLE_SMP}.
This scheduler is only available when RTEMS is configured with SMP
support enabled.
+This scheduler is currently the default in SMP configurations and is
+only selected when @code{CONFIGURE_SMP_APPLICATION} is defined.
+
@c
@c === Configuring a User Scheduler ===
@c
@@ -3780,15 +3749,15 @@ named @code{Device_drivers}.
It is expected that there the application would only rarely need to do this.
@c
-@c === CONFIGURE_MAXIMUM_DRIVERS ===
+@c === CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS ===
@c
-@subsection Specifying the Maximum Number of Device Drivers
+@subsection Specifying the Maximum Number of Dynamically Installed Device Drivers
-@findex CONFIGURE_MAXIMUM_DRIVERS
+@findex CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS
@table @b
@item CONSTANT:
-@code{CONFIGURE_MAXIMUM_DRIVERS}
+@code{CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS}
@item DATA TYPE:
Unsigned integer (@code{uint32_t}).
@@ -3797,15 +3766,20 @@ Unsigned integer (@code{uint32_t}).
Zero or positive.
@item DEFAULT VALUE:
-This is computed by default, and is set to the number of device drivers
-configured using the @code{CONFIGURE_APPLICATIONS_NEEDS_XXX_DRIVER}
-configuration parameters.
+The default value is 0.
@end table
@subheading DESCRIPTION:
-@code{CONFIGURE_MAXIMUM_DRIVERS} is defined as the number of device
-drivers per node.
+This value reflects the maximum number of device drivers the application
+will dynamically installed.
+
+The number of statically installed device drivers is computed by
+default, and is set to the number of device drivers configured using the
+@code{CONFIGURE_APPLICATIONS_NEEDS_XXX_DRIVER} configuration parameters.
+
+The maximum number of device drivconfigers in a system is the sum of
+the number of statically configured device drivers and this parameter.
@subheading NOTES:
If the application will dynamically install device drivers, then this
diff --git a/testsuites/fstests/fsbdpart01/init.c b/testsuites/fstests/fsbdpart01/init.c
index b94afdc..e828cf0 100644
--- a/testsuites/fstests/fsbdpart01/init.c
+++ b/testsuites/fstests/fsbdpart01/init.c
@@ -225,6 +225,7 @@ size_t rtems_ramdisk_configuration_size = 1;
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 13
diff --git a/testsuites/fstests/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c
index 2d3348e..b75e3dc 100644
--- a/testsuites/fstests/fsdosfsname01/init.c
+++ b/testsuites/fstests/fsdosfsname01/init.c
@@ -1299,9 +1299,10 @@ size_t rtems_ramdisk_configuration_size = RTEMS_ARRAY_SIZE(rtems_ramdisk_configu
#define CONFIGURE_INIT_TASK_STACK_SIZE ( 1024 * 64 )
#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_MAXIMUM_DRIVERS 4
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 3
#define CONFIGURE_MAXIMUM_SEMAPHORES (2 * RTEMS_DOSFS_SEMAPHORES_PER_INSTANCE)
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
diff --git a/testsuites/fstests/fsdosfssync01/init.c b/testsuites/fstests/fsdosfssync01/init.c
index fc38e2c..11ac01f 100644
--- a/testsuites/fstests/fsdosfssync01/init.c
+++ b/testsuites/fstests/fsdosfssync01/init.c
@@ -157,6 +157,7 @@ size_t rtems_ramdisk_configuration_size = 1;
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
diff --git a/testsuites/fstests/fsrofs01/init.c b/testsuites/fstests/fsrofs01/init.c
index 9bea115..72ac549 100644
--- a/testsuites/fstests/fsrofs01/init.c
+++ b/testsuites/fstests/fsrofs01/init.c
@@ -170,6 +170,7 @@ size_t rtems_ramdisk_configuration_size = 1;
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
diff --git a/testsuites/fstests/mdosfs_support/fs_support.c b/testsuites/fstests/mdosfs_support/fs_support.c
index 03c377e..1ff3632 100644
--- a/testsuites/fstests/mdosfs_support/fs_support.c
+++ b/testsuites/fstests/mdosfs_support/fs_support.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2011.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -85,7 +85,7 @@ void test_shutdown_filesystem(void)
#define CONFIGURE_MAXIMUM_SEMAPHORES RTEMS_DOSFS_SEMAPHORES_PER_INSTANCE
#define CONFIGURE_MAXIMUM_TASKS 10
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
-#define CONFIGURE_MAXIMUM_DRIVERS 10
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 8
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
#define CONFIGURE_INIT_TASK_STACK_SIZE (16 * 1024)
diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c
index 1e96006..181639d 100644
--- a/testsuites/fstests/mrfs_support/fs_support.c
+++ b/testsuites/fstests/mrfs_support/fs_support.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2011.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -65,7 +65,7 @@ test_shutdown_filesystem (void)
#define CONFIGURE_MAXIMUM_TASKS 10
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
-#define CONFIGURE_MAXIMUM_DRIVERS 10
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 8
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
#define CONFIGURE_INIT_TASK_STACK_SIZE (32 * 1024)
diff --git a/testsuites/libtests/block01/init.c b/testsuites/libtests/block01/init.c
index c26f18a..518662c 100644
--- a/testsuites/libtests/block01/init.c
+++ b/testsuites/libtests/block01/init.c
@@ -254,7 +254,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
#define CONFIGURE_MAXIMUM_TASKS 1
-#define CONFIGURE_MAXIMUM_DRIVERS 2
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/block02/init.c b/testsuites/libtests/block02/init.c
index ed68830..e091fed 100644
--- a/testsuites/libtests/block02/init.c
+++ b/testsuites/libtests/block02/init.c
@@ -200,7 +200,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 3
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 2
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/block03/init.c b/testsuites/libtests/block03/init.c
index 2ad2b49..8f3abe9 100644
--- a/testsuites/libtests/block03/init.c
+++ b/testsuites/libtests/block03/init.c
@@ -187,7 +187,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 3
-#define CONFIGURE_MAXIMUM_DRIVERS 2
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/block04/init.c b/testsuites/libtests/block04/init.c
index 1a93a30..9787578 100644
--- a/testsuites/libtests/block04/init.c
+++ b/testsuites/libtests/block04/init.c
@@ -159,7 +159,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 3
-#define CONFIGURE_MAXIMUM_DRIVERS 2
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/block05/init.c b/testsuites/libtests/block05/init.c
index 0a56ec6..6c3d738 100644
--- a/testsuites/libtests/block05/init.c
+++ b/testsuites/libtests/block05/init.c
@@ -517,7 +517,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 4
-#define CONFIGURE_MAXIMUM_DRIVERS 4
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 2
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/block06/init.c b/testsuites/libtests/block06/init.c
index e51bf27..daf6b94 100644
--- a/testsuites/libtests/block06/init.c
+++ b/testsuites/libtests/block06/init.c
@@ -1851,7 +1851,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_BDBUF_TASK_STACK_SIZE BDBUF_TEST_STACK_SIZE
#define CONFIGURE_MAXIMUM_TASKS (1 + BDBUF_TEST_TASKS)
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_MAXIMUM_SEMAPHORES 2
#define CONFIGURE_EXTRA_TASK_STACKS \
diff --git a/testsuites/libtests/block07/init.c b/testsuites/libtests/block07/init.c
index 43ff1e6..e113c90 100644
--- a/testsuites/libtests/block07/init.c
+++ b/testsuites/libtests/block07/init.c
@@ -263,7 +263,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
#define CONFIGURE_MAXIMUM_TASKS 4
-#define CONFIGURE_MAXIMUM_DRIVERS 2
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/block08/system.h b/testsuites/libtests/block08/system.h
index 6965104..5c4aa0e 100644
--- a/testsuites/libtests/block08/system.h
+++ b/testsuites/libtests/block08/system.h
@@ -44,7 +44,7 @@ rtems_task Init(
* test driver after RTEMS initialization phase
* (on test start-up).
*/
-#define CONFIGURE_MAXIMUM_DRIVERS 5
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 3
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_INIT_TASK_STACK_SIZE (4 * RTEMS_MINIMUM_STACK_SIZE)
diff --git a/testsuites/libtests/block09/init.c b/testsuites/libtests/block09/init.c
index 15cecc3..22c410e 100644
--- a/testsuites/libtests/block09/init.c
+++ b/testsuites/libtests/block09/init.c
@@ -234,7 +234,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 1
-#define CONFIGURE_MAXIMUM_DRIVERS 4
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 2
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/block10/init.c b/testsuites/libtests/block10/init.c
index 654357f..aa0c25a 100644
--- a/testsuites/libtests/block10/init.c
+++ b/testsuites/libtests/block10/init.c
@@ -476,7 +476,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 3
-#define CONFIGURE_MAXIMUM_DRIVERS 4
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 2
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/block11/init.c b/testsuites/libtests/block11/init.c
index b850aba..6424c82 100644
--- a/testsuites/libtests/block11/init.c
+++ b/testsuites/libtests/block11/init.c
@@ -399,7 +399,7 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
#define CONFIGURE_MAXIMUM_TASKS 1
-#define CONFIGURE_MAXIMUM_DRIVERS 2
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/libtests/devfs04/init.c b/testsuites/libtests/devfs04/init.c
index ecf560f..73a1ac8 100644
--- a/testsuites/libtests/devfs04/init.c
+++ b/testsuites/libtests/devfs04/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -79,9 +79,10 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
/* include an extra slot for registering the termios one dynamically */
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_MAXIMUM_DEVICES 6
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
diff --git a/testsuites/libtests/deviceio01/init.c b/testsuites/libtests/deviceio01/init.c
index e73e74b..292713f 100644
--- a/testsuites/libtests/deviceio01/init.c
+++ b/testsuites/libtests/deviceio01/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -67,9 +67,10 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
/* include an extra slot for registering the termios one dynamically */
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
diff --git a/testsuites/libtests/flashdisk01/init.c b/testsuites/libtests/flashdisk01/init.c
index bd38085..e960f88 100644
--- a/testsuites/libtests/flashdisk01/init.c
+++ b/testsuites/libtests/flashdisk01/init.c
@@ -337,6 +337,7 @@ uint32_t rtems_flashdisk_configuration_size = FLASHDISK_CONFIG_COUNT;
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS FLASHDISK_DRIVER
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
diff --git a/testsuites/libtests/ftp01/init.c b/testsuites/libtests/ftp01/init.c
index 369aebe..b47a9e8 100644
--- a/testsuites/libtests/ftp01/init.c
+++ b/testsuites/libtests/ftp01/init.c
@@ -235,8 +235,6 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_FILESYSTEM_FTPFS
-#define CONFIGURE_MAXIMUM_DRIVERS 2
-
#define CONFIGURE_MAXIMUM_TASKS (3 + FTP_WORKER_TASK_COUNT)
#define CONFIGURE_MAXIMUM_SEMAPHORES 2
diff --git a/testsuites/libtests/mouse01/init.c b/testsuites/libtests/mouse01/init.c
index 78010f1..9b925e9 100644
--- a/testsuites/libtests/mouse01/init.c
+++ b/testsuites/libtests/mouse01/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -158,6 +158,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS \
TERMIOS_TEST_DRIVER_TABLE_ENTRY, \
SERIAL_MOUSE_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 2
/* one for the console and one for the test port */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
diff --git a/testsuites/libtests/syscall01/init.c b/testsuites/libtests/syscall01/init.c
index 8b63348..f9da0b5 100644
--- a/testsuites/libtests/syscall01/init.c
+++ b/testsuites/libtests/syscall01/init.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 embedded brains GmbH. All rights reserved.
+ * Copyright (c) 2013 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Obere Lagerstr. 30
@@ -104,6 +104,7 @@ static rtems_device_driver open_driver_open(
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS OPEN_DRIVER
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
diff --git a/testsuites/libtests/termios01/init.c b/testsuites/libtests/termios01/init.c
index b15c11c..d3acfe0 100644
--- a/testsuites/libtests/termios01/init.c
+++ b/testsuites/libtests/termios01/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2010.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -616,7 +616,7 @@ static rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
/* include an extra slot for registering the termios one dynamically */
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
/* one for the console and one for the test port */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3
diff --git a/testsuites/libtests/termios03/init.c b/testsuites/libtests/termios03/init.c
index bc33feb..480f22c 100644
--- a/testsuites/libtests/termios03/init.c
+++ b/testsuites/libtests/termios03/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -156,11 +156,11 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_APPLICATION_EXTRA_DRIVERS \
- TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
/* include an extra slot for registering the termios one dynamically */
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
/* one for the console and one for the test port */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3
diff --git a/testsuites/libtests/termios04/init.c b/testsuites/libtests/termios04/init.c
index 1755f64..81ee3f3 100644
--- a/testsuites/libtests/termios04/init.c
+++ b/testsuites/libtests/termios04/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -136,11 +136,11 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_APPLICATION_EXTRA_DRIVERS \
- TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
/* include an extra slot for registering the termios one dynamically */
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
/* one for the console and one for the test port */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3
diff --git a/testsuites/libtests/termios05/init.c b/testsuites/libtests/termios05/init.c
index 4dec038..12c13f5 100644
--- a/testsuites/libtests/termios05/init.c
+++ b/testsuites/libtests/termios05/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -146,11 +146,11 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_APPLICATION_EXTRA_DRIVERS \
- TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
/* include an extra slot for registering the termios one dynamically */
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
/* one for the console and one for the test port */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3
diff --git a/testsuites/libtests/termios06/init.c b/testsuites/libtests/termios06/init.c
index 204689e..ca56eb0 100644
--- a/testsuites/libtests/termios06/init.c
+++ b/testsuites/libtests/termios06/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -207,6 +207,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
/* one for the console and one for the test port */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3
diff --git a/testsuites/libtests/termios07/init.c b/testsuites/libtests/termios07/init.c
index 5514ee9..b098122 100644
--- a/testsuites/libtests/termios07/init.c
+++ b/testsuites/libtests/termios07/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -163,11 +163,11 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_APPLICATION_EXTRA_DRIVERS \
- TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
/* include an extra slot for registering the termios one dynamically */
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
/* one for the console and one for the test port */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3
diff --git a/testsuites/libtests/termios08/init.c b/testsuites/libtests/termios08/init.c
index b3471a3..4fb6058 100644
--- a/testsuites/libtests/termios08/init.c
+++ b/testsuites/libtests/termios08/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -151,6 +151,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TERMIOS_TEST_DRIVER_TABLE_ENTRY
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 1
/* one for the console and one for the test port */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 3
diff --git a/testsuites/psxtests/psxconfig01/init.c b/testsuites/psxtests/psxconfig01/init.c
index e0d1ffc..3798ce2 100644
--- a/testsuites/psxtests/psxconfig01/init.c
+++ b/testsuites/psxtests/psxconfig01/init.c
@@ -165,8 +165,6 @@
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_MAXIMUM_DRIVERS 2
-
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_INIT
diff --git a/testsuites/samples/fileio/system.h b/testsuites/samples/fileio/system.h
index 1e575b6..452f984 100644
--- a/testsuites/samples/fileio/system.h
+++ b/testsuites/samples/fileio/system.h
@@ -3,7 +3,7 @@
* This include file contains information that is included in every
* function in the test set.
*
- * COPYRIGHT (c) 1989-2009.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -37,7 +37,6 @@ rtems_task Init(
#include <libchip/ide_ctrl.h> /* for general ide driver prototype */
#endif
-#define CONFIGURE_MAXIMUM_DRIVERS 4
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#ifdef RTEMS_BSP_HAS_IDE_DRIVER
diff --git a/testsuites/samples/pppd/system.h b/testsuites/samples/pppd/system.h
index 5e70ddb..fa473e0 100644
--- a/testsuites/samples/pppd/system.h
+++ b/testsuites/samples/pppd/system.h
@@ -23,6 +23,7 @@ extern int pppdapp_initialize(void);
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS \
{ TTY1_DRIVER_TABLE_ENTRY, TTY2_DRIVER_TABLE_ENTRY }
+#define CONFIGURE_APPLICATION_NUMBER_OF_EXTRA_DRIVERS 2
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 8
diff --git a/testsuites/sptests/sp21/init.c b/testsuites/sptests/sp21/init.c
index 84daaad..92452f0 100644
--- a/testsuites/sptests/sp21/init.c
+++ b/testsuites/sptests/sp21/init.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -269,9 +269,9 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_MAXIMUM_TASKS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c
index bc897c5..a3ec3f2 100644
--- a/testsuites/sptests/sp40/init.c
+++ b/testsuites/sptests/sp40/init.c
@@ -1,7 +1,7 @@
/*
* IO Manager Dynamic Registration
*
- * COPYRIGHT (c) 1989-2012.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* Copyright (c) 2009 embedded brains GmbH.
@@ -180,7 +180,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
/* more one more driver slot than are statically configured */
-#define CONFIGURE_MAXIMUM_DRIVERS 3
+#define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 1
#define CONFIGURE_MAXIMUM_TASKS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/sptests/spfatal16/testcase.h b/testsuites/sptests/spfatal16/testcase.h
index ced8777..50ab620 100644
--- a/testsuites/sptests/spfatal16/testcase.h
+++ b/testsuites/sptests/spfatal16/testcase.h
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2010.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,8 +17,8 @@
#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
#define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY
-#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \
- CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS 1
void force_error()
{
diff --git a/testsuites/sptests/spfatal17/testcase.h b/testsuites/sptests/spfatal17/testcase.h
index 01db837..03e9002 100644
--- a/testsuites/sptests/spfatal17/testcase.h
+++ b/testsuites/sptests/spfatal17/testcase.h
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2010.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,8 +17,8 @@
#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
#define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY
-#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \
- CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS 1
void force_error()
{
diff --git a/testsuites/sptests/spfatal18/testcase.h b/testsuites/sptests/spfatal18/testcase.h
index 2679e8e..8998cb5 100644
--- a/testsuites/sptests/spfatal18/testcase.h
+++ b/testsuites/sptests/spfatal18/testcase.h
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2010.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,8 +17,8 @@
#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
#define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY
-#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \
- CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS 1
void force_error()
{
diff --git a/testsuites/sptests/spfatal19/testcase.h b/testsuites/sptests/spfatal19/testcase.h
index 4520e66..795a988 100644
--- a/testsuites/sptests/spfatal19/testcase.h
+++ b/testsuites/sptests/spfatal19/testcase.h
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2010.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,8 +17,8 @@
#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
#define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY
-#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \
- CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS 1
void force_error()
{
diff --git a/testsuites/sptests/spfatal20/testcase.h b/testsuites/sptests/spfatal20/testcase.h
index ef7732f..34a3139 100644
--- a/testsuites/sptests/spfatal20/testcase.h
+++ b/testsuites/sptests/spfatal20/testcase.h
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2010.
+ * COPYRIGHT (c) 1989-2013.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -14,8 +14,8 @@
#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
#define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY
-#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \
- CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS CONSUME_SEMAPHORE_DRIVERS
+#define CONFIGURE_APPLICATION_PREREQUISITE_NUMBER_OF_DRIVERS 1
void force_error()
{
diff --git a/testsuites/sptests/spheapprot/init.c b/testsuites/sptests/spheapprot/init.c
index aaea75d..0b26a35 100644
--- a/testsuites/sptests/spheapprot/init.c
+++ b/testsuites/sptests/spheapprot/init.c
@@ -138,7 +138,6 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 2
-#define CONFIGURE_MAXIMUM_DRIVERS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/sptests/spmkdir/init.c b/testsuites/sptests/spmkdir/init.c
index b795dcd..97846ce 100644
--- a/testsuites/sptests/spmkdir/init.c
+++ b/testsuites/sptests/spmkdir/init.c
@@ -112,7 +112,6 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
#define CONFIGURE_MAXIMUM_TASKS 1
-#define CONFIGURE_MAXIMUM_DRIVERS 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/sptests/spnsext01/init.c b/testsuites/sptests/spnsext01/init.c
index cbe3c13..9c8655c 100644
--- a/testsuites/sptests/spnsext01/init.c
+++ b/testsuites/sptests/spnsext01/init.c
@@ -80,7 +80,6 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
#define CONFIGURE_MAXIMUM_TASKS 1
-#define CONFIGURE_MAXIMUM_DRIVERS 2
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
--
1.7.1
_______________________________________________
rtems-devel mailing list
rtems-devel@rtems.org
http://www.rtems.org/mailman/listinfo/rtems-devel
