Changeset 99a1a56 in mainline

Timestamp:

2011-11-05T13:37:55Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

904dcc6

Parents:

37e4025

Message:

libusbdev: Use const on stack structure instead of heap alloc.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/poll.h (modified) (1 diff)
• include/usb/dev/request.h (modified) (1 diff)
• src/devpoll.c (modified) (2 diffs)

uspace/lib/usbdev/include/usb/dev/poll.h

@@ -84 +84 @@
 } usb_device_auto_polling_t;
 
-int usb_device_auto_polling(usb_device_t *, size_t, usb_device_auto_polling_t *,
-    size_t, void *);
+int usb_device_auto_polling(usb_device_t *, size_t,
+    const usb_device_auto_polling_t *, size_t, void *);
 
 typedef bool (*usb_polling_callback_t)(usb_device_t *,

uspace/lib/usbdev/include/usb/dev/request.h

@@ -130 +130 @@
 int usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t);
+
 int usb_request_get_configuration(usb_pipe_t *, uint8_t *);
 int usb_request_set_configuration(usb_pipe_t *, uint8_t);

uspace/lib/usbdev/src/devpoll.c

@@ -213 +213 @@
         }
 
-        usb_device_auto_polling_t *auto_polling
-            = malloc(sizeof(usb_device_auto_polling_t));
-        if (auto_polling == NULL) {
-                return ENOMEM;
-        }
-
-        auto_polling->debug = 1;
-        auto_polling->auto_clear_halt = true;
-        auto_polling->delay = 0;
-        auto_polling->max_failures = MAX_FAILED_ATTEMPTS;
-        auto_polling->on_data = callback;
-        auto_polling->on_polling_end = terminated_callback;
-        auto_polling->on_error = NULL;
-
-        int rc = usb_device_auto_polling(dev, pipe_index, auto_polling,
+        const usb_device_auto_polling_t auto_polling = {
+                .debug = 1,
+                .auto_clear_halt = true,
+                .delay = 0,
+                .max_failures = MAX_FAILED_ATTEMPTS,
+                .on_data = callback,
+                .on_polling_end = terminated_callback,
+                .on_error = NULL,
+        };
+
+        return usb_device_auto_polling(dev, pipe_index, &auto_polling,
            request_size, arg);
-
-        free(auto_polling);
-
-        return rc;
 }
 
@@ -253 +245 @@
  */
 int usb_device_auto_polling(usb_device_t *dev, size_t pipe_index,
-    usb_device_auto_polling_t *polling,
+    const usb_device_auto_polling_t *polling,
     size_t request_size, void *arg)
 {