Changeset ceb444c in mainline

Timestamp:

2013-01-04T19:12:35Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a3886be

Parents:

0e97b4b5

Message:

ohci: Switch to new root hub initialization.

Change few messages to log level info

Location:

uspace/drv/bus/usb/ohci

Files:

• ohci.c (modified) (1 diff)
• root_hub.c (modified) (4 diffs)

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

@@ -159 +159 @@
 
         /* HC should be running OK. We can add root hub */
-        ret = hcd_ddf_setup_hub(device, &hc_impl->rh.address);
+        ret = hcd_ddf_setup_root_hub(device, USB_SPEED_FULL);
         CHECK_RET_CLEAN_RETURN(ret,
             "Failed to register OHCI root hub: %s.\n", str_error(ret));

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

@@ -153 +153 @@
         assert(regs);
 
+        instance->address = USB_ADDRESS_DEFAULT;
         instance->registers = regs;
         instance->port_count = OHCI_RD(regs->rh_desc_a) & RHDA_NDS_MASK;
@@ -167 +168 @@
 
 #if defined OHCI_POWER_SWITCH_no
-        usb_log_debug("OHCI rh: Set power mode to no power switching.\n");
+        usb_log_info("rh: Set power mode to no power switching.\n");
         /* Set port power mode to no power-switching. (always on) */
         OHCI_SET(regs->rh_desc_a, RHDA_NPS_FLAG);
@@ -175 +176 @@
 
 #elif defined OHCI_POWER_SWITCH_ganged
-        usb_log_debug("OHCI rh: Set power mode to ganged power switching.\n");
+        usb_log_info("rh: Set power mode to ganged power switching.\n");
         /* Set port power mode to ganged power-switching. */
         OHCI_CLR(regs->rh_desc_a, RHDA_NPS_FLAG);
@@ -187 +188 @@
         OHCI_CLR(regs->rh_desc_a, RHDA_OCPM_FLAG);
 #else
-        usb_log_debug("OHCI rh: Set power mode to per-port power switching.\n");
+        usb_log_info("rh: Set power mode to per-port power switching.\n");
         /* Set port power mode to per port power-switching. */
         OHCI_CLR(regs->rh_desc_a, RHDA_NPS_FLAG);