Changeset 983e135 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2011-09-19T13:31:23Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5b6f8dd

Parents:

d46b13d

Message:

usbhub: Further codestyle changes

File:

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

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

@@ -160 +160 @@
  */
 bool hub_port_changes_callback(usb_device_t *dev,
-    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) {
+    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg)
+{
         usb_log_debug("hub_port_changes_callback\n");
-        usb_hub_info_t *hub = (usb_hub_info_t *) arg;
+        usb_hub_info_t *hub = arg;
 
         /* FIXME: check that we received enough bytes. */
@@ -169 +170 @@
         }
 
-        bool change;
-        change = ((uint8_t*) change_bitmap)[0] & 1;
+        /* Lowest bit indicates global change */
+        const bool change = change_bitmap[0] & 1;
         if (change) {
                 usb_hub_process_global_interrupt(hub);
         }
 
-        size_t port;
-        for (port = 1; port < hub->port_count + 1; port++) {
-                bool change = (change_bitmap[port / 8] >> (port % 8)) % 2;
+        /* N + 1 bit indicates change on port N */
+        size_t port = 1;
+        for (; port < hub->port_count + 1; port++) {
+                const bool change = (change_bitmap[port / 8] >> (port % 8)) & 1;
                 if (change) {
                         usb_hub_process_port_interrupt(hub, port);
@@ -184 +186 @@
 leave:
         /* FIXME: proper interval. */
+        // TODO Interval should be handled by USB HC scheduler not here
         async_usleep(1000 * 250);
 
@@ -205 +208 @@
 static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev)
 {
-        usb_hub_info_t *result = malloc(sizeof (usb_hub_info_t));
+        assert(usb_dev);
+        usb_hub_info_t *result = malloc(sizeof(usb_hub_info_t));
         if (!result)
             return NULL;
@@ -215 +219 @@
 
         result->ports = NULL;
-        result->port_count = (size_t) - 1;
+        result->port_count = -1;
         fibril_mutex_initialize(&result->port_mutex);
-
         fibril_mutex_initialize(&result->pending_ops_mutex);
         fibril_condvar_initialize(&result->pending_ops_cv);
@@ -315 +318 @@
  * @return error code
  */
-static int usb_hub_set_configuration(usb_hub_info_t *hub_info) {
+static int usb_hub_set_configuration(usb_hub_info_t *hub_info)
+{
         //device descriptor
-        usb_standard_device_descriptor_t *std_descriptor
+        const usb_standard_device_descriptor_t *std_descriptor
             = &hub_info->usb_device->descriptors.device;
         usb_log_debug("Hub has %d configurations\n",
             std_descriptor->configuration_count);
+
         if (std_descriptor->configuration_count < 1) {
                 usb_log_error("There are no configurations available\n");