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

Timestamp:

2011-03-29T20:08:53Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fc883bb

Parents:

0d92638 (diff), 51e5608 (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:

development changes

Location:

uspace/lib/usb/include/usb

Files:

• classes/hidparser.h (modified) (6 diffs)
• host/device_keeper.h (modified) (3 diffs)
• request.h (modified) (1 diff)

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

@@ -70 +70 @@
  * Description of path of usage pages and usages in report descriptor
  */
+#define USB_HID_PATH_COMPARE_STRICT                             0
+#define USB_HID_PATH_COMPARE_END                                1
+#define USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY    4
+
 typedef struct {
         int32_t usage_page;
+        int32_t usage;
+
+        link_t link;
+} usb_hid_report_usage_path_t;
+
+typedef struct {
+        int depth;      
+        link_t link;
 } usb_hid_report_path_t;
 
@@ -79 +91 @@
 typedef struct {
         int32_t id;
-        int32_t usage_page;
-        int32_t usage;  
         int32_t usage_minimum;
         int32_t usage_maximum;
@@ -107 +117 @@
         uint8_t item_flags;
 
+        usb_hid_report_path_t *usage_path;
         link_t link;
 } usb_hid_report_item_t;
@@ -117 +128 @@
         link_t feature;
 } usb_hid_report_parser_t;      
-
 
 
@@ -194 +204 @@
 int usb_hid_parse_report(const usb_hid_report_parser_t *parser,  
     const uint8_t *data, size_t size,
+    usb_hid_report_path_t *path, int flags,
     const usb_hid_report_in_callbacks_t *callbacks, void *arg);
 
 int usb_hid_report_input_length(const usb_hid_report_parser_t *parser,
-        const usb_hid_report_path_t *path);
+        usb_hid_report_path_t *path, int flags);
 
 
@@ -204 +215 @@
 void usb_hid_descriptor_print(usb_hid_report_parser_t *parser);
 
+/* usage path functions */
+usb_hid_report_path_t *usb_hid_report_path(void);
+void usb_hid_report_path_free(usb_hid_report_path_t *path);
+int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, int32_t usage_page, int32_t usage);
+void usb_hid_report_remove_last_item(usb_hid_report_path_t *usage_path);
+void usb_hid_report_null_last_item(usb_hid_report_path_t *usage_path);
+void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path, int32_t tag, int32_t data);
+int usb_hid_report_compare_usage_path(usb_hid_report_path_t *report_path, usb_hid_report_path_t *path, int flags);
+int     usb_hid_report_path_clone(usb_hid_report_path_t *new_usage_path, usb_hid_report_path_t *usage_path);
+
+
+// output
+//      - funkce co vrati cesty poli v output reportu
+//      - funkce co pro danou cestu nastavi data
+//      - finalize
+
 #endif
 /**

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

@@ -51 +51 @@
         usb_speed_t speed;
         bool occupied;
+        bool control_used;
         uint16_t toggle_status[2];
         devman_handle_t handle;
@@ -61 +62 @@
         struct usb_device_info devices[USB_ADDRESS_COUNT];
         fibril_mutex_t guard;
-        fibril_condvar_t default_address_occupied;
+        fibril_condvar_t change;
         usb_address_t last_address;
 } usb_device_keeper_t;
@@ -97 +98 @@
     usb_address_t address);
 
+void usb_device_keeper_use_control(usb_device_keeper_t *instance,
+    usb_address_t address);
+
+void usb_device_keeper_release_control(usb_device_keeper_t *instance,
+    usb_address_t address);
+
 #endif
 /**

uspace/lib/usb/include/usb/request.h

@@ -41 +41 @@
 #include <usb/pipes.h>
 #include <usb/descriptor.h>
+
+/** USB device status - device is self powered (opposed to bus powered). */
+#define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0))
+
+/** USB device status - remote wake-up signaling is enabled. */
+#define USB_DEVICE_STATUS_REMOTE_WAKEUP ((uint16_t)(1 << 1))
+
+/** USB endpoint status - endpoint is halted (stalled). */
+#define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0))
 
 /** Standard device request. */