Changeset 9445aad in mainline for uspace/lib

Timestamp:

2011-03-03T23:25:34Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3c775adb, 9a422574

Parents:

bdc8ab1 (diff), 8f74140c (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:

Development branch changes

Location:

uspace/lib

Files:

• c/generic/loader.c (modified) (1 diff)
• c/generic/vfs/vfs.c (modified) (3 diffs)
• usb/include/usb/request.h (modified) (1 diff)
• usb/src/request.c (modified) (3 diffs)

uspace/lib/c/generic/loader.c

@@ -160 +160 @@
         int rc = async_data_write_start(ldr->phone_id, (void *) pa, pa_len);
         if (rc != EOK) {
+                free(pa);
                 async_wait_for(req, NULL);
                 return rc;

uspace/lib/c/generic/vfs/vfs.c

@@ -69 +69 @@
         char *ncwd_path;
         char *ncwd_path_nc;
+        size_t total_size; 
 
         fibril_mutex_lock(&cwd_mutex);
@@ -77 +78 @@
                         return NULL;
                 }
-                ncwd_path_nc = malloc(cwd_size + 1 + size + 1);
+                total_size = cwd_size + 1 + size + 1;
+                ncwd_path_nc = malloc(total_size);
                 if (!ncwd_path_nc) {
                         fibril_mutex_unlock(&cwd_mutex);
                         return NULL;
                 }
-                str_cpy(ncwd_path_nc, cwd_size + 1 + size + 1, cwd_path);
+                str_cpy(ncwd_path_nc, total_size, cwd_path);
                 ncwd_path_nc[cwd_size] = '/';
                 ncwd_path_nc[cwd_size + 1] = '\0';
         } else {
-                ncwd_path_nc = malloc(size + 1);
+                total_size = size + 1;
+                ncwd_path_nc = malloc(total_size);
                 if (!ncwd_path_nc) {
                         fibril_mutex_unlock(&cwd_mutex);
@@ -93 +96 @@
                 ncwd_path_nc[0] = '\0';
         }
-        str_append(ncwd_path_nc, cwd_size + 1 + size + 1, path);
+        str_append(ncwd_path_nc, total_size, path);
         ncwd_path = canonify(ncwd_path_nc, retlen);
         if (!ncwd_path) {

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

@@ -106 +106 @@
 int usb_request_get_full_configuration_descriptor(usb_endpoint_pipe_t *, int,
     void *, size_t, size_t *);
+int usb_request_get_full_configuration_descriptor_alloc(usb_endpoint_pipe_t *,
+    int, void **, size_t *);
 int usb_request_set_configuration(usb_endpoint_pipe_t *, uint8_t);
 

uspace/lib/usb/src/request.c

@@ -412 +412 @@
 }
 
+/** Retrieve full configuration descriptor, allocate space for it.
+ *
+ * The function takes care that full configuration descriptor is returned
+ * (i.e. the function will fail when less data then descriptor.totalLength
+ * is returned).
+ *
+ * @param[in] pipe Control endpoint pipe (session must be already started).
+ * @param[in] index Configuration index.
+ * @param[out] descriptor_ptr Where to store pointer to allocated buffer.
+ * @param[out] descriptor_size Where to store the size of the descriptor.
+ * @return Error code.
+ */
+int usb_request_get_full_configuration_descriptor_alloc(
+    usb_endpoint_pipe_t *pipe, int index,
+    void **descriptor_ptr, size_t *descriptor_size)
+{
+        int rc;
+
+        if (descriptor_ptr == NULL) {
+                return EBADMEM;
+        }
+
+        usb_standard_configuration_descriptor_t bare_config;
+        rc = usb_request_get_bare_configuration_descriptor(pipe, index,
+            &bare_config);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (bare_config.descriptor_type != USB_DESCTYPE_CONFIGURATION) {
+                return ENOENT;
+        }
+        if (bare_config.total_length < sizeof(bare_config)) {
+                return ELIMIT;
+        }
+
+        void *buffer = malloc(bare_config.total_length);
+        if (buffer == NULL) {
+                return ENOMEM;
+        }
+
+        size_t transferred = 0;
+        rc = usb_request_get_full_configuration_descriptor(pipe, index,
+            buffer, bare_config.total_length, &transferred);
+        if (rc != EOK) {
+                free(buffer);
+                return rc;
+        }
+
+        if (transferred != bare_config.total_length) {
+                free(buffer);
+                return ELIMIT;
+        }
+
+        /* Everything looks okay, copy the pointers. */
+
+        *descriptor_ptr = buffer;
+
+        if (descriptor_size != NULL) {
+                *descriptor_size = bare_config.total_length;
+        }
+
+        return EOK;
+}
+
 /** Set configuration of USB device.
  *
@@ -504 +569 @@
  *
  * @param[in] pipe Control endpoint pipe (session must be already started).
- * @param[in] index String index (in native endianess).
+ * @param[in] index String index (in native endianess),
+ *      first index has number 1 (index from descriptors can be used directly).
  * @param[in] lang String language (in native endianess).
  * @param[out] string_ptr Where to store allocated string in native encoding.
@@ -515 +581 @@
                 return EBADMEM;
         }
-        /* Index is actually one byte value. */
-        if (index > 0xFF) {
+        /*
+         * Index is actually one byte value and zero index is used
+         * to retrieve list of supported languages.
+         */
+        if ((index < 1) || (index > 0xFF)) {
                 return ERANGE;
         }