Changes in uspace/drv/ohci/root_hub.c [7d521e24:b2387c2] in mainline

File:

• uspace/drv/ohci/root_hub.c (modified) (17 diffs)

uspace/drv/ohci/root_hub.c

@@ -57 +57 @@
         .device_version = 0,
         .length = sizeof (usb_standard_device_descriptor_t),
-        /// \TODO this value is guessed
         .max_packet_size = 8,
         .vendor_id = 0x16db,
         .product_id = 0x0001,
-        /// \TODO these values migt be different
         .str_serial_number = 0,
         .usb_spec_version = 0x110,
@@ -118 +116 @@
  */
 static const uint32_t hub_clear_feature_by_writing_one_mask =
-   RHS_CLEAR_PORT_POWER;
-   // 1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER;
+    RHS_CLEAR_PORT_POWER;
 
 /**
@@ -127 +124 @@
     RHS_LPSC_FLAG |
     RHS_OCIC_FLAG;
-    //(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) |
-    //(1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
 
 /**
@@ -135 +130 @@
 static const uint32_t hub_set_feature_direct_mask =
     RHS_SET_PORT_POWER;
-    //(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
 
 /**
@@ -160 +154 @@
     RHPS_PRSC_FLAG;
 
-/*
-
-    (1 << USB_HUB_FEATURE_PORT_CONNECTION) |
-    (1 << USB_HUB_FEATURE_PORT_SUSPEND) |
-    (1 << USB_HUB_FEATURE_PORT_OVER_CURRENT) |
-    (1 << USB_HUB_FEATURE_PORT_POWER) |
-    (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) |
-    (1 << USB_HUB_FEATURE_C_PORT_ENABLE) |
-    (1 << USB_HUB_FEATURE_C_PORT_SUSPEND) |
-    (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) |
-    (1 << USB_HUB_FEATURE_C_PORT_RESET);
- */
 //note that USB_HUB_FEATURE_PORT_POWER bit is translated into
 //USB_HUB_FEATURE_PORT_LOW_SPEED for port set feature request
@@ -179 +161 @@
  */
 static const uint32_t port_status_change_mask = RHPS_CHANGE_WC_MASK;
-/*    (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) |
-    (1 << USB_HUB_FEATURE_C_PORT_ENABLE) |
-    (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) |
-    (1 << USB_HUB_FEATURE_C_PORT_RESET) |
-    (1 << USB_HUB_FEATURE_C_PORT_SUSPEND);
-*/
 
 static int create_serialized_hub_descriptor(rh_t *instance);
@@ -420 +396 @@
  * create answer to port status_request
  *
- * Copy content of corresponding port status register to answer buffer.
+ * Copy content of corresponding port status register to answer buffer. The
+ * format of the port status register and port status data is the same (
+ * see OHCI root hub and USB hub documentation).
  *
  * @param instance root hub instance
@@ -431 +409 @@
         if (port < 1 || port > instance->port_count)
                 return EINVAL;
-        uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
         request->transfered_size = 4;
-        uint32_buffer[0] = instance->registers->rh_port_status[port - 1];
+        uint32_t data = instance->registers->rh_port_status[port - 1];
+        memcpy(request->data_buffer, &data, 4);
 #if 0
         int i;
@@ -450 +428 @@
  * create answer to port status_request
  *
- * Copy content of hub status register to answer buffer.
+ * This copies flags in hub status register into the buffer. The format of the
+ * status register and status message is the same, according to USB hub
+ * specification and OHCI root hub specification.
  *
  * @param instance root hub instance
@@ -458 +438 @@
 static int process_get_hub_status_request(rh_t *instance,
     usb_transfer_batch_t * request) {
-        uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
+        //uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
         request->transfered_size = 4;
         //bits, 0,1,16,17
         uint32_t mask = 1 | (1 << 1) | (1 << 16) | (1 << 17);
-        uint32_buffer[0] = mask & instance->registers->rh_status;
+        uint32_t data = mask & instance->registers->rh_status;
+        //uint32_buffer[0] = mask & instance->registers->rh_status;
+        memcpy(request->data_buffer, &data, 4);
 
         return EOK;
@@ -485 +467 @@
 
         usb_hub_bm_request_type_t request_type = request_packet->request_type;
-        if (buffer_size < 4/*request_packet->length*/) {///\TODO
+        if (buffer_size < 4) {
                 usb_log_warning("requested more data than buffer size\n");
                 return EINVAL;
@@ -516 +498 @@
             | (1 << (USB_HUB_FEATURE_C_HUB_OVER_CURRENT + 16));
         bzero(bitmap, instance->interrupt_mask_size);
-        if (instance->registers->rh_status & mask) {
+        if ((instance->registers->rh_status & mask) != 0) {
                 bitmap[0] = 1;
         }
@@ -522 +504 @@
         mask = port_status_change_mask;
         for (port = 1; port <= instance->port_count; ++port) {
-                if (mask & instance->registers->rh_port_status[port - 1]) {
+                if ((mask & instance->registers->rh_port_status[port - 1]) != 0) {
 
                         bitmap[(port) / 8] += 1 << (port % 8);
@@ -695 +677 @@
             (instance->registers->rh_port_status[port - 1] | (1 << feature))
             & (~port_clear_feature_valid_mask);
-        /// \TODO any error?
-
         return EOK;
 }
@@ -724 +704 @@
             & (~port_clear_feature_valid_mask))
             | (1 << feature);
-        /// \TODO any error?
 
         return EOK;
@@ -942 +921 @@
  * @return
  */
-static int process_interrupt_mask_in_instance(rh_t *instance, usb_transfer_batch_t * request) {
+static int process_interrupt_mask_in_instance(rh_t *instance,
+    usb_transfer_batch_t * request) {
         memcpy(request->data_buffer, instance->interrupt_buffer,
             instance->interrupt_mask_size);
@@ -962 +942 @@
  * @return
  */
-static bool is_zeros(void * buffer, size_t size) {
+static bool is_zeros(void *buffer, size_t size) {
         if (!buffer) return true;
         if (!size) return true;