Changeset 8dc762e0 in mainline for uspace/lib/usb/include

Timestamp:

2011-04-06T21:12:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f567bcf

Parents:

1e70157

Message:

Move endpoint_t to libusb

Location:

uspace/lib/usb/include/usb/host

Files:

• endpoint.h (moved) (moved from uspace/drv/uhci-hcd/endpoint.h ) (4 diffs)
• usb_endpoint_manager.h (modified) (3 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbuhcihc
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * @brief UHCI host controller driver structure
+ *
  */
-#ifndef DRV_UHCI_UHCI_ENDPOINT_H
-#define DRV_UHCI_UHCI_ENDPOINT_H
+#ifndef LIBUSB_HOST_ENDPOINT_H
+#define LIBUSB_HOST_ENDPOINT_H
 
 #include <assert.h>
@@ -40 +40 @@
 #include <adt/list.h>
 #include <usb/usb.h>
-
-#include "hw_struct/queue_head.h"
 
 typedef struct endpoint {
@@ -50 +48 @@
         bool active;
         int toggle:1;
-        qh_t *qh;
 } endpoint_t;
 
@@ -56 +53 @@
     usb_speed_t speed, size_t max_packet_size);
 
-void endpoint_destroy(void *ep);
+void endpoint_destroy(endpoint_t *instance);
 
 void endpoint_toggle_reset(link_t *ep);

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

@@ -43 +43 @@
 #include <fibril_synch.h>
 #include <usb/usb.h>
+#include <usb/host/endpoint.h>
 
 #define BANDWIDTH_TOTAL_USB11 12000000
@@ -63 +64 @@
 
 int usb_endpoint_manager_register_ep(usb_endpoint_manager_t *instance,
-    usb_address_t address, usb_endpoint_t ep, usb_direction_t direction,
-    void *data, void (*data_remove_callback)(void* data), size_t bw);
+    usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
+    endpoint_t *ep, size_t data_size);
 
 int usb_endpoint_manager_register_ep_wait(usb_endpoint_manager_t *instance,
@@ -74 +75 @@
     usb_address_t address, usb_endpoint_t ep, usb_direction_t direction);
 
-void * usb_endpoint_manager_get_ep_data(usb_endpoint_manager_t *instance,
+endpoint_t * usb_endpoint_manager_get_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t ep, usb_direction_t direction,
     size_t *bw);