Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[janderwald] 51575: [USBSTOR] - Don't free device descriptor if it failed to acquire it - Don't move out of usb configuration array. Found by special pool - Fix bug when storing interface informati...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed May 4 12:33:01 2011 New Revision: 51575 URL: http://svn.reactos.org/svn/reactos?rev=51575&view=rev Log: [USBSTOR] - Don't free device descriptor if it failed to acquire it - Don't move out of usb configuration array. Found by special pool - Fix bug when storing interface information which lead to a overwrite - Implement retrieving generic type for device - Fix bugs in QueryDeviceId - Implement querying hardware ids - Implement querying instance ids - With these changes, usbstor now initializes and create pdo, which is also enumerated - Needs more code / fixes so that disk.sys attaches to usbstor - WIP Modified: branches/usb-bringup/drivers/usb/usbstor/descriptor.c branches/usb-bringup/drivers/usb/usbstor/misc.c branches/usb-bringup/drivers/usb/usbstor/pdo.c Modified: branches/usb-bringup/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/descriptor.c [iso-8859-1] Wed May 4 12:33:01 2011 @@ -115,7 +115,6 @@ // // failed to get device descriptor // - FreeItem(DeviceExtension->DeviceDescriptor); DeviceExtension->DeviceDescriptor = NULL; return Status; } @@ -271,7 +270,7 @@ // // was it the last descriptor // - if ((ULONG_PTR)CurrentDescriptor > ((ULONG_PTR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength)) + if ((ULONG_PTR)CurrentDescriptor >= ((ULONG_PTR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength)) { // // reached last descriptor @@ -433,7 +432,8 @@ // // update configuration info // - RtlCopyMemory(DeviceExtension->InterfaceInformation, &Urb->UrbSelectInterface.Interface, Urb->UrbSelectConfiguration.Interface.Length); + ASSERT(Urb->UrbSelectInterface.Interface.Length == DeviceExtension->InterfaceInformation->Length); + RtlCopyMemory(DeviceExtension->InterfaceInformation, &Urb->UrbSelectInterface.Interface, Urb->UrbSelectInterface.Interface.Length); } // Modified: branches/usb-bringup/drivers/usb/usbstor/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/misc.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/misc.c [iso-8859-1] Wed May 4 12:33:01 2011 @@ -203,6 +203,8 @@ IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; IoStack->Parameters.Others.Argument1 = (PVOID)UrbRequest; + IoStack->Parameters.DeviceIoControl.InputBufferLength = UrbRequest->UrbHeader.Length; + Irp->IoStatus.Status = STATUS_SUCCESS; // // setup completion routine Modified: branches/usb-bringup/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/pdo.c [iso-8859-1] Wed May 4 12:33:01 2011 @@ -75,10 +75,80 @@ // // other device // - return "CdRom"; - } - } -} + return "Other"; + } + } +} + +LPCWSTR +USBSTOR_GetGenericType( + IN PUFI_INQUIRY_RESPONSE InquiryData) +{ + // + // check if device type is zero + // + if (InquiryData->DeviceType == 0) + { + // + // direct access device + // + + // + // FIXME: check if floppy + // + return L"GenDisk"; + } + + // + // FIXME: use constant - derrived from http://en.wikipedia.org/wiki/SCSI_Peripheral_Device_Type + // + switch (InquiryData->DeviceType) + { + case 1: + { + // + // sequential device, i.e magnetic tape + // + return L"GenSequential"; + } + case 4: + { + // + // write once device + // + return L"GenWorm"; + } + case 5: + { + // + // CDROM device + // + return L"GenCdRom"; + } + case 7: + { + // + // optical memory device + // + return L"GenOptical"; + } + case 8: + { + // + // medium change device + // + return L"GenChanger"; + } + default: + { + // + // other device + // + return L"UsbstorOther"; + } + } +} + ULONG CopyField( @@ -114,6 +184,8 @@ ANSI_STRING AnsiString; UNICODE_STRING DeviceId; + DPRINT1("USBSTOR_PdoHandleQueryDeviceId\n"); + // // get device extension // @@ -135,6 +207,11 @@ DeviceType = USBSTOR_GetDeviceType(InquiryData); // + // zero buffer + // + RtlZeroMemory(Buffer, sizeof(Buffer)); + + // // lets create device string // Offset = sprintf(&Buffer[Offset], "USBSTOR\\%s&Ven_", DeviceType); @@ -192,7 +269,7 @@ // allocate DeviceId string // DeviceId.Length = 0; - DeviceId.MaximumLength = (Offset + 2) * sizeof(WCHAR); + DeviceId.MaximumLength = (strlen((PCHAR)Buffer) + 1) * sizeof(WCHAR); DeviceId.Buffer = (LPWSTR)AllocateItem(PagedPool, DeviceId.MaximumLength); if (!DeviceId.Buffer) { @@ -217,7 +294,7 @@ Irp->IoStatus.Information = (ULONG_PTR)DeviceId.Buffer; } - DPRINT1("DeviceId %wZ\n", &DeviceId); + DPRINT1("DeviceId %wZ Status %x\n", &DeviceId, Status); // // done @@ -225,6 +302,161 @@ return Status; } +NTSTATUS +USBSTOR_PdoHandleQueryHardwareId( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + WCHAR Buffer[200]; + ULONG Length; + LPWSTR DeviceName; + LPCWSTR GenericType; + + DPRINT1("USBSTOR_PdoHandleQueryInstanceId\n"); + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->DeviceDescriptor); + + // + // get generic type + // + GenericType = USBSTOR_GetGenericType((PUFI_INQUIRY_RESPONSE)PDODeviceExtension->InquiryData); + ASSERT(GenericType); + + // + // zero buffer + // + RtlZeroMemory(Buffer, sizeof(Buffer)); + + // + // format hardware id + // + Length = swprintf(Buffer, L"USB\\VID_%04x&Pid_%04x&Rev_%04x", FDODeviceExtension->DeviceDescriptor->idVendor, FDODeviceExtension->DeviceDescriptor->idProduct, FDODeviceExtension->DeviceDescriptor->bcdDevice) + 1; + Length += swprintf(&Buffer[Length], L"USB\\VID_%04x&Pid_%04x", FDODeviceExtension->DeviceDescriptor->idVendor, FDODeviceExtension->DeviceDescriptor->idProduct) + 1; + Length += swprintf(&Buffer[Length], L"USBSTOR\\%s", GenericType) + 1; + Length += swprintf(&Buffer[Length], L"%s", GenericType) + 1; + + // + // TODO: add more ids + // + + Buffer[Length] = UNICODE_NULL; + Length++; + + DPRINT1("Name %S\n", Buffer); + + // + // allocate buffer + // + DeviceName = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); + + if (!DeviceName) + { + // + // no memory + // + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy device name + // + RtlMoveMemory(DeviceName, Buffer, Length * sizeof(WCHAR)); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceName; + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +USBSTOR_PdoHandleQueryInstanceId( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + WCHAR Buffer[100]; + ULONG Length; + LPWSTR InstanceId; + + DPRINT1("USBSTOR_PdoHandleQueryInstanceId\n"); + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->DeviceDescriptor); + + // + // format instance id + // + swprintf(Buffer, L"USB\\VID_%04x&PID_%04x\\%s", FDODeviceExtension->DeviceDescriptor->idVendor, FDODeviceExtension->DeviceDescriptor->idProduct, L"00000000"); + + // + // calculate length + // + Length = wcslen(Buffer) + 1; + + // + // allocate instance id + // + InstanceId = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); + if (!InstanceId) + { + // + // no memory + // + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy instance id + // + wcscpy(InstanceId, Buffer); + + DPRINT1("USBSTOR_PdoHandleQueryInstanceId %S\n", InstanceId); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)InstanceId; + + // + // completed successfully + // + return STATUS_SUCCESS; +} NTSTATUS USBSTOR_PdoHandleDeviceRelations( @@ -234,6 +466,8 @@ PDEVICE_RELATIONS DeviceRelations; PIO_STACK_LOCATION IoStack; + DPRINT1("USBSTOR_PdoHandleDeviceRelations\n"); + // // get current irp stack location // @@ -289,6 +523,7 @@ PIO_STACK_LOCATION IoStack; PPDO_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; + PDEVICE_CAPABILITIES Caps; // // get current stack location @@ -326,9 +561,26 @@ Status = USBSTOR_PdoHandleQueryDeviceId(DeviceObject, Irp); break; } + else if (IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) + { + // + // handle instance id + // + Status = USBSTOR_PdoHandleQueryHardwareId(DeviceObject, Irp); + break; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryInstanceID) + { + // + // handle instance id + // + Status = USBSTOR_PdoHandleQueryInstanceId(DeviceObject, Irp); + break; + } DPRINT1("USBSTOR_PdoHandlePnp: IRP_MN_QUERY_ID IdType %x unimplemented\n", IoStack->Parameters.QueryId.IdType); Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; break; } case IRP_MN_REMOVE_DEVICE: @@ -341,6 +593,16 @@ // just forward irp to lower device // Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp); + + if (NT_SUCCESS(Status)) + { + // + // check if no unique id + // + Caps = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; + Caps->UniqueID = FALSE; //FIXME + Caps->Removable = TRUE; //FIXME + } break; } case IRP_MN_START_DEVICE:

13 years, 7 months

[jimtabor] 51574: [User32] - Fix loop when using arrow keys in menu mode, other miscellaneous code changes.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed May 4 12:18:57 2011 New Revision: 51574 URL: http://svn.reactos.org/svn/reactos?rev=51574&view=rev Log: [User32] - Fix loop when using arrow keys in menu mode, other miscellaneous code changes. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed May 4 12:18:57 2011 @@ -2913,8 +2913,8 @@ if (NewWnd != Mt->OwnerWnd) { Mt->OwnerWnd = NewWnd; - SetCapture(Mt->OwnerWnd); - (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); // 1 + SetCapture(Mt->OwnerWnd); // 2 } Mt->TopMenu = Mt->CurrentMenu = NewMenu; /* all subpopups are hidden */ @@ -2936,37 +2936,35 @@ * going to hide it anyway. */ static BOOL FASTCALL -MenuSuspendPopup(MTRACKER* Mt, UINT Message) -{ - MSG Msg; - - Msg.hwnd = Mt->OwnerWnd; - - PeekMessageW(&Msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE); - Mt->TrackFlags |= TF_SKIPREMOVE; - - switch (Message) - { - case WM_KEYDOWN: - PeekMessageW(&Msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE); - if (WM_KEYUP == Msg.message || WM_PAINT == Msg.message) - { - PeekMessageW(&Msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE); - PeekMessageW(&Msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE); - if (WM_KEYDOWN == Msg.message - && (VK_LEFT == Msg.wParam || VK_RIGHT == Msg.wParam)) - { - Mt->TrackFlags |= TF_SUSPENDPOPUP; - return TRUE; - } - } - break; - } - - /* failures go through this */ - Mt->TrackFlags &= ~TF_SUSPENDPOPUP; - - return FALSE; +MenuSuspendPopup(MTRACKER* Mt, UINT uMsg) +{ + MSG msg; + + msg.hwnd = Mt->OwnerWnd; + + PeekMessageW( &msg, 0, uMsg, uMsg, PM_NOYIELD | PM_REMOVE); // ported incorrectly since 8317 GvG +// Mt->TrackFlags |= TF_SKIPREMOVE; // This sends TrackMenu into a loop with arrow keys!!!! + + switch( uMsg ) + { + case WM_KEYDOWN: + PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE); + if( msg.message == WM_KEYUP || msg.message == WM_PAINT ) + { + PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE); + PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE); + if( msg.message == WM_KEYDOWN && + (msg.wParam == VK_LEFT || msg.wParam == VK_RIGHT)) + { + Mt->TrackFlags |= TF_SUSPENDPOPUP; + return TRUE; + } + } + break; + } + /* failures go through this */ + Mt->TrackFlags &= ~TF_SUSPENDPOPUP; + return FALSE; } /*********************************************************************** @@ -3029,14 +3027,14 @@ } /* Try to move 1 column left (if possible) */ - if (NO_SELECTED_ITEM != (PrevCol = MenuGetStartOfPrevColumn(&MenuInfo))) - { - if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) - { + if ( (PrevCol = MenuGetStartOfPrevColumn(&MenuInfo)) != NO_SELECTED_ITEM) + { + if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) + { MenuSelectItem(Mt->OwnerWnd, &MenuInfo, PrevCol, TRUE, 0); - } - return; - } + } + return; + } /* close topmost popup */ while (MenuTmp != Mt->CurrentMenu) @@ -3056,16 +3054,16 @@ { return; } - if ((MenuPrev == Mt->TopMenu) && 0 == (TopMenuInfo.Flags & MF_POPUP)) + if ((MenuPrev == Mt->TopMenu) && !(TopMenuInfo.Flags & MF_POPUP)) { /* move menu bar selection if no more popups are left */ - if (! MenuDoNextMenu(Mt, VK_LEFT, Flags)) + if (!MenuDoNextMenu(Mt, VK_LEFT, Flags)) { MenuMoveSelection(Mt->OwnerWnd, &TopMenuInfo, ITEM_PREV); } - if (MenuPrev != MenuTmp || 0 != (Mt->TrackFlags & TF_SUSPENDPOPUP)) + if (MenuPrev != MenuTmp || Mt->TrackFlags & TF_SUSPENDPOPUP) { /* A sublevel menu was displayed - display the next one * unless there is another displacement coming up */ @@ -3110,23 +3108,23 @@ if (hmenutmp != Mt->CurrentMenu) return; } - if (! MenuGetRosMenuInfo(&CurrentMenuInfo, Mt->CurrentMenu)) + if (! MenuGetRosMenuInfo(&CurrentMenuInfo, Mt->CurrentMenu)) { return; } - /* Check to see if there's another column */ - if (NO_SELECTED_ITEM != (NextCol = MenuGetStartOfNextColumn(&CurrentMenuInfo))) - { - TRACE("Going to %d.\n", NextCol); - if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) - { + /* Check to see if there's another column */ + if ( (NextCol = MenuGetStartOfNextColumn(&CurrentMenuInfo)) != NO_SELECTED_ITEM) + { + TRACE("Going to %d.\n", NextCol); + if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) + { MenuSelectItem(Mt->OwnerWnd, &MenuInfo, NextCol, TRUE, 0); - } - return; - } - - if (0 == (MenuInfo.Flags & MF_POPUP)) /* menu bar tracking */ + } + return; + } + + if (!(MenuInfo.Flags & MF_POPUP)) /* menu bar tracking */ { if (Mt->CurrentMenu != Mt->TopMenu) { @@ -3325,8 +3323,8 @@ if (hmenu) fEndMenu |= !MenuMouseMove( &mt, hmenu, wFlags ); - } /* switch(msg.message) - mouse */ - } + } /* switch(msg.message) - mouse */ + } else if ((msg.message >= WM_KEYFIRST) && (msg.message <= WM_KEYLAST)) { fRemove = TRUE; /* Keyboard messages are always removed */ @@ -3339,7 +3337,7 @@ case VK_MENU: case VK_F10: fEndMenu = TRUE; - break; + break; case VK_HOME: case VK_END: @@ -3668,7 +3666,6 @@ track_menu: MenuTrackMenu( hTrackMenu, wFlags, 0, 0, hwnd, NULL ); MenuExitTracking( hwnd, FALSE ); - } /**********************************************************************

13 years, 7 months

[janderwald] 51573: [USBEHCI_NEW] - Fix warnings - Fix mingw build

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed May 4 12:09:07 2011 New Revision: 51573 URL: http://svn.reactos.org/svn/reactos?rev=51573&view=rev Log: [USBEHCI_NEW] - Fix warnings - Fix mingw build Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Wed May 4 12:09:07 2011 @@ -2277,7 +2277,6 @@ { PUSBDEVICE OldUsbDevice, NewUsbDevice; CHubController * Controller; - NTSTATUS Status; DPRINT1("USBHI_RestoreUsbDevice\n"); @@ -2430,8 +2429,11 @@ // // store result length // +#ifdef _MSC_VER *LengthReturned = FIELD_OFFSET(USB_DEVICE_INFORMATION_0, PipeList[DeviceInfo->NumberOfOpenPipes]); - +#else + *LengthReturned = sizeof(USB_DEVICE_INFORMATION_0) + (DeviceInfo->NumberOfOpenPipes > 1 ? (DeviceInfo->NumberOfOpenPipes - 1) * sizeof(USB_PIPE_INFORMATION_0) : 0); +#endif // // done // Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Wed May 4 12:09:07 2011 @@ -177,6 +177,7 @@ default: /* BUG */ PC_ASSERT(FALSE); + Status = STATUS_NOT_SUPPORTED; } //

13 years, 7 months

[janderwald] 51572: [USBEHCI_NEW] - Invoke status change callback at passive level - Fill out usb descriptor struct instead passing everything in char array - Use 1 byte interrupt endpoint packet s...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed May 4 11:49:00 2011 New Revision: 51572 URL: http://svn.reactos.org/svn/reactos?rev=51572&view=rev Log: [USBEHCI_NEW] - Invoke status change callback at passive level - Fill out usb descriptor struct instead passing everything in char array - Use 1 byte interrupt endpoint packet size for hub for now - Fill in interface information when SelectConfiguration request is passed. Fixes sce callback and pool corruptions - Return device descriptor in USBHI_QueryDeviceInformation - Tested in WinXP with special pool enabled & overrun support Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Wed May 4 11:49:00 2011 @@ -20,12 +20,17 @@ IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); -VOID NTAPI +VOID +NTAPI EhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); + +VOID +NTAPI +StatusChangeWorkItemRoutine(PVOID Context); class CUSBHardwareDevice : public IUSBHardwareDevice { @@ -81,7 +86,7 @@ // friend function friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); friend VOID NTAPI EhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); - + friend VOID NTAPI StatusChangeWorkItemRoutine(PVOID Context); // constructor / destructor CUSBHardwareDevice(IUnknown *OuterUnknown){} virtual ~CUSBHardwareDevice(){} @@ -110,6 +115,7 @@ PVOID m_SCEContext; // status change callback routine context BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress EHCI_PORT_STATUS m_PortStatus[16]; // port status + WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback // set command VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); @@ -189,6 +195,11 @@ // initialize device lock // KeInitializeSpinLock(&m_Lock); + + // + // intialize status change work item + // + ExInitializeWorkItem(&m_StatusChangeWorkItem, StatusChangeWorkItemRoutine, PVOID(this)); m_VendorID = 0; m_DeviceID = 0; @@ -774,7 +785,7 @@ { ULONG Value; - DPRINT("CUSBHardwareDevice::ClearPortStatus\n"); + DPRINT("CUSBHardwareDevice::ClearPortStatus PortId %x Feature %x\n", PortId, Status); if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; @@ -1112,9 +1123,9 @@ if (This->m_SCECallBack != NULL) { // - // issue callback + // queue work item for processing // - This->m_SCECallBack(This->m_SCEContext); + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); } } else @@ -1131,6 +1142,29 @@ return; } +VOID +NTAPI +StatusChangeWorkItemRoutine( + PVOID Context) +{ + // + // cast to hardware object + // + CUSBHardwareDevice * This = (CUSBHardwareDevice*)Context; + + // + // is there a callback + // + if (This->m_SCECallBack) + { + // + // issue callback + // + This->m_SCECallBack(This->m_SCEContext); + } + +} + NTSTATUS CreateUSBHardware( PUSBHARDWAREDEVICE *OutHardware) Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Wed May 4 11:49:00 2011 @@ -129,42 +129,39 @@ }; -const UCHAR ROOTHUB2_CONFIGURATION_DESCRIPTOR [] = -{ - /* one configuration */ - 0x09, /* bLength; */ - 0x02, /* bDescriptorType; Configuration */ - 0x19, 0x00, /* wTotalLength; */ - 0x01, /* bNumInterfaces; (1) */ - 0x23, /* bConfigurationValue; */ - 0x00, /* iConfiguration; */ - 0x40, /* bmAttributes; */ - 0x00 /* MaxPower; */ +const USB_CONFIGURATION_DESCRIPTOR ROOTHUB2_CONFIGURATION_DESCRIPTOR = +{ + sizeof(USB_CONFIGURATION_DESCRIPTOR), + USB_CONFIGURATION_DESCRIPTOR_TYPE, + sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), + 1, + 1, + 0, + 0x40, /* self powered */ + 0x0 }; -const UCHAR ROOTHUB2_INTERFACE_DESCRIPTOR [] = -{ - /* one interface */ - 0x09, /* bLength: Interface; */ - 0x04, /* bDescriptorType; Interface */ - 0x00, /* bInterfaceNumber; */ - 0x00, /* bAlternateSetting; */ - 0x01, /* bNumEndpoints; */ - 0x09, /* bInterfaceClass; HUB_CLASSCODE */ - 0x01, /* bInterfaceSubClass; */ - 0x00, /* bInterfaceProtocol: */ - 0x00 /* iInterface; */ +const USB_INTERFACE_DESCRIPTOR ROOTHUB2_INTERFACE_DESCRIPTOR = +{ + sizeof(USB_INTERFACE_DESCRIPTOR), /* bLength */ + USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType; Interface */ + 0, /* bInterfaceNumber; */ + 0, /* bAlternateSetting; */ + 0x1, /* bNumEndpoints; */ + 0x09, /* bInterfaceClass; HUB_CLASSCODE */ + 0x01, /* bInterfaceSubClass; */ + 0x00, /* bInterfaceProtocol: */ + 0x00, /* iInterface; */ }; -const UCHAR ROOTHUB2_ENDPOINT_DESCRIPTOR [] = -{ - /* one endpoint (status change endpoint) */ - 0x07, /* bLength; */ - 0x05, /* bDescriptorType; Endpoint */ - 0x81, /* bEndpointAddress; IN Endpoint 1 */ - 0x03, /* bmAttributes; Interrupt */ - 0x08, 0x00, /* wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8) */ - 0xFF /* bInterval; (255ms -- usb 2.0 spec) */ +const USB_ENDPOINT_DESCRIPTOR ROOTHUB2_ENDPOINT_DESCRIPTOR = +{ + sizeof(USB_ENDPOINT_DESCRIPTOR), /* bLength */ + USB_ENDPOINT_DESCRIPTOR_TYPE, /* bDescriptorType */ + 0x81, /* bEndPointAddress */ + USB_ENDPOINT_TYPE_INTERRUPT, /* bmAttributes */ + 0x01, /* wMaxPacketSize */ + 0xC /* bInterval */ }; //---------------------------------------------------------------------------------------- @@ -266,11 +263,11 @@ // Set the SCE Callback that the Hardware Device will call on port status change // Device->SetStatusChangeEndpointCallBack((PVOID)StatusChangeEndpointCallBack, this); + // // clear init flag // m_HubControllerDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - return STATUS_SUCCESS; } @@ -286,6 +283,8 @@ PIO_STACK_LOCATION IoStack; USHORT PortStatus, PortChange; PURB Urb; + PUCHAR TransferBuffer; + UCHAR Changed = FALSE; // // get current stack location @@ -303,8 +302,9 @@ // Get the number of ports and check each one for device connected // m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); - DPRINT1("SCE Request\n"); - ((PULONG)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 0; + DPRINT1("SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); + + TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; for (PortId = 0; PortId < PortCount; PortId++) { m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); @@ -318,14 +318,15 @@ { DPRINT1("Device is connected on port %d\n", PortId); // Set the value for the port number - ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((PortId + 1) & 7); + *TransferBuffer = 1 << ((PortId + 1) & 7); + Changed = TRUE; } } // // If there were changes then return TRUE // - if (((PULONG)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] != 0) + if (Changed != 0) return TRUE; return FALSE; @@ -835,7 +836,7 @@ ULONG NumPort; ULONG PortId; - //DPRINT1("CHubController::HandleClassOther> Request %x Value %x not implemented\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); + DPRINT("CHubController::HandleClassOther> Request %x Value %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); // // get number of ports available @@ -877,6 +878,7 @@ // // request contains buffer of 2 ushort which are used from submitting port status and port change status // + DPRINT("PortId %x PortStatus %x PortChange %x\n", PortId, PortStatus, PortChange); Buffer = (PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer; // @@ -973,6 +975,7 @@ PURB Urb) { PUSBDEVICE UsbDevice; + PUSBD_INTERFACE_INFORMATION InterfaceInfo; // // is the request for the Root Hub @@ -987,11 +990,33 @@ // // set device handle // - Urb->UrbSelectConfiguration.ConfigurationHandle = (PVOID)ROOTHUB2_CONFIGURATION_DESCRIPTOR; - - // - // TODO: copy interface info - // + Urb->UrbSelectConfiguration.ConfigurationHandle = (PVOID)&ROOTHUB2_CONFIGURATION_DESCRIPTOR; + + // + // copy interface info + // + InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; + + InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)&ROOTHUB2_INTERFACE_DESCRIPTOR; + InterfaceInfo->Class = ROOTHUB2_INTERFACE_DESCRIPTOR.bInterfaceClass; + InterfaceInfo->SubClass = ROOTHUB2_INTERFACE_DESCRIPTOR.bInterfaceSubClass; + InterfaceInfo->Protocol = ROOTHUB2_INTERFACE_DESCRIPTOR.bInterfaceProtocol; + InterfaceInfo->Reserved = 0; + + // + // sanity check + // + PC_ASSERT(InterfaceInfo->NumberOfPipes == 1); + + // + // copy pipe info + // + InterfaceInfo->Pipes[0].MaximumPacketSize = ROOTHUB2_ENDPOINT_DESCRIPTOR.wMaxPacketSize; + InterfaceInfo->Pipes[0].EndpointAddress = ROOTHUB2_ENDPOINT_DESCRIPTOR.bEndpointAddress; + InterfaceInfo->Pipes[0].Interval = ROOTHUB2_ENDPOINT_DESCRIPTOR.bInterval; + InterfaceInfo->Pipes[0].PipeType = (USBD_PIPE_TYPE)(ROOTHUB2_ENDPOINT_DESCRIPTOR.bmAttributes & USB_ENDPOINT_TYPE_MASK); + InterfaceInfo->Pipes[0].PipeHandle = (PVOID)&ROOTHUB2_ENDPOINT_DESCRIPTOR; + return STATUS_SUCCESS; } else @@ -1097,6 +1122,8 @@ PUSB_HUB_DESCRIPTOR UsbHubDescriptor; ULONG PortCount, Dummy2; USHORT Dummy1; + + DPRINT("CHubController::HandleClassDevice Request %x Class %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); // // check class request type @@ -1142,7 +1169,7 @@ // FIXME: retrieve values // UsbHubDescriptor->bNumberOfPorts = (UCHAR)PortCount; - UsbHubDescriptor->wHubCharacteristics = 0x0012; + UsbHubDescriptor->wHubCharacteristics = 0x00; UsbHubDescriptor->bPowerOnToPowerGood = 0x01; UsbHubDescriptor->bHubControlCurrent = 0x00; @@ -1177,6 +1204,8 @@ PUSBDEVICE UsbDevice; ULONG Length; + DPRINT("CHubController::HandleGetDescriptor\n"); + // // check descriptor type // @@ -1231,8 +1260,7 @@ // // request is for the root bus controller // - C_ASSERT(sizeof(ROOTHUB2_CONFIGURATION_DESCRIPTOR) == sizeof(USB_CONFIGURATION_DESCRIPTOR)); - RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, ROOTHUB2_CONFIGURATION_DESCRIPTOR, sizeof(USB_CONFIGURATION_DESCRIPTOR)); + RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, &ROOTHUB2_CONFIGURATION_DESCRIPTOR, sizeof(USB_CONFIGURATION_DESCRIPTOR)); // // get configuration descriptor, very retarded! @@ -1248,6 +1276,7 @@ // buffer too small // Status = STATUS_SUCCESS; + ASSERT(FALSE); break; } @@ -1255,15 +1284,13 @@ // copy interface descriptor template // Buffer = (PUCHAR)(ConfigurationDescriptor + 1); - C_ASSERT(sizeof(ROOTHUB2_INTERFACE_DESCRIPTOR) == sizeof(USB_INTERFACE_DESCRIPTOR)); - RtlCopyMemory(Buffer, ROOTHUB2_INTERFACE_DESCRIPTOR, sizeof(USB_INTERFACE_DESCRIPTOR)); + RtlCopyMemory(Buffer, &ROOTHUB2_INTERFACE_DESCRIPTOR, sizeof(USB_INTERFACE_DESCRIPTOR)); // // copy end point descriptor template // Buffer += sizeof(USB_INTERFACE_DESCRIPTOR); - C_ASSERT(sizeof(ROOTHUB2_ENDPOINT_DESCRIPTOR) == sizeof(USB_ENDPOINT_DESCRIPTOR)); - RtlCopyMemory(Buffer, ROOTHUB2_ENDPOINT_DESCRIPTOR, sizeof(USB_ENDPOINT_DESCRIPTOR)); + RtlCopyMemory(Buffer, &ROOTHUB2_ENDPOINT_DESCRIPTOR, sizeof(USB_ENDPOINT_DESCRIPTOR)); // // done @@ -1498,7 +1525,7 @@ } case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: { - DPRINT("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE\n"); + DPRINT("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", this); if (IoStack->Parameters.Others.Argument1) { @@ -2392,8 +2419,9 @@ DeviceInfo->NumberOfOpenPipes = 0; //FIXME // - // FIXME get device descriptor - // + // get device descriptor + // + RtlMoveMemory(&DeviceInfo->DeviceDescriptor, ROOTHUB2_DEVICE_DESCRIPTOR, sizeof(USB_DEVICE_DESCRIPTOR)); // // FIXME return pipe information @@ -2402,7 +2430,7 @@ // // store result length // - *LengthReturned = sizeof(USB_DEVICE_INFORMATION_0); + *LengthReturned = FIELD_OFFSET(USB_DEVICE_INFORMATION_0, PipeList[DeviceInfo->NumberOfOpenPipes]); // // done @@ -2587,7 +2615,7 @@ PUSB_DEVICE_HANDLE HubDeviceHandle, ULONG TtCount) { - UNIMPLEMENTED + DPRINT("USBHI_Initialize20Hub HubDeviceHandle %p UNIMPLEMENTED TtCount %lu\n", HubDeviceHandle, TtCount); return STATUS_SUCCESS; } @@ -2600,7 +2628,7 @@ { CHubController * Controller; - DPRINT1("USBHI_RootHubInitNotification\n"); + DPRINT("USBHI_RootHubInitNotification %p \n", CallbackContext); // // get controller object Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Wed May 4 11:49:00 2011 @@ -2,7 +2,7 @@ #define USBEHCI_H__ #include <ntddk.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <hubbusif.h> #include <usbbusif.h>

13 years, 7 months

[jimtabor] 51571: [Win32k] - Move up the chain to convert F10 to system key mode before going into the queue, so when in menu tracking, the message can be removed and processed, see bug 1009.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed May 4 01:31:47 2011 New Revision: 51571 URL: http://svn.reactos.org/svn/reactos?rev=51571&view=rev Log: [Win32k] - Move up the chain to convert F10 to system key mode before going into the queue, so when in menu tracking, the message can be removed and processed, see bug 1009. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Wed May 4 01:31:47 2011 @@ -482,7 +482,7 @@ co_IntKeyboardSendAltKeyMsg() { DPRINT1("co_IntKeyboardSendAltKeyMsg\n"); -// co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0); This sends everything into a msg loop! + //co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0); // This sends everything into a msg loop! } static VOID APIENTRY @@ -859,6 +859,11 @@ { /* There is no focused window to receive a keyboard message */ continue; + } + if ( msg.wParam == VK_F10 ) // Bypass this key before it is in the queue. + { + if (msg.message == WM_KEYUP) msg.message = WM_SYSKEYUP; + if (msg.message == WM_KEYDOWN) msg.message = WM_SYSKEYDOWN; } /* * Post a keyboard message. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed May 4 01:31:47 2011 @@ -1340,10 +1340,6 @@ case VK_LMENU: case VK_RMENU: Msg->wParam = VK_MENU; break; - case VK_F10: - if (Msg->message == WM_KEYUP) Msg->message = WM_SYSKEYUP; - if (Msg->message == WM_KEYDOWN) Msg->message = WM_SYSKEYDOWN; - break; } }

13 years, 7 months

[mjmartin] 51570: [USBHUB_NEW] - Add UsbHub_New to build.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed May 4 01:08:37 2011 New Revision: 51570 URL: http://svn.reactos.org/svn/reactos?rev=51570&view=rev Log: [USBHUB_NEW] - Add UsbHub_New to build. Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] Wed May 4 01:08:37 2011 @@ -2,5 +2,5 @@ add_subdirectory(nt4compat) add_subdirectory(usbd) add_subdirectory(usbehci_new) -add_subdirectory(usbhub) +add_subdirectory(usbhub_new) add_subdirectory(usbstor)

13 years, 7 months

[mjmartin] 51569: [USBHUB_NEW] - Start work on reimplementing UsbHub driver. - Implement SubmitRequestToRootHub, QueryStatusChangeEndpoint, QueryInterface, GetPortStatusAndChange, SetPortFeature an...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed May 4 01:07:21 2011 New Revision: 51569 URL: http://svn.reactos.org/svn/reactos?rev=51569&view=rev Log: [USBHUB_NEW] - Start work on reimplementing UsbHub driver. - Implement SubmitRequestToRootHub, QueryStatusChangeEndpoint, QueryInterface, GetPortStatusAndChange, SetPortFeature and ClearPortFeature.Handle QueryBusRelations. - Partially implement PNP handling for FDO. When starting the device get all the information about the RootHub the driver will need and enable Power on all ports. - Partially implement PNP handling for PDO, QueryId and QueryDeviceText. - WIP Added: branches/usb-bringup/drivers/usb/usbhub_new/ branches/usb-bringup/drivers/usb/usbhub_new/CMakeLists.txt (with props) branches/usb-bringup/drivers/usb/usbhub_new/fdo.c (with props) branches/usb-bringup/drivers/usb/usbhub_new/misc.c (with props) branches/usb-bringup/drivers/usb/usbhub_new/pdo.c (with props) branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c (with props) branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h (with props) branches/usb-bringup/drivers/usb/usbhub_new/usbhub.rc (with props) Added: branches/usb-bringup/drivers/usb/usbhub_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/usb/usbhub_new/CMakeLists.txt [iso-8859-1] Wed May 4 01:07:21 2011 @@ -1,0 +1,12 @@ + +add_definitions(-DDEBUG_MODE) + +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +add_library(usbhub SHARED fdo.c misc.c pdo.c usbhub.c usbhub.rc) + +target_link_libraries(usbhub ${PSEH_LIB}) + +set_module_type(usbhub kernelmodedriver) +add_importlibs(usbhub ntoskrnl hal usbd) +add_cab_target(usbhub 2) Propchange: branches/usb-bringup/drivers/usb/usbhub_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c (added) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Wed May 4 01:07:21 2011 @@ -1,0 +1,903 @@ +ï»¿/* + * PROJECT: ReactOS Universal Serial Bus Hub Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbhub/fdo.c + * PURPOSE: Handle FDO + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#define INITGUID + +#define NDEBUG +#include "usbhub.h" + +NTSTATUS +SubmitRequestToRootHub( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG IoControlCode, + OUT PVOID OutParameter1, + OUT PVOID OutParameter2) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // Build Control Request + // + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + DeviceObject, + NULL, 0, + NULL, 0, + TRUE, + &Event, + &IoStatus); + + if (Irp == NULL) + { + DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Initialize the status block before sending the IRP + // + IoStatus.Status = STATUS_NOT_SUPPORTED; + IoStatus.Information = 0; + + // + // Get Next Stack Location and Initialize it + // + Stack = IoGetNextIrpStackLocation(Irp); + Stack->Parameters.Others.Argument1 = OutParameter1; + Stack->Parameters.Others.Argument2 = OutParameter2; + + // + // Call RootHub + // + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT1("USBHUB: Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + return Status; +} + +NTSTATUS +StatusChangeEndpointCompletion( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) +{ + PHUB_DEVICE_EXTENSION HubDeviceExtension; + LONG i; + + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)((PDEVICE_OBJECT)Context)->DeviceExtension; + + // + // Determine which port has changed + // + for (i=0; i < HubDeviceExtension->UsbExtHubInfo.NumberOfPorts; i++) + { + DPRINT1("Port %x HubDeviceExtension->PortStatus %x\n",i+1, HubDeviceExtension->PortStatusChange[i].Status); + DPRINT1("Port %x HubDeviceExtension->PortChange %x\n",i+1, HubDeviceExtension->PortStatusChange[i].Change); + // + // FIXME: Call function to check port before creating device object for it + // + } + + // + // Free the Irp and return more processing required so the IO Manger doesnât try to free it + // + IoFreeIrp(Irp); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +QueryStatusChangeEndpoint( + PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PIO_STACK_LOCATION Stack; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + HubDeviceExtension->PendingSCEUrb; + RtlZeroMemory(&HubDeviceExtension->PendingSCEUrb, + sizeof(URB)); + + // + // Create URB for Status Change Endpoint request + // + UsbBuildInterruptOrBulkTransferRequest(&HubDeviceExtension->PendingSCEUrb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + HubDeviceExtension->PipeHandle, + HubDeviceExtension->PortStatusChange, + NULL, + sizeof(USHORT) * 2 * HubDeviceExtension->UsbExtHubInfo.NumberOfPorts, + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); + + // + // Set the device handle to null for roothub + // + HubDeviceExtension->PendingSCEUrb.UrbHeader.UsbdDeviceHandle = NULL; + + // + // Allocate an Irp + // + HubDeviceExtension->PendingSCEIrp = IoAllocateIrp(HubDeviceExtension->RootHubPhysicalDeviceObject->StackSize, + FALSE); + + if (!HubDeviceExtension->PendingSCEIrp) + { + DPRINT1("USBHUB: Failed to allocate IRP for SCE request!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Initialize the IRP + // + HubDeviceExtension->PendingSCEIrp->IoStatus.Status = STATUS_NOT_SUPPORTED; + HubDeviceExtension->PendingSCEIrp->IoStatus.Information = 0; + HubDeviceExtension->PendingSCEIrp->Flags = 0; + HubDeviceExtension->PendingSCEIrp->UserBuffer = NULL; + + // + // Get the Next Stack Location and Initialize it + // + Stack = IoGetNextIrpStackLocation(HubDeviceExtension->PendingSCEIrp); + Stack->DeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; + Stack->Parameters.Others.Argument1 = &HubDeviceExtension->PendingSCEUrb; + Stack->Parameters.Others.Argument2 = NULL; + Stack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + Stack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + + // + // Set the completion routine for when device is connected to root hub + // + IoSetCompletionRoutine(HubDeviceExtension->PendingSCEIrp, + (PIO_COMPLETION_ROUTINE) StatusChangeEndpointCompletion, + DeviceObject, + TRUE, + TRUE, + TRUE); + + Status = IoCallDriver(HubDeviceExtension->RootHubPhysicalDeviceObject, HubDeviceExtension->PendingSCEIrp); + DPRINT1("SCE request status %x\n", Status); + + return STATUS_PENDING; +} + +NTSTATUS +QueryInterface( + IN PDEVICE_OBJECT DeviceObject, + IN CONST GUID InterfaceType, + IN LONG Size, + IN LONG Version, + OUT PVOID Interface) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + + // + // Initialize the Event used to wait for Irp completion + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // Build Control Request + // + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &IoStatus); + + // + // Get Next Stack Location and Initialize it. + // + Stack = IoGetNextIrpStackLocation(Irp); + Stack->MinorFunction = IRP_MN_QUERY_INTERFACE; + Stack->Parameters.QueryInterface.InterfaceType= &InterfaceType;//USB_BUS_INTERFACE_HUB_GUID; + Stack->Parameters.QueryInterface.Size = Size; + Stack->Parameters.QueryInterface.Version = Version; + Stack->Parameters.QueryInterface.Interface = Interface; + Stack->Parameters.QueryInterface.InterfaceSpecificData = NULL; + + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT("Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + return Status; +} + +NTSTATUS +GetPortStatusAndChange( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG PortId, + OUT PORT_STATUS_CHANGE *StatusChange) +{ + NTSTATUS Status; + PURB Urb; + + // + // Allocate URB + // + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); + if (!Urb) + { + DPRINT1("Failed to allocate memory for URB!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Zero it + // + RtlZeroMemory(Urb, sizeof(URB)); + + // + // Create URB for getting Port Status + // + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_OTHER, + sizeof(Urb->UrbControlVendorClassRequest), + USBD_TRANSFER_DIRECTION_OUT, + 0, + USB_REQUEST_GET_STATUS, + 0, + PortId, + &StatusChange, + 0, + sizeof(PORT_STATUS_CHANGE), + 0); + + // + // Query the Root Hub + // + Status = SubmitRequestToRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + + // + // Free URB + // + ExFreePool(Urb); + + return Status; +} + +NTSTATUS +SetPortFeature( + PDEVICE_OBJECT DeviceObject, + ULONG PortId, + ULONG Feature) +{ + NTSTATUS Status; + PURB Urb; + + // + // Allocate URB + // + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); + if (!Urb) + { + DPRINT1("Failed to allocate memory for URB!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Zero it + // + RtlZeroMemory(Urb, sizeof(URB)); + + // + // Create URB for Clearing Port Reset + // + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_OTHER, + sizeof(Urb->UrbControlVendorClassRequest), + USBD_TRANSFER_DIRECTION_IN, + 0, + USB_REQUEST_SET_FEATURE, + Feature, + PortId, + NULL, + 0, + 0, + 0); + // + // Query the Root Hub + // + Status = SubmitRequestToRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + + // + // Free URB + // + ExFreePool(Urb); + + return Status; +} + +NTSTATUS +ClearPortFeature( + PDEVICE_OBJECT DeviceObject, + ULONG PortId, + ULONG Feature) +{ + NTSTATUS Status; + PURB Urb; + + // + // Allocate a URB + // + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); + if (!Urb) + { + DPRINT1("Failed to allocate memory for URB!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Zero it + // + RtlZeroMemory(Urb, sizeof(URB)); + + // + // Create URB for Clearing Port Reset + // + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_OTHER, + sizeof(Urb->UrbControlVendorClassRequest), + USBD_TRANSFER_DIRECTION_IN, + 0, + USB_REQUEST_CLEAR_FEATURE, + Feature, + PortId, + NULL, + 0, + 0, + 0); + // + // Query the Root Hub + // + Status = SubmitRequestToRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + + // + // Free URB + // + ExFreePool(Urb); + + return Status; +} + +NTSTATUS +GetUsbDeviceDescriptor( + PDEVICE_OBJECT ChildDeviceObject, + UCHAR DescriptorType, + UCHAR Index, + USHORT LangId, + PVOID TransferBuffer, + ULONG TransferBufferLength) +{ + NTSTATUS Status; + PURB Urb; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + PMDL BufferMdl; + + // + // Get the Hubs Device Extension + // + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)ChildDeviceObject->DeviceExtension; + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) ChildDeviceExtension->ParentDeviceObject->DeviceExtension; + + // + // Allocate a URB + // + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); + if (!Urb) + { + DPRINT1("Failed to allocate memory for URB!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Zero it + // + RtlZeroMemory(Urb, sizeof(URB)); + + // + // Create a MDL for buffer + // + BufferMdl = IoAllocateMdl(TransferBuffer, + TransferBufferLength, + FALSE, + FALSE, + NULL); + + // + // Lock the Mdl + // + _SEH2_TRY + { + MmProbeAndLockPages(BufferMdl, KernelMode, IoWriteAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("MmProbeAndLockPages Failed!\n"); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + // + // Create URB for getting device descriptor + // + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + DescriptorType, + Index, + LangId, + NULL, + BufferMdl, + TransferBufferLength, + NULL); + + // + // Set the device handle + // + Urb->UrbHeader.UsbdDeviceHandle = (PVOID)ChildDeviceObject; + + // + // Query the Root Hub + // + Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + // + // Free Mdl + // + IoFreeMdl(BufferMdl); + + return Status; +} + +NTSTATUS +CreateUsbChildDeviceObject( + IN PDEVICE_OBJECT UsbHubDeviceObject, + IN LONG PortId, + OUT PDEVICE_OBJECT *UsbChildDeviceObject) +{ + //NTSTATUS Status; + //PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; + + return STATUS_SUCCESS; +} + +NTSTATUS +USBHUB_FdoQueryBusRelations( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_RELATIONS* pDeviceRelations) +{ + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PDEVICE_RELATIONS DeviceRelations; + ULONG i; + ULONG Children = 0; + ULONG NeededSize; + + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DPRINT1("Query Bus Relations\n"); + + // + // Count the number of children + // + for (i = 0; i < USB_MAXCHILDREN; i++) + { + + if (HubDeviceExtension->ChildDeviceObject[i] == NULL) + { + continue; + } + Children++; + } + + NeededSize = sizeof(DEVICE_RELATIONS); + if (Children > 1) + NeededSize += (Children - 1) * sizeof(PDEVICE_OBJECT); + + // + // Allocate DeviceRelations + // + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, + NeededSize); + + if (!DeviceRelations) + return STATUS_INSUFFICIENT_RESOURCES; + DeviceRelations->Count = Children; + Children = 0; + + // + // Fill in return structure + // + for (i = 0; i < USB_MAXCHILDREN; i++) + { + if (HubDeviceExtension->ChildDeviceObject[i]) + { + ObReferenceObject(HubDeviceExtension->ChildDeviceObject[i]); + DeviceRelations->Objects[Children++] = HubDeviceExtension->ChildDeviceObject[i]; + } + } + + ASSERT(Children == DeviceRelations->Count); + *pDeviceRelations = DeviceRelations; + + // + // FIXME: Send the first SCE Request + // + + return STATUS_SUCCESS; +} + +NTSTATUS +USBHUB_FdoHandlePnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status = STATUS_SUCCESS; + ULONG_PTR Information = 0; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + Stack = IoGetCurrentIrpStackLocation(Irp); + + switch (Stack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + PURB Urb; + ULONG Result = 0; + PUSB_INTERFACE_DESCRIPTOR Pid; + ULONG PortId; + + USBD_INTERFACE_LIST_ENTRY InterfaceList[2] = {{NULL, NULL}, {NULL, NULL}}; + PURB ConfigUrb = NULL; + + DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + + // + // Allocated size including the sizeof USBD_INTERFACE_LIST_ENTRY + // + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY), USB_HUB_TAG); + RtlZeroMemory(Urb, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY)); + + // + // Get the Root Hub Pdo + // + SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, + &HubDeviceExtension->RootHubPhysicalDeviceObject, + &HubDeviceExtension->RootHubFunctionalDeviceObject); + + ASSERT(HubDeviceExtension->RootHubPhysicalDeviceObject); + ASSERT(HubDeviceExtension->RootHubFunctionalDeviceObject); + DPRINT1("RootPdo %x, RootFdo %x\n", + HubDeviceExtension->RootHubPhysicalDeviceObject, + HubDeviceExtension->RootHubFunctionalDeviceObject); + + // + // Send the StartDevice to RootHub + // + Status = ForwardIrpAndWait(HubDeviceExtension->RootHubPhysicalDeviceObject, Irp); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to start the RootHub PDO\n"); + ASSERT(FALSE); + } + + // + // Get the current number of hubs + // + Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + IOCTL_INTERNAL_USB_GET_HUB_COUNT, + &HubDeviceExtension->NumberOfHubs, NULL); + + // + // Get the Hub Interface + // + Status = QueryInterface(HubDeviceExtension->RootHubPhysicalDeviceObject, + USB_BUS_INTERFACE_HUB_GUID, + sizeof(USB_BUS_INTERFACE_HUB_V5), + 5, + (PVOID)&HubDeviceExtension->HubInterface); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get HUB_GUID interface with status 0x%08lx\n", Status); + return STATUS_UNSUCCESSFUL; + } + + // + // Get the USBDI Interface + // + Status = QueryInterface(HubDeviceExtension->RootHubPhysicalDeviceObject, + USB_BUS_INTERFACE_USBDI_GUID, + sizeof(USB_BUS_INTERFACE_USBDI_V2), + 2, + (PVOID)&HubDeviceExtension->UsbDInterface); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get USBDI_GUID interface with status 0x%08lx\n", Status); + return Status; + } + + // + // Get Root Hub Device Handle + // + Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, + &HubDeviceExtension->RootHubHandle, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetRootHubDeviceHandle failed with status 0x%08lx\n", Status); + return Status; + } + + // + // Get Hub Device Information + // + Status = HubDeviceExtension->HubInterface.QueryDeviceInformation(HubDeviceExtension->RootHubPhysicalDeviceObject, + HubDeviceExtension->RootHubHandle, + &HubDeviceExtension->DeviceInformation, + sizeof(USB_DEVICE_INFORMATION_0), + &Result); + + + DPRINT1("Status %x, Result 0x%08lx\n", Status, Result); + DPRINT1("InformationLevel %x\n", HubDeviceExtension->DeviceInformation.InformationLevel); + DPRINT1("ActualLength %x\n", HubDeviceExtension->DeviceInformation.ActualLength); + DPRINT1("PortNumber %x\n", HubDeviceExtension->DeviceInformation.PortNumber); + DPRINT1("DeviceDescriptor %x\n", HubDeviceExtension->DeviceInformation.DeviceDescriptor); + DPRINT1("HubAddress %x\n", HubDeviceExtension->DeviceInformation.HubAddress); + DPRINT1("NumberofPipes %x\n", HubDeviceExtension->DeviceInformation.NumberOfOpenPipes); + + + // + // Get Root Hubs Device Descriptor + // + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + USB_DEVICE_DESCRIPTOR_TYPE, + 0, + 0, + &HubDeviceExtension->HubDeviceDescriptor, + NULL, + sizeof(USB_DEVICE_DESCRIPTOR), + NULL); + + Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get HubDeviceDescriptor!\n"); + } + + DumpDeviceDescriptor(&HubDeviceExtension->HubDeviceDescriptor); + + // + // Get Root Hubs Configuration Descriptor + // + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + USB_CONFIGURATION_DESCRIPTOR_TYPE, + 0, + 0, + &HubDeviceExtension->HubConfigDescriptor, + NULL, + sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), + NULL); + + Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get RootHub Configuration with status %x\n", Status); + ASSERT(FALSE); + } + ASSERT(HubDeviceExtension->HubConfigDescriptor.wTotalLength); + + DumpConfigurationDescriptor(&HubDeviceExtension->HubConfigDescriptor); + + Status = HubDeviceExtension->HubInterface.GetExtendedHubInformation(HubDeviceExtension->RootHubPhysicalDeviceObject, + HubDeviceExtension->RootHubPhysicalDeviceObject, + &HubDeviceExtension->UsbExtHubInfo, + sizeof(USB_EXTHUB_INFORMATION_0), + &Result); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to extended hub information. Unable to determine the number of ports!\n"); + ASSERT(FALSE); + } + + DPRINT1("HubDeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", HubDeviceExtension->UsbExtHubInfo.NumberOfPorts); + + // + // Get the Hub Descriptor + // + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_DEVICE, + sizeof(Urb->UrbControlVendorClassRequest), + USBD_TRANSFER_DIRECTION_IN, + 0, + USB_DEVICE_CLASS_RESERVED, + 0, + 0, + &HubDeviceExtension->HubDescriptor, + NULL, + sizeof(USB_HUB_DESCRIPTOR), + NULL); + + Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + DPRINT1("bDescriptorType %x\n", HubDeviceExtension->HubDescriptor.bDescriptorType); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Hub Descriptor!\n"); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + // + // Allocate memory for PortStatusChange to hold 2 USHORTs for each port on hub + // + HubDeviceExtension->PortStatusChange = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ULONG) * HubDeviceExtension->HubDescriptor.bNumberOfPorts, + USB_HUB_TAG); + + // + // Get the first Configuration Descriptor + // + Pid = USBD_ParseConfigurationDescriptorEx(&HubDeviceExtension->HubConfigDescriptor, + &HubDeviceExtension->HubConfigDescriptor, + -1, -1, -1, -1, -1); + ASSERT(Pid != NULL); + InterfaceList[0].InterfaceDescriptor = Pid; + ConfigUrb = USBD_CreateConfigurationRequestEx(&HubDeviceExtension->HubConfigDescriptor, + (PUSBD_INTERFACE_LIST_ENTRY)&InterfaceList); + ASSERT(ConfigUrb != NULL); + + Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + ConfigUrb, + NULL); + + HubDeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle; + HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; + DPRINT1("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + + ExFreePool(ConfigUrb); + + // + // Initialize the Hub + // + Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubDeviceExtension->RootHubPhysicalDeviceObject, + HubDeviceExtension->RootHubHandle, 1); + DPRINT1("Status %x\n", Status); + + // + // Enable power on all ports + // + for (PortId = 0; PortId < HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) + { + SetPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, PORT_POWER); + } + ExFreePool(Urb); + break; + } + + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + switch (Stack->Parameters.QueryDeviceRelations.Type) + { + case BusRelations: + { + PDEVICE_RELATIONS DeviceRelations = NULL; + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + + Status = USBHUB_FdoQueryBusRelations(DeviceObject, &DeviceRelations); + + Information = (ULONG_PTR)DeviceRelations; + break; + } + case RemovalRelations: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + } + default: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + Stack->Parameters.QueryDeviceRelations.Type); + return ForwardIrpAndForget(DeviceObject, Irp); + } + break; + } + case IRP_MN_QUERY_BUS_INFORMATION: + { + DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); + break; + } + case IRP_MN_QUERY_ID: + { + DPRINT1("IRP_MN_QUERY_ID\n"); + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); + break; + } + default: + { + DPRINT1(" IRP_MJ_PNP / unknown minor function 0x%lx\n", Stack->MinorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + } + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +USBHUB_FdoHandleDeviceControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("FdoHandleDeviceControl\n"); + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + Propchange: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbhub_new/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/misc.c (added) +++ branches/usb-bringup/drivers/usb/usbhub_new/misc.c [iso-8859-1] Wed May 4 01:07:21 2011 @@ -1,0 +1,98 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Hub Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbhub/fdo.c + * PURPOSE: Misc helper functions + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ +#define NDEBUG +#include "usbhub.h" +#include <stdarg.h> + +VOID +DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) +{ + DPRINT1("Dumping Device Descriptor %x\n", DeviceDescriptor); + DPRINT1("bLength %x\n", DeviceDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", DeviceDescriptor->bDescriptorType); + DPRINT1("bcdUSB %x\n", DeviceDescriptor->bcdUSB); + DPRINT1("bDeviceClass %x\n", DeviceDescriptor->bDeviceClass); + DPRINT1("bDeviceSubClass %x\n", DeviceDescriptor->bDeviceSubClass); + DPRINT1("bDeviceProtocol %x\n", DeviceDescriptor->bDeviceProtocol); + DPRINT1("bMaxPacketSize0 %x\n", DeviceDescriptor->bMaxPacketSize0); + DPRINT1("idVendor %x\n", DeviceDescriptor->idVendor); + DPRINT1("idProduct %x\n", DeviceDescriptor->idProduct); + DPRINT1("bcdDevice %x\n", DeviceDescriptor->bcdDevice); + DPRINT1("iManufacturer %x\n", DeviceDescriptor->iManufacturer); + DPRINT1("iProduct %x\n", DeviceDescriptor->iProduct); + DPRINT1("iSerialNumber %x\n", DeviceDescriptor->iSerialNumber); + DPRINT1("bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations); +} + +//---------------------------------------------------------------------------------------- +VOID +DumpConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + DPRINT1("Dumping ConfigurationDescriptor %x\n", ConfigurationDescriptor); + DPRINT1("bLength %x\n", ConfigurationDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", ConfigurationDescriptor->bDescriptorType); + DPRINT1("wTotalLength %x\n", ConfigurationDescriptor->wTotalLength); + DPRINT1("bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces); + DPRINT1("bConfigurationValue %x\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); + DPRINT1("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); + DPRINT1("MaxPower %x\n", ConfigurationDescriptor->MaxPower); +} + +NTSTATUS +NTAPI +ForwardIrpAndWaitCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + KEVENT Event; + NTSTATUS Status; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; +} + +NTSTATUS +ForwardIrpAndForget( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice = ((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDeviceObject; + + ASSERT(LowerDevice); + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(LowerDevice, Irp); +} + Propchange: branches/usb-bringup/drivers/usb/usbhub_new/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/pdo.c (added) +++ branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Wed May 4 01:07:21 2011 @@ -1,0 +1,282 @@ +ï»¿/* + * PROJECT: ReactOS Universal Serial Bus Hub Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbhub/fdo.c + * PURPOSE: Handle PDO + * PROGRAMMERS: + * Hervé Poussineau (hpoussin(a)reactos.org) + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#define NDEBUG +#include "usbhub.h" + +#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) + +NTSTATUS +USBHUB_PdoHandleInternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + ULONG_PTR Information = 0; + NTSTATUS Status; + + DPRINT1("UsbhubInternalDeviceControlPdo() called\n"); + + Stack = IoGetCurrentIrpStackLocation(Irp); + Status = Irp->IoStatus.Status; + + switch (Stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO: + { + PHUB_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); + if (Irp->AssociatedIrp.SystemBuffer == NULL + || Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID)) + { + Status = STATUS_INVALID_PARAMETER; + } + else + { + PVOID* pHubPointer; + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + pHubPointer = (PVOID*)Irp->AssociatedIrp.SystemBuffer; + // FIXME + *pHubPointer = NULL; + Information = sizeof(PVOID); + Status = STATUS_SUCCESS; + } + break; + } + default: + { + DPRINT1("Unknown IOCTL code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +USBHUB_PdoStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHUB_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + DPRINT1("USBHUB_PdoStartDevice\n"); + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + UNIMPLEMENTED + return Status; +} + +NTSTATUS +USBHUB_PdoQueryId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + OUT ULONG_PTR* Information) +{ + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + ULONG IdType; + PWCHAR SourceString = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + IdType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryId.IdType; + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + switch (IdType) + { + case BusQueryDeviceID: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + SourceString = ChildDeviceExtension->DeviceId; + break; + } + case BusQueryHardwareIDs: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + SourceString = ChildDeviceExtension->HardwareIds; + break; + } + case BusQueryCompatibleIDs: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + SourceString = ChildDeviceExtension->CompatibleIds; + break; + } + case BusQueryInstanceID: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + SourceString = ChildDeviceExtension->InstanceId; + break; + } + default: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); + return STATUS_NOT_SUPPORTED; + } + + *Information = (ULONG_PTR)SourceString; + return Status; +} + +NTSTATUS +USBHUB_PdoQueryDeviceText( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + OUT ULONG_PTR* Information) +{ + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + DEVICE_TEXT_TYPE DeviceTextType; + LCID LocaleId; + + DeviceTextType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.DeviceTextType; + LocaleId = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.LocaleId; + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + switch (DeviceTextType) + { + case DeviceTextDescription: + case DeviceTextLocationInformation: + { + if (DeviceTextType == DeviceTextDescription) + { + *Information = (ULONG_PTR)ChildDeviceExtension->TextDescription; + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + } + else + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); + return STATUS_SUCCESS; + } + default: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown device text type 0x%lx\n", DeviceTextType); + return STATUS_NOT_SUPPORTED; + } +} + +NTSTATUS +USBHUB_PdoHandlePnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG MinorFunction; + PIO_STACK_LOCATION Stack; + ULONG_PTR Information = 0; + NTSTATUS Status; + + Stack = IoGetCurrentIrpStackLocation(Irp); + MinorFunction = Stack->MinorFunction; + + switch (MinorFunction) + { + case IRP_MN_START_DEVICE: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + Status = USBHUB_PdoStartDevice(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + PDEVICE_CAPABILITIES DeviceCapabilities; + ULONG i; + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + + DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; + // FIXME: capabilities can change with connected device + DeviceCapabilities->LockSupported = TRUE; + DeviceCapabilities->EjectSupported = FALSE; + DeviceCapabilities->Removable = FALSE; + DeviceCapabilities->DockDevice = FALSE; + DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->SilentInstall = TRUE; + DeviceCapabilities->RawDeviceOK = FALSE; + DeviceCapabilities->SurpriseRemovalOK = FALSE; + DeviceCapabilities->HardwareDisabled = FALSE; + //DeviceCapabilities->NoDisplayInUI = FALSE; + DeviceCapabilities->DeviceState[0] = PowerDeviceD0; + for (i = 0; i < PowerSystemMaximum; i++) + DeviceCapabilities->DeviceState[i] = PowerDeviceD3; + //DeviceCapabilities->DeviceWake = PowerDeviceUndefined; + DeviceCapabilities->D1Latency = 0; + DeviceCapabilities->D2Latency = 0; + DeviceCapabilities->D3Latency = 0; + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_RESOURCES: + { + PCM_RESOURCE_LIST ResourceList; + + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); + ResourceList = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST)); + if (!ResourceList) + { + DPRINT1("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + ResourceList->Count = 0; + Information = (ULONG_PTR)ResourceList; + Status = STATUS_SUCCESS; + } + break; + } + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + { + PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; + + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + ResourceList = ExAllocatePool(PagedPool, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); + if (!ResourceList) + { + DPRINT1("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + RtlZeroMemory(ResourceList, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); + ResourceList->ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST); + ResourceList->AlternativeLists = 1; + ResourceList->List->Version = 1; + ResourceList->List->Revision = 1; + ResourceList->List->Count = 0; + Information = (ULONG_PTR)ResourceList; + Status = STATUS_SUCCESS; + } + break; + } + case IRP_MN_QUERY_DEVICE_TEXT: + { + Status = USBHUB_PdoQueryDeviceText(DeviceObject, Irp, &Information); + break; + } + case IRP_MN_QUERY_ID: + { + Status = USBHUB_PdoQueryId(DeviceObject, Irp, &Information); + break; + } + default: + { + DPRINT1("ERROR PDO IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + Propchange: branches/usb-bringup/drivers/usb/usbhub_new/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c (added) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Wed May 4 01:07:21 2011 @@ -1,0 +1,199 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Hub Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbhub/fdo.c + * PURPOSE: UsbHub Driver + * PROGRAMMERS: + * Hervé Poussineau (hpoussin(a)reactos.org) + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + + +//#define NDEBUG +#include "usbhub.h" + +NTSTATUS NTAPI +USBHUB_Create( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("USBHUB: IRP_MJ_CREATE\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +USBHUB_Close( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("USBHUB: IRP_MJ_CLOSE\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +USBHUB_Cleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("USBHUB: IRP_MJ_CLEANUP\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + + +NTSTATUS NTAPI +USBHUB_AddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PDEVICE_OBJECT DeviceObject; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + NTSTATUS Status; + + // + // Create the Device Object + // + Status = IoCreateDevice(DriverObject, + sizeof(HUB_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &DeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("USBHUB: IoCreateDevice() failed with status 0x%08lx\n", Status); + return Status; + } + + // + // Zero Hub Extension + // + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + RtlZeroMemory(HubDeviceExtension, sizeof(HUB_DEVICE_EXTENSION)); + + // + // Set this to Fdo + // + HubDeviceExtension->Common.IsFDO = TRUE; + DeviceObject->Flags |= DO_POWER_PAGABLE; + + // + // Attached to lower device + // + //Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); + HubDeviceExtension->LowerDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("USBHUB: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + IoDeleteDevice(DeviceObject); + return Status; + } + + DeviceObject->Flags |= DO_BUFFERED_IO; + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI +USBHUB_IrpStub( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + { + DPRINT1("Usbhub: FDO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + else + { + // + // Cant forward as we are the PDO! + // + DPRINT1("USBHUB: ERROR- PDO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); +#ifndef NDEBUG + DbgBreakPoint(); +#endif + } + + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + + +NTSTATUS NTAPI +USBHUB_DispatchDeviceControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Usbhub: DispatchDeviceControl\n"); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return USBHUB_FdoHandleDeviceControl(DeviceObject, Irp); + else + return USBHUB_IrpStub(DeviceObject, Irp); +} + +NTSTATUS NTAPI +USBHUB_DispatchInternalDeviceControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Usbhub: DispatchInternalDeviceControl\n"); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return USBHUB_IrpStub(DeviceObject, Irp); + else + return USBHUB_PdoHandleInternalDeviceControl(DeviceObject, Irp); +} + +NTSTATUS NTAPI +USBHUB_DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + DPRINT1("USBHUB: DispatchPnp\n"); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return USBHUB_FdoHandlePnp(DeviceObject, Irp); + else + return USBHUB_PdoHandlePnp(DeviceObject, Irp); +} + +NTSTATUS NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + ULONG i; + + DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice; + DPRINT1("USBHUB: DriverEntry\n"); + + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverObject->MajorFunction[i] = USBHUB_IrpStub; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = USBHUB_Create; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = USBHUB_Cleanup; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBHUB_DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBHUB_DispatchInternalDeviceControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = USBHUB_DispatchPnp; + + return STATUS_SUCCESS; +} + Propchange: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h (added) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Wed May 4 01:07:21 2011 @@ -1,0 +1,146 @@ +#pragma once + +#include <ntddk.h> +#include <hubbusif.h> +#include <usbbusif.h> +#include <usbioctl.h> +#include <usb.h> +#include <usbdlib.h> +#include <debug.h> +//BROKEN: #include <usbprotocoldefs.h> +#include <pseh/pseh2.h> + +#define USB_HUB_TAG 'hbsu' +#define USB_MAXCHILDREN 127 + +// Lifted from broken header above +#define C_HUB_LOCAL_POWER 0 +#define C_HUB_OVER_CURRENT 1 +#define PORT_CONNECTION 0 +#define PORT_ENABLE 1 +#define PORT_SUSPEND 2 +#define PORT_OVER_CURRENT 3 +#define PORT_RESET 4 +#define PORT_POWER 8 +#define PORT_LOW_SPEED 9 +#define C_PORT_CONNECTION 16 +#define C_PORT_ENABLE 17 +#define C_PORT_SUSPEND 18 +#define C_PORT_OVER_CURRENT 19 +#define C_PORT_RESET 20 +#define PORT_TEST 21 +#define PORT_INDICATOR 22 + +typedef struct _PORT_STATUS_CHANGE +{ + USHORT Status; + USHORT Change; +} PORT_STATUS_CHANGE, *PPORT_STATUS_CHANGE; + +typedef struct +{ + BOOLEAN IsFDO; +} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + +typedef struct _HUB_CHILDDEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDEVICE_OBJECT ParentDeviceObject; + PWCHAR DeviceId; + PWCHAR InstanceId; + PWCHAR HardwareIds; + PWCHAR CompatibleIds; + PWCHAR TextDescription; + UNICODE_STRING SymbolicLinkName; +} HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION; + +typedef struct _HUB_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDEVICE_OBJECT LowerDeviceObject; + ULONG ChildCount; + PDEVICE_OBJECT ChildDeviceObject[USB_MAXCHILDREN]; + PDEVICE_OBJECT RootHubPhysicalDeviceObject; + PDEVICE_OBJECT RootHubFunctionalDeviceObject; + + ULONG NumberOfHubs; + + PORT_STATUS_CHANGE *PortStatusChange; + URB PendingSCEUrb; + PIRP PendingSCEIrp; + + USB_BUS_INTERFACE_HUB_V5 HubInterface; + USB_BUS_INTERFACE_USBDI_V2 UsbDInterface; + + USB_HUB_DESCRIPTOR HubDescriptor; + USB_DEVICE_DESCRIPTOR HubDeviceDescriptor; + USB_CONFIGURATION_DESCRIPTOR HubConfigDescriptor; + USB_INTERFACE_DESCRIPTOR HubInterfaceDescriptor; + USB_ENDPOINT_DESCRIPTOR HubEndPointDescriptor; + + USB_EXTHUB_INFORMATION_0 UsbExtHubInfo; + USB_DEVICE_INFORMATION_0 DeviceInformation; + + USBD_CONFIGURATION_HANDLE ConfigurationHandle; + USBD_PIPE_HANDLE PipeHandle; + PVOID RootHubHandle; + + UNICODE_STRING SymbolicLinkName; +} HUB_DEVICE_EXTENSION, *PHUB_DEVICE_EXTENSION; + +// createclose.c +NTSTATUS NTAPI +USBHUB_Create( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS NTAPI +USBHUB_Close( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS NTAPI +USBHUB_Cleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +// fdo.c +NTSTATUS +USBHUB_FdoHandleDeviceControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +USBHUB_FdoHandlePnp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +// misc.c +NTSTATUS +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +ForwardIrpAndForget( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +// pdo.c +NTSTATUS +USBHUB_PdoHandlePnp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +USBHUB_PdoHandleInternalDeviceControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +VOID +DumpDeviceDescriptor( + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); + +VOID +DumpConfigurationDescriptor( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); Propchange: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.rc (added) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.rc [iso-8859-1] Wed May 4 01:07:21 2011 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USBHUB Driver API\0" +#define REACTOS_STR_INTERNAL_NAME "usbhub\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbhub.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.rc ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 7 months

[gschneider] 51568: [explorer] Remove debug outputs added in r51524

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue May 3 21:05:41 2011 New Revision: 51568 URL: http://svn.reactos.org/svn/reactos?rev=51568&view=rev Log: [explorer] Remove debug outputs added in r51524 Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Tue May 3 21:05:41 2011 @@ -469,7 +469,7 @@ // forward message to common controls SendMessage(g_Globals._hwndShellView, WM_SYSCOLORCHANGE, 0, 0); - SendMessage(_desktopBar, WM_SYSCOLORCHANGE, 0, 0);OutputDebugStringA("WM_SYSCOLORCHANGE desktop\n"); + SendMessage(_desktopBar, WM_SYSCOLORCHANGE, 0, 0); break; default: def: Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Tue May 3 21:05:41 2011 @@ -345,7 +345,7 @@ case PM_GET_NOTIFYAREA: return (LRESULT)(HWND)_hwndNotify; - case WM_SYSCOLORCHANGE:OutputDebugStringA("WM_SYSCOLORCHANGE desktopbar\n"); + case WM_SYSCOLORCHANGE: /* Forward WM_SYSCOLORCHANGE to common controls */ #ifndef _NO_REBAR SendMessage(_hwndrebar, WM_SYSCOLORCHANGE, 0, 0);

13 years, 7 months

[janderwald] 51567: [USBSTOR] - Implement retrieving string device type from SCSI device type - Handle BusQueryDeviceId - Implement support routines for sending CBW / CSW / Data - Implement retriev...

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue May 3 19:40:03 2011 New Revision: 51567 URL: http://svn.reactos.org/svn/reactos?rev=51567&view=rev Log: [USBSTOR] - Implement retrieving string device type from SCSI device type - Handle BusQueryDeviceId - Implement support routines for sending CBW / CSW / Data - Implement retrieving device type (SCSI inquiry request) - WIP Added: branches/usb-bringup/drivers/usb/usbstor/scsi.c (with props) Modified: branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt branches/usb-bringup/drivers/usb/usbstor/pdo.c branches/usb-bringup/drivers/usb/usbstor/usbstor.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Tue May 3 19:40:03 2011 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbstor SHARED descriptor.c fdo.c misc.c pdo.c usbstor.c usbstor.rc) +add_library(usbstor SHARED descriptor.c fdo.c misc.c pdo.c scsi.c usbstor.c usbstor.rc) set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) Modified: branches/usb-bringup/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/pdo.c [iso-8859-1] Tue May 3 19:40:03 2011 @@ -11,6 +11,221 @@ #include "usbstor.h" +LPCSTR +USBSTOR_GetDeviceType( + IN PUFI_INQUIRY_RESPONSE InquiryData) +{ + // + // check if device type is zero + // + if (InquiryData->DeviceType == 0) + { + // + // direct access device + // + + // + // FIXME: check if floppy + // + return "Disk"; + } + + // + // FIXME: use constant - derrived from http://en.wikipedia.org/wiki/SCSI_Peripheral_Device_Type + // + switch (InquiryData->DeviceType) + { + case 1: + { + // + // sequential device, i.e magnetic tape + // + return "Sequential"; + } + case 4: + { + // + // write once device + // + return "Worm"; + } + case 5: + { + // + // CDROM device + // + return "CdRom"; + } + case 7: + { + // + // optical memory device + // + return "Optical"; + } + case 8: + { + // + // medium change device + // + return "Changer"; + } + default: + { + // + // other device + // + return "CdRom"; + } + } +} + +ULONG +CopyField( + IN PUCHAR Name, + IN PUCHAR Buffer, + IN ULONG MaxLength) +{ + ULONG Index; + + for(Index = 0; Index < MaxLength; Index++) + { + if (Name[Index] == '\0') + return Index; + + Buffer[Index] = Name[Index]; + } + + return MaxLength; +} + + +NTSTATUS +USBSTOR_PdoHandleQueryDeviceId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPDO_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + UCHAR Buffer[100]; + LPCSTR DeviceType; + ULONG Offset = 0, Index; + PUFI_INQUIRY_RESPONSE InquiryData; + ANSI_STRING AnsiString; + UNICODE_STRING DeviceId; + + // + // get device extension + // + DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(DeviceExtension->InquiryData); + + // + // get inquiry data + // + InquiryData = (PUFI_INQUIRY_RESPONSE)DeviceExtension->InquiryData; + + // + // get device type + // + DeviceType = USBSTOR_GetDeviceType(InquiryData); + + // + // lets create device string + // + Offset = sprintf(&Buffer[Offset], "USBSTOR\\%s&Ven_", DeviceType); + + // + // copy vendor id + // + Offset += CopyField(InquiryData->Vendor, &Buffer[Offset], 8); + + // + // copy product string + // + Offset += sprintf(&Buffer[Offset], "&Prod_"); + + // + // copy product identifier + // + Offset += CopyField(InquiryData->Product, &Buffer[Offset], 16); + + // + // copy revision string + // + Offset += sprintf(&Buffer[Offset], "&Rev_"); + + // + // copy revision identifer + // + Offset += CopyField(InquiryData->Revision, &Buffer[Offset], 4); + + // + // FIXME: device serial number + // + Offset +=sprintf(&Buffer[Offset], "\\00000000&%d", DeviceExtension->LUN); + + // + // now convert restricted characters to underscores + // + for(Index = 0; Index < Offset; Index++) + { + if (Buffer[Index] <= ' ' || Buffer[Index] >= 0x7F /* last printable ascii character */ || Buffer[Index] == ',') + { + // + // convert to underscore + // + Buffer[Index] = '_'; + } + } + + // + // now initialize ansi string + // + RtlInitAnsiString(&AnsiString, (PCSZ)Buffer); + + // + // allocate DeviceId string + // + DeviceId.Length = 0; + DeviceId.MaximumLength = (Offset + 2) * sizeof(WCHAR); + DeviceId.Buffer = (LPWSTR)AllocateItem(PagedPool, DeviceId.MaximumLength); + if (!DeviceId.Buffer) + { + // + // no memory + // + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + + // + // convert to unicode + // + Status = RtlAnsiStringToUnicodeString(&DeviceId, &AnsiString, FALSE); + + if (NT_SUCCESS(Status)) + { + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceId.Buffer; + } + + DPRINT1("DeviceId %wZ\n", &DeviceId); + + // + // done + // + return Status; +} + + NTSTATUS USBSTOR_PdoHandleDeviceRelations( IN PDEVICE_OBJECT DeviceObject, @@ -102,9 +317,20 @@ Status = STATUS_NOT_SUPPORTED; break; case IRP_MN_QUERY_ID: - DPRINT1("USBSTOR_PdoHandlePnp: IRP_MN_QUERY_ID unimplemented\n"); + { + if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) + { + // + // handle query device id + // + Status = USBSTOR_PdoHandleQueryDeviceId(DeviceObject, Irp); + break; + } + + DPRINT1("USBSTOR_PdoHandlePnp: IRP_MN_QUERY_ID IdType %x unimplemented\n", IoStack->Parameters.QueryId.IdType); Status = STATUS_NOT_SUPPORTED; break; + } case IRP_MN_REMOVE_DEVICE: DPRINT1("USBSTOR_PdoHandlePnp: IRP_MN_REMOVE_DEVICE unimplemented\n"); Status = STATUS_SUCCESS; @@ -209,6 +435,8 @@ // *ChildDeviceObject = PDO; + USBSTOR_SendInquiryCmd(PDO); + // // done // Added: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c (added) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Tue May 3 19:40:03 2011 @@ -1,0 +1,406 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Storage Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbstor/pdo.c + * PURPOSE: USB block storage device driver. + * PROGRAMMERS: + * James Tabor + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbstor.h" + +NTSTATUS +USBSTOR_BuildCBW( + IN ULONG Tag, + IN ULONG DataTransferLength, + IN UCHAR LUN, + IN UCHAR CommandBlockLength, + IN PUCHAR CommandBlock, + IN OUT PCBW Control) +{ + // + // sanity check + // + ASSERT(CommandBlockLength <= 16); + + // + // now initialize CBW + // + Control->Signature = CBW_SIGNATURE; + Control->Tag = Tag; + Control->DataTransferLength = DataTransferLength; + Control->Flags = 0x80; + Control->LUN = (LUN & MAX_LUN); + Control->CommandBlockLength = CommandBlockLength; + + // + // copy command block + // + RtlCopyMemory(Control->CommandBlock, CommandBlock, CommandBlockLength); + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +USBSTOR_SendCBW( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR CommandBlockLength, + IN PUCHAR CommandBlock, + IN ULONG DataTransferLength, + OUT PCBW *OutControl) +{ + PCBW Control; + NTSTATUS Status; + PURB Urb; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // first allocate CBW + // + Control = (PCBW)AllocateItem(NonPagedPool, 512); + if (!Control) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // first allocate CBW + // + Status = USBSTOR_BuildCBW(0xDEADDEAD, DataTransferLength, PDODeviceExtension->LUN, CommandBlockLength, CommandBlock, Control); + if (!NT_SUCCESS(Status)) + { + // + // failed to build CBW + // + return Status; + } + + // + // now build the urb + // + Urb = (PURB)AllocateItem(NonPagedPool, sizeof(URB)); + if (!Urb) + { + // + // failed to allocate urb + // + FreeItem(Control); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // now initialize the urb + // + Urb->UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); + Urb->UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; + Urb->UrbBulkOrInterruptTransfer.PipeHandle = FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkOutPipeIndex].PipeHandle; + Urb->UrbBulkOrInterruptTransfer.TransferBuffer = (PVOID)Control; + Urb->UrbBulkOrInterruptTransfer.TransferBufferLength = sizeof(CBW); + Urb->UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_OUT | USBD_SHORT_TRANSFER_OK; + + // + // now send urb + // + Status = USBSTOR_SyncUrbRequest(FDODeviceExtension->LowerDeviceObject, Urb); + + // + // free urb + // + FreeItem(Urb); + + // + // store cbw + // + *OutControl = Control; + + // + // return operation status + // + return Status; +} + +NTSTATUS +USBSTOR_SendData( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DataTransferLength, + IN PVOID DataTransfer) +{ + PMDL TransferBufferMDL; + PURB Urb; + NTSTATUS Status; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // allocate mdl for buffer, buffer must be allocated from NonPagedPool + // + TransferBufferMDL = IoAllocateMdl(DataTransfer, DataTransferLength, FALSE, FALSE, NULL); + if (!TransferBufferMDL) + { + // + // failed to allocate MDL + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // build mdl for nonpaged pool + // + MmBuildMdlForNonPagedPool(TransferBufferMDL); + + // + // now build the urb + // + Urb = (PURB)AllocateItem(NonPagedPool, sizeof(URB)); + if (!Urb) + { + // + // failed to allocate urb + // + IoFreeMdl(TransferBufferMDL); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // now initialize the urb + // + Urb->UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); + Urb->UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; + Urb->UrbBulkOrInterruptTransfer.PipeHandle = FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkInPipeIndex].PipeHandle; + Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL = TransferBufferMDL; + Urb->UrbBulkOrInterruptTransfer.TransferBufferLength = DataTransferLength; + Urb->UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; + + // + // now send urb + // + Status = USBSTOR_SyncUrbRequest(FDODeviceExtension->LowerDeviceObject, Urb); + + // + // free urb + // + FreeItem(Urb); + + // + // free mdl + // + IoFreeMdl(TransferBufferMDL); + + // + // done + // + return Status; +} + +NTSTATUS +USBSTOR_SendCSW( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Data, + IN ULONG DataLength, + OUT PCSW OutCSW) +{ + NTSTATUS Status; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PURB Urb; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // now build the urb + // + Urb = (PURB)AllocateItem(NonPagedPool, sizeof(URB)); + if (!Urb) + { + // + // failed to allocate urb + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // now initialize the urb + // + Urb->UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); + Urb->UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; + Urb->UrbBulkOrInterruptTransfer.PipeHandle = FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkInPipeIndex].PipeHandle; + Urb->UrbBulkOrInterruptTransfer.TransferBuffer = Data; + Urb->UrbBulkOrInterruptTransfer.TransferBufferLength = DataLength; + Urb->UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; + + // + // now send urb + // + Status = USBSTOR_SyncUrbRequest(FDODeviceExtension->LowerDeviceObject, Urb); + + if (NT_SUCCESS(Status)) + { + // + // copy csw status + // + RtlCopyMemory(OutCSW, Data, sizeof(CSW)); + } + + // + // free urb + // + FreeItem(Urb); + + // + // done + // + return Status; +} + +NTSTATUS +USBSTOR_SendInquiryCmd( + IN PDEVICE_OBJECT DeviceObject) +{ + UFI_INQUIRY_CMD Cmd; + CSW CSW; + NTSTATUS Status; + PUFI_INQUIRY_RESPONSE Response; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PCBW OutControl; + + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // allocate inquiry response + // + Response = (PUFI_INQUIRY_RESPONSE)AllocateItem(NonPagedPool, sizeof(UFI_INQUIRY_RESPONSE)); + if (!Response) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize inquiry cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); + Cmd.Code = UFI_INQURIY_CODE; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); + Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); + + // + // now send inquiry cmd + // + Status = USBSTOR_SendCBW(DeviceObject, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), &OutControl); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendInquiryCmd> USBSTOR_SendCBW failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // now send inquiry response + // + Status = USBSTOR_SendData(DeviceObject, sizeof(UFI_INQUIRY_RESPONSE), Response); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendInquiryCmd> USBSTOR_SendData failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + DPRINT1("Response %p\n", Response); + DPRINT1("DeviceType %x\n", Response->DeviceType); + DPRINT1("RMB %x\n", Response->RMB); + DPRINT1("Version %x\n", Response->Version); + DPRINT1("Format %x\n", Response->Format); + DPRINT1("Length %x\n", Response->Length); + DPRINT1("Reserved %x\n", Response->Reserved); + DPRINT1("Vendor %c%c%c%c%c%c%c%c\n", Response->Vendor[0], Response->Vendor[1], Response->Vendor[2], Response->Vendor[3], Response->Vendor[4], Response->Vendor[5], Response->Vendor[6], Response->Vendor[7]); + DPRINT1("Product %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n", Response->Product[0], Response->Product[1], Response->Product[2], Response->Product[3], + Response->Product[4], Response->Product[5], Response->Product[6], Response->Product[7], + Response->Product[8], Response->Product[9], Response->Product[10], Response->Product[11], + Response->Product[12], Response->Product[13], Response->Product[14], Response->Product[15]); + + DPRINT1("Revision %c%c%c%c\n", Response->Revision[0], Response->Revision[1], Response->Revision[2], Response->Revision[3]); + + // + // send csw + // + Status = USBSTOR_SendCSW(DeviceObject, OutControl, 512, &CSW); + + DPRINT1("------------------------\n"); + DPRINT1("CSW %p\n", &CSW); + DPRINT1("Signature %x\n", CSW.Signature); + DPRINT1("Tag %x\n", CSW.Tag); + DPRINT1("DataResidue %x\n", CSW.DataResidue); + DPRINT1("Status %x\n", CSW.Status); + + // + // free item + // + FreeItem(OutControl); + + // + // store inquiry data + // + PDODeviceExtension->InquiryData = (PVOID)Response; + + // + // FIXME: handle error + // + ASSERT(CSW.Status == 0); + + + // + // done + // + return Status; +} Propchange: branches/usb-bringup/drivers/usb/usbstor/scsi.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] Tue May 3 19:40:03 2011 @@ -239,9 +239,9 @@ DriverObject->DriverExtension->AddDevice = USBSTOR_AddDevice; // - // driver start i/o routine - // - DriverObject->DriverStartIo = USBSTOR_StartIo; + // FIXME: driver start i/o routine + // + //DriverObject->DriverStartIo = USBSTOR_StartIo; // Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Tue May 3 19:40:03 2011 @@ -52,7 +52,8 @@ { COMMON_DEVICE_EXTENSION Common; PDEVICE_OBJECT LowerDeviceObject; // points to FDO - + UCHAR LUN; // lun id + PVOID InquiryData; // USB SCSI inquiry data }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; @@ -60,6 +61,66 @@ // max lun command identifier // #define USB_BULK_GET_MAX_LUN 0xFE + + +typedef struct +{ + ULONG Signature; // CBW signature + ULONG Tag; // CBW Tag of operation + ULONG DataTransferLength; // data transfer length + UCHAR Flags; // CBW Flags endpoint direction + UCHAR LUN; // lun unit + UCHAR CommandBlockLength; // Command block length + UCHAR CommandBlock[16]; +}CBW, *PCBW; + +#define CBW_SIGNATURE 0x43425355 +#define MAX_LUN 0xF + +typedef struct +{ + ULONG Signature; // CSW signature + ULONG Tag; // CSW tag + ULONG DataResidue; // CSW data transfer diff + UCHAR Status; // CSW status +}CSW, *PCSW; + +//-------------------------------------------------------------------------------------------------------------------------------------------- +// +// UFI INQUIRY command +// +typedef struct +{ + UCHAR Code; // operation code 0x12 + UCHAR LUN; // lun address + UCHAR PageCode; // product data information, always 0x00 + UCHAR Reserved; // reserved 0x00 + UCHAR AllocationLength; // length of inquiry data to be returned, default 36 bytes + UCHAR Reserved1[7]; //reserved bytes 0x00 +}UFI_INQUIRY_CMD, *PUFI_INQUIRY_CMD; + +C_ASSERT(sizeof(UFI_INQUIRY_CMD) == 12); + +#define UFI_INQURIY_CODE 0x12 +#define UFI_INQUIRY_CMD_LEN 0x6 + +// +// UFI INQUIRY command response +// +typedef struct +{ + UCHAR DeviceType; // device type + UCHAR RMB; // removable media bit + UCHAR Version; // contains version 0x00 + UCHAR Format; // response format + UCHAR Length; // additional length + USHORT Reserved; // reserved + UCHAR Vendor[8]; // vendor identification string + UCHAR Product[16]; // product identification string + UCHAR Revision[4]; // product revision code +}UFI_INQUIRY_RESPONSE, *PUFI_INQUIRY_RESPONSE; + +C_ASSERT(sizeof(UFI_INQUIRY_RESPONSE) == 36); //--------------------------------------------------------------------- // @@ -119,6 +180,13 @@ IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension); +NTSTATUS +NTAPI +USBSTOR_SyncForwardIrpCompletionRoutine( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context); + //--------------------------------------------------------------------- // @@ -138,3 +206,10 @@ USBSTOR_GetPipeHandles( IN PFDO_DEVICE_EXTENSION DeviceExtension); +//--------------------------------------------------------------------- +// +// scsi.c routines +// +NTSTATUS +USBSTOR_SendInquiryCmd( + IN PDEVICE_OBJECT DeviceObject);

13 years, 7 months

[ilardig] 51566: [win32k] - Handle font height == 0 also in TextIntGetTextExtentPoint (bug 5305) - Remove hardcoded font height (11) and replace it with the default font height from the device cont...

by ilardig＠svn.reactos.org

Author: ilardig Date: Tue May 3 14:55:52 2011 New Revision: 51566 URL: http://svn.reactos.org/svn/reactos?rev=51566&view=rev Log: [win32k] - Handle font height == 0 also in TextIntGetTextExtentPoint (bug 5305) - Remove hardcoded font height (11) and replace it with the default font height from the device context by Timo. Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Tue May 3 14:55:52 2011 @@ -1569,8 +1569,8 @@ // FT_Set_Pixel_Sizes(ft_face, // TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ -// (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : -// TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); +// (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? +// dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); TEXTOBJ_UnlockText(TextObj); @@ -2165,9 +2165,8 @@ error = FT_Set_Pixel_Sizes(face, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? + dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); if (error) { DPRINT1("Error in setting pixel sizes: %u\n", error); @@ -2228,7 +2227,8 @@ IntUnLockFreeType; Size->cx = (TotalWidth + 32) >> 6; - Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight); + Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? + dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); Size->cy = EngMulDiv(Size->cy, dc->ppdev->gdiinfo.ulLogPixelsY, 72); return TRUE; @@ -2452,9 +2452,8 @@ Error = FT_Set_Pixel_Sizes(Face, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? + dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); IntUnLockFreeType; if (0 != Error) { @@ -3304,9 +3303,8 @@ face, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? + dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); if (error) { DPRINT1("Error in setting pixel sizes: %u\n", error); @@ -3843,8 +3841,8 @@ FT_Set_Pixel_Sizes(face, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? + dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); for (i = FirstChar; i < FirstChar+Count; i++) { @@ -4010,9 +4008,8 @@ FT_Set_Pixel_Sizes(face, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? + dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); for (i = FirstChar; i < FirstChar+Count; i++) {

13 years, 7 months

← Newer
1
...
43
44
45
46
47
48
49
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011