Move functions declaration to header file

Use wrapped functions to acces PIC registers.

Makefile

@@ -41,7 +41,8 @@ CFLAGS=	-Wall \
 	-fomit-frame-pointer \
 	-ffreestanding \
 	-fleading-underscore \
-	-Wa,--register-prefix-optional
+	-Wa,--register-prefix-optional \
+	-g
 CFLAGS_OPTIMIZED = -mcpu=5474 \
 		-Wall \
 		-O2 \

include/bas_utils.h

@@ -26,4 +26,7 @@
 #define CLEAR_BIT(p,bit)        p &= ~(bit)
 #define CLEAR_BIT_NO(p,nr)      CLEAR_BIT(p, (1 << (nr)))
 
+extern void write_pic_byte(uint8_t value);
+extern uint8_t read_pic_byte(void);
+
 #endif /* _BAS_UTILS_H_ */

sys/BaS.c

@@ -31,6 +31,7 @@
 #include "bas_printf.h"
 #include "bas_string.h"
 #include "bas_types.h"
+#include "bas_utils.h"
 #include "sd_card.h"
 #include "wait.h"
 
@@ -366,7 +367,7 @@ void init_isr(void)
                        MCF_XLB_XARB_IMR_TTME |          /* TBST/TSIZ mismatch interrupt */
                        MCF_XLB_XARB_IMR_BAE;            /* bus activity tenure timeout interrupt */
 
-    if (!isr_register_handler(64 + INT_SOURCE_PCIARB, 5, 1, pciarb_interrupt_handler, NULL, NULL))
+    if (!isr_register_handler(64 + INT_SOURCE_PCIARB, 5, 0, pciarb_interrupt_handler, NULL, NULL))
     {
         dbg("Error: unable to register isr for PCIARB interrupts\r\n");
 

sys/interrupts.c

@@ -37,7 +37,7 @@
 #include "dma.h"
 #include "pci.h"
 
-//#define IRQ_DEBUG
+// #define IRQ_DEBUG
 #if defined(IRQ_DEBUG)
 #define dbg(format, arg...) do { xprintf("DEBUG %s(): " format, __FUNCTION__, ##arg); } while (0)
 #else
@@ -61,6 +61,7 @@ struct isrentry
 
 static struct isrentry isrtab[MAX_ISR_ENTRY];      /* list of interrupt service routines */
 
+
 /*
  * clear the table of interrupt service handlers
  */
@@ -247,20 +248,20 @@ bool pic_interrupt_handler(void *arg1, void *arg2)
 
     dbg("PIC interrupt\r\n");
 
-    rcv_byte = MCF_PSC3_PSCRB_8BIT;
+    rcv_byte = read_pic_byte();
     if (rcv_byte == 2)                  /* PIC requests RTC data */
     {
-        uint8_t *rtc_reg = (uint8_t *) 0xffff8961;
-        uint8_t *rtc_data = (uint8_t *) 0xffff8963;
+        volatile uint8_t *rtc_reg = (uint8_t *) 0xffff8961;
+        volatile uint8_t *rtc_data = (uint8_t *) 0xffff8963;
         int index = 0;
 
         err("PIC interrupt: requesting RTC data\r\n");
 
-        MCF_PSC3_PSCTB_8BIT = 0x82;     // header byte to PIC
+        write_pic_byte(0x82);     // header byte to PIC
         do
         {
-            *rtc_reg = 0;
-            MCF_PSC3_PSCTB_8BIT = *rtc_data;
+            *rtc_reg = index;
+            write_pic_byte(*rtc_data);
         } while (index++ < 64);
     }
     return true;

sys/sysinit.c

@@ -265,9 +265,6 @@ static void init_serial(void)
     MCF_PSC3_PSCCR = 0x05;
 #endif /* MACHINE_FIREBEE */
 
-    MCF_INTC_ICR32 = MCF_INTC_ICR_IL(7) |
-                     MCF_INTC_ICR_IL(4);      /* PSC3 interrupt vector. Do we need it? */
-
     xprintf("\r\nserial interfaces initialization: finished\r\n");
 }