libi2c: Claiming driver slot failed
Joel Sherrill
joel.sherrill at OARcorp.com
Fri Aug 9 14:58:31 UTC 2013
On 8/9/2013 8:51 AM, Nick Withers wrote:
> It sounds like that wouldn't fundamentally affect the application / BSP divide though, right?
No. The BSP provides a set of supported device drivers.
The application selects which to use. Some of those are
installed statically while RTEMS are initialized. Some require
tasking to be running during their initialization. Those
are installed dynamically.
> In this case, for instance, I believe libi2c's loaded dynamically (and hence there's no entry in the static driver table), but that that's really an implementation detail of the BSP and shouldn't really be visible to the app developer. Or perhaps in this case there should be a CONFIGURE_APPLICATION_I2C_DRIVER that could lead to a static driver table entry?
My understanding is that this driver is part of a framework and
the framework assumes it is initialized by the init task (e.g. dynamically
installed). If that's not correct, then it could be a static driver.
The CONFIGURE_APPLICATION_XXX_DRiVER constants are for static
drivers only.
In the current CONFIGURE_MAXIMUM_DRIVERS scheme, you have to
include the number of static drivers which is normally implicitly
computed. This just makes it so you only specify how many drivers
you register -- just like tasks you create. You don't explicitly count the
idle task in your set.
It isn't the right place to post this, but attached is my current version
of this patch.
> --
> Nick Withers
>
> Embedded Systems Programmer
> Room 2.26, Building 57
> Department of Nuclear Physics
> Research School of Physics and Engineering
> The Australian National
> University (CRICOS: 00120C)
>
> eMail: nick.withers at anu.edu.au
> Phone: +61 2 6125 2091
> Mobile: +61 414 397 446
>
> Joel Sherrill <Joel.Sherrill at OARcorp.com> wrote:
>
>> I have a pending patch that replace CONFIGURE_MAXIMUM_DRIVERS with CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS. The key idea is that the number of static drivers is the size of the driver table which can be computed. We just need extra slots for dynamic use. This should make it more directly tied to application requirements.
>>
>> Chris Johns <chrisj at rtems.org> wrote:
>>
>>
>> Nick Withers wrote:
>>> On Mon, 2013-08-05 at 14:02 +1000, Nick Withers wrote:
>>>> Hi guys,
>>>>
>>>> When I boot an MVME3100 (PowerPC) off the ticker sample application, I
>>>> get an error message "libi2c: Claiming driver slot failed (rtems status
>>>> code 5)".
>>> (snip)
>>>
>>> I got past this by #defining CONFIGURE_MAXIMUM_DRIVERS up to 10.
>>>
>>> Is this something that I should have to do? Would've thought the BSP
>>> code'd handle this...?
>> The BSP may require a number of driver slots while the actual number
>> used depends on your application and the drivers it uses. It is useful
>> on targets where the memory size is small.
>>
>> Currently there is no way for the BSP to provide a number for the table
>> so the application needs to size things to get it running. If you have
>> ideas on how this could be done we would welcome it.
>>
>> Chris
>> _______________________________________________
>> rtems-users mailing list
>> rtems-users at rtems.org
>> http://www.rtems.org/mailman/listinfo/rtems-users
>>
--
Joel Sherrill, Ph.D. Director of Research & Development
joel.sherrill at OARcorp.com On-Line Applications Research
Ask me about RTEMS: a free RTOS Huntsville AL 35805
Support Available (256) 722-9985
-------------- next part --------------
diff --git a/c/src/lib/libbsp/bfin/acinclude.m4 b/c/src/lib/libbsp/bfin/acinclude.m4
index 828fd89..ab6082e 100644
--- a/c/src/lib/libbsp/bfin/acinclude.m4
+++ b/c/src/lib/libbsp/bfin/acinclude.m4
@@ -2,12 +2,12 @@
AC_DEFUN([RTEMS_CHECK_BSPDIR],
[
case "$1" in
+ TLL6527M )
+ AC_CONFIG_SUBDIRS([TLL6527M]);;
bf537Stamp )
AC_CONFIG_SUBDIRS([bf537Stamp]);;
eZKit533 )
AC_CONFIG_SUBDIRS([eZKit533]);;
- TLL6527M )
- AC_CONFIG_SUBDIRS([TLL6527M]);;
*)
AC_MSG_ERROR([Invalid BSP]);;
esac
diff --git a/c/src/lib/libbsp/powerpc/acinclude.m4 b/c/src/lib/libbsp/powerpc/acinclude.m4
index e46fa2b..6442399 100644
--- a/c/src/lib/libbsp/powerpc/acinclude.m4
+++ b/c/src/lib/libbsp/powerpc/acinclude.m4
@@ -38,12 +38,12 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR],
AC_CONFIG_SUBDIRS([t32mppc]);;
tqm8xx )
AC_CONFIG_SUBDIRS([tqm8xx]);;
+ virtex )
+ AC_CONFIG_SUBDIRS([virtex]);;
virtex4 )
AC_CONFIG_SUBDIRS([virtex4]);;
virtex5 )
AC_CONFIG_SUBDIRS([virtex5]);;
- virtex )
- AC_CONFIG_SUBDIRS([virtex]);;
*)
AC_MSG_ERROR([Invalid BSP]);;
esac
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 50db877..6596b20 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -1174,17 +1174,24 @@ const rtems_libio_helper rtems_fs_init_helper =
* Default the number of drivers per node. This value may be
* overridden by the user.
*/
-
-#define CONFIGURE_NUMBER_OF_DRIVERS \
+#define CONFIGURE_NUMBER_OF_STATIC_DRIVERS \
RTEMS_ARRAY_SIZE(Device_drivers)
/**
+ * 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 installed in the system at one time. It must account
- * for both the statically and dynamically installed drivers.
+ * can be dynamically installed in the system at one time.
*/
-#ifndef CONFIGURE_MAXIMUM_DRIVERS
- #define CONFIGURE_MAXIMUM_DRIVERS CONFIGURE_NUMBER_OF_DRIVERS
+#ifndef CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS
+ #define CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS 0
#endif
@@ -2383,9 +2390,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 66f31ad..5ed372b 100644
--- a/doc/user/conf.t
+++ b/doc/user/conf.t
@@ -3197,8 +3197,12 @@ 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} option.
+ at code{CONFIGURE_NUMBER_OF_STATIC_DRIVERS} or
+ at 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
@@ -3746,15 +3750,15 @@ named @code{Device_drivers}.
It is expected that there the application would only rarely need to do this.
@c
- at c === CONFIGURE_MAXIMUM_DRIVERS ===
+ at c === CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS ===
@c
- at subsection Specifying the Maximum Number of Device Drivers
+ at subsection Specifying the Maximum Number of Dynamically Installed Device Drivers
- at findex CONFIGURE_MAXIMUM_DRIVERS
+ at findex CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS
@table @b
@item CONSTANT:
- at code{CONFIGURE_MAXIMUM_DRIVERS}
+ at code{CONFIGURE_MAXIMUM_DYNAMIC_DRIVERS}
@item DATA TYPE:
Unsigned integer (@code{uint32_t}).
@@ -3763,15 +3767,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:
- at 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
+ at 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/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c
index 2d3348e..92bf77e 100644
--- a/testsuites/fstests/fsdosfsname01/init.c
+++ b/testsuites/fstests/fsdosfsname01/init.c
@@ -1299,7 +1299,7 @@ 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
diff --git a/testsuites/fstests/mdosfs_support/fs_support.c b/testsuites/fstests/mdosfs_support/fs_support.c
index 03c377e..86c2a92 100644
--- a/testsuites/fstests/mdosfs_support/fs_support.c
+++ b/testsuites/fstests/mdosfs_support/fs_support.c
@@ -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..dd43b75 100644
--- a/testsuites/fstests/mrfs_support/fs_support.c
+++ b/testsuites/fstests/mrfs_support/fs_support.c
@@ -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 6352aba..0dc985c 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..06d94fa 100644
--- a/testsuites/libtests/devfs04/init.c
+++ b/testsuites/libtests/devfs04/init.c
@@ -81,7 +81,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TEST_DRIVER_TABLE_ENTRY
/* 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..ac771bd 100644
--- a/testsuites/libtests/deviceio01/init.c
+++ b/testsuites/libtests/deviceio01/init.c
@@ -69,7 +69,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS TEST_DRIVER_TABLE_ENTRY
/* 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/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/termios01/init.c b/testsuites/libtests/termios01/init.c
index b15c11c..44ebddf 100644
--- a/testsuites/libtests/termios01/init.c
+++ b/testsuites/libtests/termios01/init.c
@@ -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..244b823 100644
--- a/testsuites/libtests/termios03/init.c
+++ b/testsuites/libtests/termios03/init.c
@@ -160,7 +160,7 @@ rtems_task Init(
TERMIOS_TEST_DRIVER_TABLE_ENTRY
/* 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..bb8cd4a 100644
--- a/testsuites/libtests/termios04/init.c
+++ b/testsuites/libtests/termios04/init.c
@@ -140,7 +140,7 @@ rtems_task Init(
TERMIOS_TEST_DRIVER_TABLE_ENTRY
/* 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..5b3f4df 100644
--- a/testsuites/libtests/termios05/init.c
+++ b/testsuites/libtests/termios05/init.c
@@ -150,7 +150,7 @@ rtems_task Init(
TERMIOS_TEST_DRIVER_TABLE_ENTRY
/* 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/termios07/init.c b/testsuites/libtests/termios07/init.c
index 5514ee9..086742f 100644
--- a/testsuites/libtests/termios07/init.c
+++ b/testsuites/libtests/termios07/init.c
@@ -167,7 +167,7 @@ rtems_task Init(
TERMIOS_TEST_DRIVER_TABLE_ENTRY
/* 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/psxtests/psxconfig01/init.c b/testsuites/psxtests/psxconfig01/init.c
index dcf15ff..d3c0b2a 100644
--- a/testsuites/psxtests/psxconfig01/init.c
+++ b/testsuites/psxtests/psxconfig01/init.c
@@ -547,8 +547,6 @@ static rtems_task Init(rtems_task_argument argument)
#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..60b9a38 100644
--- a/testsuites/samples/fileio/system.h
+++ b/testsuites/samples/fileio/system.h
@@ -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/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c
index bc897c5..28d844c 100644
--- a/testsuites/sptests/sp40/init.c
+++ b/testsuites/sptests/sp40/init.c
@@ -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/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 04bae8c..f629fc9 100644
--- a/testsuites/sptests/spnsext01/init.c
+++ b/testsuites/sptests/spnsext01/init.c
@@ -79,7 +79,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
More information about the users
mailing list