Changeset 400735e in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-05-28T14:30:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3fb5a3e

Parents:

e8f826b (diff), 48141f0 (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 development/ changes

File:

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

uspace/drv/uhci-hcd/iface.c

@@ -39 +39 @@
 
 #include "iface.h"
+#include "batch.h"
 #include "hc.h"
 
@@ -122 +123 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Find device handle by address interface function.
  *
@@ -136 +137 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-        bool found =
+        const bool found =
             usb_device_keeper_find_by_address(&hc->manager, address, handle);
         return found ? EOK : ENOENT;
 }
-
 /*----------------------------------------------------------------------------*/
 /** Release address interface function
@@ -164 +164 @@
     size_t max_packet_size, unsigned int interval)
 {
+        assert(fun);
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
@@ -183 +184 @@
     usb_endpoint_t endpoint, usb_direction_t direction)
 {
+        assert(fun);
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
@@ -211 +213 @@
         if (ret != EOK)
                 return ret;
+        assert(batch);
+        assert(hc);
         batch_interrupt_out(batch);
         ret = hc_schedule(hc, batch);
@@ -239 +243 @@
         if (ret != EOK)
                 return ret;
+        assert(batch);
+        assert(hc);
         batch_interrupt_in(batch);
         ret = hc_schedule(hc, batch);
@@ -267 +273 @@
         if (ret != EOK)
                 return ret;
+        assert(batch);
+        assert(hc);
         batch_bulk_out(batch);
         ret = hc_schedule(hc, batch);
@@ -295 +303 @@
         if (ret != EOK)
                 return ret;
+        assert(batch);
+        assert(hc);
         batch_bulk_in(batch);
         ret = hc_schedule(hc, batch);
@@ -327 +337 @@
         if (ret != EOK)
                 return ret;
+        assert(batch);
+        assert(hc);
         usb_endpoint_manager_reset_if_need(&hc->ep_manager, target, setup_data);
         batch_control_write(batch);
@@ -360 +372 @@
         if (ret != EOK)
                 return ret;
+        assert(batch);
+        assert(hc);
         batch_control_read(batch);
         ret = hc_schedule(hc, batch);