Changeset 5156580 in mainline

Timestamp:

2011-03-21T13:37:40Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9078de8f

Parents:

d328172

Message:

Set rh address to 0 during dummy_reset

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (2 diffs)
• root_hub.c (modified) (1 diff)

uspace/drv/ohci/hc.c

@@ -45 +45 @@
 #include "hc.h"
 
-static int dummy_reset(int foo, void *bar)
+static int dummy_reset(int foo, void *arg)
 {
+        hc_t *hc = (hc_t*)arg;
+        assert(hc);
+        hc->rh.address = 0;
         return EOK;
 }
@@ -95 +98 @@
         devman_handle_t handle;
         ret = usb_hc_new_device_wrapper(dev, &conn, USB_SPEED_FULL, dummy_reset,
-            0, NULL, &address, &handle, NULL, NULL, NULL);
+            0, instance, &address, &handle, NULL, NULL, NULL);
         CHECK_RET_RETURN(ret, "Failed to add rh device.\n");
 

uspace/drv/ohci/root_hub.c

@@ -46 +46 @@
 {
         assert(instance);
-        instance->address = 0;
+        instance->address = -1;
         instance->registers = regs;
         instance->device = dev;