Changeset 0d5a50c in mainline

Timestamp:

2009-03-01T20:25:23Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0f94c3d

Parents:

bf25efb

Message:

Introduce pio_enable() libc call.

Location:

uspace/lib/libc

Files:

• arch/ia32/include/ddi.h (modified) (1 diff)
• generic/ddi.c (modified) (5 diffs)
• include/ddi.h (modified) (1 diff)

uspace/lib/libc/arch/ia32/include/ddi.h

@@ -33 +33 @@
 #ifndef LIBC_ia32_DDI_H_
 #define LIBC_ia32_DDI_H_
+
+#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
 
 static inline void outb(int16_t port, uint8_t b)

uspace/lib/libc/generic/ddi.c

@@ -36 +36 @@
 #include <libc.h>
 #include <task.h>
+#include <as.h>
+#include <align.h>
+#include <libarch/config.h>
 #include <kernel/ddi/ddi_arg.h>
 
@@ -42 +45 @@
  * Caller of this function must have the CAP_MEM_MANAGER capability.
  *
- * @param pf Physical address of the starting frame.
- * @param vp Virtual address of the sterting page.
- * @param pages Number of pages to map.
- * @param flags Flags for the new address space area.
+ * @param pf            Physical address of the starting frame.
+ * @param vp            Virtual address of the starting page.
+ * @param pages         Number of pages to map.
+ * @param flags         Flags for the new address space area.
  *
- * @return 0 on success, EPERM if the caller lacks the CAP_MEM_MANAGER capability,
- *         ENOENT if there is no task with specified ID and ENOMEM if there
- *         was some problem in creating address space area.
+ * @return              0 on success, EPERM if the caller lacks the
+ *                      CAP_MEM_MANAGER capability, ENOENT if there is no task
+ *                      with specified ID and ENOMEM if there was some problem
+ *                      in creating address space area.
  */
 int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
 {
-        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, flags);
+        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages,
+            flags);
 }
 
@@ -60 +65 @@
  * Caller of this function must have the IO_MEM_MANAGER capability.
  *
- * @param id Task ID.
- * @param ioaddr Starting address of the I/O range.
- * @param size Size of the range.
+ * @param id            Task ID.
+ * @param ioaddr        Starting address of the I/O range.
+ * @param size          Size of the range.
  *
- * @return 0 on success, EPERM if the caller lacks the CAP_IO_MANAGER capability,
- *         ENOENT if there is no task with specified ID and ENOMEM if there
- *         was some problem in allocating memory.
+ * @return              0 on success, EPERM if the caller lacks the
+ *                      CAP_IO_MANAGER capability, ENOENT if there is no task
+ *                      with specified ID and ENOMEM if there was some problem
+ *                      in allocating memory.
  */
 int iospace_enable(task_id_t id, void *ioaddr, unsigned long size)
@@ -81 +87 @@
 /** Interrupt control
  *
- * @param enable 1 - enable interrupts, 0 - disable interrupts
+ * @param enable        1 - enable interrupts, 0 - disable interrupts
  */
 int preemption_control(int enable)
@@ -88 +94 @@
 }
 
+/** Enable PIO for specified I/O range.
+ *
+ * @param pio_addr      I/O start address.
+ * @param size          Size of the I/O region.
+ * @param use_addr      Address where the final address for application's PIO
+ *                      will be stored.
+ *
+ * @return              Zero on success or negative error code.
+ */
+int pio_enable(void *pio_addr, size_t size, void **use_addr)
+{
+        void *phys;
+        void *virt;
+        size_t offset;
+        unsigned int pages;
+
+#ifdef IO_SPACE_BOUNDARY
+        if (pio_addr < IO_SPACE_BOUNDARY) {
+                *use_addr = pio_addr;
+                return iospace_enable(task_get_id(), pio_addr, size);
+        }
+#endif
+
+        phys = ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
+        offset = pio_addr - phys;
+        pages = ALIGN_UP(offset + size, PAGE_SIZE) >> PAGE_WIDTH;
+        virt = as_get_mappable_page(pages);
+        *use_addr = virt + offset;
+        return physmem_map(phys, virt, pages, AS_AREA_READ | AS_AREA_WRITE);
+}
+
 /** @}
  */

uspace/lib/libc/include/ddi.h

@@ -38 +38 @@
 #include <task.h>
 
-extern int physmem_map(void *pf, void *vp, unsigned long pages, int flags);
-extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size);
-extern int preemption_control(int enable);
+extern int physmem_map(void *, void *, unsigned long, int);
+extern int iospace_enable(task_id_t, void *, unsigned long);
+extern int preemption_control(int);
+extern int pio_enable(void *, size_t, void **);
 
 #endif