Changes between Version 12 and Version 13 of Component/Vci Multi Timer

Timestamp:

Jan 4, 2008, 12:35:55 PM (17 years ago)

Author:

Nicolas Pouillon

Comment:

soclib_io

Component/Vci Multi Timer

@@ -18 +18 @@
 Each timer contains 4 memory mapped registers:
 
- * `TIMER_VALUE`: ADDRESS![3:0] = 0x0
+ * `TIMER_VALUE`
 This 32 bits register is unconditionally incremented at each cycle.
 A read request returns the current time contained in this register.
 A write request sets a new value in this register.
 
- * `TIMER_MODE`: ADDRESS![3:0] = 0x4 
+ * `TIMER_MODE`
    This register contains two flags:
    * Bit 0: TIMER_RUNNING. When 1, the associated timer will decrease on each cycle
    * Bit 1: TIMER_IRQ_ENABLED: When 1, the associated IRQ line will be activated if the timer underflows.
 
- * `TIMER_PERIOD`: ADDRESS![3:0] = 0x8
+ * `TIMER_PERIOD`
 This 32 bits register defines the period between two successive interrupts.
 It may be read or written to.
 
- * `TIMER_RESETIRQ`: ADDRESS![3:0] = 0xC
+ * `TIMER_RESETIRQ`
 Any write request in this Boolean register will reset the pending IRQ.
 A read request returns the zero value when there is no pending interrupt,
@@ -53 +53 @@
 static timer_test(const size_t timer_no)
 {
-    volatile int *timer = ((int*)timer_address) + timer_no*TIMER_SPAN;
-
     // Getting / setting timer current value
-    timer[TIMER_VALUE] = 0x2a00;
-    uint32_t foo = timer[TIMER_VALUE];
+    soclib_io_set( timer_address, TIMER_SPAN*timer_no + TIMER_VALUE, 0x2a00 );
+    uint32_t foo = soclib_io_get( timer_address, TIMER_SPAN*timer_no + TIMER_VALUE );
 
     // Enabling timer and interrupt
-    timer[TIMER_MODE] = TIMER_RUNNING | TIMER_IRQ_ENABLED;
+    soclib_io_set( timer_address, TIMER_SPAN*timer_no + TIMER_MODE, TIMER_RUNNING | TIMER_IRQ_ENABLED );
 
     // Getting IRQ status, and resetting IRQ
-    if ( timer[TIMER_RESETIRQ] )
-        timer[TIMER_RESETIRQ] = 0;
+    if ( soclib_io_get( timer_address, TIMER_SPAN*timer_no + TIMER_RESETIRQ ) )
+        soclib_io_set( timer_address, TIMER_SPAN*timer_no + TIMER_RESETIRQ, 0 );
 }
 }}}