Changeset 248 for trunk/softs/giet_tsar

Timestamp:

Aug 9, 2012, 10:57:23 AM (12 years ago)

Author:

meunier

Message:

Updates in the soft_filter application (bug corrections, formatting, and adaptation to the architecture generic_mmu)

Location:

trunk/softs/giet_tsar

Files:

• dma.h (modified) (1 diff)
• drivers.c (modified) (3 diffs)
• isr.c (modified) (1 diff)
• reset.s (modified) (1 diff)

trunk/softs/giet_tsar/dma.h

@@ -9 +9 @@
     DMA_IRQ_DISABLE = 4,
     /***/
-    DMA_SPAN        = 8,
+    DMA_SPAN        = 0x400,
 };
 
 enum DmaStatusValues {
-    DMA_IDLE        = 0,
-    DMA_SUCCESS     = 1,
-    DMA_READ_ERROR  = 2,
+    DMA_SUCCESS     = 0,
+    DMA_READ_ERROR  = 1,
+    DMA_IDLE        = 2,
     DMA_WRITE_ERROR = 3,
 };

trunk/softs/giet_tsar/drivers.c

@@ -376 +376 @@
 
     tty_address = (char*)(base + increment + tid*TTY_SPAN*4);
+    //tty_address = (char*)(base + tid*TTY_SPAN*4);
 
     for ( i=0 ; i < length ; i++ )
@@ -569 +570 @@
     if( index >= max ) return -1;
 
-    register int        delay = ( (_proctime() + _procid() ) & 0xF) << 4;
-    register int*       plock = (int*)&_spin_lock[index];                       
+    register int   delay = ((_proctime() +_procid()) & 0xF) << 4;
+    register int * plock = (int *) &_spin_lock[index];                  
 
     asm volatile ("_locks_llsc:                 \n"
@@ -769 +770 @@
 {
     int*                dma_address;
-    unsigned int        base            = (unsigned int)&seg_dma_base;
+    unsigned int        base            = (unsigned int) &seg_dma_base;
     unsigned int        increment       = _segment_increment(DMA_SPAN*4);
-    char*               fb              = (char*)&seg_fb_base + offset;
-    unsigned int        delay           = (_proctime() & 0xF) << 4;
+    char *      fb              = (char *) &seg_fb_base + offset;
+    unsigned int        delay = (_proctime() & 0xF) << 4;
     unsigned int        pid             = _procid();
     unsigned int        i;

trunk/softs/giet_tsar/isr.c

@@ -183 +183 @@
    End: */
 
-/* vim: set filetype=asm expandtab shiftwidth=4 tabstop=4 softtabstop=4: */
+/* vim: set filetype=c expandtab shiftwidth=4 tabstop=4 softtabstop=4: */
 

trunk/softs/giet_tsar/reset.s

@@ -107 +107 @@
     nop
     la      $26,    _interrupt_vector   # interrupt vector address
+    la      $27,    _isr_dma 
+    sw      $27,    0($26)              # interrupt_vector[0] <= _isr_dma_get
+    sw      $27,    4($26)              # interrupt_vector[1] <= _isr_dma_get
+    sw      $27,    8($26)              # interrupt_vector[2] <= _isr_dma_get
+    sw      $27,   12($26)              # interrupt_vector[3] <= _isr_dma_get
     la      $27,    _isr_tty_get 
-    sw      $27,    0($26)              # interrupt_vector[0] <= _isr_tty_get
-    sw      $27,    4($26)              # interrupt_vector[1] <= _isr_tty_get
-    sw      $27,    8($26)              # interrupt_vector[2] <= _isr_tty_get
-    sw      $27,   12($26)              # interrupt_vector[3] <= _isr_tty_get
-    la      $27,    _isr_dma 
-    sw      $27,   16($26)              # interrupt_vector[4] <= _isr_dma
-    sw      $27,   20($26)              # interrupt_vector[5] <= _isr_dma
-    sw      $27,   24($26)              # interrupt_vector[6] <= _isr_dma
-    sw      $27,   28($26)              # interrupt_vector[7] <= _isr_dma
+    sw      $27,   16($26)              # interrupt_vector[4] <= _isr_tty
+    sw      $27,   20($26)              # interrupt_vector[5] <= _isr_tty
+    sw      $27,   24($26)              # interrupt_vector[6] <= _isr_tty
+    sw      $27,   28($26)              # interrupt_vector[7] <= _isr_tty
     la      $27,    _isr_ioc 
     sw      $27,   32($26)              # interrupt_vector[8] <= _isr_ioc