Changeset 534 for trunk/hal/tsar_mips32/drivers

Timestamp:

Sep 21, 2018, 10:20:35 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Add mtty driver.

Location:

trunk/hal/tsar_mips32/drivers

Files:

• soclib_mtty.c (modified) (8 diffs)
• soclib_mtty.h (modified) (2 diffs)
• soclib_pic.c (modified) (2 diffs)

trunk/hal/tsar_mips32/drivers/soclib_mtty.c

@@ -53 +53 @@
 
 __attribute__((section(".kdata")))
-tty_fifo_t  tty_rx_fifo[CONFIG_MAX_TXT_CHANNELS];
+mtty_fifo_t  mtty_rx_fifo[CONFIG_MAX_TXT_CHANNELS];
 
 __attribute__((section(".kdata")))
-tty_fifo_t  tty_tx_fifo[CONFIG_MAX_TXT_CHANNELS];
+mtty_fifo_t  mtty_tx_fifo[CONFIG_MAX_TXT_CHANNELS];
 
 ///////////////////////////////////////
@@ -84 +84 @@
     if( is_rx )
     {
-        tty_rx_fifo[channel].sts = 0;
-        tty_rx_fifo[channel].ptr = 0;
-        tty_rx_fifo[channel].ptw = 0;
+        mtty_rx_fifo[channel].sts = 0;
+        mtty_rx_fifo[channel].ptr = 0;
+        mtty_rx_fifo[channel].ptw = 0;
     }
     else
     {
-        tty_tx_fifo[channel].sts = 0;
-        tty_tx_fifo[channel].ptr = 0;
-        tty_tx_fifo[channel].ptw = 0;
+        mtty_tx_fifo[channel].sts = 0;
+        mtty_tx_fifo[channel].ptr = 0;
+        mtty_tx_fifo[channel].ptw = 0;
     }
 }  // end soclib_mtty_init()
@@ -99 +99 @@
 void __attribute__ ((noinline)) soclib_mtty_cmd( xptr_t th_xp )
 {
-    tty_fifo_t * fifo;     // MTTY_RX or MTTY_TX FIFO
+    mtty_fifo_t * fifo;     // MTTY_RX or MTTY_TX FIFO
     char         byte;     // byte value
     uint32_t     done;     // number of bytes moved
@@ -138 +138 @@
     if( type == TXT_WRITE )         // write bytes to MTTY_TX FIFO
     {
-        fifo = &tty_tx_fifo[channel];
+        fifo = &mtty_tx_fifo[channel];
 
         done = 0;
@@ -190 +190 @@
     else if( type == TXT_READ )       // read bytes from MTTY_RX FIFO   
     {
-        fifo = &tty_rx_fifo[channel];
+        fifo = &mtty_rx_fifo[channel];
 
         done = 0;
@@ -257 +257 @@
     process_t  * owner_ptr;         // local pointer on TXT owner process
     pid_t        owner_pid;         // TXT owner process identifier
-    tty_fifo_t * fifo;              // pointer on MTTY_TX or MTTY_RX FIFO
+    mtty_fifo_t * fifo;              // pointer on MTTY_TX or MTTY_RX FIFO
     cxy_t        tty_cxy;           // soclib_mtty cluster
     uint32_t   * tty_ptr;           // soclib_mtty segment base address
@@ -308 +308 @@
     if( is_rx )
     {
-        fifo = &tty_rx_fifo[channel];
+        fifo = &mtty_rx_fifo[channel];
 
         // try to move bytes until MTTY_READ register empty
@@ -469 +469 @@
     else
     {
-        fifo = &tty_tx_fifo[channel];
+        fifo = &mtty_tx_fifo[channel];
 
         // try to move bytes until TX_FIFO empty

trunk/hal/tsar_mips32/drivers/soclib_mtty.h

@@ -65 +65 @@
 #define MTTY_FIFO_DEPTH  128
 
-typedef struct tty_fifo_s     // 32 bytes
+typedef struct mtty_fifo_s     // 32 bytes
 {
     char          data[MTTY_FIFO_DEPTH];   // one char per slot
@@ -71 +71 @@
     unsigned int  ptw;                    // next full slot index
     unsigned int  sts;                    // number of full slots
-} tty_fifo_t;
+} mtty_fifo_t;
  
 

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -367 +367 @@
     // get the source chdev functionnal type, channel, and direction
     uint32_t func    = src_chdev->func;
+    uint32_t impl    = src_chdev->impl;
     uint32_t channel = src_chdev->channel;
     bool_t   is_rx   = src_chdev->is_rx;
 
     if( (func == DEV_FUNC_IOC) || (func == DEV_FUNC_NIC) ||
-        (func == DEV_FUNC_TXT) || (func == DEV_FUNC_IOB) )          // external IRQ => WTI
+        (func == DEV_FUNC_TXT && impl == IMPL_TXT_TTY) || (func == DEV_FUNC_IOB) )          // external IRQ => WTI
     {
         // get external IRQ index
@@ -415 +416 @@
 
     }
-    else if( (func == DEV_FUNC_DMA) || (func == DEV_FUNC_MMC) )   // internal IRQ => HWI
+    else if( (func == DEV_FUNC_DMA) || (func == DEV_FUNC_MMC) ||
+             (func == DEV_FUNC_TXT && impl == IMPL_TXT_MTY) )   // internal IRQ => HWI
     {
         // get internal IRQ index
         uint32_t hwi_id;
         if( func == DEV_FUNC_DMA ) hwi_id = lapic_input.dma[channel];
+        else if (func == DEV_FUNC_TXT ) hwi_id = lapic_input.mtty;
         else                       hwi_id = lapic_input.mmc;