Changes in kernel/arch/ia64/src/ddi/ddi.c [9d58539:8cd680c] in mainline

File:

• kernel/arch/ia64/src/ddi/ddi.c (modified) (3 diffs)

kernel/arch/ia64/src/ddi/ddi.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2008 Jakub vana
+ * Copyright (c) 2008 Jakub Vana
  * All rights reserved.
  *
@@ -47 +47 @@
  * Interrupts are disabled and task is locked.
  *
- * @param task          Task.
- * @param ioaddr        Starting I/O space address.
- * @param size          Size of the enabled I/O range.
+ * @param task   Task.
+ * @param ioaddr Starting I/O space address.
+ * @param size   Size of the enabled I/O range.
  *
- * @return 0 on success or an error code from errno.h.
+ * @return EOK on success or an error code from errno.h.
  */
 int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
         if (!task->arch.iomap) {
-                uint8_t *map;
-
                 task->arch.iomap = malloc(sizeof(bitmap_t), 0);
-                map = malloc(BITS2BYTES(IO_MEMMAP_PAGES), 0);
-                if(!map)
+                if (task->arch.iomap == NULL)
                         return ENOMEM;
-                bitmap_initialize(task->arch.iomap, map, IO_MEMMAP_PAGES);
+                
+                void *store = malloc(bitmap_size(IO_MEMMAP_PAGES), 0);
+                if (store == NULL)
+                        return ENOMEM;
+                
+                bitmap_initialize(task->arch.iomap, IO_MEMMAP_PAGES, store);
                 bitmap_clear_range(task->arch.iomap, 0, IO_MEMMAP_PAGES);
         }
@@ -69 +71 @@
         size = ALIGN_UP(size + ioaddr - 4 * iopage, PORTS_PER_PAGE);
         bitmap_set_range(task->arch.iomap, iopage, size / 4);
+        
+        return EOK;
+}
 
-        return 0;
+/** Disable I/O space range for task.
+ *
+ * Interrupts are disabled and task is locked.
+ *
+ * @param task   Task.
+ * @param ioaddr Starting I/O space address.
+ * @param size   Size of the disabled I/O range.
+ *
+ * @return EOK on success or an error code from errno.h.
+ */
+int ddi_iospace_disable_arch(task_t *task, uintptr_t ioaddr, size_t size)
+{
+        if (!task->arch.iomap)
+                return EINVAL;
+
+        uintptr_t iopage = ioaddr / PORTS_PER_PAGE;
+        size = ALIGN_UP(size + ioaddr - 4 * iopage, PORTS_PER_PAGE);
+        bitmap_clear_range(task->arch.iomap, iopage, size / 4);
+        
+        return EOK;
 }