Changeset b8cab5c in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-05-27T07:10:12Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ffca03c

Parents:

8bb61e6 (diff), 1889786 (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 with usb/development

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (2 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -77 +77 @@
 {
         assert(dev);
-        hc_t *hc = &((uhci_t*)dev->driver_data)->hc;
+        uhci_t *uhci = dev->driver_data;
+        assert(uhci);
+        hc_t *hc = &uhci->hc;
         uint16_t status = IPC_GET_ARG1(*call);
         assert(hc);
@@ -144 +146 @@
 {
         assert(fun);
-        return &((rh_t*)fun->driver_data)->resource_list;
+        rh_t *rh = fun->driver_data;
+        assert(rh);
+        return &rh->resource_list;
 }
 /*----------------------------------------------------------------------------*/