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

Timestamp:

Jan 4, 2008, 12:34:10 PM (16 years ago)

Author:

Nicolas Pouillon

Comment:

timer -> icu

Component/Vci Icu

@@ -55 +55 @@
 #include "soclib/icu.h"
 
-static const volatile void* timer_address = 0xc0000000;
+static const volatile void* icu_address = 0xc0000000;
 
 static icu_test(const size_t icu_no)
 {
     // Getting / setting interrupt mask
-    uint32_t current_interrupt_mask = soclib_io_get( timer_address, ICU_SPAN*icu_no + ICU_MASK );
+    uint32_t current_interrupt_mask = soclib_io_get( icu_address, ICU_SPAN*icu_no + ICU_MASK );
 
     // Enabling IRQ #5
-    soclib_io_set( timer_address, ICU_SPAN*icu_no + ICU_MASK_SET, 1<<5 );
+    soclib_io_set( icu_address, ICU_SPAN*icu_no + ICU_MASK_SET, 1<<5 );
     // Disabling IRQ #0
-    soclib_io_set( timer_address, ICU_SPAN*icu_no + ICU_MASK_CLEAR, 1<<0 );
+    soclib_io_set( icu_address, ICU_SPAN*icu_no + ICU_MASK_CLEAR, 1<<0 );
 
     // When interrupt is raised, you may do:
-    int irq_to_serve = soclib_io_get( timer_address, ICU_SPAN*icu_no + ICU_IT_VECTOR );
+    int irq_to_serve = soclib_io_get( icu_address, ICU_SPAN*icu_no + ICU_IT_VECTOR );
     // This should be equivalent to (see man 3 ffs)
-    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 ) );
+    int irq_to_serve = ffs( soclib_io_get( icu_address, ICU_SPAN*icu_no + ICU_IT_VECTOR )
+                          & soclib_io_get( icu_address, ICU_SPAN*icu_no + ICU_MASK ) );
 }
 }}}