Changeset 6626bba9 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2011-10-12T19:04:00Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

205f0766

Parents:

196fbb0

Message:

usbhub: Rename usb_hub_info ⇒ usb_hub_dev.

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (9 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -68 +68 @@
 
 static int usb_set_first_configuration(usb_device_t *usb_device);
-static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev);
-static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info);
-static void usb_hub_over_current(const usb_hub_info_t *hub_info,
+static usb_hub_dev_t * usb_hub_dev_create(usb_device_t *usb_dev);
+static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_info);
+static void usb_hub_over_current(const usb_hub_dev_t *hub_info,
     usb_hub_status_t status);
-static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info);
+static void usb_hub_global_interrupt(const usb_hub_dev_t *hub_info);
 static void usb_hub_polling_terminated_callback(usb_device_t *device,
     bool was_error, void *data);
@@ -100 +100 @@
         assert(usb_dev);
         /* Create driver soft-state structure */
-        usb_hub_info_t *hub_info = usb_hub_info_create(usb_dev);
+        usb_hub_dev_t *hub_info = usb_hub_dev_create(usb_dev);
         if (hub_info == NULL) {
                 usb_log_error("Failed to create hun driver structure.\n");
@@ -174 +174 @@
  * @param change_bitmap Bitmap of changed ports.
  * @param change_bitmap_size Size of the bitmap in bytes.
- * @param arg Custom argument, points to @c usb_hub_info_t.
+ * @param arg Custom argument, points to @c usb_hub_dev_t.
  * @return Whether to continue polling.
  */
@@ -181 +181 @@
 {
         usb_log_debug("hub_port_changes_callback\n");
-        usb_hub_info_t *hub = arg;
+        usb_hub_dev_t *hub = arg;
         assert(hub);
 
@@ -207 +207 @@
 /*----------------------------------------------------------------------------*/
 /**
- * create usb_hub_info_t structure
+ * create usb_hub_dev_t structure
  *
  * Does only basic copying of known information into new structure.
  * @param usb_dev usb device structure
- * @return basic usb_hub_info_t structure
- */
-static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev)
+ * @return basic usb_hub_dev_t structure
+ */
+static usb_hub_dev_t * usb_hub_dev_create(usb_device_t *usb_dev)
 {
         assert(usb_dev);
-        usb_hub_info_t *info = malloc(sizeof(usb_hub_info_t));
+        usb_hub_dev_t *info = malloc(sizeof(usb_hub_dev_t));
         if (!info)
             return NULL;
@@ -241 +241 @@
  * @return error code
  */
-static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info)
+static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_info)
 {
         assert(hub_info);
@@ -359 +359 @@
  * @return error code
  */
-static void usb_hub_over_current(const usb_hub_info_t *hub_info,
+static void usb_hub_over_current(const usb_hub_dev_t *hub_info,
     usb_hub_status_t status)
 {
@@ -398 +398 @@
  * @param hub_info hub instance
  */
-static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info)
+static void usb_hub_global_interrupt(const usb_hub_dev_t *hub_info)
 {
         assert(hub_info);
@@ -459 +459 @@
  * @param device usb device afected
  * @param was_error indicates that the fibril is stoped due to an error
- * @param data pointer to usb_hub_info_t structure
+ * @param data pointer to usb_hub_dev_t structure
  */
 static void usb_hub_polling_terminated_callback(usb_device_t *device,
     bool was_error, void *data)
 {
-        usb_hub_info_t *hub = data;
+        usb_hub_dev_t *hub = data;
         assert(hub);