Changeset 850235d in mainline for uspace/lib/c/generic/ddi.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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:

• 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>
@@ -47 +49 @@
 #include "private/libc.h"
 
+
 /** Return unique device number.
  *
@@ -120 +123 @@
  *
  */
-int iospace_enable(task_id_t id, void *ioaddr, unsigned long size)
-{
-        ddi_ioarg_t arg;
-        
-        arg.task_id = id;
-        arg.ioaddr = ioaddr;
-        arg.size = size;
+static int iospace_enable(task_id_t id, void *ioaddr, size_t size)
+{
+        const ddi_ioarg_t arg = {
+                .task_id = id,
+                .ioaddr = ioaddr,
+                .size = size
+        };
         
         return __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg);
@@ -136 +139 @@
  * @param size     Size of the I/O region.
  * @param virt     Virtual address for application's
- *                 PIO operations.
+ *                 PIO operations. Can be NULL for PMIO.
  *
  * @return EOK on success.
@@ -146 +149 @@
 #ifdef IO_SPACE_BOUNDARY
         if (pio_addr < IO_SPACE_BOUNDARY) {
-                *virt = pio_addr;
+                if (virt)
+                        *virt = pio_addr;
                 return iospace_enable(task_get_id(), pio_addr, size);
         }
+#else
+        (void) iospace_enable;
 #endif
-        
+        if (!virt)
+                return EINVAL;
+
         void *phys_frame =
             (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
@@ -166 +174 @@
 }
 
+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(const 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(const 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(const ioport32_t *reg)
+{
+        const uint32_t val = arch_pio_read_32(reg);
+        pio_trace_log(reg, val, false);
+        return val;
+}
+
 /** Register IRQ notification.
  *