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

Timestamp:

Jun 29, 2014, 12:53:25 PM (10 years ago)

Author:

alain

Message:

Introducing two modifications regarding the locks protecting
exclusive access to BDV and TTY peripherals channels:

• use the giet_lock_t type to have only one lock per cache line.
• store these locks in the seg_kernel_data or in seg_kernel_uncdata, depending on the GIET_NO HARD_CC configuration parameter, to have cacheable locks when it is possible.

File:

• soft/giet_vm/giet_drivers/tty_driver.c (modified) (1 diff)

soft/giet_vm/giet_drivers/tty_driver.c

@@ -39 +39 @@
 #endif
 
+#if !defined(GIET_NO_HARD_CC)
+# error: You must define GIET_NO_HARD_CC in the giet_config.h file
+#endif
+
 #if (NB_TTY_CHANNELS < 1)
 # error: NB_TTY_CHANNELS cannot be smaller than 1!
 #endif
 
+//////////////////////////////////////////////////////////////////////////////
+//   TTY global variables
+//////////////////////////////////////////////////////////////////////////////
+
 #define in_unckdata __attribute__((section (".unckdata")))
 #define in_kdata    __attribute__((section (".kdata")))
 
-//////////////////////////////////////////////////////////////////////////////
-//   TTY global variables
-//////////////////////////////////////////////////////////////////////////////
-
+#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] 
-    = { [0 ... NB_TTY_CHANNELS - 1] = 0 };
-
-in_unckdata unsigned int _tty_lock[NB_TTY_CHANNELS]
-    = { [0 ... NB_TTY_CHANNELS - 1] = 0 };
+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
 
 //////////////////////////////////////////////////////////////////////////////