Changeset 456 for soft/giet_vm/giet_drivers/tty_driver.c

Timestamp:

Dec 5, 2014, 3:38:31 PM (10 years ago)

Author:

alain

Message:

Defining the NIC and CMA drivers (validated by the classif application).
Updating other drivers to comply with the new tty0 common file.

File:

• soft/giet_vm/giet_drivers/tty_driver.c (modified) (3 diffs)

soft/giet_vm/giet_drivers/tty_driver.c

@@ -12 +12 @@
 #include <ctx_handler.h>
 #include <utils.h>
+#include <tty0.h>
 
 #if !defined(SEG_TTY_BASE)
@@ -21 +22 @@
 #endif
 
-#if !defined(GIET_NO_HARD_CC)
-# error: You must define GIET_NO_HARD_CC in the giet_config.h file
+#if (NB_TTY_CHANNELS == 0)
+# error: The NB_TTY_CHANNELS in the hard_config.h file cannot be 0
 #endif
 
-#if (NB_TTY_CHANNELS < 1)
-# error: NB_TTY_CHANNELS cannot be smaller than 1!
-#endif
+////////////////////////////////////////////////////////////////////////////////////
+//               global variables
+////////////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////////////////////////////////////////
-//                global variables
-//////////////////////////////////////////////////////////////////////////////
+simple_lock_t  _tty_tx_lock[NB_TTY_CHANNELS] __attribute__((aligned(64)));
 
-#define in_unckdata __attribute__((section (".unckdata")))
-#define in_kdata    __attribute__((section (".kdata")))
+unsigned int   _tty_rx_buf[NB_TTY_CHANNELS];
+unsigned int   _tty_rx_full[NB_TTY_CHANNELS]; 
 
-#if GIET_NO_HARD_CC
-in_unckdata volatile unsigned int _tty_rx_buf[NB_TTY_CHANNELS];
-in_unckdata volatile unsigned int _tty_rx_full[NB_TTY_CHANNELS]; 
-in_unckdata giet_lock_t _tty_lock[NB_TTY_CHANNELS] __attribute__((aligned(64)));
-#else
-in_kdata volatile unsigned int _tty_rx_buf[NB_TTY_CHANNELS];
-in_kdata volatile unsigned int _tty_rx_full[NB_TTY_CHANNELS]; 
-in_kdata giet_lock_t _tty_lock[NB_TTY_CHANNELS] __attribute__((aligned(64)));
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////
 //               access functions
-//////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////
@@ -67 +56 @@
 }
 
+//////////////////////////////////////
+void _tty_init( unsigned int channel )
+{
+    _tty_rx_full[channel] = 0;
+}
 
 ////////////////////////////////////////