Changeset 258 for soft/giet_vm/display

Timestamp:

Dec 4, 2013, 7:48:04 PM (11 years ago)

Author:

alain

Message:

This is a major release, including a deep restructuration of code.
The main evolutions are

• use of the Tsar preloader to load the GIET boot-loader from disk
• introduction of a FAT32 file system library,
• use of this fat32 library by the boot-loader to load the map.bin data structure, and the various .elf files
• reorganisation of drivers (one file per peripheral).
• introduction of drivers for new peripherals: vci_chbuf_dma and vci_multi_ahci.
• introduction of a new physical memory allocator in the boot code.

This release has been tested on the tsar_generic_iob architecture,
for the two following mappings: 4c_1p_iob_four.xml and 4c_1p_iob_sort.xml

Location:

soft/giet_vm/display

Files:

• display.ld (modified) (1 diff)
• main.c (modified) (1 diff)
• main_cma.c (added)
• main_dma.c (deleted)
• main_pipe.c (deleted)

soft/giet_vm/display/display.ld

@@ -3 +3 @@
 *****************************************************************************/
 
-seg_data_base      = 0x00800000;        
 seg_code_base      = 0x00400000;
+seg_data_base      = 0x00500000;        
 
 /***************************************************************************

soft/giet_vm/display/main.c

@@ -1 +1 @@
 #include <stdio.h>
 
-#define NBLOCKS 32   // number of blocks per image (128 * 128) / 512
+#define NBLOCKS 32   // (128 * 128) / 512
 
-unsigned char buf0[128*128] __attribute__((aligned(64)));
-unsigned char buf1[128*128] __attribute__((aligned(64)));
+unsigned char buf[128*128] __attribute__((aligned(512)));
 
-__attribute__((constructor)) int main(void)
-{
-    unsigned int  x;
-    unsigned int  base = 0;
+__attribute__((constructor)) void main()
+{  
+    int           fd;
+    int           blocks;
+    unsigned int  ko;
+    unsigned int  blocks_to_skip = 8*NBLOCKS;
 
-    /* initialise CDMA transfert (double buffer) */
+    giet_tty_printf("\nStarting task DISPLAY on processor %d at cycle %d\n",
+                    giet_procid(), giet_proctime() );
 
-    giet_tty_printf( "*** Starting task DISPLAY_CMA on processor %d at cycle %d\n",
-                     giet_procid(), giet_proctime() );
-    giet_tty_printf( "  - buf0 address (LSB) = %x\n", (unsigned int)buf0 );
-    giet_tty_printf( "  - buf1 address (LSB) = %x\n", (unsigned int)buf1 );
+    ///////////////////////////////////////////
+    fd = giet_fat_open( "misc/images.raw", 0 );
+    if ( fd < 0 )
+    {
+        giet_tty_printf("\n*** echec giet_fat_open for misc/images.raw at cycle %d\n", 
+                        giet_proctime() );
+        giet_exit();
+    }
+    else
+    {
+        giet_tty_printf("\ngiet_fat_open completed for misc/images.raw at cycle %d\n", 
+                        giet_proctime() );
+    }
 
-    x = giet_fb_cma_init( buf0,       // buf0 base address
-                          buf1,       // buf1 base address
-                          128*128 );  // buffer size (bytes)
-    giet_assert( (x==0), "echec giet_fb_cdma_init" );
+    /////////////////////////////////////////
+    while ( blocks_to_skip < (10 * NBLOCKS) )
+    {
+        // lecture image sur le disque
+        blocks = giet_fat_read( fd, buf, NBLOCKS, blocks_to_skip );
+        if ( blocks != NBLOCKS )
+        {
+            giet_tty_printf("\n*** echec giet_fat_read at cycle %d\n", 
+                            giet_proctime() );
+            giet_exit();
+        }
+        else
+        {
+            giet_tty_printf("\ngiet_fat_read for image %d completed at cycle %d \n", 
+                            (blocks_to_skip>>5), giet_proctime());
+        }
 
-    while (base < 10 * NBLOCKS)
-    {
-        /* Phase 1 : transfer one image from disk to buf0 and display  */
+        // transfert vers le frame buffer  
+        ko = giet_fb_sync_write( 0, buf, 128 * 128 );
+        if ( ko )
+        {
+            giet_tty_printf("\n*** echec giet_fb_sync_write at cycle %d\n", 
+                            giet_proctime() );
+            giet_exit();
+        }
+        else
+        {
+            giet_tty_printf("\ndisplay completed for image %d at cycle %d \n", 
+                            (blocks_to_skip>>5), giet_proctime());
+        }
 
-        giet_tty_printf( "\n *** image %d *** at date = %d \n",
-                         (base/NBLOCKS), giet_proctime() );
+        blocks_to_skip = blocks_to_skip + NBLOCKS;
+    }
 
-        x = giet_ioc_read( base,            // lba on disk
-                           buf0,            // user buffer address
-                           NBLOCKS );       // number of blocks
-        giet_assert( (x==0) , "echec giet_ioc_read for buf0" );
-
-        x = giet_ioc_completed();
-        giet_assert( (x==0) , "echec giet_ioc_completed for buf0" );
-
-        giet_tty_printf( "ioc_read buf0 completed at date = %d \n", giet_proctime() );
-
-        x = giet_fb_cma_write( 0 );         // buf0
-        giet_assert( (x==0) , "echec giet_fb_cma_write for buf0" );
-        
-        base = base + NBLOCKS;
-
-        /* Phase 2 : transfer one image from disk to buf1 and display  */
-
-        giet_tty_printf( "\n *** image %d *** at date = %d \n",
-                         (base/NBLOCKS), giet_proctime() );
-
-        x = giet_ioc_read( base,            // lba on disk
-                           buf1,            // user buffer address
-                           NBLOCKS );       // number of locks
-        giet_assert( (x==0) , "echec giet_ioc_read for buf1");
-
-        x = giet_ioc_completed();
-        giet_assert( (x==0) , "echec giet_ioc_completed for buf1");
-
-        giet_tty_printf( "ioc_read buf1 completed at date = %d \n", giet_proctime() );
-
-        x = giet_fb_cma_write( 1 );         // buf1
-        giet_assert( (x==0) , "echec giet_fb_cma_write for buf1" );
-        
-        base = base + NBLOCKS;
-    } // end while
-
-    giet_fb_cma_stop();
+    giet_tty_printf("\n*** Tak display exit at cycle %d ***\n", giet_proctime());
     giet_exit();
-    return 0;
 }