Changeset 226 for soft

Timestamp:

Dec 14, 2012, 10:10:12 AM (12 years ago)

Author:

karaoui

Message:

2 modifications:
Better debug info for the tty number used,
Adding the O_TRUNC flag when opening/creating the map.bin.

Location:

soft/giet_vm

Files:

• sys/drivers.c (modified) (3 diffs)
• xml/xml_parser.c (modified) (2 diffs)

soft/giet_vm/sys/drivers.c

@@ -232 +232 @@
 //      _tty_error()
 ////////////////////////////////////////////////////////////////////////////////
-void _tty_error( unsigned int task_id )
+void _tty_error( unsigned int tty_id, unsigned int task_id )
 {
     unsigned int proc_id = _procid();
 
     _get_lock(&_tty_put_lock);
-    _puts("\n[GIET ERROR] TTY index too large for task ");
+    if( tty_id == 0xFFFFFFFF )
+        _puts("\n[GIET ERROR] no TTY assigned to the task ");
+    else
+        _puts("\n[GIET ERROR] TTY index too large for task ");
     _putd( task_id );
     _puts(" on processor ");
@@ -263 +266 @@
     if ( tty_id >= NB_TTYS )
     {
-        _tty_error( task_id );
+        _tty_error( tty_id , task_id );
         return 0;
     }
@@ -299 +302 @@
     if ( tty_id >= NB_TTYS )
     {
-        _tty_error( task_id );
+        _tty_error( tty_id, task_id );
         return 0;
     }

soft/giet_vm/xml/xml_parser.c

@@ -129 +129 @@
 unsigned int kernel_init_base    = 0x80090000;  /* system init entry */ 
 
-unsigned int boot_code_base      = 0xBFC00000;   /* boot code */
+unsigned int boot_code_base      = 0xBFC00000;  /* boot code */
 unsigned int boot_stack_base     = 0xBFC08000;  /* boot temporary stack */ 
 unsigned int boot_mapping_base   = 0xBFC0C000;  /* mapping_info blob */
@@ -1967 +1967 @@
 
     //open file
-    int fdout = open( file_path, (O_CREAT | O_RDWR), (S_IWUSR | S_IRUSR) );
+    int fdout = open( file_path, (O_CREAT | O_RDWR | O_TRUNC), (S_IWUSR | S_IRUSR) );
     if ( fdout < 0)
     {
         perror("open");
-        exit(1);
-    }
-
-    //reinitialise the file
-    if( ftruncate(fdout, 0) )
-    {
-        perror("truncate");
         exit(1);
     }