Changes between Version 10 and Version 11 of Component/Vci Icu

Timestamp:

Jan 4, 2008, 12:32:17 PM (16 years ago)

Author:

Nicolas Pouillon

Comment:

soclib_io

Component/Vci Icu

@@ -23 +23 @@
 This component contains 5 memory mapped registers:
 
- * `ICU_INT`: ADDRESS![4:0] = 0x0
+ * `ICU_INT`
    Each bit in this register reflects the state of the corresponding interrupt line.
    This is read-only.
 
- * `ICU_MASK`: ADDRESS![4:0] = 0x4
+ * `ICU_MASK`
    Each bit in this register reflects the state of the enable for the corresponding interrupt line.
    This is read-only.
 
- * `ICU_MASK_SET`: ADDRESS![4:0] = 0x8
+ * `ICU_MASK_SET`
    Each bit set in the written word will be set in the ICU MASK. (ICU_MASK = ICU_MASK | written_data).
    This is write-only.
 
- * `ICU_MASK_CLEAR`: ADDRESS![4:0] = 0xc
+ * `ICU_MASK_CLEAR`
    Each bit set in the written word will be reset in the ICU MASK. (ICU_MASK = ICU_MASK & ~written_data).
    This is write-only.
 
- * `ICU_IT_VECTOR`: ADDRESS![4:0] = 0x10
+ * `ICU_IT_VECTOR`
    This register gives the number of the highest-priority active interrupt.
    If no interrupt is active, (-1) is returned.
@@ -59 +59 @@
 static icu_test(const size_t icu_no)
 {
-    volatile int *icu = ((int*)icu_address) + timer_no*ICU_SPAN;
-
     // Getting / setting interrupt mask
-    uint32_t current_interrupt_mask = icu[ICU_MASK];
+    uint32_t current_interrupt_mask = soclib_io_get( timer_address, ICU_SPAN*icu_no + ICU_MASK );
 
     // Enabling IRQ #5
-    icu[ICU_MASK_SET] = 0x20;
+    soclib_io_set( timer_address, ICU_SPAN*icu_no + ICU_MASK_SET, 1<<5 );
     // Disabling IRQ #0
-    icu[ICU_MASK_CLEAR] = 0x1;
+    soclib_io_set( timer_address, ICU_SPAN*icu_no + ICU_MASK_CLEAR, 1<<0 );
 
     // When interrupt is raised, you may do:
-    int irq_to_serve = icu[ICU_IT_VECTOR];
+    int irq_to_serve = soclib_io_get( timer_address, ICU_SPAN*icu_no + ICU_IT_VECTOR );
     // This should be equivalent to (see man 3 ffs)
-    int irq_to_serve = ffs(icu[ICU_IT_VECTOR] & icu[ICU_MASK]);
+    int irq_to_serve = ffs( soclib_io_get( timer_address, ICU_SPAN*icu_no + ICU_IT_VECTOR )
+                          & soclib_io_get( timer_address, ICU_SPAN*icu_no + ICU_MASK ) );
 }
 }}}