Changeset 237

Timestamp:

May 2, 2013, 6:38:04 PM (12 years ago)

Author:

meunier

Message:

Adding a syscall to allow a user to know the block size with which the block device has been configured.

Location:

soft/giet_vm

Files:

• libs/stdio.c (modified) (2 diffs)
• libs/stdio.h (modified) (1 diff)
• sys/drivers.c (modified) (5 diffs)
• sys/drivers.h (modified) (2 diffs)
• sys/irq_handler.c (modified) (1 diff)
• sys/sys_handler.c (modified) (1 diff)

soft/giet_vm/libs/stdio.c

@@ -35 +35 @@
 #define SYSCALL_IOC_READ        0x16
 #define SYSCALL_IOC_COMPLETED   0x17
+#define SYSCALL_IOC_BLOCK_SIZE  0x18
 #define SYSCALL_VOBJ_GET_VBASE  0x1A
 #define SYSCALL_NIC_WRITE       0x1B
@@ -548 +549 @@
 
 
+//////////////////////////////////////////////////////////////////////////////////
+// giet_ioc_block_size()
+//////////////////////////////////////////////////////////////////////////////////
+// This blocking function returns the block_size (in bytes) of the block device
+//////////////////////////////////////////////////////////////////////////////////
+unsigned int giet_ioc_block_size() {
+    return sys_call(SYSCALL_IOC_BLOCK_SIZE, 0, 0, 0, 0);
+}
+
+
 /////  Frame buffer device related system calls  /////
 

soft/giet_vm/libs/stdio.h

@@ -34 +34 @@
 unsigned int giet_ioc_write(unsigned int lba, void * buffer, unsigned int count);
 unsigned int giet_ioc_completed();
+unsigned int giet_ioc_block_size();
 
 /* Frame buffer device related functions */

soft/giet_vm/sys/drivers.c

@@ -220 +220 @@
 //unsigned int _timer_reset_irq_cpt(unsigned int cluster_id, unsigned int local_id) {
 //    // parameters checking 
-//    if ( cluster_id >= NB_CLUSTERS)    return 1;
-//    if ( local_id >= NB_TIMERS_MAX ) return 2;
+//    if (cluster_id >= NB_CLUSTERS) {
+//        return 1;
+//    }
+//    if (local_id >= NB_TIMERS_MAX) {
+//        return 2;
+//    }
 //
 //#if USE_XICU
@@ -227 +231 @@
 //#else
 //    unsigned int * timer_address = (unsigned int *) ((char *) &seg_tim_base + (cluster_id * CLUSTER_SIZE));
-//
-//    timer_address[local_id * TIMER_SPAN + TIMER_RESETIRQ] = 1;
+//    unsigned int timer_period = timer_address[local_id * TIMER_SPAN + TIMER_PERIOD];
+//
+//    timer_address[local_id * TIMER_SPAN + TIMER_PERIOD] = timer_period;
 //#endif
 //
@@ -770 +775 @@
     *status = ioc_address[BLOCK_DEVICE_STATUS]; // read status & reset IRQ 
     return 0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+//     _ioc_get_block_size()
+// This function returns the block_size with which the IOC has been configured.
+///////////////////////////////////////////////////////////////////////////////
+unsigned int _ioc_get_block_size() {
+    // get IOC base address
+    unsigned int * ioc_address = (unsigned int *) &seg_ioc_base;
+    
+    return  ioc_address[BLOCK_DEVICE_BLOCK_SIZE];
 }
 
@@ -905 +922 @@
 
     // get page table address
-    unsigned int user_ptab = _get_context_slot( task_id, CTX_PTAB_ID);
+    unsigned int user_ptab = _get_context_slot(task_id, CTX_PTAB_ID);
 
     // get peripheral buffer virtual address
-    if ( dev_type) {
+    if (dev_type) {
         device_vaddr = (unsigned int) &seg_nic_base + offset;
     }
@@ -926 +943 @@
 
     // Compute user buffer physical address
-    ko = _v2p_translate( (page_table_t*)user_ptab, (user_vaddr >> 12), &ppn, &flags);
+    ko = _v2p_translate((page_table_t*) user_ptab, (user_vaddr >> 12), &ppn, &flags);
     if (ko) {
         _get_lock(&_tty_put_lock);

soft/giet_vm/sys/drivers.h

@@ -19 +19 @@
 unsigned int _timer_stop(unsigned int cluster_id, unsigned int local_id);
 unsigned int _timer_reset_irq(unsigned int cluster_id, unsigned int local_id);
-unsigned int _timer_reset_irq_cpt(unsigned int cluster_id, unsigned int local_id);
+//unsigned int _timer_reset_irq_cpt(unsigned int cluster_id, unsigned int local_id);
 
 
@@ -60 +60 @@
 unsigned int _ioc_completed();
 unsigned int _ioc_get_status(unsigned int * status);
+unsigned int _ioc_get_block_size();
 
 ///////////////////////////////////////////////////////////////////////////////////

soft/giet_vm/sys/irq_handler.c

@@ -127 +127 @@
 
     // release DMA channel 
-    _dma_done[dma_global_id] = 1;  
+    _dma_done[dma_global_id] = 1;
 #else
     _puts("[GIET ERROR] NB_DMAS_MAX is set to zero\n");

soft/giet_vm/sys/sys_handler.c

@@ -46 +46 @@
     &_ioc_read,            /* 0x16 */
     &_ioc_completed,       /* 0x17 */
-    &_sys_ukn,             /* 0x18 */
+    &_ioc_get_block_size,  /* 0x18 */
     &_sys_ukn,             /* 0x19 */
     &_vobj_get_vbase,      /* 0x1A */