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

Timestamp:

2011-05-27T07:10:12Z (13 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-rhd/main.c (modified) (4 diffs)

uspace/drv/uhci-rhd/main.c

@@ -37 +37 @@
 #include <errno.h>
 #include <str_error.h>
+
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
@@ -45 +46 @@
 #define NAME "uhci-rhd"
 
-static int hc_get_my_registers(ddf_dev_t *dev,
+static int hc_get_my_registers(const ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size);
 /*----------------------------------------------------------------------------*/
@@ -130 +131 @@
  */
 int hc_get_my_registers(
-    ddf_dev_t *dev, uintptr_t *io_reg_address, size_t *io_reg_size)
+    const ddf_dev_t *dev, uintptr_t *io_reg_address, size_t *io_reg_size)
 {
-        assert(dev != NULL);
+        assert(dev);
 
-        int parent_phone = devman_parent_device_connect(dev->handle,
+        const int parent_phone = devman_parent_device_connect(dev->handle,
             IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
@@ -141 +142 @@
 
         hw_resource_list_t hw_resources;
-        int ret = hw_res_get_resource_list(parent_phone, &hw_resources);
+        const int ret = hw_res_get_resource_list(parent_phone, &hw_resources);
         if (ret != EOK) {
                 async_hangup(parent_phone);