Changeset 7bdcc45 in mainline for uspace/drv/ns8250/ns8250.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/drv/ns8250/ns8250.c (modified) (3 diffs)

uspace/drv/ns8250/ns8250.c

@@ -274 +274 @@
         
         /* Gain control over port's registers. */
-        if (pio_enable((void *) data->io_addr, REG_COUNT,
+        if (pio_enable((void *)(uintptr_t) data->io_addr, REG_COUNT,
             (void **) &data->port)) {
-                printf(NAME ": error - cannot gain the port %lx for device "
+                printf(NAME ": error - cannot gain the port %#" PRIx32 " for device "
                     "%s.\n", data->io_addr, dev->name);
                 return false;
@@ -727 +727 @@
 {
         printf(NAME ": ns8250_add_device %s (handle = %d)\n",
-            dev->name, dev->handle);
+            dev->name, (int) dev->handle);
         
         int res = ns8250_dev_initialize(dev);
@@ -887 +887 @@
     ipc_call_t *call)
 {
-        ipcarg_t method = IPC_GET_METHOD(*call);
+        sysarg_t method = IPC_GET_IMETHOD(*call);
         int ret;
         unsigned int baud_rate, parity, word_length, stop_bits;