interrupt handler type change

9 files changed, 74 insertions, 111 deletions

diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
index b9a57929fa..f1cbc00bce 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-21	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* clock/p_clock.c: Update for interrupt handler type change.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* make/custom/tqm8xx.inc: Remove RTEMS_BSP_FAMILY.
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 8246d0ae62..5cf4345d39 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -23,6 +23,7 @@ include_HEADERS += include/coverhd.h
 include_bsp_HEADERS = include/tqm.h include/8xx_immap.h \
     include/irq.h include/irq-config.h \
     ../../shared/include/irq-generic.h\
+    spi/spi.h\
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
 
@@ -53,6 +54,8 @@ libbsp_a_SOURCES += clock/p_clock.c
 
 # console
 libbsp_a_SOURCES += console/console.c
+# spi
+libbsp_a_SOURCES += spi/spi.c
 # timer
 libbsp_a_SOURCES += timer/timer.c
 # startup
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/clock/p_clock.c b/c/src/lib/libbsp/powerpc/tqm8xx/clock/p_clock.c
index 3067745acd..0e46563e43 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/clock/p_clock.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/clock/p_clock.c
@@ -22,8 +22,7 @@ extern void clockOff (void*);
 extern int clockIsOn(void*);
 extern void Clock_isr(void*);
 
-void BSP_clock_hdl(rtems_vector_number vecnum, 
-		   void * arg)
+void BSP_clock_hdl(void * arg)
 {
   Clock_isr(arg);
 }
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
index 2d5435fde6..6a48bd390a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
@@ -54,31 +54,20 @@
 #include <stdlib.h>
 #include <bsp.h>
 #include <mpc8xx.h>
+#include <rtems/irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 #include <termios.h>
 #include <unistd.h>
 #include <rtems/termiostypes.h>
 #include <rtems/bspIo.h>
 
-/*
- * Declare clock speed -- may be overwritten by downloader or debugger
- */
-int m8xx_clock_rate	= 0;
 
 /*
  * Interrupt-driven input buffer
  */
 #define RXBUFSIZE	256
 
-#define M8xx_IVEC_SRC_MASK (0x1f)
-#define M8xx_IVEC_SRC_SCC1  (0x1E)
-#define M8xx_IVEC_SRC_SCC2  (0x1D)
-#define M8xx_IVEC_SRC_SCC3  (0x1C)
-#define M8xx_IVEC_SRC_SCC4  (0x1B)
-#define M8xx_IVEC_SRC_SMC1  (0x04)
-#define M8xx_IVEC_SRC_SMC2  (0x03)
-
-#define M8xx_IREG_MASK(src) (1UL << src)
 #define M8xx_SICR_BRG1 (0)
 #define M8xx_SICR_BRG2 (1)
 #define M8xx_SICR_BRG3 (2)
@@ -132,9 +121,8 @@ typedef struct m8xx_console_chan_desc_s {
     volatile m8xxSMCRegisters_t *smcr;
   } regs;
   int ivec_src;
-  uint32_t ireg_mask;
-  int        cr_chan_code;
-  int        brg_used;
+  int cr_chan_code;
+  int brg_used;
 } m8xx_console_chan_desc_t;
 
 m8xx_console_chan_desc_t m8xx_console_chan_desc[CONS_CHN_CNT] = {
@@ -142,48 +130,42 @@ m8xx_console_chan_desc_t m8xx_console_chan_desc[CONS_CHN_CNT] = {
   {TRUE,
    {(m8xxSCCparms_t *)&(m8xx.scc1p),NULL},
    {&(m8xx.scc1),NULL},
-   M8xx_IVEC_SRC_SCC1,
-   M8xx_IREG_MASK(M8xx_IVEC_SRC_SCC1),
+   BSP_CPM_IRQ_SCC1,
    M8xx_CR_CHAN_SCC1,
    -1},
   /* SCC2 */
   {TRUE,
    {&(m8xx.scc2p),NULL},
    {&(m8xx.scc2),NULL},
-   M8xx_IVEC_SRC_SCC2,
-   M8xx_IREG_MASK(M8xx_IVEC_SRC_SCC2),
+   BSP_CPM_IRQ_SCC2,
    M8xx_CR_CHAN_SCC2,
    -1},
   /* SCC3 */
   {TRUE,
    {&(m8xx.scc3p),NULL},
    {&(m8xx.scc3),NULL},
-   M8xx_IVEC_SRC_SCC3,
-   M8xx_IREG_MASK(M8xx_IVEC_SRC_SCC3),
+   BSP_CPM_IRQ_SCC3,
    M8xx_CR_CHAN_SCC3,
    -1},
   /* SCC4 */
   {TRUE,
    {&(m8xx.scc4p),NULL},
    {&(m8xx.scc4),NULL},
-   M8xx_IVEC_SRC_SCC4,
-   M8xx_IREG_MASK(M8xx_IVEC_SRC_SCC4),
+   BSP_CPM_IRQ_SCC4,
    M8xx_CR_CHAN_SCC4,
    -1},
   /* SMC1 */
   {FALSE,
    {NULL,&(m8xx.smc1p)},
    {NULL,&(m8xx.smc1)},
-   M8xx_IVEC_SRC_SMC1,
-   M8xx_IREG_MASK(M8xx_IVEC_SRC_SMC1),
+   BSP_CPM_IRQ_SMC1,
    M8xx_CR_CHAN_SMC1,
    -1},
   /* SMC2 */
   {FALSE,
    {NULL,&(m8xx.smc2p)},
    {NULL,&(m8xx.smc2)},
-   M8xx_IVEC_SRC_SMC2,
-   M8xx_IREG_MASK(M8xx_IVEC_SRC_SMC2),
+   BSP_CPM_IRQ_SMC2_OR_PIP,
    M8xx_CR_CHAN_SMC2,
    -1}};
 
@@ -249,7 +231,7 @@ sccBRGval (int baud)
   int divisor;
   int div16 = 0;
 
-  divisor = ((m8xx_clock_rate / 16) + (baud / 2)) / baud;
+  divisor = ((BSP_bus_frequency / 16) + (baud / 2)) / baud;
   if (divisor > 4096) {
     div16 = 1;
     divisor = (divisor + 8) / 16;
@@ -283,6 +265,7 @@ static void sccBRGinit(void)
 #endif
 }
 
+#if CONS_USE_EXT_CLK
 /*
  * input clock frq for CPM clock inputs
  */
@@ -295,6 +278,7 @@ static uint32_t clkin_frq[2][4] = {
   {1843000,0,0,0}
 #endif
 };
+#endif
 
 /*
  * allocate, set and connect baud rate generators
@@ -310,7 +294,7 @@ static int sccBRGalloc(int chan,int baud)
   int old_brg;
   int new_brg = -1;
   int brg_idx;
-#if 0 /* we do not support external clocked console */
+#if CONS_USE_EXT_CLK
   int clk_group;
   int clk_sel;
 #endif
@@ -319,7 +303,7 @@ static int sccBRGalloc(int chan,int baud)
   /* compute brg register contents needed */
   reg_val = sccBRGval(baud);
 
-#if 0 /* we do not support external clocked console */
+#if CONS_EXT_CLK
   /* search for clock input with this frq */
   clk_group = ((chan == CONS_CHN_SCC3) ||
 	       (chan == CONS_CHN_SCC4) ||
@@ -438,32 +422,9 @@ sccSetAttributes (int minor, const struct termios *t)
  * Interrupt handler 
  */
 static rtems_isr
-sccInterruptHandler (rtems_vector_number v)
+sccInterruptHandler (void *arg)
 {
-  int chan = 0;
-  /*
-   * calculate channel from vector
-   */
-  switch(v & M8xx_IVEC_SRC_MASK) {
-  case M8xx_IVEC_SRC_SCC1:
-    chan = CONS_CHN_SCC1;
-    break;
-  case M8xx_IVEC_SRC_SCC2:
-    chan = CONS_CHN_SCC2;
-    break;
-  case M8xx_IVEC_SRC_SCC3:
-    chan = CONS_CHN_SCC3;
-    break;
-  case M8xx_IVEC_SRC_SCC4:
-    chan = CONS_CHN_SCC4;
-    break;
-  case M8xx_IVEC_SRC_SMC1:
-    chan = CONS_CHN_SMC1;
-    break;
-  case M8xx_IVEC_SRC_SMC2:
-    chan = CONS_CHN_SMC2;
-    break;
-  }
+  int chan = (int)arg;
 
   /*
    * Buffer received?
@@ -533,8 +494,24 @@ sccInterruptHandler (rtems_vector_number v)
       }
     }
   }
+}
+
+static void
+mpc8xx_console_irq_on(const rtems_irq_connect_data *irq)
+{
+    CHN_MASK_SET(irq->name,3);	/* Enable TX and RX interrupts */
+}
 
-  m8xx.cisr = m8xx_console_chan_desc[chan].ireg_mask;/* Clear interrupt-in-service bit */
+static void
+mpc8xx_console_irq_off(const rtems_irq_connect_data *irq)
+{
+    CHN_MASK_SET(irq->name,0);	/* Disable TX and RX interrupts */
+}
+
+static int
+mpc8xx_console_irq_isOn(const rtems_irq_connect_data *irq)
+{
+  return (0 != CHN_MASK_GET(irq->name)); /* Check TX and RX interrupts */
 }
 
 static void
@@ -730,19 +707,18 @@ sccInitialize (int chan)
   }
 
   if (m8xx_scc_mode[chan] != TERMIOS_POLLED) {
-    rtems_isr_entry old_handler;
-    rtems_status_code sc;
     
-#if 0
-    sc = rtems_interrupt_catch (sccInterruptHandler,
-				m8xx_console_chan_desc[chan].ivec_src 
-				| (m8xx.cicr & 0xE0),
-				&old_handler);
-#endif
-    #warning "Redo interrupt installation"
-    printk( "Redo interrupt installation" );
-    CHN_MASK_SET(chan,3);	/* Enable TX and RX interrupts */
-    m8xx.cimr |= m8xx_console_chan_desc[chan].ireg_mask;  /* Enable interrupts */
+    rtems_irq_connect_data irq_conn_data = {
+      m8xx_console_chan_desc[chan].ivec_src,
+      sccInterruptHandler,         /* rtems_irq_hdl           */
+      (rtems_irq_hdl_param)chan,   /* (rtems_irq_hdl_param)   */
+      mpc8xx_console_irq_on,       /* (rtems_irq_enable)      */
+      mpc8xx_console_irq_off,      /* (rtems_irq_disable)     */
+      mpc8xx_console_irq_isOn      /* (rtems_irq_is_enabled)  */
+    };
+    if (!BSP_install_rtems_irq_handler (&irq_conn_data)) {
+      rtems_panic("console: cannot install IRQ handler");
+    }
   }
 }
 
@@ -900,13 +876,6 @@ rtems_device_driver console_initialize(rtems_device_major_number  major,
   char tty_name[] = "/dev/tty00";
 
   /*
-   * init base clock for BRGs
-   * (if not already set by debugger etc)
-   */
-  if (m8xx_clock_rate == 0) {
-    m8xx_clock_rate = BSP_bus_frequency;
-  }
-  /*
    * Set up TERMIOS
    */
   rtems_termios_initialize ();
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h b/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
index ffd4b3543f..24a45410c3 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
@@ -132,18 +132,9 @@ extern int rtems_scc_enet_driver_attach (struct rtems_bsdnet_ifconfig *config,
 #undef RTEMS_BSP_HAS_IDE_DRIVER
 
 /*
- * our bus frequency
+ * our (internal) bus frequency
  */
-extern unsigned int BSP_bus_frequency;
-
-/* functions */
-
-rtems_isr_entry set_vector(                    /* returns old vector */
-  rtems_isr_entry     handler,                  /* isr routine        */
-  rtems_vector_number vector,                   /* vector number      */
-  int                 type                      /* RTEMS or RAW intr  */
-);
-
+extern uint32_t BSP_bus_frequency;
 
 #ifdef __cplusplus
 }
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/irq/irq.c b/c/src/lib/libbsp/powerpc/tqm8xx/irq/irq.c
index 4dac7fb38b..d01542e8fa 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/irq/irq.c
@@ -98,15 +98,15 @@ static int BSP_irq_handle_at_cpm(void)
 {
   int32_t  cpvecnum;
   uint32_t msr;
-  rtems_interrupt_level level;
 
   /* Get vector number: write IACK=1, then read vectir */
   m8xx.civr = 1;
   cpvecnum  = (m8xx.civr >> 11) + BSP_CPM_IRQ_LOWEST_OFFSET;
   
   /*
-   * Check the vector number, mask lower priority interrupts, enable
-   * exceptions and dispatch the handler.
+   * Check the vector number,
+   * enable exceptions and dispatch the handler.
+   * NOTE: lower-prio interrupts are automatically masked in CPIC
    */
   if (BSP_IS_CPM_IRQ(cpvecnum)) {      
     /* Enable all interrupts */
@@ -115,15 +115,16 @@ static int BSP_irq_handle_at_cpm(void)
     bsp_interrupt_handler_dispatch(cpvecnum);
     /* Restore machine state */
     ppc_external_exceptions_disable(msr);
-    /*
-     * clear "in-service" bit
-     */
-    m8xx.cisr = 1 << (cpvecnum - BSP_CPM_IRQ_LOWEST_OFFSET);
   }
   else {
     /* not valid vector */
     bsp_interrupt_handler_default(cpvecnum);
   }
+  /*
+   * clear "in-service" bit
+   */
+  m8xx.cisr = 1 << (cpvecnum - BSP_CPM_IRQ_LOWEST_OFFSET);
+
   return 0;
 }
 
@@ -131,7 +132,6 @@ static int BSP_irq_handle_at_siu( unsigned excNum)
 {
   int32_t  sivecnum;
   uint32_t msr;
-  rtems_interrupt_level level;
   bool  is_cpm_irq;
   uint32_t simask_save;
   /*
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am b/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
index 7c54509da1..a73f10070b 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
@@ -77,6 +77,10 @@ $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJE
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
 
+$(PROJECT_INCLUDE)/bsp/spi.h: spi/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spi.h
+
 $(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
index b02ccdb057..a7d2a3d2d6 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
@@ -21,13 +21,13 @@
  */
 
 #include <rtems.h>
-
+#include <stdlib.h>
 #include <libcpu/powerpc-utility.h>
 
 #include <bsp.h>
 #include <bsp/bootcard.h>
-/* #include <bsp/irq-generic.h>
-   #include <bsp/ppc_exc_bspsupp.h> */
+#include <bsp/irq-generic.h>
+#include <bsp/ppc_exc_bspsupp.h>
 
 #ifdef BSP_HAS_TQMMON
 /*
@@ -36,11 +36,10 @@
 #endif /* BSP_HAS_TQMMON */
 
 /* Configuration parameters for console driver, ... */
-unsigned int BSP_bus_frequency;
+uint32_t BSP_bus_frequency;
 
 /* Configuration parameters for clock driver, ... */
 uint32_t bsp_clicks_per_usec; /* for PIT driver: OSCCLK */
-uint32_t bsp_clock_speed    ; /* needed for PIT driver  */
 /* for timer: */
 uint32_t   bsp_timer_average_overhead; /* Average overhead of timer in ticks */
 uint32_t   bsp_timer_least_valid;      /* Least valid number from timer      */
@@ -94,7 +93,7 @@ const char *bsp_tqm_get_cib_string( const char *cib_id)
   /*
    * search for pattern in info block (CIB)
    */
-  fnd_str = strstr(TQM_CONF_INFO_BLOCK_ADDR,srch_pattern);
+  fnd_str = strstr((const char *)TQM_CONF_INFO_BLOCK_ADDR,srch_pattern);
 
   if (fnd_str == NULL) {
     return NULL;
@@ -111,7 +110,7 @@ rtems_status_code  bsp_tqm_get_cib_uint32( const char *cib_id,
 					   uint32_t   *result)
 {
   const char *item_ptr;
-  const char *end_ptr;
+  char *end_ptr;
   item_ptr = bsp_tqm_get_cib_string(cib_id);
   if (item_ptr == NULL) {
     return RTEMS_INVALID_ID;
@@ -174,7 +173,6 @@ void bsp_start( void)
   bsp_clicks_per_usec = 0; /* force to zero to control 
 			    * PIT clock driver from EXTCLK
 			    */
-  bsp_clock_speed     = BSP_bus_frequency;
   bsp_timer_least_valid = 3; 
   bsp_timer_average_overhead = 3;
 
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/start.S b/c/src/lib/libbsp/powerpc/tqm8xx/startup/start.S
index b7e557ee02..d94817d597 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/start.S
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/start.S
@@ -24,11 +24,6 @@
 #include <bsp.h>
 #include <mpc8xx.h>
 
-#warning Call to boot_card has changed and needs checking.
-#warning The call is "void boot_card(const char* cmdline);"
-#warning You need to pass a NULL.
-#warning Please check and remove these warnings.
-	
 .extern boot_card
 
 .section ".entry"  
@@ -147,7 +142,7 @@ start_code_in_ram:
 	
 /* clear arguments and do further init. in C (common for RAM/ROM startup) */
 
-        /* Clear argc, argv and envp */
+        /* Clear cmdline */
         xor r3, r3, r3
 
         bl      SYM (boot_card)  /* Call the first C routine */