From c4ccf26cb7808786e15312b41c3055b2da75203b Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 17 Apr 2018 06:57:46 +0200
Subject: bsps: Convert all bsp_predriver_hook()

Use RTEMS_SYSINIT_ITEM() instead.

Update #2408.
---
 c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c   | 13 ++++++-------
 c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c | 14 ++++++--------
 c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c   | 14 ++++++--------
 3 files changed, 18 insertions(+), 23 deletions(-)

(limited to 'c/src/lib/libbsp/bfin')

diff --git a/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c b/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c
index 2614273dcd..4c8302a7ba 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c
+++ b/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c
@@ -16,6 +16,7 @@
 #include <cplb.h>
 #include <bsp/interrupt.h>
 #include <libcpu/ebiuRegs.h>
+#include <rtems/sysinit.h>
 
 const unsigned int dcplbs_table[16][2] = {  
   { 0xFFA00000, (PAGE_SIZE_1MB | CPLB_D_PAGE_MGMT | CPLB_WT) },
@@ -121,13 +122,11 @@ static void Init_Flags(void)
   *((uint16_t*)PORTHIO_SET)  = 0x1<<15;
 }
 
-/*
- *  bsp_predriver_hook
- */
-void bsp_predriver_hook(void)
-{
-  bfin_interrupt_init();
-}
+RTEMS_SYSINIT_ITEM(
+  bfin_interrupt_init,
+  RTEMS_SYSINIT_BSP_PRE_DRIVERS,
+  RTEMS_SYSINIT_ORDER_MIDDLE
+);
 
 void bsp_start( void )
 {
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c b/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c
index 074feb873f..ffc2d950c7 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c
@@ -22,7 +22,7 @@
 #include <libcpu/mmu.h>
 #include <libcpu/mmuRegs.h>
 #include <libcpu/interrupt.h>
-
+#include <rtems/sysinit.h>
 
 static bfin_mmu_config_t mmuRegions = {
     /* instruction */
@@ -69,13 +69,11 @@ static void initPLL(void);
 static void initEBIU(void);
 static void initGPIO(void);
 
-/*
- *  BSP predriver hook.
- */
-void bsp_predriver_hook(void)
-{
-  bfin_interrupt_init();
-}
+RTEMS_SYSINIT_ITEM(
+  bfin_interrupt_init,
+  RTEMS_SYSINIT_BSP_PRE_DRIVERS,
+  RTEMS_SYSINIT_ORDER_MIDDLE
+);
 
 void bsp_start(void)
 {
diff --git a/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c b/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c
index 4b34e8cdd9..3579dd7766 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c
+++ b/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c
@@ -17,6 +17,7 @@
 #include <bsp/bootcard.h>
 #include <cplb.h>
 #include <libcpu/interrupt.h>
+#include <rtems/sysinit.h>
 
 const unsigned int dcplbs_table[16][2] = {
   { 0xFFA00000,   (PAGE_SIZE_1MB | CPLB_D_PAGE_MGMT | CPLB_WT) },
@@ -117,14 +118,11 @@ static void Init_Flags(void)
   *((uint8_t*)FlashA_PortB_Data) = 0x00;
 }
 
-/*
- * BSP predriver hook.  Called just before drivers are initialized.
- * Used to setup libc and install any BSP extensions.
- */
-void bsp_predriver_hook(void)
-{
-  bfin_interrupt_init();
-}
+RTEMS_SYSINIT_ITEM(
+  bfin_interrupt_init,
+  RTEMS_SYSINIT_BSP_PRE_DRIVERS,
+  RTEMS_SYSINIT_ORDER_MIDDLE
+);
 
 void bsp_start( void )
 {
-- 
cgit v1.2.3