Changes in uspace/lib/c/generic/ddi.c [acc0efb:9d58539] in mainline

File:

• uspace/lib/c/generic/ddi.c (modified) (6 diffs)

uspace/lib/c/generic/ddi.c

@@ -34 +34 @@
 
 #include <assert.h>
-#include <atomic.h>
 #include <unistd.h>
-#include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -48 +46 @@
 #include <libarch/config.h>
 #include "private/libc.h"
-
 
 /** Return unique device number.
@@ -123 +120 @@
  *
  */
-static int iospace_enable(task_id_t id, void *ioaddr, size_t size)
+int iospace_enable(task_id_t id, void *ioaddr, unsigned long size)
 {
-        const ddi_ioarg_t arg = {
-                .task_id = id,
-                .ioaddr = ioaddr,
-                .size = size
-        };
+        ddi_ioarg_t arg;
+        
+        arg.task_id = id;
+        arg.ioaddr = ioaddr;
+        arg.size = size;
         
         return __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg);
@@ -139 +136 @@
  * @param size     Size of the I/O region.
  * @param virt     Virtual address for application's
- *                 PIO operations. Can be NULL for PMIO.
+ *                 PIO operations.
  *
  * @return EOK on success.
@@ -149 +146 @@
 #ifdef IO_SPACE_BOUNDARY
         if (pio_addr < IO_SPACE_BOUNDARY) {
-                if (virt)
-                        *virt = pio_addr;
+                *virt = pio_addr;
                 return iospace_enable(task_get_id(), pio_addr, size);
         }
 #endif
-        if (!virt)
-                return EINVAL;
-
+        
         void *phys_frame =
             (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
@@ -170 +164 @@
         *virt = virt_page + offset;
         return EOK;
-}
-
-void pio_write_8(ioport8_t *reg, uint8_t val)
-{
-        pio_trace_log(reg, val, true);
-        arch_pio_write_8(reg, val);
-}
-
-void pio_write_16(ioport16_t *reg, uint16_t val)
-{
-        pio_trace_log(reg, val, true);
-        arch_pio_write_16(reg, val);
-}
-
-void pio_write_32(ioport32_t *reg, uint32_t val)
-{
-        pio_trace_log(reg, val, true);
-        arch_pio_write_32(reg, val);
-}
-
-uint8_t pio_read_8(ioport8_t *reg)
-{
-        const uint8_t val = arch_pio_read_8(reg);
-        pio_trace_log(reg, val, false);
-        return val;
-}
-
-uint16_t pio_read_16(ioport16_t *reg)
-{
-        const uint16_t val = arch_pio_read_16(reg);
-        pio_trace_log(reg, val, false);
-        return val;
-}
-
-uint32_t pio_read_32(ioport32_t *reg)
-{
-        const uint32_t val = arch_pio_read_32(reg);
-        pio_trace_log(reg, val, false);
-        return val;
 }