Changeset 295 for soft/giet_vm/giet_drivers/ioc_driver.h

Timestamp:

Mar 26, 2014, 6:44:44 PM (10 years ago)

Author:

alain

Message:

Introducing a major release, to suppoort the tsar_generic_leti platform
and the various (external or internal) peripherals configurations.
The map.xml format has been modified, in order to support the new
vci_iopic componentand a new policy for peripherals initialisation.
The IRQs are nom described in the XICU and IOPIC components
(and not anymore in the processors).
To enforce this major change, the map.xml file signature changed:
The signature value must be: 0xDACE2014

This new release has been tested on the tsar_generic_leti platform
for the following mappings:

• 4c_4p_sort_leti
• 4c_4p_sort_leti_ext
• 4c_4p_transpose_leti
• 4c_4p_transpose_leti_ext
• 4c_1p_four_leti_ext

File:

• soft/giet_vm/giet_drivers/ioc_driver.h (modified) (1 diff)

soft/giet_vm/giet_drivers/ioc_driver.h

@@ -13 +13 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
-enum IOC_registers 
-{
-    BLOCK_DEVICE_BUFFER,
-    BLOCK_DEVICE_LBA,
-    BLOCK_DEVICE_COUNT,
-    BLOCK_DEVICE_OP,
-    BLOCK_DEVICE_STATUS,
-    BLOCK_DEVICE_IRQ_ENABLE,
-    BLOCK_DEVICE_SIZE,
-    BLOCK_DEVICE_BLOCK_SIZE,
-    BLOCK_DEVICE_BUFFER_EXT,
-};
-enum IOC_operations 
-{
-    BLOCK_DEVICE_NOOP,
-    BLOCK_DEVICE_READ,
-    BLOCK_DEVICE_WRITE,
-};
-enum IOC_status
-{
-    BLOCK_DEVICE_IDLE,
-    BLOCK_DEVICE_BUSY,
-    BLOCK_DEVICE_READ_SUCCESS,
-    BLOCK_DEVICE_WRITE_SUCCESS,
-    BLOCK_DEVICE_READ_ERROR,
-    BLOCK_DEVICE_WRITE_ERROR,
-    BLOCK_DEVICE_ERROR,
-};
 enum IOC_driver_modes
 {
-    IOC_BOOT_PA_MODE,  // No V2P translation / Polling IOC_STATUS / no access checking
-    IOC_BOOT_VA_MODE,  // V2P translation    / Polling IOC_STATUS / no access checking
-    IOC_KERNEL_MODE,   // V2P translation    / Descheduling + IRQ / no access checking
-    IOC_USER_MODE,     // V2P translation    / Descheduling + IRQ / access checking
+    IOC_BOOT_MODE   = 0,     //  Polling IOC_STATUS / no access right checking
+    IOC_KERNEL_MODE = 1,     //  Descheduling + IRQ / no access right checking
+    IOC_USER_MODE   = 2,     //  Descheduling + IRQ / access right checking
 };
 
 ///////////////////////////////////////////////////////////////////////////////////
-// IOC access functions and variables (vci_block_device)
+// IOC global variables (generic disk controller)
 ///////////////////////////////////////////////////////////////////////////////////
 
-extern unsigned int _ioc_lock;
-extern unsigned int _ioc_status;
-extern volatile unsigned int _ioc_gtid;
 extern volatile unsigned int _ioc_iommu_ix1;
 extern volatile unsigned int _ioc_iommu_npages; 
 
+///////////////////////////////////////////////////////////////////////////////////
+// IOC access functions  (generic disk controller)
+///////////////////////////////////////////////////////////////////////////////////
+
 extern unsigned int _ioc_init( unsigned int channel );
 
-extern unsigned int _ioc_write( unsigned int mode,
+extern unsigned int _ioc_write( unsigned int channel,
+                                unsigned int mode,
                                 unsigned int lba, 
                                 const void*  buffer, 
                                 unsigned int count );
 
-extern unsigned int _ioc_read(  unsigned int mode,
+extern unsigned int _ioc_read(  unsigned int channel,
+                                unsigned int mode,
                                 unsigned int lba, 
                                 void*        buffer,
                                 unsigned int count );
 
-extern unsigned int _ioc_get_status( unsigned int  channel,
-                                     unsigned int* status );
+extern unsigned int _ioc_get_status( unsigned int channel );
 
 extern unsigned int _ioc_get_block_size();