Changeset 4a7a8d4 in mainline for uspace/lib/usbdev/include/usb

Timestamp:

2011-05-13T10:31:54Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

aca3489

Parents:

05e21ffc (diff), c372e03 (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 with usb/development

Location:

uspace/lib/usbdev/include/usb

Files:

• devdrv.h (moved) (moved from uspace/lib/usb/include/usb/devdrv.h )
• devpoll.h (moved) (moved from uspace/lib/usb/include/usb/devpoll.h )
• dp.h (moved) (moved from uspace/lib/usb/include/usb/dp.h )
• hub.h (moved) (moved from uspace/lib/usb/include/usb/hub.h ) (1 diff)
• pipes.h (moved) (moved from uspace/lib/usb/include/usb/pipes.h )
• recognise.h (moved) (moved from uspace/lib/usb/include/usb/recognise.h )
• request.h (moved) (moved from uspace/lib/usb/include/usb/request.h ) (1 diff)
• usbdevice.h (moved) (moved from uspace/lib/usb/include/usb/usbdevice.h ) (1 diff)

uspace/lib/usbdev/include/usb/hub.h

@@ -63 +63 @@
     const usb_hc_attached_device_t *);
 int usb_hc_unregister_device(usb_hc_connection_t *, usb_address_t);
+int usb_hc_get_handle_by_address(usb_hc_connection_t *, usb_address_t,
+    devman_handle_t *);
 
 #endif

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

@@ -142 +142 @@
 
 int usb_request_clear_endpoint_halt(usb_pipe_t *, uint16_t);
+int usb_pipe_clear_halt(usb_pipe_t *, usb_pipe_t *);
+int usb_request_get_endpoint_status(usb_pipe_t *, usb_pipe_t *, uint16_t *);
 
 #endif

uspace/lib/usbdev/include/usb/usbdevice.h

@@ -50 +50 @@
 } usb_hc_connection_t;
 
-int usb_hc_find(devman_handle_t, devman_handle_t *);
-
 int usb_hc_connection_initialize_from_device(usb_hc_connection_t *,
     ddf_dev_t *);