Changeset 82122f3 in mainline for uspace/lib/usb/include

Timestamp:

2010-12-17T14:51:41Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1f383dde

Parents:

692f13e4 (diff), 11658b64 (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:

Merged development into lelian/hidd

Location:

uspace/lib/usb/include/usb

Files:

• classes/classes.h (modified) (1 diff)
• classes/hid.h (modified) (1 diff)
• usb.h (modified) (1 diff)
• usbdrv.h (modified) (1 diff)

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

@@ -60 +60 @@
 } usb_class_t;
 
+const char *usb_str_class(usb_class_t);
 
 #endif

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

@@ -127 +127 @@
         usb_hid_configuration_t *conf;
         usb_address_t address;
-        usb_endpoint_t default_ep;
+        usb_endpoint_t poll_endpoint;
         usb_hid_report_parser_t *parser;
 } usb_hid_dev_kbd_t;

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

@@ -101 +101 @@
  * Used by various USB functions as opaque handle.
  */
-typedef ipcarg_t usb_handle_t;
+typedef sysarg_t usb_handle_t;
 
 /** USB packet identifier. */

uspace/lib/usb/include/usb/usbdrv.h

@@ -94 +94 @@
 int usb_drv_async_wait_for(usb_handle_t);
 
+int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t);
+int usb_drv_register_child_in_devman(int, device_t *, usb_address_t,
+    devman_handle_t *);
+
 
 #endif