Changeset beb9336 in mainline for uspace/drv/bus/usb/uhci/res.c

Timestamp:

2012-08-24T14:07:52Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 mainline

File:

• uspace/drv/bus/usb/uhci/res.c (modified) (4 diffs)

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

@@ -51 +51 @@
  * @return Error code.
  */
-int get_my_registers(const ddf_dev_t *dev,
+int get_my_registers(ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size, int *irq_no)
 {
@@ -57 +57 @@
 
         async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
-            IPC_FLAG_BLOCKING);
+            devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
@@ -92 +92 @@
  * @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);
+            devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
@@ -111 +111 @@
  * @return Error code.
  */
-int disable_legacy(const ddf_dev_t *device)
+int disable_legacy(ddf_dev_t *device)
 {
         assert(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;