Changeset 95285378 in mainline

Timestamp:

2011-05-07T13:45:39Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

1866945

Parents:

192ba25

Message:

workaround for ohci root hub not needed and removed
some comments

File:

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

uspace/drv/ohci/root_hub.c

@@ -45 +45 @@
 
 /**
- *      standart device descriptor for ohci root hub
+ * standart device descriptor for ohci root hub
  */
 static const usb_standard_device_descriptor_t ohci_rh_device_descriptor = {
@@ -69 +69 @@
  */
 static const usb_standard_configuration_descriptor_t ohci_rh_conf_descriptor = {
-        /// \TODO some values are default or guessed
         .attributes = 1 << 7,
         .configuration_number = 1,
@@ -87 +86 @@
         .endpoint_count = 1,
         .interface_class = USB_CLASS_HUB,
-        /// \TODO is this correct?
         .interface_number = 1,
         .interface_protocol = 0,
@@ -107 +105 @@
 };
 
+/**
+ * bitmask of hub features that are valid to be cleared
+ */
 static const uint32_t hub_clear_feature_valid_mask =
     (1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER) |
 (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
 
+/**
+ * bitmask of hub features that are cleared by writing 1 (and not 0)
+ */
 static const uint32_t hub_clear_feature_by_writing_one_mask =
     1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER;
 
+/**
+ * bitmask of hub features that are valid to be set
+ */
 static const uint32_t hub_set_feature_valid_mask =
     (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) |
 (1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
 
-
+/**
+ * bitmask of hub features that are set by writing 1 and cleared by writing 0
+ */
 static const uint32_t hub_set_feature_direct_mask =
     (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
 
+/**
+ * bitmask of port features that are valid to be set
+ */
 static const uint32_t port_set_feature_valid_mask =
     (1 << USB_HUB_FEATURE_PORT_ENABLE) |
@@ -128 +140 @@
 (1 << USB_HUB_FEATURE_PORT_POWER);
 
+/**
+ * bitmask of port features that can be cleared
+ */
 static const uint32_t port_clear_feature_valid_mask =
     (1 << USB_HUB_FEATURE_PORT_CONNECTION) |
@@ -141 +156 @@
 //USB_HUB_FEATURE_PORT_LOW_SPEED
 
+/**
+ * bitmask with port status changes
+ */
 static const uint32_t port_status_change_mask =
     (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) |
@@ -152 +170 @@
 
 static int rh_init_descriptors(rh_t *instance);
-
-static void rh_check_port_connectivity(rh_t * instance);
 
 static int process_get_port_status_request(rh_t *instance, uint16_t port,
@@ -220 +236 @@
         if (!instance->interrupt_buffer)
                 return ENOMEM;
-        rh_check_port_connectivity(instance);
-
-
-        usb_log_info("OHCI root hub with %d ports.\n", instance->port_count);
+
+        usb_log_info("OHCI root hub with %d ports initialized.\n",
+            instance->port_count);
 
         return EOK;
@@ -381 +396 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
-
-/**
- * check whether there are connected devices on ports and if yes, indicate
- * connection change
- * 
- * @param instance
- */
-static void rh_check_port_connectivity(rh_t * instance) {
-        size_t port;
-        usb_log_debug("rh_check_port_connectivity\n");
-        for (port = 1; port < instance->port_count; ++port) {
-                bool connected =
-                    ((instance->registers->rh_port_status[port - 1]) &
-                    (1 << USB_HUB_FEATURE_PORT_CONNECTION)) != 0;
-                if (connected) {
-                        usb_log_debug("port %d has connected device\n", port);
-                        instance->registers->rh_port_status[port - 1] =
-                            instance->registers->rh_port_status[port - 1]
-                            | (1 << USB_HUB_FEATURE_C_PORT_CONNECTION);
-                        usb_log_debug("change indicated to status "
-                            "register\n");
-                }
-        }
-}
-
-
 /*----------------------------------------------------------------------------*/