Changeset 5b6111b in rtems

Timestamp:

Feb 3, 2005, 4:01:04 PM (16 years ago)

Author:

Eric Norum <WENorum@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

2538e7ae

Parents:

0c20a46

Message:

Add support for interrupt controller allocation. This will provides a
mechanism for applications to find a free level/priority.

Location:

c/src/lib/libbsp/m68k/uC5282

Files:

• clock/clock.c (modified) (1 diff)
• console/console.c (modified) (4 diffs)
• include/bsp.h (modified) (1 diff)
• network/network.c (modified) (2 diffs)
• startup/bspstart.c (modified) (1 diff)
• timer/timer.c (modified) (1 diff)

c/src/lib/libbsp/m68k/uC5282/clock/clock.c

@@ -48 +48 @@
         int level;                                                       \
         int preScaleCode = -2;                                           \
-        int preScaleDivisor = get_CPU_clock_speed() / 1000000;   \
+        int preScaleDivisor = bsp_get_CPU_clock_speed() / 1000000;       \
         while (preScaleDivisor) {                                        \
             preScaleDivisor >>= 1;                                       \
             preScaleCode++;                                              \
         }                                                                \
+        bsp_allocate_interrupt(PIT3_IRQ_LEVEL, PIT3_IRQ_PRIORITY);       \
         MCF5282_INTC0_ICR58 = MCF5282_INTC_ICR_IL(PIT3_IRQ_LEVEL) |      \
                               MCF5282_INTC_ICR_IP(PIT3_IRQ_PRIORITY);    \

c/src/lib/libbsp/m68k/uC5282/console/console.c

@@ -137 +137 @@
         info->hwflow   = hwflow;
 
-    clock_speed = get_CPU_clock_speed();
+    clock_speed = bsp_get_CPU_clock_speed();
     /* determine the baud divisor value */
     divisor = (clock_speed / ( 32 * baud ));
@@ -397 +397 @@
         switch(chan) {
         case 0:
+            bsp_allocate_interrupt(UART0_IRQ_LEVEL, UART0_IRQ_PRIORITY);
             MCF5282_INTC0_ICR13 = MCF5282_INTC_ICR_IL(UART0_IRQ_LEVEL) |
                                   MCF5282_INTC_ICR_IP(UART0_IRQ_PRIORITY);
@@ -404 +405 @@
 
         case 1:
+            bsp_allocate_interrupt(UART1_IRQ_LEVEL, UART1_IRQ_PRIORITY);
             MCF5282_INTC0_ICR14 = MCF5282_INTC_ICR_IL(UART1_IRQ_LEVEL) |
                                   MCF5282_INTC_ICR_IP(UART1_IRQ_PRIORITY);
@@ -411 +413 @@
 
         case 2:
+            bsp_allocate_interrupt(UART2_IRQ_LEVEL, UART2_IRQ_PRIORITY);
             MCF5282_INTC0_ICR15 = MCF5282_INTC_ICR_IL(UART2_IRQ_LEVEL) |
                                   MCF5282_INTC_ICR_IP(UART2_IRQ_PRIORITY);

c/src/lib/libbsp/m68k/uC5282/include/bsp.h

@@ -68 +68 @@
 /* functions */
 
-unsigned32 get_CPU_clock_speed(void);
+unsigned32 bsp_get_CPU_clock_speed(void);
+int bsp_allocate_interrupt(int level, int priority);
 unsigned const char *uC5282_gethwaddr(int a);
 const char *uC5282_getbenv(const char *a);

c/src/lib/libbsp/m68k/uC5282/network/network.c

@@ -180 +180 @@
     rtems_status_code status;
     rtems_isr_entry old_handler;
-        unsigned32 clock_speed = get_CPU_clock_speed();
+        unsigned32 clock_speed = bsp_get_CPU_clock_speed();
 
     /*
@@ -298 +298 @@
         rtems_panic ("Can't attach MCF5282 FEC RX interrupt handler: %s\n",
                      rtems_status_text(status));
+    bsp_allocate_interrupt(FEC_IRQ_LEVEL, FEC_IRQ_TX_PRIORITY);
     MCF5282_INTC0_ICR23 = MCF5282_INTC_ICR_IL(FEC_IRQ_LEVEL) |
                           MCF5282_INTC_ICR_IP(FEC_IRQ_TX_PRIORITY);
     MCF5282_INTC0_IMRL &= ~(MCF5282_INTC_IMRL_INT23 | MCF5282_INTC_IMRL_MASKALL);
+    bsp_allocate_interrupt(FEC_IRQ_LEVEL, FEC_IRQ_RX_PRIORITY);
     MCF5282_INTC0_ICR27 = MCF5282_INTC_ICR_IL(FEC_IRQ_LEVEL) |
                           MCF5282_INTC_ICR_IP(FEC_IRQ_RX_PRIORITY);

c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c

@@ -247 +247 @@
 }
 
-unsigned32 get_CPU_clock_speed(void)
+unsigned32 bsp_get_CPU_clock_speed(void)
 {
     extern char _CPUClockSpeed[];
     return( (unsigned32)_CPUClockSpeed);
+}
+
+/*
+ * Interrupt controller allocation
+ */
+int bsp_allocate_interrupt(int level, int priority)
+{
+    static char used[7];
+    rtems_interrupt_level l;
+    int ret = -1;
+
+    if ((level < 1) || (level > 7) || (priority < 0) || (priority > 7))
+        return ret;
+    rtems_interrupt_disable(l);
+    if ((used[level-1] & (1 << priority)) == 0) {
+        used[level-1] |= (1 << priority);
+        ret = 0;
+    }
+    rtems_interrupt_enable(l);
+    return ret;
 }
 

c/src/lib/libbsp/m68k/uC5282/timer/timer.c

@@ -11 +11 @@
 Timer_initialize(void)
 {
-    int preScaleDivisor = get_CPU_clock_speed() / 1000000;
+    int preScaleDivisor = bsp_get_CPU_clock_speed() / 1000000;
     int div = MCF5282_TIMER_DTMR_CLK_DIV1;