Changeset 22ceff3a in mainline for uspace/lib

Timestamp:

2011-10-17T07:29:44Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

12f55220

Parents:

25696fea (diff), 1f131fb9 (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 with mainline

Location:

uspace/lib

Files:

• usbdev/include/usb/dev/driver.h (modified) (2 diffs)
• usbdev/src/devdrv.c (modified) (8 diffs)
• usbhid/include/usb/hid/hiddescriptor.h (modified) (1 diff)
• usbhid/src/hiddescriptor.c (modified) (1 diff)

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

@@ -156 +156 @@
 \endcode
          */
-        usb_endpoint_description_t **endpoints;
+        const usb_endpoint_description_t **endpoints;
         /** Driver ops. */
         const usb_driver_ops_t *ops;
@@ -164 +164 @@
 
 int usb_device_select_interface(usb_device_t *, uint8_t,
-    usb_endpoint_description_t **);
+    const usb_endpoint_description_t **);
 
 int usb_device_retrieve_descriptors(usb_pipe_t *, usb_device_descriptors_t *);
 int usb_device_create_pipes(const ddf_dev_t *, usb_device_connection_t *,
-    usb_endpoint_description_t **, const uint8_t *, size_t, int, int,
+    const usb_endpoint_description_t **, const uint8_t *, size_t, int, int,
     usb_endpoint_mapping_t **, size_t *);
 int usb_device_destroy_pipes(const ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
-int usb_device_create(ddf_dev_t *, usb_endpoint_description_t **, usb_device_t **, const char **);
-void usb_device_destroy(usb_device_t *);
+int usb_device_create(ddf_dev_t *, const usb_endpoint_description_t **,
+    usb_device_t **, const char **);
+void usb_device_deinit(usb_device_t *);
 void * usb_device_data_alloc(usb_device_t *, size_t);
 

uspace/lib/usbdev/src/devdrv.c

@@ -81 +81 @@
  * @return Number of pipes (excluding default control pipe).
  */
-static size_t count_other_pipes(usb_endpoint_description_t **endpoints)
+static size_t count_other_pipes(const usb_endpoint_description_t **endpoints)
 {
         size_t count = 0;
@@ -101 +101 @@
  * @return Error code.
  */
-static int initialize_other_pipes(usb_endpoint_description_t **endpoints,
+static int initialize_other_pipes(const usb_endpoint_description_t **endpoints,
     usb_device_t *dev, int alternate_setting)
 {
@@ -154 +154 @@
         rc = driver->ops->device_add(dev);
         if (rc != EOK)
-                usb_device_destroy(dev);
+                usb_device_deinit(dev);
         return rc;
 }
@@ -191 +191 @@
         const int ret = driver->ops->device_gone(usb_dev);
         if (ret == EOK)
-                usb_device_destroy(usb_dev);
+                usb_device_deinit(usb_dev);
 
         return ret;
@@ -238 +238 @@
  */
 int usb_device_select_interface(usb_device_t *dev, uint8_t alternate_setting,
-    usb_endpoint_description_t **endpoints)
+    const usb_endpoint_description_t **endpoints)
 {
         if (dev->interface_no < 0) {
@@ -321 +321 @@
  */
 int usb_device_create_pipes(const ddf_dev_t *dev, usb_device_connection_t *wire,
-    usb_endpoint_description_t **endpoints,
+    const usb_endpoint_description_t **endpoints,
     const uint8_t *config_descr, size_t config_descr_size,
     int interface_no, int interface_setting,
@@ -526 +526 @@
  */
 int usb_device_create(ddf_dev_t *ddf_dev,
-    usb_endpoint_description_t **endpoints,
+    const usb_endpoint_description_t **endpoints,
     usb_device_t **dev_ptr, const char **errstr_ptr)
 {
@@ -590 +590 @@
 /** Destroy instance of a USB device.
  *
- * @param dev Device to be destroyed.
- */
-void usb_device_destroy(usb_device_t *dev)
+ * @param dev Device to be de-initialized.
+ *
+ * Does not free/destroy supplied pointer.
+ */
+void usb_device_deinit(usb_device_t *dev)
 {
         if (dev == NULL) {

uspace/lib/usbhid/include/usb/hid/hiddescriptor.h

@@ -42 +42 @@
 #include <usb/hid/hidtypes.h>
 
-int usb_hid_parse_report_descriptor(usb_hid_report_t *report, 
+int usb_hid_parse_report_descriptor(usb_hid_report_t *report,
                 const uint8_t *data, size_t size);
-
-void usb_hid_free_report(usb_hid_report_t *report);
 
 void usb_hid_descriptor_print(usb_hid_report_t *report);
 
 int usb_hid_report_init(usb_hid_report_t *report);
+
+void usb_hid_report_deinit(usb_hid_report_t *report);
 
 int usb_hid_report_append_fields(usb_hid_report_t *report,

uspace/lib/usbhid/src/hiddescriptor.c

@@ -1016 +1016 @@
  * @return void
  */
-void usb_hid_free_report(usb_hid_report_t *report)
+void usb_hid_report_deinit(usb_hid_report_t *report)
 {
         if(report == NULL){