Changeset c6cb76d in mainline for uspace/lib/usb/include

Timestamp:

2011-04-08T20:19:48Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

297341b

Parents:

7dfc06fa (diff), 61727bf (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

Location:

uspace/lib/usb/include/usb

Files:

• classes/hidparser.h (modified) (4 diffs)
• host/batch.h (modified) (1 diff)
• host/device_keeper.h (modified) (1 diff)
• host/endpoint.h (modified) (3 diffs)

uspace/lib/usb/include/usb/classes/hidparser.h

@@ -88 +88 @@
         /** */  
         int depth;      
+        uint8_t report_id;
         
         /** */  
         link_t link;
+
 } usb_hid_report_path_t;
 
@@ -155 +157 @@
         /** */  
         link_t feature;
+        
+        int use_report_id;
+
+        /** */
+        link_t stack;
 } usb_hid_report_parser_t;      
 
@@ -166 +173 @@
          * @param arg Custom argument.
          */
-        void (*keyboard)(const uint8_t *key_codes, size_t count, const uint8_t modifiers, void *arg);
+        void (*keyboard)(const uint8_t *key_codes, size_t count, const uint8_t report_id, void *arg);
 } usb_hid_report_in_callbacks_t;
 
@@ -269 +276 @@
 
 /** */
+int usb_hid_report_path_set_report_id(usb_hid_report_path_t *usage_path, uint8_t report_id);
+
+/** */
 int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, int32_t usage_page, int32_t usage);
 

uspace/lib/usb/include/usb/host/batch.h

@@ -92 +92 @@
 void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
 void usb_transfer_batch_call_out(usb_transfer_batch_t *instance);
-void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error);
+void usb_transfer_batch_finish(usb_transfer_batch_t *instance);
+
+static inline void usb_transfer_batch_finish_error(
+    usb_transfer_batch_t *instance, int error)
+{
+        assert(instance);
+        instance->error = error;
+        usb_transfer_batch_finish(instance);
+}
 
 #endif

uspace/lib/usb/include/usb/host/device_keeper.h

@@ -96 +96 @@
 usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance,
     usb_address_t address);
-
-void usb_device_keeper_use_control(usb_device_keeper_t *instance,
-    usb_target_t target);
-
-void usb_device_keeper_release_control(usb_device_keeper_t *instance,
-    usb_target_t target);
-
 #endif
 /**

uspace/lib/usb/include/usb/host/endpoint.h

@@ -39 +39 @@
 #include <bool.h>
 #include <adt/list.h>
+#include <fibril_synch.h>
+
 #include <usb/usb.h>
 
@@ -48 +50 @@
         usb_speed_t speed;
         size_t max_packet_size;
-        bool active;
         unsigned toggle:1;
+        fibril_mutex_t guard;
+        fibril_condvar_t avail;
+        volatile bool active;
         link_t same_device_eps;
 } endpoint_t;
@@ -58 +62 @@
 
 void endpoint_destroy(endpoint_t *instance);
+
+void endpoint_use(endpoint_t *instance);
+
+void endpoint_release(endpoint_t *instance);
 
 int endpoint_toggle_get(endpoint_t *instance);