Changeset 743 for trunk/softs/giet_tsar/stdio.h

Timestamp:

Jul 10, 2014, 11:23:56 AM (10 years ago)

Author:

cfuguet

Message:

giet_tsar:

• Using X_IO and Y_IO constanst define in the hard_config.h to designates IO cluster.

• Using contigouos cluster id to calculate processor stack base address.

• Several optimizations in stdio functions

File:

• trunk/softs/giet_tsar/stdio.h (modified) (5 diffs)

trunk/softs/giet_tsar/stdio.h

@@ -40 +40 @@
 typedef unsigned int    size_t;
 
-// global variables defined in stdio.c
+// constants
 
-extern  int volatile    _ioc_lock;
-extern  int volatile    _ioc_done;
-extern  int volatile    _ioc_status;
-
-extern  char volatile   _tty_get_buf[];
-extern  int volatile    _tty_get_full[];
-
-extern int volatile     _barrier_value[];
-extern int volatile     _barrier_count[];
-extern int volatile     _barrier_lock[];
-
-extern int volatile     _spin_lock[];
+#define CLUSTER_IO (((X_IO) << (Y_WIDTH)) | (Y_IO))
 
 // functions defined in stdio.c
@@ -64 +53 @@
                                   unsigned int src_address,
                                   unsigned int length );
-unsigned int    _procid();
-unsigned int    _proctime();
-unsigned int    _procnumber();
+inline unsigned int _procid();
+inline unsigned int _proctime();
+inline unsigned int _procnumber();
+
+inline unsigned int _io_cluster();
 
 unsigned int    _rand();
@@ -72 +63 @@
 void            _it_mask();
 void            _it_enable();
+
+int             _sr_read();
+void            _sr_write(int sr);
 
 void            _dcache_buf_invalidate( const void* buffer, size_t size );
@@ -95 +89 @@
 void            _ioc_write( size_t lba, void* buffer, size_t count, size_t ext );
 void            _ioc_read (size_t lba, void* buffer, size_t count, size_t ext );
+unsigned int    _ioc_get_blocksize();
 void            _ioc_completed();
 void            _ioc_isr();
@@ -115 +110 @@
 void            _barrier_wait(size_t index);
 
-unsigned char   _byte_extended_read(  unsigned int   cluster, 
-                                      unsigned int   address );
-unsigned int    _word_extended_read(  unsigned int   cluster, 
-                                      unsigned int   address );
+volatile unsigned char _byte_extended_read( unsigned int cluster, 
+                                            unsigned int address );
+volatile unsigned int  _word_extended_read( unsigned int cluster, 
+                                            unsigned int address );
+
 void            _word_extended_write( unsigned int   cluster, 
                                       unsigned int   address,