Changes in kernel/arch/ia32/src/ddi/ddi.c [d99c1d2:da1bafb] in mainline

File:

• kernel/arch/ia32/src/ddi/ddi.c (modified) (5 diffs)

kernel/arch/ia32/src/ddi/ddi.c

@@ -50 +50 @@
  * Interrupts are disabled and task is locked.
  *
- * @param task Task.
+ * @param task   Task.
  * @param ioaddr Startign I/O space address.
- * @param size Size of the enabled I/O range.
+ * @param size   Size of the enabled I/O range.
  *
  * @return 0 on success or an error code from errno.h.
+ *
  */
 int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
-        size_t bits;
-
-        bits = ioaddr + size;
+        size_t bits = ioaddr + size;
         if (bits > IO_PORTS)
                 return ENOENT;
-
+        
         if (task->arch.iomap.bits < bits) {
-                bitmap_t oldiomap;
-                uint8_t *newmap;
-        
                 /*
                  * The I/O permission bitmap is too small and needs to be grown.
                  */
                 
-                newmap = (uint8_t *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
+                uint8_t *newmap = (uint8_t *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
                 if (!newmap)
                         return ENOMEM;
                 
+                bitmap_t oldiomap;
                 bitmap_initialize(&oldiomap, task->arch.iomap.map,
                     task->arch.iomap.bits);
                 bitmap_initialize(&task->arch.iomap, newmap, bits);
-
+                
                 /*
                  * Mark the new range inaccessible.
@@ -85 +82 @@
                 bitmap_set_range(&task->arch.iomap, oldiomap.bits,
                     bits - oldiomap.bits);
-
+                
                 /*
                  * In case there really existed smaller iomap,
                  * copy its contents and deallocate it.
-                 */             
+                 */
                 if (oldiomap.bits) {
                         bitmap_copy(&task->arch.iomap, &oldiomap,
@@ -96 +93 @@
                 }
         }
-
+        
         /*
          * Enable the range and we are done.
          */
         bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, (size_t) size);
-
+        
         /*
          * Increment I/O Permission bitmap generation counter.
          */
         task->arch.iomapver++;
-
+        
         return 0;
 }
@@ -116 +113 @@
  *
  * Interrupts must be disabled prior this call.
+ *
  */
 void io_perm_bitmap_install(void)
 {
-        size_t bits;
-        ptr_16_32_t cpugdtr;
-        descriptor_t *gdt_p;
-        size_t ver;
-
         /* First, copy the I/O Permission Bitmap. */
-        spinlock_lock(&TASK->lock);
-        ver = TASK->arch.iomapver;
-        if ((bits = TASK->arch.iomap.bits)) {
+        irq_spinlock_lock(&TASK->lock, false);
+        size_t ver = TASK->arch.iomapver;
+        size_t bits = TASK->arch.iomap.bits;
+        if (bits) {
+                ASSERT(TASK->arch.iomap.map);
+                
                 bitmap_t iomap;
-                task_t *task = TASK;
-        
-                ASSERT(TASK->arch.iomap.map);
                 bitmap_initialize(&iomap, CPU->arch.tss->iomap,
                     TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &task->arch.iomap, task->arch.iomap.bits);
+                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                
                 /*
                  * It is safe to set the trailing eight bits because of the
@@ -141 +135 @@
                 bitmap_set_range(&iomap, ALIGN_UP(TASK->arch.iomap.bits, 8), 8);
         }
-        spinlock_unlock(&TASK->lock);
-
+        irq_spinlock_unlock(&TASK->lock, false);
+        
         /*
          * Second, adjust TSS segment limit.
          * Take the extra ending byte with all bits set into account.
          */
+        ptr_16_32_t cpugdtr;
         gdtr_store(&cpugdtr);
-        gdt_p = (descriptor_t *) cpugdtr.base;
+        
+        descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base;
         gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits));
         gdtr_load(&cpugdtr);
-
+        
         /*
          * Before we load new TSS limit, the current TSS descriptor