Changeset 159100a in mainline for uspace/lib

Timestamp:

2011-07-13T22:19:26Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef9460b

Parents:

3e5c48c9 (diff), 5d36062 (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 OHCI improvements and fixes.

Location:

uspace/lib

Files:

• usb/include/usb/classes/hub.h (modified) (1 diff)
• usbhost/include/usb/host/endpoint.h (modified) (1 diff)
• usbhost/include/usb/host/usb_endpoint_manager.h (modified) (1 diff)
• usbhost/src/batch.c (modified) (1 diff)
• usbhost/src/endpoint.c (modified) (1 diff)

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

@@ -119 +119 @@
      */
     uint16_t hub_characteristics;
+#define HUB_CHAR_POWER_PER_PORT_FLAG  (1 << 0)
+#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1)
 
     /**

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

@@ -61 +61 @@
 } endpoint_t;
 
-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);
+endpoint_t * endpoint_get(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/usbhost/include/usb/host/usb_endpoint_manager.h

@@ -82 +82 @@
     size_t data_size)
 {
-        endpoint_t *ep = malloc(sizeof(endpoint_t));
-        if (ep == NULL)
+        endpoint_t *ep = endpoint_get(
+            address, endpoint, direction, type, speed, max_packet_size);
+        if (!ep)
                 return ENOMEM;
 
-        int ret = endpoint_init(ep, address, endpoint, direction, type, speed,
-            max_packet_size);
-        if (ret != EOK) {
-                free(ep);
-                return ret;
-        }
-
-        ret = usb_endpoint_manager_register_ep(instance, ep, data_size);
+        const int ret =
+            usb_endpoint_manager_register_ep(instance, ep, data_size);
         if (ret != EOK) {
                 endpoint_destroy(ep);
-                return ret;
         }
-        return EOK;
+        return ret;
 }
 #endif

uspace/lib/usbhost/src/batch.c

@@ -109 +109 @@
         assert(instance);
         assert(instance->ep);
+        assert(instance->next_step);
         endpoint_release(instance->ep);
         instance->next_step(instance);

uspace/lib/usbhost/src/endpoint.c

@@ -39 +39 @@
 #include <usb/host/endpoint.h>
 
-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)
+endpoint_t * endpoint_get(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);
-        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;
-        instance->active = false;
-        fibril_mutex_initialize(&instance->guard);
-        fibril_condvar_initialize(&instance->avail);
-        endpoint_clear_hc_data(instance);
-        return EOK;
+        endpoint_t *instance = malloc(sizeof(endpoint_t));
+        if (instance) {
+                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;
+                instance->active = false;
+                fibril_mutex_initialize(&instance->guard);
+                fibril_condvar_initialize(&instance->avail);
+                endpoint_clear_hc_data(instance);
+        }
+        return instance;
 }
 /*----------------------------------------------------------------------------*/