Changeset 15d3b54 in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-03-14T21:24:02Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fcf07e6

Parents:

c69209d (diff), 9370884 (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:

Doxygen comments, enable hw interrupts if possible

File:

• uspace/drv/uhci-hcd/iface.c (modified) (7 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+/** @addtogroup drvusbuhcihc
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * @brief UHCI driver hc interface implementation
  */
 #include <ddf/driver.h>
@@ -161 +161 @@
                 return ENOMEM;
         batch_interrupt_out(batch);
+        const int ret = uhci_hc_schedule(hc, batch);
+        if (ret != EOK) {
+                batch_dispose(batch);
+                return ret;
+        }
         return EOK;
 }
@@ -192 +197 @@
                 return ENOMEM;
         batch_interrupt_in(batch);
+        const int ret = uhci_hc_schedule(hc, batch);
+        if (ret != EOK) {
+                batch_dispose(batch);
+                return ret;
+        }
         return EOK;
 }
@@ -224 +234 @@
                 return ENOMEM;
         batch_bulk_out(batch);
+        const int ret = uhci_hc_schedule(hc, batch);
+        if (ret != EOK) {
+                batch_dispose(batch);
+                return ret;
+        }
         return EOK;
 }
@@ -255 +270 @@
                 return ENOMEM;
         batch_bulk_in(batch);
+        const int ret = uhci_hc_schedule(hc, batch);
+        if (ret != EOK) {
+                batch_dispose(batch);
+                return ret;
+        }
         return EOK;
 }
@@ -293 +313 @@
         device_keeper_reset_if_need(&hc->device_manager, target, setup_data);
         batch_control_write(batch);
+        const int ret = uhci_hc_schedule(hc, batch);
+        if (ret != EOK) {
+                batch_dispose(batch);
+                return ret;
+        }
         return EOK;
 }
@@ -327 +352 @@
                 return ENOMEM;
         batch_control_read(batch);
+        const int ret = uhci_hc_schedule(hc, batch);
+        if (ret != EOK) {
+                batch_dispose(batch);
+                return ret;
+        }
         return EOK;
 }