Changeset 040068c in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2010-12-09T00:28:58Z (13 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/pciintel/pci.c (modified) (2 diffs)

uspace/drv/pciintel/pci.c

@@ -324 +324 @@
                 printf(NAME ": device %s : ", dev->name);
                 printf("address = %" PRIx64, range_addr);
-                printf(", size = %x\n", range_size);
+                printf(", size = %x\n", (unsigned int) range_size);
         }
         
@@ -489 +489 @@
             (uint32_t) hw_resources.resources[0].res.io_range.address;
         
-        if (pio_enable((void *)bus_data->conf_io_addr, 8,
+        if (pio_enable((void *)(uintptr_t)bus_data->conf_io_addr, 8,
             &bus_data->conf_addr_port)) {
                 printf(NAME ": failed to enable configuration ports.\n");