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

Timestamp:

Jun 10, 2014, 12:33:23 PM (10 years ago)

Author:

alain

Message:

All drivers have been modified to use only the information
contained in the hard_config.h file

File:

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

soft/giet_vm/giet_drivers/tty_driver.c

@@ -16 +16 @@
 // be stored in the context of the task by the boot code.
 //
-// The seg_tty_base must be defined in giet_vsegs.ld file.
+// The SEG_TTY_BASE address must be defined in the hard_config.h file.
 ///////////////////////////////////////////////////////////////////////////////////
 // Implementation note:
@@ -31 +31 @@
 #include <utils.h>
 
+#if !defined(SEG_TTY_BASE)
+# error: You must define SEG_TTY_BASE in the hard_config.h file
+#endif
+
 #if !defined(NB_TTY_CHANNELS)
 # error: You must define NB_TTY_CHANNELS in the hard_config.h file
@@ -60 +64 @@
                                 unsigned int index )
 {
-    unsigned int* vaddr = (unsigned int*)&seg_tty_base + channel*TTY_SPAN + index;
+    unsigned int* vaddr = (unsigned int*)SEG_TTY_BASE + channel*TTY_SPAN + index;
     return _io_extended_read( vaddr );
 }
@@ -71 +75 @@
                         unsigned int value )
 {
-    unsigned int* vaddr = (unsigned int*)&seg_tty_base + channel*TTY_SPAN + index;
+    unsigned int* vaddr = (unsigned int*)SEG_TTY_BASE + channel*TTY_SPAN + index;
     _io_extended_write( vaddr, value );
 }