RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

config: Fix IO driver table initialization

Browse Source 
Check all IO driver table configuration options which are used to initialize
_IO_Driver_address_table[].  Checks for the following settings were missing:

* CONFIGURE_BSP_PREREQUISITE_DRIVERS

* CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS

* CONFIGURE_APPLICATION_NEEDS_WATCHDOG_DRIVER

* CONFIGURE_APPLICATION_EXTRA_DRIVERS

Update #3875.
This commit is contained in:
Sebastian Huber
2021-11-16 17:00:29 +01:00
parent 32cee88357
commit c47daf6f68
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
cpukit/include/rtems/confdefs/iodrivers.h
View File

@@ -43,16 +43,30 @@
#ifdef CONFIGURE_INIT #ifdef CONFIGURE_INIT
#if defined(CONFIGURE_APPLICATION_EXTRA_DRIVERS) \ #include <rtems/confdefs/bsp.h>
|| defined(CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER) \
|| defined(CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER) \ #if !defined(CONFIGURE_DISABLE_BSP_SETTINGS) && \
|| defined(CONFIGURE_APPLICATION_NEEDS_FRAME_BUFFER_DRIVER) \ defined(CONFIGURE_BSP_PREREQUISITE_DRIVERS)
|| defined(CONFIGURE_APPLICATION_NEEDS_IDE_DRIVER) \ #define _CONFIGURE_BSP_PREREQUISITE_DRIVERS CONFIGURE_BSP_PREREQUISITE_DRIVERS
|| defined(CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER) \ #endif
|| defined(CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER) \
|| defined(CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER) \ #if defined(_CONFIGURE_BSP_PREREQUISITE_DRIVERS) || \
|| defined(CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER) \ defined(CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS) || \
|| CONFIGURE_MAXIMUM_DRIVERS > 0 defined(CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER) || \
defined(CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER) || \
defined(CONFIGURE_APPLICATION_NEEDS_WATCHDOG_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)
#define _CONFIGURE_HAS_IO_DRIVERS
#endif
#if defined(_CONFIGURE_HAS_IO_DRIVERS) || \
defined(CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER) || \
CONFIGURE_MAXIMUM_DRIVERS > 0
#include <rtems/ioimpl.h> #include <rtems/ioimpl.h>
#include <rtems/sysinit.h> #include <rtems/sysinit.h>
@@ -110,9 +124,8 @@ extern "C" {
rtems_driver_address_table rtems_driver_address_table
_IO_Driver_address_table[ CONFIGURE_MAXIMUM_DRIVERS ] = { _IO_Driver_address_table[ CONFIGURE_MAXIMUM_DRIVERS ] = {
#if !defined(CONFIGURE_DISABLE_BSP_SETTINGS) && \ #ifdef _CONFIGURE_BSP_PREREQUISITE_DRIVERS
defined(CONFIGURE_BSP_PREREQUISITE_DRIVERS) _CONFIGURE_BSP_PREREQUISITE_DRIVERS,
CONFIGURE_BSP_PREREQUISITE_DRIVERS,
#endif #endif
#ifdef CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS #ifdef CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS
CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS, CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS,
@@ -144,15 +157,8 @@ _IO_Driver_address_table[ CONFIGURE_MAXIMUM_DRIVERS ] = {
#ifdef CONFIGURE_APPLICATION_EXTRA_DRIVERS #ifdef CONFIGURE_APPLICATION_EXTRA_DRIVERS
CONFIGURE_APPLICATION_EXTRA_DRIVERS, CONFIGURE_APPLICATION_EXTRA_DRIVERS,
#endif #endif
#if defined(CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER) \ #if defined(CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER) || \
|| ( !defined(CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER) \ !defined(_CONFIGURE_HAS_IO_DRIVERS)
&& !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) )
NULL_DRIVER_TABLE_ENTRY NULL_DRIVER_TABLE_ENTRY
#endif #endif
}; };
@@ -179,16 +185,9 @@ RTEMS_SYSINIT_ITEM(
} }
#endif #endif
#endif /* CONFIGURE_APPLICATION_EXTRA_DRIVERS #endif /* _CONFIGURE_HAS_IO_DRIVERS) ||
|| CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER ||
|| CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER CONFIGURE_MAXIMUM_DRIVERS */
|| CONFIGURE_APPLICATION_NEEDS_FRAME_BUFFER_DRIVER
|| CONFIGURE_APPLICATION_NEEDS_IDE_DRIVER
|| CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER
|| CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
|| CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
|| CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER
|| CONFIGURE_MAXIMUM_DRIVERS */
/* /*