Changeset 3c9646b in mainline

Timestamp:

2013-09-10T12:51:59Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4cdcd2b

Parents:

91bf378

Message:

bbone, bboard: modify the code to use the unified interrupt controller driver implementation.

Location:

kernel/arch/arm32/src/mach

Files:

• beagleboardxm/beagleboardxm.c (modified) (6 diffs)
• beaglebone/beaglebone.c (modified) (6 diffs)

kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

@@ -60 +60 @@
 
 static struct beagleboard {
-        amdm37x_irc_regs_t *irc_addr;
+        omap_irc_regs_t *irc_addr;
         omap_uart_t uart;
         amdm37x_gpt_t timer;
@@ -103 +103 @@
             PAGE_NOT_CACHEABLE);
         ASSERT(beagleboard.irc_addr);
-        amdm37x_irc_init(beagleboard.irc_addr);
+        omap_irc_init(beagleboard.irc_addr);
 
         /* Initialize timer. Use timer1, because it is in WKUP power domain
@@ -123 +123 @@
 
         /* Enable timer interrupt */
-        amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_GPT1_IRQ);
+        omap_irc_enable(beagleboard.irc_addr, AMDM37x_GPT1_IRQ);
 
         /* Start timer here */
@@ -147 +147 @@
 static void bbxm_irq_exception(unsigned int exc_no, istate_t *istate)
 {
-        const unsigned inum = amdm37x_irc_inum_get(beagleboard.irc_addr);
+        const unsigned inum = omap_irc_inum_get(beagleboard.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -161 +161 @@
         /** amdm37x manual ch. 12.5.2 (p. 2428) places irc ack at the end
          * of ISR. DO this to avoid strange behavior. */
-        amdm37x_irc_irq_ack(beagleboard.irc_addr);
+        omap_irc_irq_ack(beagleboard.irc_addr);
 }
 
@@ -188 +188 @@
                 indev_t *srln = srln_wire(srln_instance, sink);
                 omap_uart_input_wire(&beagleboard.uart, srln);
-                amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
+                omap_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
         }
 #endif

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -63 +63 @@
 
 static struct beaglebone {
-        am335x_irc_regs_t *irc_addr;
+        omap_irc_regs_t *irc_addr;
         am335x_cm_per_regs_t *cm_per_addr;
         am335x_cm_dpll_regs_t *cm_dpll_addr;
@@ -104 +104 @@
 
         /* Initialize the interrupt controller */
-        am335x_irc_init(bbone.irc_addr);
+        omap_irc_init(bbone.irc_addr);
 }
 
@@ -153 +153 @@
         }
         /* Enable the interrupt */
-        am335x_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);
+        omap_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);
         /* Start the timer */
         am335x_timer_start(&bbone.timer);
@@ -176 +176 @@
 static void bbone_irq_exception(unsigned int exc_no, istate_t *istate)
 {
-        const unsigned inum = am335x_irc_inum_get(bbone.irc_addr);
+        const unsigned inum = omap_irc_inum_get(bbone.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -187 +187 @@
         }
 
-        am335x_irc_irq_ack(bbone.irc_addr);
+        omap_irc_irq_ack(bbone.irc_addr);
 }
 
@@ -214 +214 @@
                 indev_t *srln = srln_wire(srln_instance, sink);
                 omap_uart_input_wire(&bbone.uart, srln);
-                am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
+                omap_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
         }
 #endif