Changeset 340513c in mainline

Timestamp:

2016-10-31T23:31:05Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

405b67c

Parents:

54861ca

Message:

Make io_addr naturally wide

Do not clip io_addr to 32-bits as it can be a full 64-bit address on
64-bit systems.

File:

• uspace/drv/char/ns8250/ns8250.c (modified) (3 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -163 +163 @@
         int irq;
         /** The base i/o address of the devices registers. */
-        uint32_t io_addr;
+        uintptr_t io_addr;
         /** The i/o port used to access the serial ports registers. */
         ioport8_t *port;
@@ -330 +330 @@
         
         /* Gain control over port's registers. */
-        if (pio_enable((void *)(uintptr_t) ns->io_addr, REG_COUNT,
+        if (pio_enable((void *) ns->io_addr, REG_COUNT,
             (void **) &ns->port)) {
-                ddf_msg(LVL_ERROR, "Cannot map the port %#" PRIx32
+                ddf_msg(LVL_ERROR, "Cannot map the port %#" PRIxn
                     " for device %s.", ns->io_addr, ddf_dev_get_name(ns->dev));
                 return false;
@@ -432 +432 @@
                         ioport = true;
                         ddf_msg(LVL_NOTE, "Device %s was assigned I/O address = "
-                            "0x%x.", ddf_dev_get_name(ns->dev), ns->io_addr);
+                            "0x%#" PRIxn ".", ddf_dev_get_name(ns->dev), ns->io_addr);
                         break;