Changeset 15d0046 in mainline for kernel/arch/ia64/src/ddi/ddi.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

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

@@ -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)
@@ -72 +72 @@
         bitmap_set_range(task->arch.iomap, iopage, size / 4);
         
-        return 0;
+        return EOK;
+}
+
+/** 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;
 }