Changeset 040068c in mainline for uspace/drv/ns8250/ns8250.c

Timestamp:

2010-12-09T00:28:58Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cdc1aa1

Parents:

818dc00 (diff), 0a5a950 (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 + minor changes

The marge with mainline includes the hands-off configure and merge with
our DDF fixes.

The virtual USB host controller is now under the virtual devices hierarchy
(the path is /virt/usbhc now).

File:

• uspace/drv/ns8250/ns8250.c (modified) (2 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 %#" PRIx32 " for device "
@@ -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);