Changeset f20bc82 in mainline for uspace/drv/bus/usb/ohci/root_hub.c

Timestamp:

2011-07-11T17:10:31Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

14426a0

Parents:

b21dfba

Message:

OHCI: Root hub: Don't store interrupt mask in rh_t isntance.

It was never kept and always refreshed. OHCI limit of 15 ports enables us to use uint16_t directly if we take care of endian issue.

File:

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

uspace/drv/bus/usb/ohci/root_hub.c

@@ -134 +134 @@
 static void create_serialized_hub_descriptor(rh_t *instance);
 static void rh_init_descriptors(rh_t *instance);
-static void create_interrupt_mask_in_instance(rh_t *instance);
+static uint16_t create_interrupt_mask_in_instance(rh_t *instance);
 static int get_status_request(rh_t *instance, usb_transfer_batch_t *request);
 static int get_descriptor_request(
@@ -145 +145 @@
 static int request_without_data(rh_t *instance, usb_transfer_batch_t *request);
 static int ctrl_request(rh_t *instance, usb_transfer_batch_t *request);
-static void interrupt_mask_in_instance(
-    rh_t *instance, usb_transfer_batch_t *request);
-static bool is_zeros(const void *buffer, size_t size);
-
 
 #define TRANSFER_OK(bytes) \
@@ -175 +171 @@
         /* Don't forget the hub status bit and round up */
         instance->interrupt_mask_size = (instance->port_count + 1 + 8) / 8;
-        instance->interrupt_buffer[0] = 0;
-        instance->interrupt_buffer[1] = 0;
         instance->unfinished_interrupt_transfer = NULL;
 
@@ -210 +204 @@
         case USB_TRANSFER_INTERRUPT:
                 usb_log_debug("Root hub got INTERRUPT packet\n");
-                create_interrupt_mask_in_instance(instance);
-                if (is_zeros(instance->interrupt_buffer,
-                    instance->interrupt_mask_size)) {
+                const uint16_t mask =
+                    create_interrupt_mask_in_instance(instance);
+                if (mask == 0) {
                         usb_log_debug("No changes..\n");
                         instance->unfinished_interrupt_transfer = request;
@@ -218 +212 @@
                 } else {
                         usb_log_debug("Processing changes..\n");
-                        interrupt_mask_in_instance(instance, request);
+                        memcpy(request->data_buffer, &mask,
+                            instance->interrupt_mask_size);
+                        request->transfered_size = instance->interrupt_mask_size;
+                        instance->unfinished_interrupt_transfer = NULL;
+                        usb_transfer_batch_finish_error(request, EOK);
                 }
                 break;
@@ -240 +238 @@
 
         usb_log_debug("Finalizing interrupt transfer\n");
-        create_interrupt_mask_in_instance(instance);
-        interrupt_mask_in_instance(instance,
-            instance->unfinished_interrupt_transfer);
+        const uint16_t mask = create_interrupt_mask_in_instance(instance);
+        memcpy(instance->unfinished_interrupt_transfer->data_buffer,
+            &mask, instance->interrupt_mask_size);
+        instance->unfinished_interrupt_transfer->transfered_size =
+           instance->interrupt_mask_size;
+        usb_transfer_batch_finish(instance->unfinished_interrupt_transfer);
+
+        instance->unfinished_interrupt_transfer = NULL;
 }
 /*----------------------------------------------------------------------------*/
@@ -383 +386 @@
  * @param instance root hub instance
  */
-void create_interrupt_mask_in_instance(rh_t *instance)
-{
-        assert(instance);
-
-        uint8_t * bitmap = instance->interrupt_buffer;
-        bzero(bitmap, instance->interrupt_mask_size);
+uint16_t create_interrupt_mask_in_instance(rh_t *instance)
+{
+        assert(instance);
+        uint16_t mask = 0;
+
         /* Only local power source change and over-current change can happen */
         if (instance->registers->rh_status & (RHS_LPSC_FLAG | RHS_OCIC_FLAG)) {
-                bitmap[0] = 1;
+                mask |= 1;
         }
         size_t port = 1;
@@ -399 +401 @@
                     & instance->registers->rh_port_status[port - 1]) {
 
-                        bitmap[(port) / 8] |= 1 << (port % 8);
+                        mask |= (1 << port);
                 }
         }
+        return host2uint32_t_le(mask);
 }
 /*----------------------------------------------------------------------------*/
@@ -700 +703 @@
         }
 }
-/*----------------------------------------------------------------------------*/
-/**
- * Process waiting interrupt request
- *
- * If an interrupt transfer has been received and there was no change,
- * the driver stores the transfer information and waits for change to occur.
- * This routine is called when that happens and it finalizes the interrupt
- * transfer.
- *
- * @param instance hub instance
- * @param request batch request to be processed
- *
- * @return
- */
-void interrupt_mask_in_instance(rh_t *instance, usb_transfer_batch_t *request)
-{
-        assert(instance);
-        assert(request);
-
-        memcpy(request->data_buffer, instance->interrupt_buffer,
-            instance->interrupt_mask_size);
-        request->transfered_size = instance->interrupt_mask_size;
-        instance->unfinished_interrupt_transfer = NULL;
-        usb_transfer_batch_finish_error(request, EOK);
-}
-/*----------------------------------------------------------------------------*/
-/**
- * return whether the buffer is full of zeros
- *
- * Convenience function.
- * @param buffer
- * @param size
- * @return
- */
-bool is_zeros(const void *buffer, size_t size)
-{
-        if (!buffer) return true;
-        const char * const end = buffer + size;
-        const char *data = buffer;
-        for (; data < end; ++data) {
-                if (*data)
-                        return false;
-        }
-        return true;
-}
 
 /**