diff options
-rw-r--r-- | testsuites/samples/ChangeLog | 4 | ||||
-rw-r--r-- | testsuites/samples/pppd/system.h | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog index 61d77f9755..96c46bc4ad 100644 --- a/testsuites/samples/ChangeLog +++ b/testsuites/samples/ChangeLog @@ -1,3 +1,7 @@ +2011-02-17 Joel Sherrill <joel.sherrill@oarcorp.com> + + * pppd/system.h: Use confdefs.h to generate device driver table. + 2011-02-17 Sebastian Huber <Sebastian.Huber@embedded-brains.de> * pppd/system.h: Added missing include files. diff --git a/testsuites/samples/pppd/system.h b/testsuites/samples/pppd/system.h index 7400029b59..cbd15e8373 100644 --- a/testsuites/samples/pppd/system.h +++ b/testsuites/samples/pppd/system.h @@ -11,21 +11,19 @@ extern rtems_task Init(rtems_task_argument argument); #include <bsp.h> -#define CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE -#ifdef CONFIGURE_INIT -rtems_driver_address_table Device_drivers[5] = { - CONSOLE_DRIVER_TABLE_ENTRY, - CLOCK_DRIVER_TABLE_ENTRY, -#if defined(TTY1_DRIVER_TABLE_ENTRY) - TTY1_DRIVER_TABLE_ENTRY, -#endif -#if defined(TTY2_DRIVER_TABLE_ENTRY) - TTY2_DRIVER_TABLE_ENTRY, +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#ifndef TTY1_DRIVER_TABLE_ENTRY + #define TTY1_DRIVER_TABLE_ENTRY NULL_DRIVER_TABLE_ENTRY #endif - {NULL, NULL, NULL, NULL, NULL, NULL} -}; +#ifndef TTY2_DRIVER_TABLE_ENTRY + #define TTY2_DRIVER_TABLE_ENTRY NULL_DRIVER_TABLE_ENTRY #endif +#define CONFIGURE_APPLICATION_EXTRA_DRIVERS \ + { TTY1_DRIVER_TABLE_ENTRY, TTY2_DRIVER_TABLE_ENTRY } + #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 8 |