Changeset 00287cc in mainline for kernel/arch/arm32/src/interrupt.c

Timestamp:

2009-03-12T23:26:32Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

648c9d9

Parents:

3b122e9

Message:

arm32: update for the new scheme of device drivers and keyboard/serial modules
streamline arm32 port (as GXemul is still the only machine supported), more cleanup is needed

File:

• kernel/arch/arm32/src/interrupt.c (modified) (5 diffs)

kernel/arch/arm32/src/interrupt.c

@@ -36 +36 @@
 #include <arch/asm.h>
 #include <arch/regutils.h>
+#include <arch/drivers/gxemul.h>
 #include <ddi/irq.h>
-#include <arch/machine.h>
+#include <ddi/device.h>
 #include <interrupt.h>
 
 /** Initial size of a table holding interrupt handlers. */
 #define IRQ_COUNT 8
+
+static irq_t gxemul_timer_irq;
 
 /** Disable interrupts.
@@ -50 +53 @@
 {
         ipl_t ipl = current_status_reg_read();
-
+        
         current_status_reg_control_write(STATUS_REG_IRQ_DISABLED_BIT | ipl);
         
@@ -63 +66 @@
 {
         ipl_t ipl = current_status_reg_read();
-
+        
         current_status_reg_control_write(ipl & ~STATUS_REG_IRQ_DISABLED_BIT);
-
+        
         return ipl;
 }
@@ -89 +92 @@
 }
 
+/** Starts gxemul Real Time Clock device, which asserts regular interrupts.
+ *
+ * @param frequency Interrupts frequency (0 disables RTC).
+ */
+static void gxemul_timer_start(uint32_t frequency)
+{
+        *((uint32_t *) (gxemul_rtc + GXEMUL_RTC_FREQ_OFFSET))
+            = frequency;
+}
+
+static irq_ownership_t gxemul_timer_claim(irq_t *irq)
+{
+        return IRQ_ACCEPT;
+}
+
+/** Timer interrupt handler.
+ *
+ * @param irq Interrupt information.
+ * @param arg Not used.
+ */
+static void gxemul_timer_irq_handler(irq_t *irq)
+{
+        /*
+        * We are holding a lock which prevents preemption.
+        * Release the lock, call clock() and reacquire the lock again.
+        */
+        spinlock_unlock(&irq->lock);
+        clock();
+        spinlock_lock(&irq->lock);
+        
+        /* acknowledge tick */
+        *((uint32_t *) (gxemul_rtc + GXEMUL_RTC_ACK_OFFSET))
+            = 0;
+}
+
 /** Initialize basic tables for exception dispatching
  * and starts the timer.
@@ -95 +133 @@
 {
         irq_init(IRQ_COUNT, IRQ_COUNT);
-        machine_timer_irq_start();
+        
+        irq_initialize(&gxemul_timer_irq);
+        gxemul_timer_irq.devno = device_assign_devno();
+        gxemul_timer_irq.inr = GXEMUL_TIMER_IRQ;
+        gxemul_timer_irq.claim = gxemul_timer_claim;
+        gxemul_timer_irq.handler = gxemul_timer_irq_handler;
+        
+        irq_register(&gxemul_timer_irq);
+        
+        gxemul_timer_start(GXEMUL_TIMER_FREQ);
 }