Changeset 2b3dd78 in mainline for uspace/lib/usbdev

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/alternate_ifaces.h (modified) (1 diff)
• include/usb/dev/device.h (modified) (1 diff)
• include/usb/dev/request.h (modified) (1 diff)
• src/recognise.c (modified) (1 diff)
• src/request.c (modified) (1 diff)

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

@@ -59 +59 @@
 typedef struct {
         /** Array of alternate interfaces descriptions. */
-        const usb_alternate_interface_descriptors_t *alternatives;
+        usb_alternate_interface_descriptors_t *alternatives;
         /** Size of @c alternatives array. */
         size_t alternative_count;

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

@@ -52 +52 @@
         usb_standard_device_descriptor_t device;
         /** Full configuration descriptor of current configuration. */
-        const void *full_config;
+        void *full_config;
         size_t full_config_size;
 } usb_device_descriptors_t;

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

@@ -70 +70 @@
     void *, size_t, size_t *);
 errno_t usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *,
-    int, const void **, size_t *);
+    int, void **, size_t *);
 errno_t usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, const void *, size_t);

uspace/lib/usbdev/src/recognise.c

@@ -61 +61 @@
  */
 static errno_t usb_add_match_id(match_id_list_t *matches, int score,
-    const char *match_str)
+    char *match_str)
 {
         assert(matches);

uspace/lib/usbdev/src/request.c

@@ -475 +475 @@
 errno_t usb_request_get_full_configuration_descriptor_alloc(
     usb_pipe_t *pipe, int index,
-    const void **descriptor_ptr, size_t *descriptor_size)
+    void **descriptor_ptr, size_t *descriptor_size)
 {
         errno_t rc;