Changeset 15be932 in mainline

Timestamp:

2011-01-08T19:01:10Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b276c3b

Parents:

93fb170c

Message:

Begin work on usb identification

Add uhci_setup_sync function to support blocking calls

Location:

uspace/drv/uhci

Files:

• Makefile (modified) (1 diff)
• utils/hc_synchronizer.c (modified) (2 diffs)
• utils/hc_synchronizer.h (modified) (1 diff)
• utils/identify.c (added)
• utils/identify.h (added)

uspace/drv/uhci/Makefile

@@ -40 +40 @@
         uhci.c \
         utils/fibril_semaphore.c \
-        utils/hc_synchronizer.c
+        utils/hc_synchronizer.c \
+        utils/identify.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/uhci/utils/hc_synchronizer.c

@@ +1 @@
+#include "debug.h"
 #include "hc_synchronizer.h"
+#include "uhci.h"
 
 void sync_init(sync_value_t *value)
@@ -31 +33 @@
         fibril_semaphore_up(&value->done);
 }
+/*----------------------------------------------------------------------------*/
+int uhci_setup_sync(
+  device_t *hc,
+  usb_target_t target,
+  usb_transfer_type_t type,
+  void *buffer, size_t size,
+  sync_value_t *result
+  )
+{
+        assert(result);
+        sync_init(result);
+
+        int ret =
+          uhci_setup(hc, target, type, buffer, size,
+                  sync_out_callback, (void*)result);
+
+        if (ret) {
+                uhci_print_error("sync setup transaction failed(%d).\n", ret);
+                return ret;
+        }
+
+        uhci_print_verbose("setup transaction sent, waiting to complete.\n");
+        sync_wait_for(result);
+
+        return ret;
+}

uspace/drv/uhci/utils/hc_synchronizer.h

@@ -59 +59 @@
 void sync_out_callback(
   device_t *device, usb_transaction_outcome_t result, void *value);
+
+int uhci_setup_sync(
+  device_t *hc,
+  usb_target_t target,
+  usb_transfer_type_t type,
+  void *buffer, size_t size,
+  sync_value_t *result
+  );
 #endif
 /**