Changeset f1d6866 in mainline for uspace/drv/bus/usb/uhci/pci.c

Timestamp:

2011-09-18T21:22:59Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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/uhci/pci.c (modified) (6 diffs)

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

@@ -61 +61 @@
         assert(io_reg_size);
         assert(irq_no);
-        
+
         async_sess_t *parent_sess =
             devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
@@ -67 +67 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         hw_resource_list_t hw_resources;
-        int rc = hw_res_get_resource_list(parent_sess, &hw_resources);
+        const int rc = hw_res_get_resource_list(parent_sess, &hw_resources);
+        async_hangup(parent_sess);
         if (rc != EOK) {
-                async_hangup(parent_sess);
                 return rc;
         }
-        
+
         uintptr_t io_address = 0;
         size_t io_size = 0;
         bool io_found = false;
-        
+
         int irq = 0;
         bool irq_found = false;
-        
+
         size_t i;
         for (i = 0; i < hw_resources.count; i++) {
@@ -102 +102 @@
                 }
         }
-        
-        async_hangup(parent_sess);
-        
+        free(hw_resources.resources);
+
         if (!io_found || !irq_found)
                 return ENOENT;
-        
+
         *io_reg_address = io_address;
         *io_reg_size = io_size;
         *irq_no = irq;
-        
+
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Call the PCI driver with a request to enable interrupts
  *
@@ -127 +126 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         const bool enabled = hw_res_enable_interrupt(parent_sess);
         async_hangup(parent_sess);
-        
+
         return enabled ? EOK : EIO;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Call the PCI driver with a request to clear legacy support register
  *
@@ -142 +141 @@
 {
         assert(device);
-        
+
         async_sess_t *parent_sess =
             devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle,
@@ -148 +147 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         /* See UHCI design guide for these values p.45,
          * write all WC bits in USB legacy register */
         const sysarg_t address = 0xc0;
         const sysarg_t value = 0xaf00;
-        
+
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        
+
         const int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE),
             IPC_M_CONFIG_SPACE_WRITE_16, address, value);
-        
+
         async_exchange_end(exch);
         async_hangup(parent_sess);
-        
+
         return rc;
 }