diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-01-26 07:16:52 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-01-26 11:41:28 +0100 |
| commit | 47190194866ba83cbfeeb5816bb18ddd9f6e8e50 (patch) | |
| tree | 38d4f665e5d85797c1a20163d546e79b5aa340af | |
| parent | mpci: Fix warning (diff) | |
| download | rtems-47190194866ba83cbfeeb5816bb18ddd9f6e8e50.tar.bz2 | |
drvmgr: Remove dupl bsp_driver_level_hook() decl
| -rw-r--r-- | c/src/lib/libbsp/shared/bspdriverlevelhook.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/shared/include/bootcard.h | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c | 2 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/preinstall.am | 3 |
6 files changed, 5 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/shared/bspdriverlevelhook.c b/c/src/lib/libbsp/shared/bspdriverlevelhook.c index 93406f9b45..e506ea73be 100644 --- a/c/src/lib/libbsp/shared/bspdriverlevelhook.c +++ b/c/src/lib/libbsp/shared/bspdriverlevelhook.c @@ -9,7 +9,7 @@ * http://www.rtems.org/license/LICENSE. */ -#include <bsp/bootcard.h> +#include <drvmgr/drvmgr.h> void bsp_driver_level_hook( int level ) { diff --git a/c/src/lib/libbsp/shared/include/bootcard.h b/c/src/lib/libbsp/shared/include/bootcard.h index 8559b218d7..385c0aeb08 100644 --- a/c/src/lib/libbsp/shared/include/bootcard.h +++ b/c/src/lib/libbsp/shared/include/bootcard.h @@ -55,8 +55,6 @@ void bsp_start(void); void bsp_predriver_hook(void); -void bsp_driver_level_hook( int level ); - void bsp_postdriver_hook(void); void bsp_reset(void); diff --git a/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c b/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c index 2cdf4daf8a..218ed80774 100644 --- a/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c +++ b/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c @@ -25,6 +25,7 @@ * the configuration and add custom cores in the RTEMS project. */ #ifdef RTEMS_DRVMGR_STARTUP +#include <drvmgr/drvmgr.h> #include <drvmgr/leon2_amba_bus.h> /* All drivers included by BSP, this is overridden by the user by including diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c b/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c index 498c97b0a3..84edb73091 100644 --- a/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c +++ b/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c @@ -16,6 +16,8 @@ #include <bsp.h> #include <bsp/bootcard.h> +#include <drvmgr/drvmgr.h> + static void leon3_interrupt_common_init( void ) { /* Initialize shared interrupt handling, must be done after IRQ diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 86c20a9d2d..1758fff704 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -242,12 +242,10 @@ include_rtems_HEADERS += libmisc/untar/untar.h include_rtems_HEADERS += libmisc/fsmount/fsmount.h ## Driver manager -if LIBDRVMGR include_drvmgrdir = $(includedir)/drvmgr include_drvmgr_HEADERS = libdrvmgr/drvmgr.h include_drvmgr_HEADERS += libdrvmgr/drvmgr_confdefs.h include_drvmgr_HEADERS += libdrvmgr/drvmgr_list.h -endif ## HACK: doxygen filter. EXTRA_DIST = doxy-filter diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am index 0758ec5263..95d61ae781 100644 --- a/cpukit/preinstall.am +++ b/cpukit/preinstall.am @@ -527,7 +527,6 @@ $(PROJECT_INCLUDE)/rtems/fsmount.h: libmisc/fsmount/fsmount.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fsmount.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fsmount.h -if LIBDRVMGR $(PROJECT_INCLUDE)/drvmgr/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr @: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) @@ -544,4 +543,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr_confdefs.h $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h: libdrvmgr/drvmgr_list.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h -endif + |