Changeset 7e1b130 in mainline for uspace/lib/usbdev/src/devpoll.c

Timestamp:

2011-12-23T18:13:33Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3819ce5, b39eb79, f0b74b2

Parents:

2f0dd2a (diff), 153cc76a (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:

USB branch changes.

+ USB device drivers use single async session to host controller, this session (represented by usb_hc_connection_t) is used for both HC requests and to back usb device connection.
+ Pipe locking was removed. Reference counting was moved to usb_hc_connection_t. Every read/write operation uses separate parallel exchange thus any contention is resolved on hc side.

• async_sess_t setup using EXCHANGE_PARALLEL uses one extra phone (session phone, each exch creates its own), thus the number of phones used by usb dvice driver might increase. Possible solutions are: make read/write calls atomic (all other calls are atomic) and use EXCHANGE_ATOMIC, any other solution provided by changes to async_sess_t.

File:

• uspace/lib/usbdev/src/devpoll.c (modified) (7 diffs)

uspace/lib/usbdev/src/devpoll.c

@@ -46 +46 @@
 /** Data needed for polling. */
 typedef struct {
+        /** Parameters for automated polling. */
         usb_device_auto_polling_t auto_polling;
 
+        /** USB device to poll. */
         usb_device_t *dev;
+        /** Device pipe to use for polling. */
         size_t pipe_index;
+        /** Size of the recieved data. */
         size_t request_size;
+        /** Data buffer. */
         uint8_t *buffer;
-        void *custom_arg;
 } polling_data_t;
 
@@ -119 +123 @@
                         ++failed_attempts;
                         const bool cont = (params->on_error == NULL) ? true :
-                            params->on_error(data->dev, rc, data->custom_arg);
+                            params->on_error(data->dev, rc, params->arg);
                         if (!cont) {
                                 failed_attempts = params->max_failures;
@@ -129 +133 @@
                 assert(params->on_data);
                 const bool carry_on = params->on_data(
-                    data->dev, data->buffer, actual_size, data->custom_arg);
+                    data->dev, data->buffer, actual_size, params->arg);
 
                 if (!carry_on) {
@@ -149 +153 @@
 
         if (params->on_polling_end != NULL) {
-                params->on_polling_end(data->dev, failed, data->custom_arg);
+                params->on_polling_end(data->dev, failed, params->arg);
         }
 
@@ -199 +203 @@
                 .on_polling_end = terminated_callback,
                 .on_error = NULL,
+                .arg = arg,
         };
 
         return usb_device_auto_polling(dev, pipe_index, &auto_polling,
-           request_size, arg);
+           request_size);
 }
 
@@ -224 +229 @@
 int usb_device_auto_polling(usb_device_t *dev, size_t pipe_index,
     const usb_device_auto_polling_t *polling,
-    size_t request_size, void *arg)
+    size_t request_size)
 {
         if ((dev == NULL) || (polling == NULL) || (polling->on_data == NULL)) {
@@ -252 +257 @@
         polling_data->dev = dev;
         polling_data->pipe_index = pipe_index;
-        polling_data->custom_arg = arg;
 
         /* Copy provided settings. */