From 760eda9346260389b34573445d03fcdd28bf732c Mon Sep 17 00:00:00 2001 From: DizzyOfCRN Date: Fri, 8 Aug 2014 18:34:52 +0000 Subject: [PATCH] Minor cleanup and fixing string descriptor for language git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49274 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- rom/usb/vusbhc/vxhci/vxhci_commands.c | 14 +++----------- rom/usb/vusbhc/vxhci/vxhci_device.c | 14 +++++++------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/rom/usb/vusbhc/vxhci/vxhci_commands.c b/rom/usb/vusbhc/vxhci/vxhci_commands.c index e61e32ad14..90f370db4b 100644 --- a/rom/usb/vusbhc/vxhci/vxhci_commands.c +++ b/rom/usb/vusbhc/vxhci/vxhci_commands.c @@ -100,7 +100,6 @@ WORD cmdUsbReset(struct IOUsbHWReq *ioreq) { /* We should do a proper reset sequence with a real driver */ unit->state = UHSF_RESET; unit->roothub.addr = 0; - unit->state = UHSF_RESUMING; unit->state = UHSF_OPERATIONAL; mybug_unit(0, ("Done\n\n")); return RC_OK; @@ -145,7 +144,7 @@ WORD cmdControlXFerRootHub(struct IOUsbHWReq *ioreq) { UWORD bmRequestRecipient = (ioreq->iouh_SetupData.bmRequestType) & (URTF_DEVICE | URTF_INTERFACE | URTF_ENDPOINT | URTF_OTHER); UWORD bRequest = (ioreq->iouh_SetupData.bRequest); - D(UWORD wIndex = AROS_WORD2LE(ioreq->iouh_SetupData.wIndex)); + D(UWORD wIndex = AROS_WORD2LE(ioreq->iouh_SetupData.wIndex)); UWORD wValue = AROS_WORD2LE(ioreq->iouh_SetupData.wValue); UWORD wLength = AROS_WORD2LE(ioreq->iouh_SetupData.wLength); @@ -178,13 +177,6 @@ WORD cmdControlXFerRootHub(struct IOUsbHWReq *ioreq) { mybug_unit(0, ("UDT_DEVICE\n")); mybug_unit(0, ("GetDeviceDescriptor (%ld)\n", wLength)); - /* - Poseidon first does a dummy psdPipeSetup(URTF_IN|URTF_STANDARD|URTF_DEVICE, USR_GET_DESCRIPTOR, UDT_DEVICE) - with 8 byte transfer size. It will then set the address with psdPipeSetup(URTF_STANDARD|URTF_DEVICE, USR_SET_ADDRESS) - After that Poseidon does again psdPipeSetup(URTF_IN|URTF_STANDARD|URTF_DEVICE, USR_GET_DESCRIPTOR, UDT_DEVICE) with - 8 byte transfer size to get the bMaxPacketSize0 for transfer sizes. - Only after that will it read the whole descriptor. - */ ioreq->iouh_Actual = (wLength > sizeof(struct UsbStdDevDesc)) ? sizeof(struct UsbStdDevDesc) : wLength; CopyMem((APTR) &unit->roothub.devdesc, ioreq->iouh_Data, ioreq->iouh_Actual); @@ -220,7 +212,7 @@ WORD cmdControlXFerRootHub(struct IOUsbHWReq *ioreq) { strdesc->bDescriptorType = UDT_STRING; if(wLength > 3) { - strdesc->bString[1] = AROS_WORD2LE(0x0409); // English (Yankee) + strdesc->bString[0] = AROS_WORD2LE(0x0409); // English (Yankee) ioreq->iouh_Actual = sizeof(struct UsbStdStrDesc); mybug_unit(0, ("Done\n\n")); return(0); @@ -238,7 +230,7 @@ WORD cmdControlXFerRootHub(struct IOUsbHWReq *ioreq) { case 2: { char roothubname[100]; - sprintf(roothubname, "VXHCI USB%x%x", AROS_LE2WORD(unit->roothub.devdesc.bcdUSB>>8)&0xf, AROS_LE2WORD(unit->roothub.devdesc.bcdUSB>>4)&0xf); + sprintf(roothubname, "VXHCI root hub (USB%x.%x)", AROS_LE2WORD(unit->roothub.devdesc.bcdUSB>>8)&0xf, AROS_LE2WORD(unit->roothub.devdesc.bcdUSB>>4)&0xf); return cmdGetString(ioreq, roothubname); break; } diff --git a/rom/usb/vusbhc/vxhci/vxhci_device.c b/rom/usb/vusbhc/vxhci/vxhci_device.c index 5e4d20b61b..97c17d54d5 100644 --- a/rom/usb/vusbhc/vxhci/vxhci_device.c +++ b/rom/usb/vusbhc/vxhci/vxhci_device.c @@ -300,7 +300,7 @@ struct VXHCIUnit *VXHCI_AddNewUnit(ULONG unitnum, UWORD bcdusb) { unit->roothub.devdesc.bcdDevice = AROS_WORD2LE(bcdusb); - sprintf(unit->name, "VXHCI_USB%x%x[%d]", (bcdusb>>8)&0xf, (bcdusb>>4)&0xf, unit->number); + sprintf(unit->name, "VXHCI_USB%x%x[%d]", (AROS_LE2WORD(unit->roothub.devdesc.bcdUSB)>>8)&0xf, (AROS_LE2WORD(unit->roothub.devdesc.bcdUSB)>>4)&0xf, unit->number); #ifdef VXHCI_NUMPORTS20 if( (bcdusb >= 0x0200) && (bcdusb < 0x0300) ) { @@ -410,9 +410,9 @@ struct VXHCIUnit *VXHCI_AddNewUnit(ULONG unitnum, UWORD bcdusb) { //unit->roothub.hubdesc.usb30.DeviceRemovable = 0; } - D( mybug(-1, ("[VXHCI] VXHCI_AddNewUnit:\n")); - mybug(-1, (" Created new unit numbered %d at %p\n",unit->number, unit)); - mybug(-1, (" Unit node name %s\n", unit->node.ln_Name)); + D( mybug(0, ("[VXHCI] VXHCI_AddNewUnit:\n")); + mybug(0, (" Created new unit numbered %d at %p\n",unit->number, unit)); + mybug(0, (" Unit node name %s\n", unit->node.ln_Name)); switch(unit->state) { case UHSF_SUSPENDED: @@ -446,9 +446,9 @@ struct VXHCIPort *VXHCI_AddNewPort(struct VXHCIUnit *unit, ULONG portnum) { port->node.ln_Name = (STRPTR)&port->name; } - mybug(-1, ("[VXHCI] VXHCI_AddNewPort:\n")); - mybug(-1, (" Created new port numbered %d at %p\n",port->number, port)); - mybug(-1, (" Port node name %s\n", port->node.ln_Name)); + mybug(0, ("[VXHCI] VXHCI_AddNewPort:\n")); + mybug(0, (" Created new port numbered %d at %p\n",port->number, port)); + mybug(0, (" Port node name %s\n", port->node.ln_Name)); return port; } -- 2.11.4.GIT