Changes in uspace/drv/ohci/pci.c [dc5f2fb:79ae36dd] in mainline

File:

• uspace/drv/ohci/pci.c (modified) (7 diffs)

uspace/drv/ohci/pci.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /**
  * @addtogroup drvusbohci
@@ -34 +35 @@
  * PCI related functions needed by the OHCI driver.
  */
+
 #include <errno.h>
 #include <assert.h>
@@ -63 +65 @@
         assert(irq_no);
 
-        int parent_phone = devman_parent_device_connect(dev->handle,
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
             IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
-        int rc;
-
+        if (!parent_sess)
+                return ENOMEM;
+        
         hw_resource_list_t hw_resources;
-        rc = hw_res_get_resource_list(parent_phone, &hw_resources);
+        int rc = hw_res_get_resource_list(parent_sess, &hw_resources);
         if (rc != EOK) {
-                async_hangup(parent_phone);
+                async_hangup(parent_sess);
                 return rc;
         }
-
+        
         uintptr_t mem_address = 0;
         size_t mem_size = 0;
         bool mem_found = false;
-
+        
         int irq = 0;
         bool irq_found = false;
-
+        
         size_t i;
         for (i = 0; i < hw_resources.count; i++) {
                 hw_resource_t *res = &hw_resources.resources[i];
-                switch (res->type)
-                {
+                switch (res->type) {
                 case INTERRUPT:
                         irq = res->res.interrupt.irq;
@@ -95 +94 @@
                         usb_log_debug2("Found interrupt: %d.\n", irq);
                         break;
-
                 case MEM_RANGE:
                         if (res->res.mem_range.address != 0
@@ -104 +102 @@
                                     (void *) mem_address, mem_size);
                                 mem_found = true;
-                                }
+                        }
                 default:
                         break;
                 }
         }
-
+        
         if (mem_found && irq_found) {
                 *mem_reg_address = mem_address;
@@ -115 +113 @@
                 *irq_no = irq;
                 rc = EOK;
-        } else {
+        } else
                 rc = ENOENT;
-        }
-
-        async_hangup(parent_phone);
+        
+        async_hangup(parent_sess);
         return rc;
 }
-/*----------------------------------------------------------------------------*/
-/** Calls the PCI driver with a request to enable interrupts
+
+/** Call the PCI driver with a request to enable interrupts
  *
  * @param[in] device Device asking for interrupts
@@ -130 +127 @@
 int pci_enable_interrupts(ddf_dev_t *device)
 {
-        int parent_phone =
-            devman_parent_device_connect(device->handle, IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-        bool enabled = hw_res_enable_interrupt(parent_phone);
-        async_hangup(parent_phone);
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle,
+            IPC_FLAG_BLOCKING);
+        if (!parent_sess)
+                return ENOMEM;
+        
+        bool enabled = hw_res_enable_interrupt(parent_sess);
+        async_hangup(parent_sess);
+        
         return enabled ? EOK : EIO;
 }
-/**
- * @}
- */
 
 /**