Changeset d0cbfd3 in mainline

Timestamp:

2017-11-01T20:34:04Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

aad43a8

Parents:

aa537a5a

Message:

Use proper PIO and ioport64_t interfaces in obio

Location:

uspace/drv/intctl/obio

Files:

• obio.c (modified) (3 diffs)
• obio.h (modified) (1 diff)

uspace/drv/intctl/obio/obio.c

@@ -94 +94 @@
                 case IRC_ENABLE_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
-                        ((volatile uint64_t *)(obio->regs))[OBIO_IMR(inr & INO_MASK)] |= (1UL << 31);
+                        pio_set_64(&obio->regs[OBIO_IMR(inr & INO_MASK)],
+                            1UL << 31, 0);
                         async_answer_0(callid, EOK);
                         break;
@@ -103 +104 @@
                 case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
-                        ((volatile uint64_t *)(obio->regs))[OBIO_CIR(inr & INO_MASK)] = 0;
+                        pio_write_64(&obio->regs[OBIO_CIR(inr & INO_MASK)], 0);
                         async_answer_0(callid, EOK);
                         break;
@@ -122 +123 @@
 
         flags = AS_AREA_READ | AS_AREA_WRITE;
-        obio->regs = (volatile uint64_t *)AS_AREA_ANY;
+        obio->regs = (ioport64_t *)AS_AREA_ANY;
         retval = physmem_map(res->base,
             ALIGN_UP(OBIO_SIZE, PAGE_SIZE) >> PAGE_WIDTH, flags,

uspace/drv/intctl/obio/obio.h

@@ -47 +47 @@
 /** OBIO */
 typedef struct {
-        volatile uint64_t *regs;
+        ioport64_t *regs;
         uintptr_t phys_base;
         ddf_dev_t *dev;