Changeset 7eaeec1 in mainline for uspace/drv/bus/usb/ehci/res.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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/bus/usb/ehci/res.c (modified) (6 diffs)

uspace/drv/bus/usb/ehci/res.c

@@ -76 +76 @@
  * @return Error code.
  */
-int get_my_registers(const ddf_dev_t *dev,
+int get_my_registers(ddf_dev_t *dev,
     uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no)
 {
@@ -82 +82 @@
         
         async_sess_t *parent_sess = devman_parent_device_connect(
-            EXCHANGE_SERIALIZE, dev->handle, IPC_FLAG_BLOCKING);
+            EXCHANGE_SERIALIZE, ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
@@ -115 +115 @@
  * @return Error code.
  */
-int enable_interrupts(const ddf_dev_t *device)
+int enable_interrupts(ddf_dev_t *device)
 {
         async_sess_t *parent_sess = devman_parent_device_connect(
-            EXCHANGE_SERIALIZE, device->handle, IPC_FLAG_BLOCKING);
+            EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
@@ -134 +134 @@
  * @return Error code.
  */
-static int disable_extended_caps(const ddf_dev_t *device, unsigned eecp)
+static int disable_extended_caps(ddf_dev_t *device, unsigned eecp)
 {
         /* nothing to do */
@@ -141 +141 @@
 
         async_sess_t *parent_sess = devman_parent_device_connect(
-            EXCHANGE_SERIALIZE, device->handle, IPC_FLAG_BLOCKING);
+            EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
@@ -234 +234 @@
 }
 
-int disable_legacy(const ddf_dev_t *device, uintptr_t reg_base, size_t reg_size)
+int disable_legacy(ddf_dev_t *device, uintptr_t reg_base, size_t reg_size)
 {
         assert(device);