Changeset 0aae4a6a in mainline

Timestamp:

2011-04-07T07:32:46Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

92d6868

Parents:

fc9f88d

Message:

Add usb address and endpoint num to endpoint structure

Location:

uspace

Files:

• drv/uhci-hcd/iface.c (modified) (1 diff)
• lib/usb/include/usb/host/endpoint.h (modified) (2 diffs)
• lib/usb/src/host/endpoint.c (modified) (1 diff)

uspace/drv/uhci-hcd/iface.c

@@ -168 +168 @@
         if (ep == NULL)
                 return ENOMEM;
-        ret = endpoint_init(ep, transfer_type, speed, max_packet_size);
+        ret = endpoint_init(ep, address, endpoint, direction,
+            transfer_type, speed, max_packet_size);
         if (ret != EOK) {
                 free(ep);

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

@@ -42 +42 @@
 
 typedef struct endpoint {
-        link_t same_device_eps;
+        usb_address_t address;
+        usb_endpoint_t endpoint;
+        usb_direction_t direction;
         usb_transfer_type_t transfer_type;
         usb_speed_t speed;
@@ -48 +50 @@
         bool active;
         unsigned toggle:1;
+        link_t same_device_eps;
 } endpoint_t;
 
-int endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type,
-    usb_speed_t speed, size_t max_packet_size);
+int endpoint_init(endpoint_t *instance, usb_address_t address,
+    usb_endpoint_t endpoint, usb_direction_t direction,
+    usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size);
 
 void endpoint_destroy(endpoint_t *instance);

uspace/lib/usb/src/host/endpoint.c

@@ -37 +37 @@
 #include <usb/host/endpoint.h>
 
-int endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type,
-    usb_speed_t speed, size_t max_packet_size)
+int endpoint_init(endpoint_t *instance, usb_address_t address,
+    usb_endpoint_t endpoint, usb_direction_t direction,
+    usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size)
 {
         assert(instance);
-        link_initialize(&instance->same_device_eps);
-        instance->transfer_type = transfer_type;
+        instance->address = address;
+        instance->endpoint = endpoint;
+        instance->direction = direction;
+        instance->transfer_type = type;
         instance->speed = speed;
         instance->max_packet_size = max_packet_size;
         instance->toggle = 0;
+        link_initialize(&instance->same_device_eps);
         return EOK;
 }