Changeset 7c95d6f5 in mainline for uspace/lib/usbdev/src

Timestamp:

2011-10-15T12:13:59Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

065064e6

Parents:

8a121b1

Message:

usb: Further const madness.

Location:

uspace/lib/usbdev/src

Files:

• altiface.c (modified) (3 diffs)
• devdrv.c (modified) (2 diffs)
• pipesinit.c (modified) (5 diffs)

uspace/lib/usbdev/src/altiface.c

@@ -48 +48 @@
  * @return Number of alternate interfaces for @p interface_no interface.
  */
-size_t usb_interface_count_alternates(uint8_t *config_descr,
+size_t usb_interface_count_alternates(const uint8_t *config_descr,
     size_t config_descr_size, uint8_t interface_no)
 {
@@ -90 +90 @@
  * @return Error code.
  */
-int usb_alternate_interfaces_create(uint8_t *config_descr,
+int usb_alternate_interfaces_create(const uint8_t *config_descr,
     size_t config_descr_size, int interface_number,
     usb_alternate_interfaces_t **alternates_ptr)
@@ -160 +160 @@
                     dp_data.data, iface_ptr);
                 if (iface_ptr == NULL) {
-                        uint8_t *next = dp_data.data + dp_data.size;
+                        const uint8_t *next = dp_data.data + dp_data.size;
                         cur_alt_iface->nested_descriptors_size
                             = next - cur_alt_iface->nested_descriptors;

uspace/lib/usbdev/src/devdrv.c

@@ -115 +115 @@
         int rc = usb_device_create_pipes(dev->ddf_dev, &dev->wire, endpoints,
             dev->descriptors.configuration, dev->descriptors.configuration_size,
-            dev->interface_no, alternate_setting,
-            &pipes, &pipes_count);
+            dev->interface_no, alternate_setting, &pipes, &pipes_count);
 
         if (rc != EOK) {
@@ -319 +318 @@
 int usb_device_create_pipes(const ddf_dev_t *dev, usb_device_connection_t *wire,
     usb_endpoint_description_t **endpoints,
-    uint8_t *config_descr, size_t config_descr_size,
+    const uint8_t *config_descr, size_t config_descr_size,
     int interface_no, int interface_setting,
     usb_endpoint_mapping_t **pipes_ptr, size_t *pipes_count_ptr)

uspace/lib/usbdev/src/pipesinit.c

@@ -224 +224 @@
 static int process_interface(
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
-    usb_dp_parser_t *parser, usb_dp_parser_data_t *parser_data,
+    const usb_dp_parser_t *parser, const usb_dp_parser_data_t *parser_data,
     const uint8_t *interface_descriptor)
 {
@@ -284 +284 @@
 int usb_pipe_initialize_from_configuration(
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
-    uint8_t *configuration_descriptor, size_t configuration_descriptor_size,
+    const uint8_t *config_descriptor, size_t config_descriptor_size,
     usb_device_connection_t *connection)
 {
         assert(connection);
 
-        if (configuration_descriptor == NULL) {
+        if (config_descriptor == NULL) {
                 return EBADMEM;
         }
-        if (configuration_descriptor_size
+        if (config_descriptor_size
             < sizeof(usb_standard_configuration_descriptor_t)) {
                 return ERANGE;
@@ -310 +310 @@
          * Prepare the descriptor parser.
          */
-        usb_dp_parser_t dp_parser = {
+        const usb_dp_parser_t dp_parser = {
                 .nesting = descriptor_nesting
         };
-        usb_dp_parser_data_t dp_data = {
-                .data = configuration_descriptor,
-                .size = configuration_descriptor_size,
+        const usb_dp_parser_data_t dp_data = {
+                .data = config_descriptor,
+                .size = config_descriptor_size,
                 .arg = connection
         };
@@ -323 +323 @@
          */
         const uint8_t *interface = usb_dp_get_nested_descriptor(&dp_parser,
-            &dp_data, configuration_descriptor);
+            &dp_data, config_descriptor);
         if (interface == NULL) {
                 return ENOENT;
@@ -331 +331 @@
                     &dp_parser, &dp_data, interface);
                 interface = usb_dp_get_sibling_descriptor(&dp_parser, &dp_data,
-                    configuration_descriptor, interface);
+                    config_descriptor, interface);
         } while (interface != NULL);