Changeset b7c2757 in mainline

Timestamp:

2011-07-11T14:13:12Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2a0b1dd

Parents:

1368a6b

Message:

OHCI: Root hub: Initialization won't fail.

Descriptor initialization won't fail.

Location:

uspace/drv/bus/usb/ohci

Files:

• root_hub.c (modified) (5 diffs)
• root_hub.h (modified) (1 diff)

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

@@ -164 +164 @@
 static void create_serialized_hub_descriptor(rh_t *instance);
 
-static int rh_init_descriptors(rh_t *instance);
+static void rh_init_descriptors(rh_t *instance);
 
 static void create_interrupt_mask_in_instance(rh_t *instance);
@@ -224 +224 @@
  * @return Error code.
  */
-int rh_init(rh_t *instance, ohci_regs_t *regs)
+void rh_init(rh_t *instance, ohci_regs_t *regs)
 {
         assert(instance);
@@ -247 +247 @@
         instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
 
-        int ret = rh_init_descriptors(instance);
-        if (ret != EOK) {
-                return ret;
-        }
+        rh_init_descriptors(instance);
 
         usb_log_info("Root hub (%zu ports) initialized.\n",
             instance->port_count);
-
-        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -381 +376 @@
  * @return Error code
  */
-int rh_init_descriptors(rh_t *instance)
+void rh_init_descriptors(rh_t *instance)
 {
         assert(instance);
@@ -395 +390 @@
             sizeof(usb_standard_interface_descriptor_t) +
             instance->hub_descriptor_size;
-
-        return EOK;
 }
 /*----------------------------------------------------------------------------*/

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

@@ -77 +77 @@
 } rh_t;
 
-int rh_init(rh_t *instance, ohci_regs_t *regs);
+void rh_init(rh_t *instance, ohci_regs_t *regs);
 
 int rh_request(rh_t *instance, usb_transfer_batch_t *request);