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

Timestamp:

2011-03-07T19:08:13Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1d115c8, a8e98498

Parents:

f16a76b (diff), 18e9eeb (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:

EHCI handsoff fix (it works now), refactoring, Doxygen

File:

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

uspace/drv/uhci-hcd/pci.c

@@ -65 +65 @@
 
         int rc;
-
         hw_resource_list_t hw_resources;
         rc = hw_res_get_resource_list(parent_phone, &hw_resources);
@@ -82 +81 @@
         for (i = 0; i < hw_resources.count; i++) {
                 hw_resource_t *res = &hw_resources.resources[i];
-                switch (res->type) {
-                        case INTERRUPT:
-                                irq = res->res.interrupt.irq;
-                                irq_found = true;
-                                usb_log_debug2("Found interrupt: %d.\n", irq);
-                                break;
-                        case IO_RANGE:
-                                io_address = res->res.io_range.address;
-                                io_size = res->res.io_range.size;
-                                usb_log_debug2("Found io: %llx %zu.\n",
-                                    res->res.io_range.address, res->res.io_range.size);
-                                io_found = true;
-                                break;
-                        default:
-                                break;
+                switch (res->type)
+                {
+                case INTERRUPT:
+                        irq = res->res.interrupt.irq;
+                        irq_found = true;
+                        usb_log_debug2("Found interrupt: %d.\n", irq);
+                        break;
+
+                case IO_RANGE:
+                        io_address = res->res.io_range.address;
+                        io_size = res->res.io_range.size;
+                        usb_log_debug2("Found io: %llx %zu.\n",
+                            res->res.io_range.address, res->res.io_range.size);
+                        io_found = true;
+
+                default:
+                        break;
                 }
         }
 
-        if (!io_found) {
-                rc = ENOENT;
-                goto leave;
-        }
-
-        if (!irq_found) {
+        if (!io_found || !irq_found) {
                 rc = ENOENT;
                 goto leave;
@@ -121 +117 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Calls the PCI driver with a request to enable interrupts
+ *
+ * @param[in] device Device asking for interrupts
+ * @return Error code.
+ */
 int pci_enable_interrupts(ddf_dev_t *device)
 {
@@ -130 +131 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Calls the PCI driver with a request to clear legacy support register
+ *
+ * @param[in] device Device asking to disable interrupts
+ * @return Error code.
+ */
 int pci_disable_legacy(ddf_dev_t *device)
 {
         assert(device);
-        int parent_phone = devman_parent_device_connect(device->handle,
-                IPC_FLAG_BLOCKING);
+        int parent_phone =
+            devman_parent_device_connect(device->handle, IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
                 return parent_phone;
@@ -144 +150 @@
         sysarg_t value = 0x8f00;
 
-  int rc = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
+        int rc = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
             IPC_M_CONFIG_SPACE_WRITE_16, address, value);
         async_hangup(parent_phone);
 
-  return rc;
+        return rc;
 }
 /*----------------------------------------------------------------------------*/