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

Timestamp:

2011-11-26T14:34:20Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d085fbbe

Parents:

2703331b

Message:

libusbdev: Remove redundant checks. Add few const qualifiers.

File:

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

uspace/lib/usbdev/src/devpoll.c

@@ -70 +70 @@
         
         if (polling_data->auto_polling.debug > 0) {
-                usb_endpoint_mapping_t *mapping
+                const usb_endpoint_mapping_t *mapping
                     = &polling_data->dev->pipes[polling_data->pipe_index];
                 usb_log_debug("Poll%p: started polling of `%s' - " \
@@ -85 +85 @@
         size_t failed_attempts = 0;
         while (failed_attempts <= polling_data->auto_polling.max_failures) {
-                int rc;
-
                 size_t actual_size;
-                rc = usb_pipe_read(pipe, polling_data->buffer,
+                const int rc = usb_pipe_read(pipe, polling_data->buffer,
                     polling_data->request_size, &actual_size);
 
@@ -113 +111 @@
                          */
                         usb_request_clear_endpoint_halt(
-                            &polling_data->dev->ctrl_pipe,
-                            pipe->endpoint_no);
+                            &polling_data->dev->ctrl_pipe, pipe->endpoint_no);
                 }
 
@@ -196 +193 @@
     usb_polling_terminted_callback_t terminated_callback, void *arg)
 {
-        if ((dev == NULL) || (callback == NULL)) {
-                return EBADMEM;
-        }
-        if (request_size == 0) {
-                return EINVAL;
-        }
-        if ((dev->pipes[pipe_index].pipe.transfer_type != USB_TRANSFER_INTERRUPT)
-            || (dev->pipes[pipe_index].pipe.direction != USB_DIRECTION_IN)) {
-                return EINVAL;
-        }
-
         const usb_device_auto_polling_t auto_polling = {
                 .debug = 1,
@@ -242 +228 @@
     size_t request_size, void *arg)
 {
-        if (dev == NULL) {
+        if ((dev == NULL) || (polling == NULL) || (polling->on_data == NULL)) {
                 return EBADMEM;
         }
-        if (pipe_index >= dev->pipes_count) {
+
+        if (pipe_index >= dev->pipes_count || request_size == 0) {
                 return EINVAL;
         }
@@ -251 +238 @@
             || (dev->pipes[pipe_index].pipe.direction != USB_DIRECTION_IN)) {
                 return EINVAL;
-        }
-        if ((polling == NULL) || (polling->on_data == NULL)) {
-                return EBADMEM;
         }