Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[fireball] 51333: [RTL] - Properly check parameters in RtlFindActivationContextSectionString. Almost the same as Wine did, but factored out into a standalone function, improved undocumented flags c...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Apr 14 09:57:08 2011 New Revision: 51333 URL: http://svn.reactos.org/svn/reactos?rev=51333&view=rev Log: [RTL] - Properly check parameters in RtlFindActivationContextSectionString. Almost the same as Wine did, but factored out into a standalone function, improved undocumented flags checks and allowing null data pointer in certain cases. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=51333… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Apr 14 09:57:08 2011 @@ -2667,30 +2667,48 @@ return STATUS_SUCCESS; } +#define FIND_ACTCTX_RETURN_FLAGS 0x00000002 +#define FIND_ACTCTX_RETURN_ASSEMBLY_METADATA 0x00000004 +#define FIND_ACTCTX_VALID_MASK (FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX | FIND_ACTCTX_RETURN_FLAGS | FIND_ACTCTX_RETURN_ASSEMBLY_METADATA) + +NTSTATUS +NTAPI +RtlpFindActivationContextSection_CheckParameters( ULONG flags, const GUID *guid, ULONG section_kind, + UNICODE_STRING *section_name, PACTCTX_SECTION_KEYED_DATA data ) +{ + /* Check general parameter combinations */ + if (!section_name || + (flags & ~FIND_ACTCTX_VALID_MASK) || + ((flags & FIND_ACTCTX_VALID_MASK) && !data) || + (data && data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex))) + { + DPRINT1("invalid parameter\n"); + return STATUS_INVALID_PARAMETER; + } + + /* TODO */ + if (flags & FIND_ACTCTX_RETURN_FLAGS || + flags & FIND_ACTCTX_RETURN_ASSEMBLY_METADATA) + { + DPRINT1("unknown flags %08x\n", flags); + return STATUS_INVALID_PARAMETER; + } + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind, UNICODE_STRING *section_name, PVOID ptr ) { PACTCTX_SECTION_KEYED_DATA data = ptr; - NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; - - if (guid) - { - DPRINT1("expected guid == NULL\n"); - return STATUS_INVALID_PARAMETER; - } - if (flags & ~FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) - { - DPRINT1("unknown flags %08x\n", flags); - return STATUS_INVALID_PARAMETER; - } - if (!data || data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || - !section_name || !section_name->Buffer) - { - DPRINT1("invalid parameter\n"); - return STATUS_INVALID_PARAMETER; - } + NTSTATUS status; + + status = RtlpFindActivationContextSection_CheckParameters(flags, guid, section_kind, section_name, data); + if (!NT_SUCCESS(status)) return status; + + status = STATUS_SXS_KEY_NOT_FOUND; ASSERT(NtCurrentTeb()); ASSERT(NtCurrentTeb()->ActivationContextStackPointer);

13 years, 8 months

[mjmartin] 51332: [Win32k] - Fix implementation of message callbacks, now callbacks can be called across processes. - Fix some comments.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Apr 14 01:21:38 2011 New Revision: 51332 URL: http://svn.reactos.org/svn/reactos?rev=51332&view=rev Log: [Win32k] - Fix implementation of message callbacks, now callbacks can be called across processes. - Fix some comments. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Apr 14 01:21:38 2011 @@ -1425,8 +1425,8 @@ RETURN( FALSE); } - /* If this is not a callback and it can be sent now, then send it. */ - if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + /* If it can be sent now, then send it. */ + if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { if (Win32Thread->TIF_flags & TIF_INCLEANUP) { @@ -1452,11 +1452,20 @@ ObDereferenceObject(Win32Thread->pEThread); IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - } - - - - if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + + if (CompletionCallback) + { + co_IntCallSentMessageCallback(CompletionCallback, + hWnd, + Msg, + CompletionCallbackContext, + Result); + } + } + + + + if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { @@ -1470,6 +1479,12 @@ DPRINT1("MsqSendMessage(): Not enough memory to allocate a message"); RETURN( FALSE); } + + IntReferenceMessageQueue(Window->head.pti->MessageQueue); + /* Take reference on this MessageQueue if its a callback. It will be released + when message is processed or removed from target hwnd MessageQueue */ + if (CompletionCallback) + IntReferenceMessageQueue(Win32Thread->MessageQueue); Message->Msg.hwnd = hWnd; Message->Msg.message = Msg; @@ -1482,8 +1497,6 @@ Message->SenderQueue = NULL; // mjmartin, you are right! This is null. Message->CallBackSenderQueue = Win32Thread->MessageQueue; Message->DispatchingListEntry.Flink = NULL; - - IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = MSQ_NORMAL; @@ -1492,7 +1505,6 @@ InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, TRUE); - IntDereferenceMessageQueue(Window->head.pti->MessageQueue); RETURN(TRUE); 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] Thu Apr 14 01:21:38 2011 @@ -588,6 +588,28 @@ Message->Msg.wParam, Message->Msg.lParam); } + else if ((Message->CompletionCallback) + && (Message->CallBackSenderQueue == MessageQueue)) + { /* Call the callback routine */ + if (Message->QS_Flags & QS_SMRESULT) + { + co_IntCallSentMessageCallback(Message->CompletionCallback, + Message->Msg.hwnd, + Message->Msg.message, + Message->CompletionCallbackContext, + Message->lResult); + /* Set callback to NULL to prevent reentry */ + Message->CompletionCallback = NULL; + } + else + { + /* The message has not been processed yet, reinsert it. */ + RemoveEntryList(&Message->ListEntry); + InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); + DPRINT("Callback Message not processed yet. Requeuing the message\n"); + return (FALSE); + } + } else { /* Call the window procedure. */ Result = co_IntSendMessage( Message->Msg.hwnd, @@ -600,6 +622,22 @@ to be cleaned up on thread termination anymore */ RemoveEntryList(&Message->ListEntry); + /* If the message is a callback, insert it in the callback senders MessageQueue */ + if (Message->CompletionCallback) + { + if (Message->CallBackSenderQueue) + { + Message->lResult = Result; + Message->QS_Flags |= QS_SMRESULT; + + /* insert it in the callers message queue */ + InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); + MsqWakeQueue(Message->CallBackSenderQueue, QS_SENDMESSAGE, TRUE); + IntDereferenceMessageQueue(Message->CallBackSenderQueue); + } + return (TRUE); + } + /* remove the message from the dispatching list if needed, so lock the sender's message queue */ if (Message->SenderQueue) { @@ -635,19 +673,10 @@ KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* Call the callback if the message was sent with SendMessageCallback */ - if (Message->CompletionCallback != NULL) - { - co_IntCallSentMessageCallback(Message->CompletionCallback, - Message->Msg.hwnd, - Message->Msg.message, - Message->CompletionCallbackContext, - Result); - } - - /* Only if the message has a sender was the queue referenced */ + /* if the message has a sender */ if (Message->SenderQueue) { + /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(Message->SenderQueue); IntDereferenceMessageQueue(MessageQueue); } @@ -710,6 +739,11 @@ RemoveEntryList(&SentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, SentMessage->QS_Flags); + /* if it is a callback and this queue is not the sender queue, dereference queue */ + if ((SentMessage->CompletionCallback) && (SentMessage->CallBackSenderQueue != MessageQueue)) + { + IntDereferenceMessageQueue(SentMessage->CallBackSenderQueue); + } /* Only if the message has a sender was the queue referenced */ if ((SentMessage->SenderQueue) && (SentMessage->DispatchingListEntry.Flink != NULL)) @@ -729,7 +763,7 @@ ExFreePool((PVOID)SentMessage->Msg.lParam); } - /* Only if the message has a sender was the queue referenced */ + /* if the message has a sender */ if (SentMessage->SenderQueue) { /* dereference our and the sender's message queue */ @@ -1573,8 +1607,14 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + /* if it is a callback and this queue is not the sender queue, dereference queue */ + if ((CurrentSentMessage->CompletionCallback) && (CurrentSentMessage->CallBackSenderQueue != MessageQueue)) + { + IntDereferenceMessageQueue(CurrentSentMessage->CallBackSenderQueue); + } + DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); - /* Only if the message has a sender was the queue referenced */ + /* Only if the message has a sender was the message in the DispatchingList */ if ((CurrentSentMessage->SenderQueue) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { @@ -1593,7 +1633,7 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* Only if the message has a sender was the queue referenced */ + /* if the message has a sender */ if (CurrentSentMessage->SenderQueue) { /* dereference our and the sender's message queue */ @@ -1613,6 +1653,12 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + /* if it is a callback and this queue is not the sender queue, dereference queue */ + if ((CurrentSentMessage->CompletionCallback) && (CurrentSentMessage->CallBackSenderQueue != MessageQueue)) + { + IntDereferenceMessageQueue(CurrentSentMessage->CallBackSenderQueue); + } + /* remove the message from the dispatching list */ if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) { @@ -1633,7 +1679,7 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* Only if the message has a sender was the queue referenced */ + /* if the message has a sender */ if (CurrentSentMessage->SenderQueue) { /* dereference our and the sender's message queue */

13 years, 8 months

[mkupfer] 51331: remove obsolete object handling

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Apr 13 20:20:16 2011 New Revision: 51331 URL: http://svn.reactos.org/svn/reactos?rev=51331&view=rev Log: remove obsolete object handling Modified: trunk/reactos/base/applications/taskmgr/trayicon.c Modified: trunk/reactos/base/applications/taskmgr/trayicon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/trayicon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/trayicon.c [iso-8859-1] Wed Apr 13 20:20:16 2011 @@ -113,8 +113,6 @@ */ if (hScreenDC) ReleaseDC(NULL, hScreenDC); - if (hOldBitmap) - hBitmap = SelectObject(hDC, hOldBitmap); if (hDC) DeleteDC(hDC); if (hBitmapBrush)

13 years, 8 months

[gadamopoulos] 51330: [explorer] - Use the shell default auto-arrangement positioning. Aloow using custom positioning when configured. This fixes the positioning of icons of the desktop to look lik...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Apr 13 18:25:58 2011 New Revision: 51330 URL: http://svn.reactos.org/svn/reactos?rev=51330&view=rev Log: [explorer] - Use the shell default auto-arrangement positioning. Aloow using custom positioning when configured. This fixes the positioning of icons of the desktop to look like windows Modified: trunk/reactos/base/shell/explorer/desktop/desktop.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] Wed Apr 13 18:25:58 2011 @@ -496,8 +496,6 @@ { _hwndListView = GetNextWindow(hwnd, GW_CHILD); - SetWindowStyle(_hwndListView, GetWindowStyle(_hwndListView)&~LVS_ALIGNMASK);//|LVS_ALIGNTOP|LVS_AUTOARRANGE); - // work around for Windows NT, Win 98, ... // Without this the desktop has mysteriously only a size of 800x600 pixels. ClientRect rect(hwnd); @@ -506,9 +504,8 @@ // subclass background window new BackgroundWindow(_hwndListView); - _icon_algo = 1; // default icon arrangement - - PositionIcons(); + _icon_algo = 0; // default icon arrangement + InitDragDrop(); } @@ -736,6 +733,9 @@ RECT work_area; SystemParametersInfo(SPI_GETWORKAREA, 0, &work_area, 0); + + /* disable default allignment */ + SetWindowStyle(_hwndListView, GetWindowStyle(_hwndListView)&~LVS_ALIGNMASK);//|LVS_ALIGNTOP|LVS_AUTOARRANGE); const POINTS& dir1 = s_align_dir1[_icon_algo]; const POINTS& dir2 = s_align_dir2[_icon_algo];

13 years, 8 months

[akhaldi] 51329: [CMAKE] * Sync with trunk r51323.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 13 08:39:17 2011 New Revision: 51329 URL: http://svn.reactos.org/svn/reactos?rev=51329&view=rev Log: [CMAKE] * Sync with trunk r51323. Added: branches/cmake-bringup/base/applications/cmdutils/doskey/lang/pl-PL.rc - copied unchanged from r51323, trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc branches/cmake-bringup/base/applications/network/ping/lang/cs-CZ.rc - copied unchanged from r51323, trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc branches/cmake-bringup/base/applications/rapps/lang/sv-SE.rc - copied unchanged from r51323, trunk/reactos/base/applications/rapps/lang/sv-SE.rc branches/cmake-bringup/base/applications/sndrec32/lang/cs-CZ.rc - copied unchanged from r51323, trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc branches/cmake-bringup/base/applications/sndrec32/lang/pl-PL.rc - copied unchanged from r51323, trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc branches/cmake-bringup/base/applications/sndvol32/dialog.c - copied unchanged from r51323, trunk/reactos/base/applications/sndvol32/dialog.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/sv-SE.rc - copied unchanged from r51323, trunk/reactos/subsystems/win32/csrss/win32csr/lang/sv-SE.rc Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/cacls/lang/pl-PL.rc branches/cmake-bringup/base/applications/calc/lang/pl-PL.rc branches/cmake-bringup/base/applications/charmap/lang/cs-CZ.rc branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/pl-PL.rc branches/cmake-bringup/base/applications/cmdutils/more/lang/pl-PL.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Pl.rc branches/cmake-bringup/base/applications/dxdiag/lang/pl-PL.rc branches/cmake-bringup/base/applications/findstr/lang/pl-PL.rc branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc branches/cmake-bringup/base/applications/logoff/lang/pl-PL.rc branches/cmake-bringup/base/applications/mmc/lang/pl-PL.rc branches/cmake-bringup/base/applications/mscutils/eventvwr/lang/pl-PL.rc branches/cmake-bringup/base/applications/mscutils/servman/lang/bg-BG.rc branches/cmake-bringup/base/applications/mscutils/servman/lang/pl-PL.rc branches/cmake-bringup/base/applications/mstsc/lang/pl-PL.rc branches/cmake-bringup/base/applications/network/ipconfig/lang/pl-PL.rc branches/cmake-bringup/base/applications/network/ping/ping.rc branches/cmake-bringup/base/applications/notepad/lang/pl-PL.rc branches/cmake-bringup/base/applications/rapps/lang/pl-PL.rc branches/cmake-bringup/base/applications/rapps/rsrc.rc branches/cmake-bringup/base/applications/regedit/lang/pl-PL.rc branches/cmake-bringup/base/applications/sndrec32/rsrc.rc branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt branches/cmake-bringup/base/applications/sndvol32/lang/bg-BG.rc branches/cmake-bringup/base/applications/sndvol32/lang/cs-CZ.rc branches/cmake-bringup/base/applications/sndvol32/lang/de-DE.rc branches/cmake-bringup/base/applications/sndvol32/lang/el-GR.rc branches/cmake-bringup/base/applications/sndvol32/lang/en-US.rc branches/cmake-bringup/base/applications/sndvol32/lang/es-ES.rc branches/cmake-bringup/base/applications/sndvol32/lang/fr-FR.rc branches/cmake-bringup/base/applications/sndvol32/lang/hu-HU.rc branches/cmake-bringup/base/applications/sndvol32/lang/id-ID.rc branches/cmake-bringup/base/applications/sndvol32/lang/it-IT.rc branches/cmake-bringup/base/applications/sndvol32/lang/ja-JP.rc branches/cmake-bringup/base/applications/sndvol32/lang/ko-KR.rc branches/cmake-bringup/base/applications/sndvol32/lang/lt-LT.rc branches/cmake-bringup/base/applications/sndvol32/lang/nl-NL.rc branches/cmake-bringup/base/applications/sndvol32/lang/no-NO.rc branches/cmake-bringup/base/applications/sndvol32/lang/pl-PL.rc branches/cmake-bringup/base/applications/sndvol32/lang/pt-BR.rc branches/cmake-bringup/base/applications/sndvol32/lang/ru-RU.rc branches/cmake-bringup/base/applications/sndvol32/lang/sk-SK.rc branches/cmake-bringup/base/applications/sndvol32/lang/sv-SE.rc branches/cmake-bringup/base/applications/sndvol32/lang/th-TH.rc branches/cmake-bringup/base/applications/sndvol32/lang/uk-UA.rc branches/cmake-bringup/base/applications/sndvol32/misc.c branches/cmake-bringup/base/applications/sndvol32/mixer.c branches/cmake-bringup/base/applications/sndvol32/resources.h branches/cmake-bringup/base/applications/sndvol32/sndvol32.c branches/cmake-bringup/base/applications/sndvol32/sndvol32.h branches/cmake-bringup/base/setup/reactos/lang/cs-CZ.rc branches/cmake-bringup/base/setup/usetup/lang/cs-CZ.h branches/cmake-bringup/base/shell/explorer-new/lang/pl-PL.rc branches/cmake-bringup/base/shell/explorer-new/trayntfy.c branches/cmake-bringup/base/shell/explorer/explorer-pl.rc branches/cmake-bringup/dll/cpl/console/lang/cs-CZ.rc branches/cmake-bringup/dll/cpl/desk/lang/cs-CZ.rc branches/cmake-bringup/dll/cpl/desk/lang/pl-PL.rc branches/cmake-bringup/dll/ntdll/def/ntdll.spec branches/cmake-bringup/dll/ntdll/ldr/ldrinit.c branches/cmake-bringup/dll/ntdll/ldr/ldrpe.c branches/cmake-bringup/dll/win32/advapi32/reg/reg.c branches/cmake-bringup/dll/win32/comctl32/comctl32_ros.diff branches/cmake-bringup/dll/win32/comctl32/listview.c branches/cmake-bringup/dll/win32/kernel32/include/kernel32.h branches/cmake-bringup/dll/win32/kernel32/misc/ldr.c branches/cmake-bringup/dll/win32/netapi32/access.c branches/cmake-bringup/dll/win32/shell32/desktop.c branches/cmake-bringup/dll/win32/shell32/lang/bg-BG.rc branches/cmake-bringup/dll/win32/shell32/lang/ca-ES.rc branches/cmake-bringup/dll/win32/shell32/lang/cs-CZ.rc branches/cmake-bringup/dll/win32/shell32/lang/da-DK.rc branches/cmake-bringup/dll/win32/shell32/lang/de-DE.rc branches/cmake-bringup/dll/win32/shell32/lang/el-GR.rc branches/cmake-bringup/dll/win32/shell32/lang/en-GB.rc branches/cmake-bringup/dll/win32/shell32/lang/en-US.rc branches/cmake-bringup/dll/win32/shell32/lang/es-ES.rc branches/cmake-bringup/dll/win32/shell32/lang/fi-FI.rc branches/cmake-bringup/dll/win32/shell32/lang/fr-FR.rc branches/cmake-bringup/dll/win32/shell32/lang/hu-HU.rc branches/cmake-bringup/dll/win32/shell32/lang/it-IT.rc branches/cmake-bringup/dll/win32/shell32/lang/ja-JP.rc branches/cmake-bringup/dll/win32/shell32/lang/ko-KR.rc branches/cmake-bringup/dll/win32/shell32/lang/nl-NL.rc branches/cmake-bringup/dll/win32/shell32/lang/no-NO.rc branches/cmake-bringup/dll/win32/shell32/lang/pl-PL.rc branches/cmake-bringup/dll/win32/shell32/lang/pt-BR.rc branches/cmake-bringup/dll/win32/shell32/lang/pt-PT.rc branches/cmake-bringup/dll/win32/shell32/lang/ro-RO.rc branches/cmake-bringup/dll/win32/shell32/lang/ru-RU.rc branches/cmake-bringup/dll/win32/shell32/lang/sk-SK.rc branches/cmake-bringup/dll/win32/shell32/lang/sl-SI.rc branches/cmake-bringup/dll/win32/shell32/lang/sv-SE.rc branches/cmake-bringup/dll/win32/shell32/lang/tr-TR.rc branches/cmake-bringup/dll/win32/shell32/lang/uk-UA.rc branches/cmake-bringup/dll/win32/shell32/lang/zh-CN.rc branches/cmake-bringup/dll/win32/shell32/lang/zh-TW.rc branches/cmake-bringup/dll/win32/shell32/shlview.c branches/cmake-bringup/dll/win32/user32/include/user32p.h branches/cmake-bringup/dll/win32/user32/misc/dllmain.c branches/cmake-bringup/dll/win32/user32/user32.spec branches/cmake-bringup/dll/win32/user32/windows/input.c branches/cmake-bringup/drivers/filesystems/npfs/create.c branches/cmake-bringup/include/ndk/rtlfuncs.h branches/cmake-bringup/lib/rtl/actctx.c branches/cmake-bringup/ntoskrnl/cc/view.c branches/cmake-bringup/ntoskrnl/config/cminit.c branches/cmake-bringup/ntoskrnl/config/cmkcbncb.c branches/cmake-bringup/ntoskrnl/config/cmsysini.c branches/cmake-bringup/ntoskrnl/ex/handle.c branches/cmake-bringup/ntoskrnl/include/internal/ex.h branches/cmake-bringup/ntoskrnl/mm/ARM3/mminit.c branches/cmake-bringup/ntoskrnl/ob/obdir.c branches/cmake-bringup/ntoskrnl/ob/obsdcach.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/console.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/bg-BG.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/de-DE.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/el-GR.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/en-US.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/es-ES.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/fr-FR.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/id-ID.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/it-IT.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/ja-JP.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/no-NO.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/pl-PL.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/ru-RU.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/sk-SK.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/uk-UA.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/zh-CN.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/zh-TW.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/resource.h branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc branches/cmake-bringup/subsystems/win32/win32k/include/cursoricon.h branches/cmake-bringup/subsystems/win32/win32k/include/desktop.h branches/cmake-bringup/subsystems/win32/win32k/include/input.h branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h branches/cmake-bringup/subsystems/win32/win32k/include/timer.h branches/cmake-bringup/subsystems/win32/win32k/ntuser/accelerator.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/callback.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/focus.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/hook.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/keyboard.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/menu.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/object.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/simplecall.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/timer.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/cacls/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/charmap/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/more/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/findstr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/logoff/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mmc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/network/ipconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/resources.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/sndvol32.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… Modified: branches/cmake-bringup/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/console/l… Modified: branches/cmake-bringup/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/lang… Modified: branches/cmake-bringup/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/lang… Modified: branches/cmake-bringup/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/def/ntd… Modified: branches/cmake-bringup/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/ldr/ldr… Modified: branches/cmake-bringup/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/ldr/ldr… Modified: branches/cmake-bringup/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… Modified: branches/cmake-bringup/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… Modified: branches/cmake-bringup/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… Modified: branches/cmake-bringup/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi3… Modified: branches/cmake-bringup/dll/win32/shell32/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/rtlfu… Modified: branches/cmake-bringup/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/actctx.c?… Modified: branches/cmake-bringup/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/cc/view.… Modified: branches/cmake-bringup/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/config/c… Modified: branches/cmake-bringup/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/config/c… Modified: branches/cmake-bringup/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/config/c… Modified: branches/cmake-bringup/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/handl… Modified: branches/cmake-bringup/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ob/obdir… Modified: branches/cmake-bringup/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ob/obsdc… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/resource.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

13 years, 8 months

[rharabien] 51328: [GDI32] * DPtoLP/LPtoDP functions should return TRUE even if they get 0 or less points or if pointer to points is invalid. See gdi32:DPtoLP apitest. * Fixes 24 gdi32:DPtoLP apite...

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Apr 13 08:14:37 2011 New Revision: 51328 URL: http://svn.reactos.org/svn/reactos?rev=51328&view=rev Log: [GDI32] * DPtoLP/LPtoDP functions should return TRUE even if they get 0 or less points or if pointer to points is invalid. See gdi32:DPtoLP apitest. * Fixes 24 gdi32:DPtoLP apitests. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Wed Apr 13 08:14:37 2011 @@ -256,18 +256,14 @@ PDC pdc; LPPOINT Points; ULONG Size; - BOOL ret; + BOOL ret = TRUE; + + if (Count <= 0) + return TRUE; pdc = DC_LockDc(hDC); if (!pdc) { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (!UnsafePtsIn || !UnsafePtOut || Count <= 0) - { - DC_UnlockDc(pdc); EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -291,8 +287,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; + /* Do not set last error */ _SEH2_YIELD(goto leave;) } _SEH2_END; @@ -323,8 +318,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; + /* Do not set last error */ } _SEH2_END;

13 years, 8 months

[mjmartin] 51327: [USB\USBEHCI] - Implement ExecuteTransfer to replace SubmitTransfer. - Start implentation for BulkTransfers and needed DMA. This needs much more work to be done correctly. We will...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed Apr 13 04:48:50 2011 New Revision: 51327 URL: http://svn.reactos.org/svn/reactos?rev=51327&view=rev Log: [USB\USBEHCI] - Implement ExecuteTransfer to replace SubmitTransfer. - Start implentation for BulkTransfers and needed DMA. This needs much more work to be done correctly. We will get to it. - Implement URB_FUNCTION_CLASS_INTERFACE. - Add comments. Change 3 of 3. Modified: trunk/reactos/drivers/usb/usbehci/irp.c trunk/reactos/drivers/usb/usbehci/pdo.c trunk/reactos/drivers/usb/usbehci/transfer.c trunk/reactos/drivers/usb/usbehci/transfer.h Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Wed Apr 13 04:48:50 2011 @@ -70,12 +70,16 @@ NTSTATUS HandleUrbRequest(PPDO_DEVICE_EXTENSION PdoDeviceExtension, PIRP Irp) { NTSTATUS Status = STATUS_UNSUCCESSFUL; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; ULONG_PTR Information = 0; PIO_STACK_LOCATION Stack; PUSB_DEVICE UsbDevice = NULL; + PEHCI_HOST_CONTROLLER hcd; URB *Urb; PFDO_DEVICE_EXTENSION FdoDeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) PdoDeviceExtension->ControllerFdo->DeviceExtension; + + hcd = &FdoDeviceExtension->hcd; Stack = IoGetCurrentIrpStackLocation(Irp); ASSERT(Stack); @@ -105,16 +109,62 @@ { case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: { - DPRINT1("URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER UsbDevice %x\n", UsbDevice); + PUSB_ENDPOINT_DESCRIPTOR EndPointDesc; + int i; + + for (i = 0; i < UsbDevice->ActiveInterface->InterfaceDescriptor.bNumEndpoints; i++) + { + EndPointDesc = (PUSB_ENDPOINT_DESCRIPTOR)&UsbDevice->ActiveInterface->EndPoints[i]->EndPointDescriptor; + DPRINT("EndPoint %d Handle %x\n", i, &UsbDevice->ActiveInterface->EndPoints[i]->EndPointDescriptor); + DPRINT("bmAttributes %x\n", EndPointDesc->bmAttributes); + DPRINT("EndPoint is transfer type %x\n", EndPointDesc->bmAttributes & 0x0F); + } + DPRINT("UsbDevice %x, Handle %x\n", UsbDevice, Urb->UrbBulkOrInterruptTransfer.PipeHandle); if (&UsbDevice->ActiveInterface->EndPoints[0]->EndPointDescriptor != Urb->UrbBulkOrInterruptTransfer.PipeHandle) { - DPRINT1("Invalid Parameter, Expected EndPointDescriptor of %x, but got %x\n", &UsbDevice->ActiveInterface->EndPoints[0]->EndPointDescriptor, Urb->UrbBulkOrInterruptTransfer.PipeHandle); - Status = STATUS_INVALID_PARAMETER; + DPRINT("HubDevice %x, UsbDevice %x\n", PdoDeviceExtension->UsbDevices[0], UsbDevice); + if (Urb->UrbBulkOrInterruptTransfer.TransferFlags & USBD_TRANSFER_DIRECTION_IN) + DPRINT1("USBD_TRANSFER_DIRECTION_IN\n"); + if (Urb->UrbBulkOrInterruptTransfer.TransferFlags & USBD_TRANSFER_DIRECTION_OUT) + DPRINT1("USBD_TRANSFER_DIRECTION_OUT\n"); + if (Urb->UrbBulkOrInterruptTransfer.TransferFlags & USBD_SHORT_TRANSFER_OK) + DPRINT1("USBD_SHORT_TRANSFER_OK\n"); + EndPointDesc = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; + DPRINT("EndPoint is transfer type %x\n", EndPointDesc->bmAttributes & 0x0F); + DPRINT("Endpoint Address %x\n", EndPointDesc->bEndpointAddress & 0x0F); + if ((EndPointDesc->bmAttributes & 0x0F) == USB_ENDPOINT_TYPE_BULK) + { + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + + ExecuteTransfer(FdoDeviceExtension->DeviceObject, + UsbDevice, + Urb->UrbBulkOrInterruptTransfer.PipeHandle, + NULL, + Urb->UrbBulkOrInterruptTransfer.TransferFlags, + Urb->UrbBulkOrInterruptTransfer.TransferBuffer ? + Urb->UrbBulkOrInterruptTransfer.TransferBuffer : + (PVOID)Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL, + Urb->UrbBulkOrInterruptTransfer.TransferBuffer ? + Urb->UrbBulkOrInterruptTransfer.TransferBufferLength : 0, + Irp); + } + else + { + DPRINT1("Transfer Type not implemented yet!\n"); + /* FAKE IT */ + Status = STATUS_SUCCESS; + } + + break; + } + if (!Urb->UrbBulkOrInterruptTransfer.TransferBuffer) + { + DPRINT1("TransferBuffer is NULL!\n"); ASSERT(FALSE); break; } - ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer != NULL); RtlZeroMemory(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); if (UsbDevice == PdoDeviceExtension->UsbDevices[0]) @@ -122,9 +172,9 @@ if (Urb->UrbBulkOrInterruptTransfer.TransferFlags & (USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK)) { LONG i; - for (i = 0; i < PdoDeviceExtension->NumberOfPorts; i++) - { - if (PdoDeviceExtension->Ports[i].PortChange) + for (i = 0; i < hcd->ECHICaps.HCSParams.PortCount; i++) + { + if (hcd->Ports[i].PortChange) { DPRINT1("Inform hub driver that port %d has changed\n", i+1); ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((i + 1) & 7); @@ -177,10 +227,7 @@ } if (UsbDevice == PdoDeviceExtension->UsbDevices[0]) { - DPRINT1("ROOTHUB!\n"); BufPtr = (PUCHAR)Urb->UrbControlDescriptorRequest.TransferBuffer; - - DPRINT1("Length %x\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); /* Copy the Device Descriptor */ RtlCopyMemory(BufPtr, &UsbDevice->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); @@ -193,11 +240,17 @@ BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); IoMarkIrpPending(Irp); Status = STATUS_PENDING; - SubmitControlTransfer(&FdoDeviceExtension->hcd, - &CtrlSetup, - Urb->UrbControlDescriptorRequest.TransferBuffer, - Urb->UrbControlDescriptorRequest.TransferBufferLength, - Irp); + ExecuteTransfer(FdoDeviceExtension->DeviceObject, + UsbDevice, + 0, + &CtrlSetup, + 0, + Urb->UrbControlDescriptorRequest.TransferBuffer ? + Urb->UrbControlDescriptorRequest.TransferBuffer : + (PVOID)Urb->UrbControlDescriptorRequest.TransferBufferMDL, + Urb->UrbControlDescriptorRequest.TransferBuffer ? + Urb->UrbControlDescriptorRequest.TransferBufferLength : 0, + Irp); break; } case USB_CONFIGURATION_DESCRIPTOR_TYPE: @@ -270,12 +323,17 @@ BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); IoMarkIrpPending(Irp); Status = STATUS_PENDING; - - SubmitControlTransfer(&FdoDeviceExtension->hcd, - &CtrlSetup, - Urb->UrbControlDescriptorRequest.TransferBuffer, - Urb->UrbControlDescriptorRequest.TransferBufferLength, - Irp); + ExecuteTransfer(FdoDeviceExtension->DeviceObject, + UsbDevice, + 0, + &CtrlSetup, + 0, + Urb->UrbControlDescriptorRequest.TransferBuffer ? + Urb->UrbControlDescriptorRequest.TransferBuffer : + (PVOID)Urb->UrbControlDescriptorRequest.TransferBufferMDL, + Urb->UrbControlDescriptorRequest.TransferBuffer ? + Urb->UrbControlDescriptorRequest.TransferBufferLength : 0, + Irp); break; } default: @@ -290,17 +348,17 @@ PUSBD_INTERFACE_INFORMATION InterfaceInfo; LONG iCount, pCount; - DPRINT1("Selecting Configuration\n"); - DPRINT1("ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); + DPRINT("Selecting Configuration\n"); + DPRINT("ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); + if (Urb->UrbSelectConfiguration.ConfigurationDescriptor) { Urb->UrbSelectConfiguration.ConfigurationHandle = &UsbDevice->ActiveConfig->ConfigurationDescriptor; - DPRINT1("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); - ASSERT(FALSE); + DPRINT("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; - DPRINT1("Length %x\n", InterfaceInfo->Length); - DPRINT1("NumberOfPipes %x\n", InterfaceInfo->NumberOfPipes); + DPRINT("Length %x\n", InterfaceInfo->Length); + DPRINT("NumberOfPipes %x\n", InterfaceInfo->NumberOfPipes); for (iCount = 0; iCount < Urb->UrbSelectConfiguration.ConfigurationDescriptor->bNumInterfaces; iCount++) { @@ -324,6 +382,29 @@ InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((PUCHAR)InterfaceInfo + InterfaceInfo->Length); if (InterfaceInfo->Length == 0) break; } + + if (UsbDevice != PdoDeviceExtension->UsbDevices[0]) + { + DPRINT("Setting Configuration!\n"); + BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + DPRINT1("Input Buffer %x, MDL %x\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, (PVOID)Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); + + ExecuteTransfer(FdoDeviceExtension->DeviceObject, + UsbDevice, + 0, + &CtrlSetup, + 0, + NULL, + 0, + Irp); + break; + } + else + { + DPRINT1("Hub only has one configuration.\n"); + } } else { @@ -334,7 +415,6 @@ } case URB_FUNCTION_SELECT_INTERFACE: { - USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; PUSBD_INTERFACE_INFORMATION InterfaceInfo; int i; @@ -353,12 +433,14 @@ BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); IoMarkIrpPending(Irp); Status = STATUS_PENDING; - - SubmitControlTransfer(&FdoDeviceExtension->hcd, - &CtrlSetup, - NULL, - 0, - Irp); + ExecuteTransfer(FdoDeviceExtension->DeviceObject, + UsbDevice, + 0, + &CtrlSetup, + 0, + NULL, + 0, + Irp); break; } case URB_FUNCTION_CLASS_DEVICE: @@ -425,7 +507,6 @@ } else { - /* FIXME: Handle this correctly */ UsbHubDescr->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); UsbHubDescr->bDescriptorType = 0x29; break; @@ -433,7 +514,7 @@ DPRINT1("USB_DEVICE_CLASS_HUB request\n"); UsbHubDescr->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); UsbHubDescr->bDescriptorType = 0x29; - UsbHubDescr->bNumberOfPorts = PdoDeviceExtension->NumberOfPorts; + UsbHubDescr->bNumberOfPorts = hcd->ECHICaps.HCSParams.PortCount; UsbHubDescr->wHubCharacteristics = 0x0012; UsbHubDescr->bPowerOnToPowerGood = 0x01; UsbHubDescr->bHubControlCurrent = 0x00; @@ -480,10 +561,10 @@ DPRINT("USB_REQUEST_GET_STATUS Port %d\n", Urb->UrbControlVendorClassRequest.Index); ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); - DPRINT("PortStatus %x\n", PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus); - DPRINT("PortChange %x\n", PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange); - ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[0] = PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus; - ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[1] = PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange; + DPRINT("PortStatus %x\n", hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus); + DPRINT("PortChange %x\n", hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange); + ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[0] = hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus; + ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[1] = hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange; break; } case USB_REQUEST_CLEAR_FEATURE: @@ -492,12 +573,12 @@ { case C_PORT_CONNECTION: DPRINT("C_PORT_CONNECTION\n"); - PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_CONNECT; + hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_CONNECT; break; case C_PORT_RESET: DPRINT("C_PORT_RESET\n"); - PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_RESET; - PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus |= USB_PORT_STATUS_ENABLE; + hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_RESET; + hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus |= USB_PORT_STATUS_ENABLE; break; default: DPRINT("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); @@ -507,46 +588,49 @@ } case USB_REQUEST_SET_FEATURE: { - DPRINT("USB_REQUEST_SET_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, + DPRINT1("USB_REQUEST_SET_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, Urb->UrbControlVendorClassRequest.Value); switch(Urb->UrbControlVendorClassRequest.Value) { case PORT_RESET: { - DPRINT("Port Reset %d\n", Urb->UrbControlVendorClassRequest.Index-1); - PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange |= USB_PORT_STATUS_RESET; - PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus &= ~USB_PORT_STATUS_ENABLE; - ResetPort(&FdoDeviceExtension->hcd, Urb->UrbControlVendorClassRequest.Index-1); + DPRINT1("Port Reset %d\n", Urb->UrbControlVendorClassRequest.Index-1); + hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange |= USB_PORT_STATUS_RESET; + hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus &= ~USB_PORT_STATUS_ENABLE; + ResetPort(hcd, Urb->UrbControlVendorClassRequest.Index-1); break; } case PORT_ENABLE: { - DPRINT("PORT_ENABLE not implemented\n"); + DPRINT1("PORT_ENABLE not implemented\n"); break; } case PORT_POWER: { - DPRINT("PORT_POWER not implemented\n"); + DPRINT1("PORT_POWER not implemented\n"); break; } default: { - DPRINT("Unknown Set Feature!\n"); - break; - } - } - - if (!(PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus & 0x8000)) + DPRINT1("Unknown Set Feature!\n"); + break; + } + } + + if (!(hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus & 0x8000)) + { + DPRINT1("------ PortStatus %x\n", hcd->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus); + DPRINT1("Calling CompletePendingURBRequest\n"); + CompletePendingURBRequest(PdoDeviceExtension); - + } break; } case USB_REQUEST_SET_ADDRESS: { DPRINT1("USB_REQUEST_SET_ADDRESS\n"); - ASSERT(FALSE); break; } case USB_REQUEST_GET_DESCRIPTOR: @@ -606,7 +690,35 @@ } case URB_FUNCTION_CLASS_INTERFACE: { + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); + DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); + DPRINT1("TransferBufferLength %x\n", Urb->UrbControlVendorClassRequest.TransferBufferLength); + DPRINT1("TransferBuffer %x\n", Urb->UrbControlVendorClassRequest.TransferBuffer); + DPRINT1("TransferBufferMDL %x\n", Urb->UrbControlVendorClassRequest.TransferBufferMDL); + DPRINT1("RequestTypeReservedBits %x\n", Urb->UrbControlVendorClassRequest.RequestTypeReservedBits); + DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request); + DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value); + DPRINT1("Index %x\n", Urb->UrbControlVendorClassRequest.Index); + CtrlSetup.bmRequestType.B = 0xa1; //FIXME: Const. + CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + ExecuteTransfer(FdoDeviceExtension->DeviceObject, + UsbDevice, + 0, + &CtrlSetup, + 0, + Urb->UrbControlVendorClassRequest.TransferBuffer ? + Urb->UrbControlVendorClassRequest.TransferBuffer : + (PVOID)Urb->UrbControlVendorClassRequest.TransferBufferMDL, + Urb->UrbControlVendorClassRequest.TransferBuffer ? + Urb->UrbControlVendorClassRequest.TransferBufferLength : 0, + Irp); break; } default: @@ -632,8 +744,9 @@ if (IsListEmpty(&DeviceExtension->IrpQueue)) { - DPRINT1("There should have been one SCE request pending\n"); + DPRINT1("There should have been one SCE request pending. Did the usbhub driver load?\n"); KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); + ASSERT(FALSE); return; } NextIrp = RemoveHeadList(&DeviceExtension->IrpQueue); Modified: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Wed Apr 13 04:48:50 2011 @@ -47,12 +47,8 @@ 0x01, /* bNumInterfaces; (1) */ 0x23, /* bConfigurationValue; */ 0x00, /* iConfiguration; */ - 0x40, /* bmAttributes; - Bit 7: must be set, - 6: Self-powered, - 5: Remote wakeup, - 4..0: reserved */ - 0x00 /* MaxPower; */ + 0x40, /* bmAttributes; */ + 0x00 /* MaxPower; */ }; const UCHAR ROOTHUB2_INTERFACE_DESCRIPTOR [] = @@ -66,7 +62,7 @@ 0x09, /* bInterfaceClass; HUB_CLASSCODE */ 0x01, /* bInterfaceSubClass; */ 0x00, /* bInterfaceProtocol: */ - 0x00 /* iInterface; */ + 0x00 /* iInterface; */ }; const UCHAR ROOTHUB2_ENDPOINT_DESCRIPTOR [] = @@ -88,12 +84,14 @@ PIO_STACK_LOCATION Stack = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; ULONG_PTR Information = 0; + PEHCI_HOST_CONTROLLER hcd; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) PdoDeviceExtension->ControllerFdo->DeviceExtension; ASSERT(PdoDeviceExtension->Common.IsFdo == FALSE); + hcd = &FdoDeviceExtension->hcd; Stack = IoGetCurrentIrpStackLocation(Irp); switch(Stack->Parameters.DeviceIoControl.IoControlCode) @@ -108,13 +106,18 @@ UsbDevice = Urb->UrbHeader.UsbdDeviceHandle; + /* If there was no device passed then this URB is for the RootHub */ if (UsbDevice == NULL) UsbDevice = PdoDeviceExtension->UsbDevices[0]; + /* Check if it is a Status Change Endpoint (SCE). The Hub Driver sends this request and miniports mark the IRP pending + if there is no changes on any of the ports. When the DPC of miniport routine detects changes this IRP will be completed. + Based on XEN PV Usb Drivers */ + if ((Urb->UrbHeader.Function == URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER) && (UsbDevice == PdoDeviceExtension->UsbDevices[0])) { - DPRINT1("URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER on SCE\n"); + DPRINT("URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER on SCE\n"); if (Urb->UrbBulkOrInterruptTransfer.PipeHandle != &UsbDevice->ActiveInterface->EndPoints[0]->EndPointDescriptor) { DPRINT1("PipeHandle doesnt match SCE PipeHandle\n"); @@ -123,12 +126,23 @@ /* Queue the Irp first */ QueueURBRequest(PdoDeviceExtension, Irp); - /* Check if there is any connected devices */ - for (i = 0; i < PdoDeviceExtension->NumberOfPorts; i++) - { - if (PdoDeviceExtension->Ports[i].PortChange == 0x01) + /* Check for port changes */ + if (EnumControllerPorts(hcd) == FALSE) + { + DPRINT("No port change\n"); + Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + break; + } + + /* If we reached this point then port status has changed, so check + which port */ + for (i = 0; i < hcd->ECHICaps.HCSParams.PortCount; i++) + { + if (hcd->Ports[i].PortChange == 0x01) { - DPRINT1("Inform hub driver that port %d has changed\n", i+1); + DPRINT1("On SCE request: Inform hub driver that port %d has changed\n", i+1); + ASSERT(FALSE); ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((i + 1) & 7); Information = 0; Status = STATUS_SUCCESS; @@ -143,15 +157,11 @@ } } if (Status == STATUS_SUCCESS) break; - DPRINT1("Queueing IRP\n"); + IoMarkIrpPending(Irp); Status = STATUS_PENDING; break; } - else - { - DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB send to device %x\n", UsbDevice); - } Status = HandleUrbRequest(PdoDeviceExtension, Irp); @@ -186,7 +196,7 @@ } case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: { - DPRINT("Ehci: IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %x\n", Stack->Parameters.Others.Argument2); + DPRINT1("Ehci: IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %x\n", Stack->Parameters.Others.Argument2); if (Stack->Parameters.Others.Argument1) { /* Return the root hubs devicehandle */ @@ -202,12 +212,12 @@ } case IOCTL_INTERNAL_USB_GET_HUB_COUNT: { - DPRINT("Ehci: IOCTL_INTERNAL_USB_GET_HUB_COUNT %x\n", IOCTL_INTERNAL_USB_GET_HUB_COUNT); + DPRINT1("Ehci: IOCTL_INTERNAL_USB_GET_HUB_COUNT %x\n", IOCTL_INTERNAL_USB_GET_HUB_COUNT); ASSERT(Stack->Parameters.Others.Argument1 != NULL); if (Stack->Parameters.Others.Argument1) { - /* FIXME: Determine the number of hubs between the usb device and root hub */ - DPRINT1("RootHubCount %x\n", *(PULONG)Stack->Parameters.Others.Argument1); + /* FIXME: Determine the number of hubs between the usb device and root hub. + For now we have at least one. */ *(PULONG)Stack->Parameters.Others.Argument1 = 1; } Status = STATUS_SUCCESS; @@ -235,15 +245,14 @@ } case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO: { - DPRINT("Ehci: IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO Arg1 %x, Arg2 %x\n", Stack->Parameters.Others.Argument1, Stack->Parameters.Others.Argument2); + DPRINT("IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n"); + /* DDK documents that both the PDO and FDO are returned. However, while writing the UsbHub driver it was determine + that this was not the case. Windows usbehci driver gives the Pdo in both Arguments. Which makes sense as upper level + drivers should not be communicating with FDO. */ if (Stack->Parameters.Others.Argument1) *(PVOID *)Stack->Parameters.Others.Argument1 = FdoDeviceExtension->Pdo; - - /* Windows usbehci driver gives the Pdo in both Arguments. */ if (Stack->Parameters.Others.Argument2) - //*(PVOID *)Stack->Parameters.Others.Argument2 = IoGetAttachedDeviceReference(FdoDeviceExtension->DeviceObject); *(PVOID *)Stack->Parameters.Others.Argument2 = FdoDeviceExtension->Pdo; - Information = 0; Status = STATUS_SUCCESS; break; @@ -254,8 +263,6 @@ DPRINT1("Ehci: IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION\n"); /* FIXME: Set Callback for safe power down */ CallBackInfo = Stack->Parameters.DeviceIoControl.Type3InputBuffer; - DPRINT1("IdleCallback %x\n", CallBackInfo->IdleCallback); - DPRINT1("IdleContext %x\n", CallBackInfo->IdleContext); PdoDeviceExtension->IdleCallback = CallBackInfo->IdleCallback; PdoDeviceExtension->IdleContext = CallBackInfo->IdleContext; @@ -300,6 +307,7 @@ } case BusQueryHardwareIDs: { + /* FIXME: Build from Device Vendor and Device ID */ Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB20&VID8086&PID265C&REV0000") + 1; Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB20&VID8086&PID265C") + 1; Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB20") + 1; @@ -388,7 +396,6 @@ PPDO_DEVICE_EXTENSION PdoDeviceExtension; PFDO_DEVICE_EXTENSION FdoDeviceExtension; UNICODE_STRING InterfaceSymLinkName; - LONG i; DPRINT1("Ehci: PDO StartDevice\n"); PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -397,15 +404,6 @@ /* Create the root hub */ RootHubDevice = InternalCreateUsbDevice(1, 0, NULL, TRUE); - for (i = 0; i < PdoDeviceExtension->NumberOfPorts; i++) - { - PdoDeviceExtension->Ports[i].PortStatus = 0x8000; - PdoDeviceExtension->Ports[i].PortChange = 0; - - if (!FdoDeviceExtension->hcd.ECHICaps.HCSParams.PortPowerControl) - PdoDeviceExtension->Ports[i].PortStatus |= USB_PORT_STATUS_POWER; - } - RtlCopyMemory(&RootHubDevice->DeviceDescriptor, ROOTHUB2_DEVICE_DESCRIPTOR, sizeof(ROOTHUB2_DEVICE_DESCRIPTOR)); @@ -413,7 +411,8 @@ RootHubDevice->DeviceDescriptor.idVendor = FdoDeviceExtension->VendorId; RootHubDevice->DeviceDescriptor.idProduct = FdoDeviceExtension->DeviceId; - /* FIXME: Do something better below */ + /* Here config, interfaces and descriptors are stored. This was duplicated from XEN PV Usb Drivers implementation. + Not sure that it is really needed as the information can be queueried from the device. */ RootHubDevice->Configs = ExAllocatePoolWithTag(NonPagedPool, sizeof(PVOID) * RootHubDevice->DeviceDescriptor.bNumConfigurations, @@ -483,11 +482,11 @@ PPDO_DEVICE_EXTENSION PdoDeviceExtension; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - DPRINT1("BusRelations!!!!!\n"); + DPRINT("BusRelations!!!!!\n"); /* The hub driver has created the new device object and reported to pnp, as a result the pnp manager - has resent this IRP and type, so leave the next SCE request pending until a new device arrives. - Is there a better way to do this */ + has sent this IRP and type, so leave the next SCE request pending until a new device arrives. + Is there a better way to do this? */ ExAcquireFastMutex(&PdoDeviceExtension->ListLock); PdoDeviceExtension->HaltQueue = TRUE; ExReleaseFastMutex(&PdoDeviceExtension->ListLock); @@ -531,7 +530,7 @@ DeviceCapabilities->UINumber = 0; DeviceCapabilities->DeviceD2 = 1; - /* FIXME */ + /* FIXME: Verify these settings are correct */ DeviceCapabilities->HardwareDisabled = FALSE; //DeviceCapabilities->NoDisplayInUI = FALSE; DeviceCapabilities->DeviceState[0] = PowerDeviceD0; Modified: trunk/reactos/drivers/usb/usbehci/transfer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/transf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/transfer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/transfer.c [iso-8859-1] Wed Apr 13 04:48:50 2011 @@ -7,9 +7,20 @@ * Michael Martin (michael.martin(a)reactos.org) */ +/* All QueueHeads, Descriptors and pipe setup packets used by control transfers are allocated from common buffer. + The routines in physmem manages this buffer. Each allocation is aligned to 32bits, which is requirement of USB 2.0. */ + #include "transfer.h" #include <debug.h> + +typedef struct _MAPREGISTERCALLBACKINFO +{ + PVOID MapRegisterBase; + KEVENT Event; +}MAPREGISTERCALLBACKINFO, *PMAPREGISTERCALLBACKINFO; + +/* Fills CtrlSetup parameter with values based on Urb */ VOID BuildSetupPacketFromURB(PEHCI_HOST_CONTROLLER hcd, PURB Urb, PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup) { @@ -76,6 +87,7 @@ /* SET CONFIG */ case URB_FUNCTION_SELECT_CONFIGURATION: + DPRINT1("Bulding data for Select Config\n"); CtrlSetup->bRequest = USB_REQUEST_SET_CONFIGURATION; CtrlSetup->wValue.W = Urb->UrbSelectConfiguration.ConfigurationDescriptor->bConfigurationValue; CtrlSetup->wIndex.W = 0; @@ -131,18 +143,86 @@ } } -BOOLEAN -SubmitControlTransfer(PEHCI_HOST_CONTROLLER hcd, - PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup, - PVOID TransferBuffer, - ULONG TransferBufferLength, - PIRP IrpToComplete) +/* Build a Bulk Transfer with a max transfer of 3 descriptors which each has 5 pointers to one page of memory, paged align of course */ +PQUEUE_HEAD +BuildBulkTransfer(PEHCI_HOST_CONTROLLER hcd, + ULONG DeviceAddress, + USBD_PIPE_HANDLE PipeHandle, + UCHAR PidDirection, + PMDL pMdl, + BOOLEAN FreeMdl) { PQUEUE_HEAD QueueHead; PQUEUE_TRANSFER_DESCRIPTOR Descriptor[3]; - ULONG MdlPhysicalAddr; - PKEVENT Event = NULL; - PMDL pMdl = NULL; + ULONG MdlByteCount = MmGetMdlByteCount(pMdl); + ULONG NeededDescriptorCount = 1; + int i; + + QueueHead = CreateQueueHead(hcd); + QueueHead->EndPointCharacteristics.DeviceAddress = DeviceAddress; + + if (PipeHandle) + { + QueueHead->EndPointCharacteristics.EndPointNumber = ((PUSB_ENDPOINT_DESCRIPTOR)PipeHandle)->bEndpointAddress & 0x0F; + QueueHead->EndPointCharacteristics.MaximumPacketLength = ((PUSB_ENDPOINT_DESCRIPTOR)PipeHandle)->wMaxPacketSize; + } + + QueueHead->FreeMdl = FreeMdl; + QueueHead->Mdl = pMdl; + + /* FIXME: This is totally screwed */ + /* Calculate how many descriptors would be needed to transfer this buffer */ + if (pMdl) + { + if (MdlByteCount < (PAGE_SIZE * 5)) + NeededDescriptorCount = 1; + else if (MdlByteCount < (PAGE_SIZE * 10)) + NeededDescriptorCount = 2; + else if (MdlByteCount < (PAGE_SIZE * 15)) + NeededDescriptorCount = 3; + else + ASSERT(FALSE); + } + /* Limiter Transfers to PAGE_SIZE * 5 * 3, Three Descriptors */ + + QueueHead->NumberOfTransferDescriptors = NeededDescriptorCount; + for (i=0; i< NeededDescriptorCount;i++) + { + Descriptor[i] = CreateDescriptor(hcd, + PidDirection, + 0); + Descriptor[i]->AlternateNextPointer = QueueHead->DeadDescriptor->PhysicalAddr; + + if (i > 0) + { + Descriptor[i-1]->NextDescriptor = Descriptor[i]; + Descriptor[i]->PreviousDescriptor = Descriptor[i-1]; + Descriptor[i-1]->NextPointer = Descriptor[i]->PhysicalAddr; + } + } + + Descriptor[0]->Token.Bits.InterruptOnComplete = TRUE; + + /* Save the first descriptor in the QueueHead */ + QueueHead->FirstTransferDescriptor = Descriptor[0]; + QueueHead->NextPointer = Descriptor[0]->PhysicalAddr; + + return QueueHead; +} + + +/* Builds a QueueHead with 2 to 3 descriptors needed for control transfer + 2 descriptors used for and control request that doesnt return data, such as SetAddress */ +PQUEUE_HEAD +BuildControlTransfer(PEHCI_HOST_CONTROLLER hcd, + ULONG DeviceAddress, + USBD_PIPE_HANDLE PipeHandle, + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup, + PMDL pMdl, + BOOLEAN FreeMdl) +{ + PQUEUE_HEAD QueueHead; + PQUEUE_TRANSFER_DESCRIPTOR Descriptor[3]; PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetupVA, CtrlPhysicalPA; CtrlSetupVA = (PUSB_DEFAULT_PIPE_SETUP_PACKET)AllocateMemory(hcd, @@ -150,57 +230,45 @@ (ULONG*)&CtrlPhysicalPA); RtlCopyMemory(CtrlSetupVA, CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - /* If no Irp then wait on completion */ - if (IrpToComplete == NULL) - { - Event = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); - KeInitializeEvent(Event, NotificationEvent, FALSE); - } - - if (TransferBuffer) - { - /* Allocate Mdl for Buffer */ - pMdl = IoAllocateMdl(TransferBuffer, - TransferBufferLength, - FALSE, - FALSE, - NULL); - - /* Lock Physical Pages */ - MmBuildMdlForNonPagedPool(pMdl); - //MmProbeAndLockPages(pMdl, KernelMode, IoReadAccess); - - MdlPhysicalAddr = MmGetPhysicalAddress((PVOID)TransferBuffer).LowPart; - } QueueHead = CreateQueueHead(hcd); + QueueHead->EndPointCharacteristics.DeviceAddress = DeviceAddress; + if (PipeHandle) + QueueHead->EndPointCharacteristics.EndPointNumber = ((PUSB_ENDPOINT_DESCRIPTOR)PipeHandle)->bEndpointAddress & 0x0F; + + QueueHead->Token.Bits.DataToggle = TRUE; + QueueHead->FreeMdl = FreeMdl; + QueueHead->Mdl = pMdl; Descriptor[0] = CreateDescriptor(hcd, PID_CODE_SETUP_TOKEN, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - Descriptor[0]->Token.Bits.InterruptOnComplete = FALSE; Descriptor[0]->Token.Bits.DataToggle = FALSE; - /* Save the first descriptor */ - QueueHead->TransferDescriptor = Descriptor[0]; - - if (TransferBuffer) + QueueHead->FirstTransferDescriptor = Descriptor[0]; + + if (pMdl) { Descriptor[1] = CreateDescriptor(hcd, PID_CODE_IN_TOKEN, - TransferBufferLength); - } - - Descriptor[2] = CreateDescriptor(hcd, - PID_CODE_OUT_TOKEN, - 0); - - Descriptor[1]->Token.Bits.InterruptOnComplete = FALSE; + MmGetMdlByteCount(pMdl)); + + Descriptor[2] = CreateDescriptor(hcd, + PID_CODE_OUT_TOKEN, + 0); + } + else + { + Descriptor[2] = CreateDescriptor(hcd, + PID_CODE_IN_TOKEN, + 0); + } + + Descriptor[2]->Token.Bits.InterruptOnComplete = TRUE; /* Link the descriptors */ - - if (TransferBuffer) + if (pMdl) { Descriptor[0]->NextDescriptor = Descriptor[1]; Descriptor[1]->NextDescriptor = Descriptor[2]; @@ -213,35 +281,267 @@ Descriptor[2]->PreviousDescriptor = Descriptor[0]; } - /* Assign the descritors buffers */ + /* Assign the descriptor buffers */ Descriptor[0]->BufferPointer[0] = (ULONG)CtrlPhysicalPA; - - if (TransferBuffer) - { - Descriptor[1]->BufferPointer[0] = MdlPhysicalAddr; + Descriptor[0]->BufferPointerVA[0] = (ULONG)CtrlSetupVA; + + if (pMdl) + { Descriptor[0]->NextPointer = Descriptor[1]->PhysicalAddr; - Descriptor[1]->NextPointer = Descriptor[2]->PhysicalAddr; + Descriptor[0]->AlternateNextPointer = Descriptor[2]->PhysicalAddr; + Descriptor[1]->NextPointer = Descriptor[2]->PhysicalAddr; + Descriptor[1]->AlternateNextPointer = Descriptor[2]->PhysicalAddr; } else { Descriptor[0]->NextPointer = Descriptor[2]->PhysicalAddr; + Descriptor[0]->AlternateNextPointer = Descriptor[2]->PhysicalAddr; } QueueHead->NextPointer = Descriptor[0]->PhysicalAddr; + if (pMdl) + QueueHead->NumberOfTransferDescriptors = 3; + else + QueueHead->NumberOfTransferDescriptors = 2; + return QueueHead; +} + + +IO_ALLOCATION_ACTION NTAPI MapRegisterCallBack(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID MapRegisterBase, + PVOID Context) +{ + PMAPREGISTERCALLBACKINFO CallBackInfo = (PMAPREGISTERCALLBACKINFO)Context; + + CallBackInfo->MapRegisterBase = MapRegisterBase; + + KeSetEvent(&CallBackInfo->Event, IO_NO_INCREMENT, FALSE); + return KeepObject; +} + + +NTSTATUS +ExecuteTransfer(PDEVICE_OBJECT DeviceObject, + PUSB_DEVICE UsbDevice, + USBD_PIPE_HANDLE PipeHandle, + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup, + ULONG TransferFlags, + PVOID TransferBufferOrMdl, + ULONG TransferBufferLength, + PIRP IrpToComplete) +{ + PUSB_ENDPOINT_DESCRIPTOR EndPointDesc = NULL; + PEHCI_HOST_CONTROLLER hcd; + PQUEUE_HEAD QueueHead; + PKEVENT CompleteEvent = NULL; + PMAPREGISTERCALLBACKINFO CallBackInfo; + LARGE_INTEGER TimeOut; + PMDL pMdl = NULL; + BOOLEAN FreeMdl = FALSE; + PVOID VirtualAddressOfMdl; + ULONG NumberOfMapRegisters; + KIRQL OldIrql; + NTSTATUS Status = STATUS_SUCCESS; + UCHAR EndPointType, PidDirection; + BOOLEAN IsReadOp = TRUE; + ULONG TransferBtyesOffset, CurrentTransferBytes; + PQUEUE_TRANSFER_DESCRIPTOR Descriptor; + PHYSICAL_ADDRESS PhysicalAddr; + int i,j; + + hcd = &((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->hcd; + + /* If no Irp then we will need to wait on completion */ + if (IrpToComplete == NULL) + { + CompleteEvent = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); + KeInitializeEvent(CompleteEvent, NotificationEvent, FALSE); + } + + CallBackInfo = ExAllocatePool(NonPagedPool, sizeof(MAPREGISTERCALLBACKINFO)); + CallBackInfo->MapRegisterBase = 0; + + KeInitializeEvent(&CallBackInfo->Event, NotificationEvent, FALSE); + + /* Determine EndPoint Type */ + if (!PipeHandle) + { + EndPointType = USB_ENDPOINT_TYPE_CONTROL; + } + else + { + EndPointDesc = (PUSB_ENDPOINT_DESCRIPTOR)PipeHandle; + EndPointType = EndPointDesc->bmAttributes & 0x0F; + } + + if (TransferBufferOrMdl) + { + /* Create MDL for Buffer */ + if (TransferBufferLength) + { + pMdl = IoAllocateMdl(TransferBufferOrMdl, + TransferBufferLength, + FALSE, + FALSE, + NULL); + /* UEHCI created the MDL so it needs to free it */ + FreeMdl = TRUE; + } + else + { + pMdl = TransferBufferOrMdl; + } + MmBuildMdlForNonPagedPool(pMdl); + } + + switch (EndPointType) + { + case USB_ENDPOINT_TYPE_CONTROL: + { + QueueHead = BuildControlTransfer(hcd, + UsbDevice->Address, + PipeHandle, + CtrlSetup, + pMdl, + FreeMdl); + IsReadOp = TRUE; + break; + } + case USB_ENDPOINT_TYPE_BULK: + { + PidDirection = EndPointDesc->bEndpointAddress >> 7; + if (PidDirection) + IsReadOp = FALSE; + + QueueHead = BuildBulkTransfer(hcd, + UsbDevice->Address, + PipeHandle, + PidDirection, + pMdl, + FreeMdl); + + break; + } + case USB_ENDPOINT_TYPE_INTERRUPT: + { + DPRINT1("Interrupt Endpoints not implemented yet!\n"); + break; + } + case USB_ENDPOINT_TYPE_ISOCHRONOUS: + { + DPRINT1("Isochronous Endpoints not implemented yet!\n"); + break; + } + default: + { + DPRINT1("Unknown Endpoint type!!\n"); + break; + } + } QueueHead->IrpToComplete = IrpToComplete; - QueueHead->MdlToFree = pMdl; - QueueHead->Event = Event; - - /* Link in the QueueHead */ - LinkQueueHead(hcd, QueueHead); - + QueueHead->Event = CompleteEvent; + + if (!pMdl) + { + ASSERT(QueueHead->NumberOfTransferDescriptors == 2); + LinkQueueHead(hcd, QueueHead); + if (IrpToComplete == NULL) + { + DPRINT1("Waiting For Completion %x!\n", CompleteEvent); + TimeOut.QuadPart = -10000000; + KeWaitForSingleObject(CompleteEvent, Suspended, KernelMode, FALSE, NULL);//&TimeOut); + DPRINT1("Request Completed\n"); + ExFreePool(CompleteEvent); + } + return Status; + } + //ASSERT(FALSE); + + KeFlushIoBuffers(pMdl, IsReadOp, TRUE); + NumberOfMapRegisters = 15; + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + hcd->pDmaAdapter->DmaOperations->AllocateAdapterChannel(hcd->pDmaAdapter, + ((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ControllerFdo, + NumberOfMapRegisters, + MapRegisterCallBack, + (PVOID)CallBackInfo); + KeLowerIrql(OldIrql); + DPRINT1("Waiting for AdapterChannel\n"); + KeWaitForSingleObject(&CallBackInfo->Event, Suspended, KernelMode, FALSE, NULL); + DPRINT1("Dma controller ready!\n"); + DPRINT1("Getting address for MDL %x\n", pMdl); + + VirtualAddressOfMdl = MmGetMdlVirtualAddress(pMdl); + + TransferBtyesOffset = 0; + while (TransferBtyesOffset < MmGetMdlByteCount(pMdl)) + { + CurrentTransferBytes = MmGetMdlByteCount(pMdl); + Descriptor = QueueHead->FirstTransferDescriptor; + if ((Descriptor->Token.Bits.PIDCode == PID_CODE_SETUP_TOKEN) && (QueueHead->NumberOfTransferDescriptors == 3)) + { + DPRINT1("QueueHead is for endpoint 0\n"); + DPRINT1("MapRegisterBase %x\n", CallBackInfo->MapRegisterBase); + DPRINT1("VirtualAddressOfMdl %x, TransferBytesOffset %x\n", VirtualAddressOfMdl, TransferBtyesOffset); + Descriptor = Descriptor->NextDescriptor; + PhysicalAddr = hcd->pDmaAdapter->DmaOperations->MapTransfer(hcd->pDmaAdapter, + pMdl, + CallBackInfo->MapRegisterBase, + (PVOID)((ULONG_PTR)VirtualAddressOfMdl + TransferBtyesOffset), + &CurrentTransferBytes, + !IsReadOp); + DPRINT1("BufferPointer[0] = %x\n", PhysicalAddr.LowPart); + Descriptor->BufferPointer[0] = PhysicalAddr.LowPart; + DPRINT1("CurrentTransferBytes %x\n", CurrentTransferBytes); + TransferBtyesOffset += CurrentTransferBytes; + LinkQueueHead(hcd, QueueHead); + break; + } + DPRINT1("PID_CODE_SETUP_TOKEN %x, PidDirection %x, NumDesc %x\n", PID_CODE_SETUP_TOKEN, PidDirection, QueueHead->NumberOfTransferDescriptors); + for (i=0; i<QueueHead->NumberOfTransferDescriptors; i++) + { + if (Descriptor->Token.Bits.PIDCode != PID_CODE_SETUP_TOKEN) + { + for (j=0; j<5; j++) + { + PhysicalAddr = hcd->pDmaAdapter->DmaOperations->MapTransfer(hcd->pDmaAdapter, + pMdl, + CallBackInfo->MapRegisterBase, + (PVOID)((ULONG_PTR)VirtualAddressOfMdl + TransferBtyesOffset), + &CurrentTransferBytes, + !IsReadOp); + DPRINT1("BufferPointer[%d] = %x\n", j, PhysicalAddr.LowPart); + Descriptor->BufferPointer[j] = PhysicalAddr.LowPart; + TransferBtyesOffset += CurrentTransferBytes; + if (TransferBtyesOffset >= MmGetMdlByteCount(pMdl)) + break; + } + } + Descriptor = Descriptor->NextDescriptor; + } + LinkQueueHead(hcd, QueueHead); + break; + } + + if (TransferBtyesOffset < MmGetMdlByteCount(pMdl)) ASSERT(FALSE); if (IrpToComplete == NULL) { - DPRINT1("Waiting For Completion %x!\n", Event); - KeWaitForSingleObject(Event, Suspended, KernelMode, FALSE, NULL); - ExFreePool(Event); - } - - return TRUE; + DPRINT1("Waiting For Completion %x!\n", CompleteEvent); + TimeOut.QuadPart = -10000000; + KeWaitForSingleObject(CompleteEvent, Suspended, KernelMode, FALSE, NULL);//&TimeOut); + DPRINT1("Request Completed\n"); + ExFreePool(CompleteEvent); + } + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + hcd->pDmaAdapter->DmaOperations->FreeMapRegisters(hcd->pDmaAdapter, + CallBackInfo->MapRegisterBase, + NumberOfMapRegisters); + + hcd->pDmaAdapter->DmaOperations->FreeAdapterChannel (hcd->pDmaAdapter); + KeLowerIrql(OldIrql); + return Status; } Modified: trunk/reactos/drivers/usb/usbehci/transfer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/transf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/transfer.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/transfer.h [iso-8859-1] Wed Apr 13 04:48:50 2011 @@ -3,18 +3,37 @@ #include "hardware.h" #include "hwiface.h" #include "physmem.h" +#include "usbehci.h" #include <usb.h> #include <ntddk.h> -BOOLEAN -SubmitControlTransfer(PEHCI_HOST_CONTROLLER hcd, - PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup, - PVOID TransferBuffer, - ULONG TransferBufferLength, - PIRP IrpToComplete); +PQUEUE_HEAD +BuildControlTransfer(PEHCI_HOST_CONTROLLER hcd, + ULONG DeviceAddress, + USBD_PIPE_HANDLE PipeHandle, + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup, + PMDL pMdl, + BOOLEAN FreeMdl); + +PQUEUE_HEAD +BuildBulkTransfer(PEHCI_HOST_CONTROLLER hcd, + ULONG DeviceAddress, + USBD_PIPE_HANDLE PipeHandle, + UCHAR PidDirection, + PMDL pMdl, + BOOLEAN FreeMdl); VOID BuildSetupPacketFromURB(PEHCI_HOST_CONTROLLER hcd, PURB Urb, PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup); +NTSTATUS +ExecuteTransfer(PDEVICE_OBJECT DeviceObject, + PUSB_DEVICE UsbDevice, + USBD_PIPE_HANDLE PipeHandle, + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup, + ULONG TransferFlags, + PVOID TransferBufferOrMdl, + ULONG TransferBufferLength, + PIRP IrpToComplete);

13 years, 8 months

[mjmartin] 51326: [USB\USBEHCI] - For common buffer memory, only allocate one page and allocate more as needed. This implementation will most likely be replaced with janderwalds. - Use a safecount ...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed Apr 13 04:43:25 2011 New Revision: 51326 URL: http://svn.reactos.org/svn/reactos?rev=51326&view=rev Log: [USB\USBEHCI] - For common buffer memory, only allocate one page and allocate more as needed. This implementation will most likely be replaced with janderwalds. - Use a safecount while attempting to stop and start the controller, so that an error can be displayed vice doing endless loop for controllers that are misbehaving. - Reorganize a few structuers and remove members of structures that are not used. - Add comments for some of the DirectCall Interface Functions. Change 2 of 3. Modified: trunk/reactos/drivers/usb/usbehci/common.c trunk/reactos/drivers/usb/usbehci/hardware.c trunk/reactos/drivers/usb/usbehci/physmem.c trunk/reactos/drivers/usb/usbehci/physmem.h trunk/reactos/drivers/usb/usbehci/usbehci.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbiffn.c Modified: trunk/reactos/drivers/usb/usbehci/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/common… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] Wed Apr 13 04:43:25 2011 @@ -98,7 +98,7 @@ DPRINT1(" PingState %x\n", QueueHead->Token.Bits.PingState); DPRINT1(" SplitTransactionState %x\n", QueueHead->Token.Bits.SplitTransactionState); DPRINT1(" ErrorCounter %x\n", QueueHead->Token.Bits.ErrorCounter); - DPRINT1(" First TransferDescriptor %x\n", QueueHead->TransferDescriptor); + DPRINT1(" First TransferDescriptor %x\n", QueueHead->FirstTransferDescriptor); } VOID Modified: trunk/reactos/drivers/usb/usbehci/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.c [iso-8859-1] Wed Apr 13 04:43:25 2011 @@ -64,7 +64,7 @@ { ULONG tmp; ULONG OpRegisters = hcd->OpRegisters; - DPRINT1("Reset Port %x\n", Port); + DPRINT("Reset Port %x\n", Port); tmp = READ_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * Port))); if (tmp & 0x400) @@ -95,7 +95,9 @@ if (tmp & 0x100) { DPRINT1("EHCI ERROR: Port Reset did not complete!\n"); - } + ASSERT(FALSE); + } + DPRINT("Reset complete\n"); } VOID @@ -107,7 +109,7 @@ LONG FailSafe; LONG tmp; - DPRINT1("Stopping Ehci controller\n"); + DPRINT("Stopping Ehci controller\n"); WRITE_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_USBINTR), 0); @@ -117,7 +119,7 @@ WRITE_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_USBCMD), tmp); /* Wait for the device to stop */ - for (FailSafe = 100; FailSafe > 1; FailSafe++) + for (FailSafe = 0; FailSafe < 1000; FailSafe++) { KeStallExecutionProcessor(10); tmp = READ_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBSTS)); @@ -129,7 +131,10 @@ } } if (!UsbSts->HCHalted) + { DPRINT1("EHCI ERROR: Controller is not responding to Stop request!\n"); + ASSERT(FALSE); + } } VOID @@ -138,7 +143,7 @@ ULONG OpRegisters = hcd->OpRegisters; PEHCI_USBCMD_CONTENT UsbCmd; PEHCI_USBSTS_CONTEXT UsbSts; - LONG FailSafe; + LONG failSafe; LONG tmp; LONG tmp2; @@ -160,7 +165,7 @@ WRITE_REGISTER_ULONG ((PULONG)(OpRegisters + EHCI_USBCMD), tmp); /* Wait for the device to reset */ - for (FailSafe = 100; FailSafe > 1; FailSafe++) + for (failSafe = 0; failSafe < 1000; failSafe++) { KeStallExecutionProcessor(10); tmp = READ_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBCMD)); @@ -176,6 +181,7 @@ if (UsbCmd->HCReset) { DPRINT1("EHCI ERROR: Controller failed to reset! Will attempt to continue.\n"); + ASSERT(FALSE); } UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; @@ -209,7 +215,7 @@ WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBCMD), tmp); /* Wait for the device to start */ - for (;;) + for (failSafe = 0; failSafe < 1000; failSafe++) { KeStallExecutionProcessor(10); tmp2 = READ_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBSTS)); @@ -222,8 +228,93 @@ DPRINT("Waiting for start, USBSTS: %x\n", READ_REGISTER_ULONG ((PULONG)(OpRegisters + EHCI_USBSTS))); } + if (UsbSts->HCHalted) + { + DPRINT1("EHCI ERROR: Controller failed to start!!!\n"); + ASSERT(FALSE); + } /* Set all port routing to ECHI controller */ WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_CONFIGFLAG), 1); +} + +BOOLEAN +EnumControllerPorts(PEHCI_HOST_CONTROLLER hcd) +{ + ULONG tmp, i, OpRegisters, ChildDeviceCount = 0; + BOOLEAN PortChange = FALSE; + + OpRegisters = (ULONG)hcd->OpRegisters; + /* Loop through the ports */ + for (i = 0; i < hcd->ECHICaps.HCSParams.PortCount; i++) + { + tmp = READ_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * i))); + + /* Check for port change on this port */ + if (tmp & 0x02) + { + DPRINT1("Port Change\n"); + + /* Clear status change */ + tmp = READ_REGISTER_ULONG((PULONG)((OpRegisters + EHCI_PORTSC) + (4 * i))); + tmp |= 0x02; + WRITE_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * i)), tmp); + + PortChange = TRUE; + /* Connect or Disconnect? */ + if (tmp & 0x01) + { + DPRINT1("Device connected on port %d\n", i); + + /* Check if a companion host controller exists */ + if (hcd->ECHICaps.HCSParams.CHCCount) + { + tmp = READ_REGISTER_ULONG((PULONG)((OpRegisters + EHCI_PORTSC) + (4 * i))); + + /* Port should be in disabled state, as per USB 2.0 specs */ + if (tmp & 0x04) + { + DPRINT1("Warning: The port the device has just connected to is not disabled!\n"); + } + + /* Is this non high speed device */ + if (tmp & 0x400) + { + DPRINT1("Non HighSpeed device connected. Releasing ownership.\n"); + /* Release ownership to companion host controller */ + WRITE_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * i)), 0x2000); + continue; + } + } + + KeStallExecutionProcessor(30); + + /* As per USB 2.0 Specs, 9.1.2. Reset the port and clear the status change */ + //tmp |= 0x100 | 0x02; + /* Sanity, Disable port */ + //tmp &= ~0x04; + + //WRITE_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i)), tmp); + + //KeStallExecutionProcessor(20); + + tmp = READ_REGISTER_ULONG((PULONG)((OpRegisters + EHCI_PORTSC) + (4 * i))); + + ChildDeviceCount++; + hcd->Ports[i].PortStatus &= ~0x8000; + DPRINT1("Removed 0x8000\n"); + ASSERT(FALSE); + hcd->Ports[i].PortStatus |= USB_PORT_STATUS_HIGH_SPEED; + hcd->Ports[i].PortStatus |= USB_PORT_STATUS_CONNECT; + hcd->Ports[i].PortChange |= USB_PORT_STATUS_CONNECT; + } + else + { + DPRINT1("Device disconnected on port %d\n", i); + ChildDeviceCount--; + } + } + } + return PortChange; } VOID @@ -241,11 +332,11 @@ PCap->HCSParamsLong = READ_REGISTER_ULONG((PULONG)(CapRegister + 4)); PCap->HCCParams = READ_REGISTER_ULONG((PULONG)(CapRegister + 8)); - DPRINT1("Length %d\n", PCap->Length); - DPRINT1("Reserved %d\n", PCap->Reserved); - DPRINT1("HCIVersion %x\n", PCap->HCIVersion); - DPRINT1("HCSParams %x\n", PCap->HCSParamsLong); - DPRINT1("HCCParams %x\n", PCap->HCCParams); + DPRINT("Length %d\n", PCap->Length); + DPRINT("Reserved %d\n", PCap->Reserved); + DPRINT("HCIVersion %x\n", PCap->HCIVersion); + DPRINT("HCSParams %x\n", PCap->HCSParamsLong); + DPRINT("HCCParams %x\n", PCap->HCCParams); if (PCap->HCCParams & 0x02) DPRINT1("Frame list size is configurable\n"); Modified: trunk/reactos/drivers/usb/usbehci/physmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/physme… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/physmem.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/physmem.c [iso-8859-1] Wed Apr 13 04:43:25 2011 @@ -22,21 +22,32 @@ ULONG AllocateMemory(PEHCI_HOST_CONTROLLER hcd, ULONG Size, ULONG *PhysicalAddress) { - PMEM_HEADER MemoryPage = (PMEM_HEADER)hcd->CommonBufferVA; + PMEM_HEADER MemoryPage = NULL; ULONG PageCount = 0; ULONG NumberOfPages = hcd->CommonBufferSize / PAGE_SIZE; - ULONG BlocksNeeded; + ULONG BlocksNeeded = 0; ULONG i,j, freeCount; ULONG RetAddr = 0; + MemoryPage = (PMEM_HEADER)hcd->CommonBufferVA[0]; Size = ((Size + SMALL_ALLOCATION_SIZE - 1) / SMALL_ALLOCATION_SIZE) * SMALL_ALLOCATION_SIZE; BlocksNeeded = Size / SMALL_ALLOCATION_SIZE; + do { if (MemoryPage->IsFull) { PageCount++; - MemoryPage = (PMEM_HEADER)((ULONG)MemoryPage + PAGE_SIZE); + + if (!(PMEM_HEADER)hcd->CommonBufferVA[PageCount]) + { + hcd->CommonBufferVA[PageCount] = + hcd->pDmaAdapter->DmaOperations->AllocateCommonBuffer(hcd->pDmaAdapter, + PAGE_SIZE, + &hcd->CommonBufferPA[PageCount], + FALSE); + } + MemoryPage = (PMEM_HEADER)hcd->CommonBufferVA[PageCount]; continue; } freeCount = 0; @@ -54,8 +65,9 @@ if ((i-freeCount+1 + BlocksNeeded) > sizeof(MemoryPage->Entry)) { freeCount = 0; - continue; + break; } + if (freeCount == BlocksNeeded) { for (j = 0; j < freeCount; j++) @@ -68,20 +80,35 @@ RetAddr = (ULONG)MemoryPage + (SMALL_ALLOCATION_SIZE * (i - freeCount + 1)) + sizeof(MEM_HEADER); - *PhysicalAddress = (ULONG)hcd->CommonBufferPA.LowPart + (RetAddr - (ULONG)hcd->CommonBufferVA); + *(ULONG*)PhysicalAddress = (ULONG)hcd->CommonBufferPA[PageCount].LowPart + (RetAddr - (ULONG)hcd->CommonBufferVA[PageCount]); + return RetAddr; } } PageCount++; - MemoryPage = (PMEM_HEADER)((ULONG)MemoryPage + PAGE_SIZE); + if (!(PMEM_HEADER)hcd->CommonBufferVA[PageCount]) + { + + hcd->CommonBufferVA[PageCount] = + hcd->pDmaAdapter->DmaOperations->AllocateCommonBuffer(hcd->pDmaAdapter, + PAGE_SIZE, + &hcd->CommonBufferPA[PageCount], + FALSE); + DPRINT1("Allocated CommonBuffer VA %x, PA %x\n", hcd->CommonBufferVA[PageCount], hcd->CommonBufferPA[PageCount]); + } + MemoryPage = (PMEM_HEADER)hcd->CommonBufferVA[PageCount]; + } while (PageCount < NumberOfPages); + + if (PageCount == NumberOfPages) + ASSERT(FALSE); return 0; } VOID -ReleaseMemory(ULONG Address) +ReleaseMemory(PEHCI_HOST_CONTROLLER hcd, ULONG Address) { PMEM_HEADER MemoryPage; ULONG Index, i, BlockSize; @@ -90,9 +117,25 @@ Index = (Address - ((ULONG)MemoryPage + sizeof(MEM_HEADER))) / SMALL_ALLOCATION_SIZE; BlockSize = MemoryPage->Entry[Index].Blocks; + for (i = 0; i < BlockSize; i++) { MemoryPage->Entry[Index + i].InUse = 0; MemoryPage->Entry[Index + i].Blocks = 0; } + + if (MemoryPage != (PMEM_HEADER)hcd->CommonBufferVA[0]) + { + for (i=0; i < sizeof(MemoryPage->Entry) / 2; i++) + { + if ((MemoryPage->Entry[i].InUse) || (MemoryPage->Entry[sizeof(MemoryPage->Entry) - i].InUse)) + return; + } + DPRINT1("Freeing CommonBuffer VA %x, PA %x\n", MemoryPage, MmGetPhysicalAddress(MemoryPage)); + hcd->pDmaAdapter->DmaOperations->FreeCommonBuffer(hcd->pDmaAdapter, + PAGE_SIZE, + MmGetPhysicalAddress(MemoryPage), + MemoryPage, + FALSE); + } } Modified: trunk/reactos/drivers/usb/usbehci/physmem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/physme… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/physmem.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/physmem.h [iso-8859-1] Wed Apr 13 04:43:25 2011 @@ -22,5 +22,4 @@ AllocateMemory(PEHCI_HOST_CONTROLLER hcd, ULONG Size, ULONG *PhysicalAddress); VOID -ReleaseMemory(ULONG Address); - +ReleaseMemory(PEHCI_HOST_CONTROLLER hcd, ULONG Address); Modified: trunk/reactos/drivers/usb/usbehci/usbehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.c [iso-8859-1] Wed Apr 13 04:43:25 2011 @@ -69,7 +69,7 @@ VOID NTAPI DriverUnload(PDRIVER_OBJECT DriverObject) { - DPRINT1("Unloading Driver\n"); + DPRINT("Unloading Driver\n"); /* FIXME: Clean up */ } @@ -94,7 +94,7 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = DispatchInternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; - + DriverObject->DriverUnload = DriverUnload; DPRINT1("Driver entry done\n"); Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Wed Apr 13 04:43:25 2011 @@ -93,14 +93,6 @@ PDEVICE_OBJECT DeviceObject; } COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; -typedef struct _EHCIPORTS -{ - ULONG PortNumber; - ULONG PortType; - USHORT PortStatus; - USHORT PortChange; -} EHCIPORTS, *PEHCIPORTS; - typedef struct _FDO_DEVICE_EXTENSION { COMMON_DEVICE_EXTENSION Common; @@ -109,10 +101,7 @@ PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT Pdo; ULONG DeviceState; - PVOID RootHubDeviceHandle; - PDMA_ADAPTER pDmaAdapter; - ULONG Vector; KIRQL Irql; @@ -125,8 +114,6 @@ KAFFINITY Affinity; - ULONG MapRegisters; - ULONG BusNumber; ULONG BusAddress; ULONG PCIAddress; @@ -148,8 +135,6 @@ BOOLEAN AsyncComplete; - //PULONG ResourceBase; - //ULONG Size; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct _PDO_DEVICE_EXTENSION @@ -168,8 +153,6 @@ RH_INIT_CALLBACK *CallbackRoutine; USB_IDLE_CALLBACK IdleCallback; PVOID IdleContext; - ULONG NumberOfPorts; - EHCIPORTS Ports[32]; KTIMER Timer; KEVENT QueueDrainedEvent; FAST_MUTEX ListLock; Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Wed Apr 13 04:43:25 2011 @@ -7,12 +7,15 @@ * Michael Martin (michael.martin(a)reactos.org) */ +/* Many of these direct calls are documented on http://www.osronline.com */ + #include "usbehci.h" #include <hubbusif.h> #include <usbbusif.h> +#include "hardware.h" #include "transfer.h" -PVOID InternalCreateUsbDevice(UCHAR DeviceNumber, ULONG Port, PUSB_DEVICE Parent, BOOLEAN Hub) +PVOID InternalCreateUsbDevice(ULONG Port, PUSB_DEVICE Parent, BOOLEAN Hub) { PUSB_DEVICE UsbDevicePointer = NULL; @@ -31,7 +34,6 @@ DPRINT1("This is the root hub\n"); } - UsbDevicePointer->Address = 0;//DeviceNumber; UsbDevicePointer->Port = Port - 1; UsbDevicePointer->ParentDevice = Parent; @@ -56,6 +58,11 @@ /* Bus Interface Hub V5 Functions */ + +/* Hub Driver calls this routine for each new device it is informed about on USB Bus + osronline documents that this is where the device address is assigned. It also + states the same for InitializeUsbDevice. This function only gets the device descriptor + from the device and checks that the members for device are correct. */ NTSTATUS USB_BUSIFFN @@ -65,11 +72,18 @@ USHORT PortStatus, USHORT PortNumber) { PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + PEHCI_HOST_CONTROLLER hcd; PUSB_DEVICE UsbDevice; - LONG i = 0; - + LONG i; + + DPRINT1("Ehci: CreateUsbDevice: HubDeviceHandle %x, PortStatus %x, PortNumber %x\n", HubDeviceHandle, PortStatus, PortNumber); + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; - DPRINT1("Ehci: CreateUsbDevice: HubDeviceHandle %x, PortStatus %x, PortNumber %x\n", HubDeviceHandle, PortStatus, PortNumber); + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; + + hcd = &FdoDeviceExtension->hcd; if (PdoDeviceExtension->UsbDevices[0] != HubDeviceHandle) { @@ -77,28 +91,61 @@ return STATUS_DEVICE_NOT_CONNECTED; } - UsbDevice = InternalCreateUsbDevice(PdoDeviceExtension->ChildDeviceCount, PortNumber, HubDeviceHandle, FALSE); - - if (!UsbDevice) - return STATUS_INSUFFICIENT_RESOURCES; - + UsbDevice = NULL; /* Add it to the list */ - while (TRUE) + for (i=0; i < MAX_USB_DEVICES; i++) { if (PdoDeviceExtension->UsbDevices[i] == NULL) { - PdoDeviceExtension->UsbDevices[i] = (PUSB_DEVICE)UsbDevice; + PdoDeviceExtension->UsbDevices[i] = InternalCreateUsbDevice(PortNumber, HubDeviceHandle, FALSE); + + if (!PdoDeviceExtension->UsbDevices[i]) + return STATUS_INSUFFICIENT_RESOURCES; + UsbDevice = PdoDeviceExtension->UsbDevices[i]; break; } - i++; - } - - PdoDeviceExtension->Ports[PortNumber - 1].PortStatus = PortStatus; + } + + /* Check that a device was created */ + if (!UsbDevice) + { + DPRINT1("Too many usb devices attached. Max is %d\n", MAX_USB_DEVICES); + return STATUS_UNSUCCESSFUL; + } + + hcd->Ports[PortNumber - 1].PortStatus = PortStatus; + + /* Get the device descriptor */ + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.HiByte = USB_DEVICE_DESCRIPTOR_TYPE; + CtrlSetup.wIndex.W = 0; + CtrlSetup.wLength = sizeof(USB_DEVICE_DESCRIPTOR); + CtrlSetup.bmRequestType.B = 0x80; + ExecuteTransfer(FdoDeviceExtension->DeviceObject, + UsbDevice, + 0, + &CtrlSetup, + 0, + &UsbDevice->DeviceDescriptor, + sizeof(USB_DEVICE_DESCRIPTOR), + NULL); + + /* Check status and bLength and bDescriptor members */ + if ((UsbDevice->DeviceDescriptor.bLength != 0x12) || (UsbDevice->DeviceDescriptor.bDescriptorType != 0x1)) + { + return STATUS_DEVICE_DATA_ERROR; + } + + DumpDeviceDescriptor(&UsbDevice->DeviceDescriptor); /* Return it */ *NewDevice = UsbDevice; return STATUS_SUCCESS; } + +/* Assigns the device an address, gets the configuration, interface, and endpoint descriptors + from the device. All this data is saved as part of this driver */ NTSTATUS USB_BUSIFFN @@ -107,13 +154,16 @@ PPDO_DEVICE_EXTENSION PdoDeviceExtension; PFDO_DEVICE_EXTENSION FdoDeviceExtension; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + USB_DEVICE_DESCRIPTOR DeviceDesc; PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc; PUSB_INTERFACE_DESCRIPTOR InterfaceDesc; PUSB_ENDPOINT_DESCRIPTOR EndpointDesc; PUSB_DEVICE UsbDevice; PVOID Buffer; PUCHAR Ptr; - LONG i, j, k; + UCHAR NewAddress = 0; + + LONG i, j, k, InitAttept; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; @@ -126,30 +176,90 @@ return STATUS_DEVICE_NOT_CONNECTED; } - CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; - CtrlSetup.wValue.LowByte = 0; - CtrlSetup.wValue.HiByte = USB_DEVICE_DESCRIPTOR_TYPE; - CtrlSetup.wIndex.W = 0; - CtrlSetup.wLength = sizeof(USB_DEVICE_DESCRIPTOR); - CtrlSetup.bmRequestType.B = 0x80; - - SubmitControlTransfer(&FdoDeviceExtension->hcd, - &CtrlSetup, - &UsbDevice->DeviceDescriptor, - sizeof(USB_DEVICE_DESCRIPTOR), - NULL); - - //DumpDeviceDescriptor(&UsbDevice->DeviceDescriptor); - - if (UsbDevice->DeviceDescriptor.bLength != 0x12) - { - DPRINT1("Failed to get Device Descriptor from device connected on port %d\n", UsbDevice->Port); + for (i=0; i<127; i++) + { + if (UsbDevice == PdoDeviceExtension->UsbDevices[i]) + { + NewAddress = i; + break; + } + } + + ASSERT(NewAddress); + + /* Linux drivers make 3 attemps to set the device address because of problems with some devices. Do the same */ + InitAttept = 0; + while (InitAttept < 3) + { + /* Set the device address */ + CtrlSetup.bmRequestType.B = 0x00; + CtrlSetup.bRequest = USB_REQUEST_SET_ADDRESS; + CtrlSetup.wValue.W = NewAddress; + CtrlSetup.wIndex.W = 0; + CtrlSetup.wLength = 0; + + DPRINT1("Setting Address to %x\n", NewAddress); + ExecuteTransfer(PdoDeviceExtension->ControllerFdo, + UsbDevice, + 0, + &CtrlSetup, + 0, + NULL, + 0, + NULL); + + KeStallExecutionProcessor(300 * InitAttept); + + /* Send 0 length packet to endpoint 0 for ack */ +/* + ExecuteTransfer(PdoDeviceExtension->ControllerFdo, + UsbDevice, + 0, + NULL, + 0, + NULL, + 0, + NULL); +*/ + + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.HiByte = USB_DEVICE_DESCRIPTOR_TYPE; + CtrlSetup.wIndex.W = 0; + CtrlSetup.wLength = sizeof(USB_DEVICE_DESCRIPTOR); + CtrlSetup.bmRequestType.B = 0x80; + + UsbDevice->Address = NewAddress; + ExecuteTransfer(FdoDeviceExtension->DeviceObject, + UsbDevice, + 0, + &CtrlSetup, + 0, + &DeviceDesc, + sizeof(USB_DEVICE_DESCRIPTOR), + NULL); + + DPRINT1("Length %d, DescriptorType %d\n", DeviceDesc.bLength, DeviceDesc.bDescriptorType); + if ((DeviceDesc.bLength == 0x12) && (DeviceDesc.bDescriptorType == 0x01)) + break; + + /* If the descriptor was not gotten */ + UsbDevice->Address = 0; + InitAttept++; + } + + if (InitAttept == 3) + { + DPRINT1("Unable to initialize usb device connected on port %d!\n", UsbDevice->Port); + /* FIXME: Should the memory allocated for this device be deleted? */ return STATUS_DEVICE_DATA_ERROR; } + DumpDeviceDescriptor(&DeviceDesc); if (UsbDevice->DeviceDescriptor.bNumConfigurations == 0) { DPRINT1("Device on port %d has no configurations!\n", UsbDevice->Port); + /* FIXME: Should the memory allocated for this device be deleted? */ return STATUS_DEVICE_DATA_ERROR; } UsbDevice->Configs = ExAllocatePoolWithTag(NonPagedPool, @@ -159,6 +269,7 @@ if (!UsbDevice->Configs) { DPRINT1("Out of memory\n"); + /* FIXME: Should the memory allocated for this device be deleted? */ return STATUS_NO_MEMORY; } @@ -167,6 +278,7 @@ if (!Buffer) { DPRINT1("Out of memory\n"); + /* FIXME: Should the memory allocated for this device be deleted? */ return STATUS_NO_MEMORY; } @@ -184,16 +296,18 @@ CtrlSetup.wValue.HiByte = USB_CONFIGURATION_DESCRIPTOR_TYPE; CtrlSetup.wIndex.W = 0; CtrlSetup.wLength = PAGE_SIZE; - - SubmitControlTransfer(&FdoDeviceExtension->hcd, - &CtrlSetup, - Buffer, - PAGE_SIZE, - NULL); + ExecuteTransfer(PdoDeviceExtension->ControllerFdo, + UsbDevice, + 0, + &CtrlSetup, + 0, + Buffer, + PAGE_SIZE, + NULL); ConfigDesc = (PUSB_CONFIGURATION_DESCRIPTOR)Ptr; - //DumpFullConfigurationDescriptor(ConfigDesc); + DumpFullConfigurationDescriptor(ConfigDesc); ASSERT(ConfigDesc->wTotalLength <= PAGE_SIZE); UsbDevice->Configs[i] = ExAllocatePoolWithTag(NonPagedPool, @@ -230,30 +344,13 @@ UsbDevice->ActiveConfig = UsbDevice->Configs[0]; UsbDevice->ActiveInterface = UsbDevice->Configs[0]->Interfaces[0]; - return STATUS_SUCCESS; - - /* Set the device address */ - CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; - CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; - CtrlSetup.bmRequestType._BM.Reserved = 0; - CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_HOST_TO_DEVICE; - CtrlSetup.bRequest = USB_REQUEST_SET_ADDRESS; - CtrlSetup.wValue.W = UsbDevice->Address; - CtrlSetup.wIndex.W = 0; - CtrlSetup.wLength = 0; - - DPRINT1("Setting Address to %x\n", UsbDevice->Address); - - SubmitControlTransfer(&FdoDeviceExtension->hcd, - &CtrlSetup, - NULL, - 0, - NULL); - - PdoDeviceExtension->UsbDevices[i]->DeviceState = DEVICEINTIALIZED; - return STATUS_SUCCESS; -} - + + UsbDevice->DeviceState = DEVICEINTIALIZED; + + return STATUS_SUCCESS; +} + +/* Return the descriptors that will fit. Descriptors were saved when the InitializeUsbDevice function was called */ NTSTATUS USB_BUSIFFN GetUsbDescriptors(PVOID BusContext, @@ -290,6 +387,7 @@ return STATUS_SUCCESS; } +/* Documented http://www.osronline.com/ddkx/buses/usbinterkr_1m7m.htm */ NTSTATUS USB_BUSIFFN RemoveUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle, ULONG Flags) @@ -347,15 +445,18 @@ return STATUS_SUCCESS; } +/* Documented at http://www.osronline.com/ddkx/buses/usbinterkr_01te.htm */ NTSTATUS USB_BUSIFFN RestoreUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE OldDeviceHandle, PUSB_DEVICE_HANDLE NewDeviceHandle) { PUSB_DEVICE OldUsbDevice; PUSB_DEVICE NewUsbDevice; + PUSB_CONFIGURATION ConfigToDelete; + int i; DPRINT1("Ehci: RestoreUsbDevice %x, %x, %x\n", BusContext, OldDeviceHandle, NewDeviceHandle); - +ASSERT(FALSE); OldUsbDevice = DeviceHandleToUsbDevice(BusContext, OldDeviceHandle); NewUsbDevice = DeviceHandleToUsbDevice(BusContext, NewDeviceHandle); @@ -380,9 +481,6 @@ if ((OldUsbDevice->DeviceDescriptor.idVendor == NewUsbDevice->DeviceDescriptor.idVendor) && (OldUsbDevice->DeviceDescriptor.idProduct == NewUsbDevice->DeviceDescriptor.idProduct)) { - PUSB_CONFIGURATION ConfigToDelete; - int i; - NewUsbDevice->DeviceState &= ~DEVICEBUSY; NewUsbDevice->DeviceState &= ~DEVICEREMOVED; @@ -407,6 +505,7 @@ } } +/* FIXME: Research this */ NTSTATUS USB_BUSIFFN GetPortHackFlags(PVOID BusContext, PULONG Flags) @@ -496,6 +595,9 @@ PUSB_CONTROLLER_INFORMATION_0 ControllerInfo; DPRINT1("Ehci: GetControllerInformation called\n"); + + if (!LengthReturned) + return STATUS_INVALID_PARAMETER; ControllerInfo = ControllerInformationBuffer; @@ -653,7 +755,7 @@ DPRINT1("Invalid DeviceHandle or device not connected\n"); } - DPRINT1("FlushTransfers\n"); + DPRINT1("FlushTransfers not implemented.\n"); } VOID @@ -725,5 +827,6 @@ EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2) { DPRINT1("Ehci: EnumLogEntry called %x, %x, %x, %x\n", DriverTag, EnumTag, P1, P2); - return STATUS_SUCCESS; -} + + return STATUS_SUCCESS; +}

13 years, 8 months

[mjmartin] 51325: [USB\USBEHCI] - Fix linking of QueueHeads. Implement LinkQueueHeadToCompletedList and CleanupAsyncList. These functions are used to software link the completed queueheads to a com...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed Apr 13 04:33:14 2011 New Revision: 51325 URL: http://svn.reactos.org/svn/reactos?rev=51325&view=rev Log: [USB\USBEHCI] - Fix linking of QueueHeads. Implement LinkQueueHeadToCompletedList and CleanupAsyncList. These functions are used to software link the completed queueheads to a completed list. Only after the driver handshakes with the controller can this memory be freed. Fix a few incorrect values for QueueHead. - EhciDefferedRoutine: Implement handling of completed QueueHeads by removing them from the AnsycList and setting any errors for failure. - Reserved a QueueHead that will always be in the AsyncList Address Register. By setting it as the Head of Reclamation the controller can know when it has reached the end of the QueueHead list. - Remove all code from FdoDispatchInternalDeviceControl. This should never be called by upper level drivers. Change 1 of 3. Modified: trunk/reactos/drivers/usb/usbehci/fdo.c trunk/reactos/drivers/usb/usbehci/hardware.h trunk/reactos/drivers/usb/usbehci/hwiface.c trunk/reactos/drivers/usb/usbehci/hwiface.h Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Wed Apr 13 04:33:14 2011 @@ -21,10 +21,11 @@ ULONG tmp; ULONG OpRegisters; PEHCI_HOST_CONTROLLER hcd; - LONG i; + int i; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeferredContext; + /* Nothing is valid if the Pdo is NULL */ if (!FdoDeviceExtension->Pdo) { DPRINT1("PDO not set yet!\n"); @@ -36,127 +37,183 @@ OpRegisters = (ULONG)FdoDeviceExtension->hcd.OpRegisters; hcd = &FdoDeviceExtension->hcd; - + CStatus = (ULONG) SystemArgument2; - - /* TD retired or Error */ - if (CStatus & (EHCI_STS_INT | EHCI_ERROR_INT)) - { - DPRINT("Asyn Complete!\n"); - ULONG CurrentAddr, OffSet; - PQUEUE_HEAD CompletedQH, NextQH; - PQUEUE_TRANSFER_DESCRIPTOR CompletedTD, NextTD; - - /* AsyncListAddr Register will have the next QueueHead to execute */ - CurrentAddr = GetAsyncListQueueRegister(hcd); - - /* Calculate the VA for the next QueueHead */ - OffSet = CurrentAddr - (ULONG)FdoDeviceExtension->hcd.CommonBufferPA.LowPart; - NextQH = (PQUEUE_HEAD)((ULONG)FdoDeviceExtension->hcd.CommonBufferVA + OffSet); - - /* Get the previous QueueHead which is the QueueHead just completed */ - CompletedQH = NextQH->PreviousQueueHead; - ASSERT(CompletedQH); - DPRINT("CompletedQH %x\n", CompletedQH); - - //DumpQueueHead(CompletedQH); - - /* Free memory for the Descriptors */ - CompletedTD = CompletedQH->TransferDescriptor; - NextTD = CompletedTD; - while (NextTD) - { - CompletedTD = NextTD; - NextTD = NextTD->NextDescriptor; - FreeDescriptor(CompletedTD); - } - - /* If the Event is set then release waiter */ - if (CompletedQH->Event) - { - KeSetEvent(CompletedQH->Event, IO_NO_INCREMENT, FALSE); - } - - /* Free the Mdl if there was one */ - if(CompletedQH->MdlToFree) - IoFreeMdl(CompletedQH->MdlToFree); - - /* Is there an IRP that needs to be completed */ - if (CompletedQH->IrpToComplete) - { - PIRP Irp; - PIO_STACK_LOCATION Stack; - PURB Urb; - - Irp = CompletedQH->IrpToComplete; - Stack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(Stack); - Urb = (PURB) Stack->Parameters.Others.Argument1; - - /* Check for error */ - if (CStatus & EHCI_ERROR_INT) + /* If Reclamation (The QueueHead list has been transveresed twice), + look through the queuehead list and find queue heads that have been + 1. Halted due to error + 2. Transfer completion. + Move these QueueHeads to a temporary list that is used to pend memory release. + Either an Event is signalled or an Irp is completed depending on what was set during transfer request + setup. Next software issue a "DoorBell" that informs the controller the Asynchronous List is about to + be modified. + After the controller acks this with interrupt, the memory for queueheads are released. */ + + if (CStatus & (EHCI_STS_RECL| EHCI_STS_INT | EHCI_ERROR_INT)) + { + PQUEUE_HEAD CurrentQH; + PQUEUE_TRANSFER_DESCRIPTOR CurrentTD; + BOOLEAN QueueHeadCompleted; + + /* Go through the list and delink completed (not active) QueueHeads */ + CurrentQH = hcd->AsyncListQueue; + CurrentQH = CurrentQH->NextQueueHead; + + while ((CurrentQH) && (CurrentQH != hcd->AsyncListQueue)) + { + DPRINT1("Checking QueueHead %x, Next %x\n", CurrentQH, CurrentQH->NextQueueHead); + DPRINT1("Active %d, Halted %d\n", CurrentQH->Token.Bits.Active, CurrentQH->Token.Bits.Halted); + + /* if the QueueHead has completed */ + if (!CurrentQH->Token.Bits.Active) { - /* Haled bit should be set */ - if (CompletedQH->Token.Bits.Halted) + /* Assume success */ + USBD_STATUS UrbStatus = USBD_STATUS_SUCCESS; + + QueueHeadCompleted = TRUE; + + /* Check the Status of the QueueHead */ + if (CurrentQH->Token.Bits.Halted) { - if (CompletedQH->Token.Bits.DataBufferError) + if (CurrentQH->Token.Bits.DataBufferError) { DPRINT1("Data buffer error\n"); - Urb->UrbHeader.Status = USBD_STATUS_DATA_BUFFER_ERROR; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; + UrbStatus = USBD_STATUS_DATA_BUFFER_ERROR; } - else if (CompletedQH->Token.Bits.BabbleDetected) + else if (CurrentQH->Token.Bits.BabbleDetected) { DPRINT1("Babble Detected\n"); - Urb->UrbHeader.Status = USBD_STATUS_BABBLE_DETECTED; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; + UrbStatus = USBD_STATUS_BABBLE_DETECTED; } else { DPRINT1("Stall PID\n"); - Urb->UrbHeader.Status = USBD_STATUS_STALL_PID; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; + UrbStatus = USBD_STATUS_STALL_PID; } } + + /* Check the Descriptors */ + CurrentTD = CurrentQH->FirstTransferDescriptor; + while (CurrentTD) + { + /* FIXME: What needs to happen if the QueueHead was marked as complete but descriptors was not */ + if ((CurrentTD->Token.Bits.Active) || (CurrentTD->Token.Bits.Halted)) + { + /* The descriptor was not completed */ + QueueHeadCompleted = FALSE; + DPRINT1("QueueHead was marked as completed but contains descriptors that were not completed\n"); + ASSERT(FALSE); + break; + } + CurrentTD = CurrentTD->NextDescriptor; + } + + if ((QueueHeadCompleted) || (CurrentQH->Token.Bits.Halted)) + { + PQUEUE_HEAD FreeQH; + + FreeQH = CurrentQH; + CurrentQH = CurrentQH->NextQueueHead; + DPRINT1("QueueHead %x has completed. Removing\n", FreeQH); + /* Move it into the completed list */ + UnlinkQueueHead(hcd, FreeQH); + LinkQueueHeadToCompletedList(hcd, FreeQH); + DPRINT1("Remove done\n"); + + /* If the Event is set then the caller is waiting on completion */ + if (FreeQH->Event) + { + KeSetEvent(FreeQH->Event, IO_NO_INCREMENT, FALSE); + } + + /* If there is an IrpToComplete then the caller did not wait on completion + and the IRP was marked as PENDING. Complete it now. */ + if (FreeQH->IrpToComplete) + { + PIRP Irp; + PIO_STACK_LOCATION Stack; + PURB Urb; + + Irp = FreeQH->IrpToComplete; + Stack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(Stack); + Urb = (PURB) Stack->Parameters.Others.Argument1; + ASSERT(Urb); + + /* Check for error */ + if (CStatus & EHCI_ERROR_INT) + { + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + /* Set BufferLength to 0 as there was error */ + if (Urb->UrbHeader.Function == URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE) + { + Urb->UrbControlDescriptorRequest.TransferBufferLength = 0; + } + DPRINT1("There was an Error, TransferBufferLength set to 0\n"); + } + else + { + if (Urb->UrbHeader.Function == URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE) + { + if (Urb->UrbControlDescriptorRequest.TransferBufferLength >= + ((PUSB_COMMON_DESCRIPTOR)(Urb->UrbControlDescriptorRequest.TransferBuffer))->bLength) + { + Urb->UrbControlDescriptorRequest.TransferBufferLength = + ((PUSB_COMMON_DESCRIPTOR)(Urb->UrbControlDescriptorRequest.TransferBuffer))->bLength; + } + } + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + DPRINT1("Completing Irp\n"); + } + Urb->UrbHeader.Status = UrbStatus; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + /* FIXME: Move to static function */ + PEHCI_USBCMD_CONTENT UsbCmd; + /* Ring the DoorBell so that host controller knows a QueueHead was removed */ + DPRINT1("Ringing Doorbell\n"); + tmp = READ_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + UsbCmd->DoorBell = TRUE; + WRITE_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_USBCMD), tmp); + continue; + } } - else - { - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - DPRINT1("Completing Irp\n"); - - } - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - - /* Unlink QueueHead */ - UnlinkQueueHead(hcd, CompletedQH); - /* Wait for a complete AsnycList tranversal before deleting? */ - DeleteQueueHead(CompletedQH); - } - - /* Port Change */ + + CurrentQH = CurrentQH->NextQueueHead; + } + } + + + /* Port Change. */ + /* FIXME: Use EnumControllerPorts instead */ if (CStatus & EHCI_STS_PCD) { /* Loop through the ports */ - for (i = 0; i < FdoDeviceExtension->hcd.ECHICaps.HCSParams.PortCount; i++) + for (i = 0; i < hcd->ECHICaps.HCSParams.PortCount; i++) { tmp = READ_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * i))); /* Check for port change on this port */ if (tmp & 0x02) { + /* Clear status change */ + tmp = READ_REGISTER_ULONG((PULONG)((OpRegisters + EHCI_PORTSC) + (4 * i))); + tmp |= 0x02; + WRITE_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * i)), tmp); + /* Connect or Disconnect? */ if (tmp & 0x01) { DPRINT1("Device connected on port %d\n", i); /* Check if a companion host controller exists */ - if (FdoDeviceExtension->hcd.ECHICaps.HCSParams.CHCCount) + if (hcd->ECHICaps.HCSParams.CHCCount) { tmp = READ_REGISTER_ULONG((PULONG)((OpRegisters + EHCI_PORTSC) + (4 * i))); @@ -178,6 +235,7 @@ KeStallExecutionProcessor(30); + /* FIXME: Hub driver does this also, is it needed here? */ /* As per USB 2.0 Specs, 9.1.2. Reset the port and clear the status change */ //tmp |= 0x100 | 0x02; /* Sanity, Disable port */ @@ -190,21 +248,16 @@ tmp = READ_REGISTER_ULONG((PULONG)((OpRegisters + EHCI_PORTSC) + (4 * i))); PdoDeviceExtension->ChildDeviceCount++; - PdoDeviceExtension->Ports[i].PortStatus &= ~0x8000; - PdoDeviceExtension->Ports[i].PortStatus |= USB_PORT_STATUS_HIGH_SPEED; - PdoDeviceExtension->Ports[i].PortStatus |= USB_PORT_STATUS_CONNECT; - PdoDeviceExtension->Ports[i].PortChange |= USB_PORT_STATUS_CONNECT; + hcd->Ports[i].PortStatus &= ~0x8000; + hcd->Ports[i].PortStatus |= USB_PORT_STATUS_HIGH_SPEED; + hcd->Ports[i].PortStatus |= USB_PORT_STATUS_CONNECT; + hcd->Ports[i].PortChange |= USB_PORT_STATUS_CONNECT; DPRINT1("Completing URB\n"); CompletePendingURBRequest(PdoDeviceExtension); } else { DPRINT1("Device disconnected on port %d\n", i); - - /* Clear status change */ - tmp = READ_REGISTER_ULONG((PULONG)((OpRegisters + EHCI_PORTSC) + (4 * i))); - tmp |= 0x02; - WRITE_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * i)), tmp); } } } @@ -214,6 +267,7 @@ if (CStatus & EHCI_STS_IAA) { DPRINT1("Async Advance!\n"); + CleanupAsyncList(hcd); } } @@ -232,7 +286,7 @@ /* Read device status */ CStatus = ReadControllerStatus(hcd); - CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR); + CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR | EHCI_STS_RECL); if ((!CStatus) || (FdoDeviceExtension->DeviceState == 0)) { @@ -243,9 +297,22 @@ /* Clear status */ ClearControllerStatus(hcd, CStatus); + if (CStatus & EHCI_STS_RECL) + { + DPRINT("Reclamation\n"); + } + if (CStatus & EHCI_ERROR_INT) { DPRINT1("EHCI Status=0x%x\n", CStatus); + /* This check added in case the NT USB Driver is still loading. + It will cause this error condition at every device connect. */ + if(CStatus & EHCI_STS_PCD) + { + DPRINT1("EHCI Error: Another driver may be interfering with proper operation of this driver\n"); + DPRINT1(" Hint: Ensure that the old NT Usb Driver has been removed!\n"); + ASSERT(FALSE); + } } if (CStatus & EHCI_STS_FATAL) @@ -270,6 +337,7 @@ PFDO_DEVICE_EXTENSION FdoDeviceExtension; PCM_PARTIAL_RESOURCE_DESCRIPTOR resource; DEVICE_DESCRIPTION DeviceDescription; + PEHCI_HOST_CONTROLLER hcd; ULONG NumberResources; ULONG iCount; ULONG DeviceAddress; @@ -278,26 +346,21 @@ NTSTATUS Status; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - + hcd = &FdoDeviceExtension->hcd; + + /* Sanity Checks */ Status = IoGetDeviceProperty(FdoDeviceExtension->LowerDevice, DevicePropertyAddress, sizeof(ULONG), &DeviceAddress, &PropertySize); - if (NT_SUCCESS(Status)) - { - DPRINT1("--->DeviceAddress: %x\n", DeviceAddress); - } Status = IoGetDeviceProperty(FdoDeviceExtension->LowerDevice, DevicePropertyBusNumber, sizeof(ULONG), &BusNumber, &PropertySize); - if (NT_SUCCESS(Status)) - { - DPRINT1("--->BusNumber: %x\n", BusNumber); - } + /* Get the resources the PNP Manager gave */ NumberResources = translated->Count; @@ -364,11 +427,21 @@ } } + for (iCount = 0; iCount < hcd->ECHICaps.HCSParams.PortCount; iCount++) + { + hcd->Ports[iCount].PortStatus = 0x8000; + hcd->Ports[iCount].PortChange = 0; + + if (hcd->ECHICaps.HCSParams.PortPowerControl) + hcd->Ports[iCount].PortStatus |= USB_PORT_STATUS_POWER; + } + KeInitializeDpc(&FdoDeviceExtension->DpcObject, EhciDefferedRoutine, FdoDeviceExtension); RtlZeroMemory(&DeviceDescription, sizeof(DEVICE_DESCRIPTION)); + DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; DeviceDescription.Master = TRUE; DeviceDescription.ScatterGather = TRUE; @@ -377,20 +450,24 @@ DeviceDescription.InterfaceType = PCIBus; DeviceDescription.MaximumLength = EHCI_MAX_SIZE_TRANSFER; - FdoDeviceExtension->pDmaAdapter = IoGetDmaAdapter(FdoDeviceExtension->LowerDevice, - &DeviceDescription, - &FdoDeviceExtension->MapRegisters); - - if (FdoDeviceExtension->pDmaAdapter == NULL) + hcd->pDmaAdapter = IoGetDmaAdapter(FdoDeviceExtension->LowerDevice, + &DeviceDescription, + &hcd->MapRegisters); + + if (hcd->pDmaAdapter == NULL) { DPRINT1("Ehci: IoGetDmaAdapter failed!\n"); ASSERT(FALSE); } + DPRINT1("MapRegisters %x\n", hcd->MapRegisters); + /* Allocate Common Buffer for Periodic Frame List */ FdoDeviceExtension->PeriodicFrameList.VirtualAddr = - FdoDeviceExtension->pDmaAdapter->DmaOperations->AllocateCommonBuffer(FdoDeviceExtension->pDmaAdapter, - sizeof(ULONG) * 1024, &FdoDeviceExtension->PeriodicFrameList.PhysicalAddr, FALSE); + hcd->pDmaAdapter->DmaOperations->AllocateCommonBuffer(hcd->pDmaAdapter, + sizeof(ULONG) * 1024, + &FdoDeviceExtension->PeriodicFrameList.PhysicalAddr, + FALSE); if (FdoDeviceExtension->PeriodicFrameList.VirtualAddr == NULL) { @@ -403,36 +480,53 @@ ExInitializeFastMutex(&FdoDeviceExtension->FrameListMutex); - /* Allocate pages for queueheads and descriptors */ - FdoDeviceExtension->hcd.CommonBufferVA = - FdoDeviceExtension->pDmaAdapter->DmaOperations->AllocateCommonBuffer(FdoDeviceExtension->pDmaAdapter, - PAGE_SIZE * 16, - &FdoDeviceExtension->hcd.CommonBufferPA, - FALSE); - - if (FdoDeviceExtension->hcd.CommonBufferVA == 0) + /* Allocate initial page for queueheads and descriptors */ + FdoDeviceExtension->hcd.CommonBufferVA[0] = + hcd->pDmaAdapter->DmaOperations->AllocateCommonBuffer(hcd->pDmaAdapter, + PAGE_SIZE, + &FdoDeviceExtension->hcd.CommonBufferPA[0], + FALSE); + + if (FdoDeviceExtension->hcd.CommonBufferVA[0] == 0) { DPRINT1("Ehci: Failed to allocate common buffer!\n"); return STATUS_UNSUCCESSFUL; } - FdoDeviceExtension->hcd.CommonBufferSize = PAGE_SIZE * 16; + hcd->CommonBufferSize = PAGE_SIZE * 16; /* Zeroize it */ - RtlZeroMemory(FdoDeviceExtension->hcd.CommonBufferVA, - PAGE_SIZE * 16); + RtlZeroMemory(FdoDeviceExtension->hcd.CommonBufferVA[0], + PAGE_SIZE); /* Init SpinLock for host controller device lock */ - KeInitializeSpinLock(&FdoDeviceExtension->hcd.Lock); - - /* Reserved a Queue Head that will always be in the AsyncList Address Register */ - FdoDeviceExtension->hcd.AsyncListQueue = CreateQueueHead(&FdoDeviceExtension->hcd); - FdoDeviceExtension->hcd.AsyncListQueue->HorizontalLinkPointer = FdoDeviceExtension->hcd.AsyncListQueue->PhysicalAddr | QH_TYPE_QH; - FdoDeviceExtension->hcd.AsyncListQueue->EndPointCharacteristics.QEDTDataToggleControl = FALSE; - FdoDeviceExtension->hcd.AsyncListQueue->Token.Bits.InterruptOnComplete = FALSE; - + KeInitializeSpinLock(&hcd->Lock); + + /* Reserved a Queue Head that will always be in the AsyncList Address Register. By setting it as the Head of Reclamation + the controller can know when it has reached the end of the QueueHead list */ + hcd->AsyncListQueue = CreateQueueHead(hcd); + + hcd->AsyncListQueue->HorizontalLinkPointer = hcd->AsyncListQueue->PhysicalAddr | QH_TYPE_QH; + hcd->AsyncListQueue->EndPointCharacteristics.QEDTDataToggleControl = FALSE; + hcd->AsyncListQueue->Token.Bits.InterruptOnComplete = FALSE; + hcd->AsyncListQueue->EndPointCharacteristics.HeadOfReclamation = TRUE; + hcd->AsyncListQueue->Token.Bits.Halted = TRUE; + hcd->AsyncListQueue->NextQueueHead = hcd->AsyncListQueue; + hcd->AsyncListQueue->PreviousQueueHead = hcd->AsyncListQueue; + + /* Reserve a Queue Head thats only purpose is for linking completed Queue Heads. + Completed QueueHeads are moved to this temporary. As the memory must still be valid + up until the controllers doorbell is rang to let it know info has been removed from QueueHead list */ + hcd->CompletedListQueue = CreateQueueHead(hcd); + hcd->CompletedListQueue->NextQueueHead = hcd->CompletedListQueue; + hcd->CompletedListQueue->PreviousQueueHead = hcd->CompletedListQueue; + /* Ensure the controller is stopped */ - StopEhci(&FdoDeviceExtension->hcd); + StopEhci(hcd); + + SetAsyncListQueueRegister(hcd, hcd->AsyncListQueue->PhysicalAddr); + + /* FIXME: Implement Periodic Frame List */ Status = IoConnectInterrupt(&FdoDeviceExtension->EhciInterrupt, InterruptService, @@ -446,10 +540,8 @@ FdoDeviceExtension->Affinity, FALSE); - StartEhci(&FdoDeviceExtension->hcd); - DPRINT1("AsycnAddr %x\n", GetAsyncListQueueRegister(&FdoDeviceExtension->hcd)); + StartEhci(hcd); FdoDeviceExtension->DeviceState = DEVICESTARTED; - return STATUS_SUCCESS; } @@ -472,6 +564,10 @@ DPRINT1("Ehci: QueryBusRelations\n"); + /* FIXME: Currently only support for one ehci controller */ + if (DeviceExtension->Pdo) + goto Done; + /* Create the PDO with the next available number */ while (TRUE) { @@ -513,9 +609,10 @@ PdoDeviceExtension->ControllerFdo = DeviceObject; PdoDeviceExtension->DeviceObject = Pdo; - PdoDeviceExtension->NumberOfPorts = DeviceExtension->hcd.ECHICaps.HCSParams.PortCount; + //PdoDeviceExtension->NumberOfPorts = DeviceExtension->hcd.ECHICaps.HCSParams.PortCount; InitializeListHead(&PdoDeviceExtension->IrpQueue); + KeInitializeSpinLock(&PdoDeviceExtension->IrpQueueLock); KeInitializeEvent(&PdoDeviceExtension->QueueDrainedEvent, SynchronizationEvent, TRUE); @@ -525,7 +622,7 @@ Pdo->Flags &= ~DO_DEVICE_INITIALIZING; DeviceExtension->Pdo = Pdo; - +Done: DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); if (!DeviceRelations) @@ -534,8 +631,8 @@ } DeviceRelations->Count = 1; - DeviceRelations->Objects[0] = Pdo; - ObReferenceObject(Pdo); + DeviceRelations->Objects[0] = DeviceExtension->Pdo; + ObReferenceObject(DeviceExtension->Pdo); *pDeviceRelations = DeviceRelations; return STATUS_SUCCESS; @@ -705,6 +802,7 @@ ASSERT(FdoDeviceExtension->LowerDevice == Pdo); + /* Get the EHCI Device ID and Vendor ID */ Status = GetBusInterface(FdoDeviceExtension->LowerDevice, &FdoDeviceExtension->BusInterface); if (!NT_SUCCESS(Status)) @@ -772,270 +870,8 @@ NTSTATUS NTAPI FdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PFDO_DEVICE_EXTENSION FdoDeviceExtension; - PPDO_DEVICE_EXTENSION PdoDeviceExtension; - PIO_STACK_LOCATION Stack = NULL; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - ULONG_PTR Information = 0; - PUSB_DEVICE UsbDevice = NULL; - URB *Urb; - - /*FIXME: This should never be called by upper drivers as they should only be dealing with the pdo */ - - FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; - PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) FdoDeviceExtension->Pdo->DeviceExtension; - - ASSERT(FdoDeviceExtension->Common.IsFdo == TRUE); - - Stack = IoGetCurrentIrpStackLocation(Irp); - - ASSERT(Stack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_SUBMIT_URB); - - Urb = (PURB) Stack->Parameters.Others.Argument1; - DPRINT("Header Length %d\n", Urb->UrbHeader.Length); - DPRINT("Header Function %d\n", Urb->UrbHeader.Function); - - UsbDevice = DeviceHandleToUsbDevice(PdoDeviceExtension, Urb->UrbHeader.UsbdDeviceHandle); - - if (!UsbDevice) - { - DPRINT1("Ehci: Invalid DeviceHandle or device not connected\n"); - return STATUS_DEVICE_NOT_CONNECTED; - } - switch (Urb->UrbHeader.Function) - { - case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: - { - DPRINT1("Ehci: URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER:\n"); - break; - } - case URB_FUNCTION_GET_STATUS_FROM_DEVICE: - { - DPRINT1("Ehci: URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); - break; - } - case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: - { - DPRINT1("Ehci: URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE\n"); - switch(Urb->UrbControlDescriptorRequest.DescriptorType) - { - case USB_DEVICE_DESCRIPTOR_TYPE: - { - DPRINT1("USB DEVICE DESC\n"); - break; - } - case USB_CONFIGURATION_DESCRIPTOR_TYPE: - DPRINT1("USB CONFIG DESC\n"); - //break; - case USB_STRING_DESCRIPTOR_TYPE: - { - DPRINT1("Usb String Descriptor\n"); - break; - } - default: - { - DPRINT1("Ehci: Descriptor Type %x not supported!\n", Urb->UrbControlDescriptorRequest.DescriptorType); - } - } - break; - } - case URB_FUNCTION_SELECT_CONFIGURATION: - { - DPRINT1("Ehci: URB_FUNCTION_SELECT_CONFIGURATION\n"); - DPRINT1("Urb->UrbSelectConfiguration.ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); - break; - } - case URB_FUNCTION_CLASS_DEVICE: - { - DPRINT1("Ehci: URB_FUNCTION_CLASS_DEVICE %x\n",Urb->UrbControlVendorClassRequest.Request); - switch (Urb->UrbControlVendorClassRequest.Request) - { - case USB_REQUEST_GET_DESCRIPTOR: - { - DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); - DPRINT1("Urb->UrbControlVendorClassRequest.Value %x\n", Urb->UrbControlVendorClassRequest.Value); - - switch (Urb->UrbControlVendorClassRequest.Value >> 8) - { - case USB_DEVICE_CLASS_AUDIO: - { - DPRINT1("USB_DEVICE_CLASS_AUDIO\n"); - break; - } - case USB_DEVICE_CLASS_COMMUNICATIONS: - { - DPRINT1("USB_DEVICE_CLASS_COMMUNICATIONS\n"); - break; - } - case USB_DEVICE_CLASS_HUMAN_INTERFACE: - { - DPRINT1("USB_DEVICE_CLASS_HUMAN_INTERFACE\n"); - break; - } - case USB_DEVICE_CLASS_MONITOR: - { - DPRINT1("USB_DEVICE_CLASS_MONITOR\n"); - break; - } - case USB_DEVICE_CLASS_PHYSICAL_INTERFACE: - { - DPRINT1("USB_DEVICE_CLASS_PHYSICAL_INTERFACE\n"); - break; - } - case USB_DEVICE_CLASS_POWER: - { - DPRINT1("USB_DEVICE_CLASS_POWER\n"); - break; - } - case USB_DEVICE_CLASS_PRINTER: - { - DPRINT1("USB_DEVICE_CLASS_PRINTER\n"); - break; - } - case USB_DEVICE_CLASS_STORAGE: - { - DPRINT1("USB_DEVICE_CLASS_STORAGE\n"); - break; - } - case USB_DEVICE_CLASS_RESERVED: - DPRINT1("Reserved!!!\n"); - case USB_DEVICE_CLASS_HUB: - { - DPRINT1("USB_DEVICE_CLASS_HUB request\n"); - break; - } - default: - { - DPRINT1("Unknown UrbControlVendorClassRequest Value\n"); - } - } - break; - } - case USB_REQUEST_GET_STATUS: - { - DPRINT1("DEVICE: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); - break; - } - default: - { - DPRINT1("Unhandled URB request for class device\n"); - //Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; - } - } - break; - } - case URB_FUNCTION_CLASS_OTHER: - { - DPRINT1("Ehci: URB_FUNCTION_CLASS_OTHER\n"); - switch (Urb->UrbControlVendorClassRequest.Request) - { - case USB_REQUEST_GET_STATUS: - { - DPRINT1("OTHER: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); - break; - } - case USB_REQUEST_CLEAR_FEATURE: - { - DPRINT1("USB_REQUEST_CLEAR_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, - Urb->UrbControlVendorClassRequest.Value); - switch (Urb->UrbControlVendorClassRequest.Value) - { - case C_PORT_CONNECTION: - DPRINT1("Clearing Connect\n"); - break; - case C_PORT_RESET: - DPRINT1("Clearing Reset\n"); - break; - default: - DPRINT1("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); - break; - } - break; - } - case USB_REQUEST_SET_FEATURE: - { - DPRINT1("USB_REQUEST_SET_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, - Urb->UrbControlVendorClassRequest.Value); - - switch(Urb->UrbControlVendorClassRequest.Value) - { - case PORT_RESET: - { - DPRINT1("Port reset\n"); - break; - } - case PORT_ENABLE: - { - DPRINT1("Unhandled Set Feature\n"); - break; - } - default: - { - DPRINT1("Unknown Set Feature!\n"); - break; - } - } - break; - } - case USB_REQUEST_SET_ADDRESS: - { - DPRINT1("USB_REQUEST_SET_ADDRESS\n"); - break; - } - case USB_REQUEST_GET_DESCRIPTOR: - { - DPRINT1("USB_REQUEST_GET_DESCRIPTOR\n"); - break; - } - case USB_REQUEST_SET_DESCRIPTOR: - { - DPRINT1("USB_REQUEST_SET_DESCRIPTOR\n"); - break; - } - case USB_REQUEST_GET_CONFIGURATION: - { - DPRINT1("USB_REQUEST_GET_CONFIGURATION\n"); - break; - } - case USB_REQUEST_SET_CONFIGURATION: - { - DPRINT1("USB_REQUEST_SET_CONFIGURATION\n"); - break; - } - case USB_REQUEST_GET_INTERFACE: - { - DPRINT1("USB_REQUEST_GET_INTERFACE\n"); - break; - } - case USB_REQUEST_SET_INTERFACE: - { - DPRINT1("USB_REQUEST_SET_INTERFACE\n"); - break; - } - case USB_REQUEST_SYNC_FRAME: - { - DPRINT1("USB_REQUEST_SYNC_FRAME\n"); - break; - } - default: - { - DPRINT1("Unknown Function Class Unknown request\n"); - break; - } - } - break; - } - default: - { - DPRINT1("Ehci: Unhandled URB %x\n", Urb->UrbHeader.Function); - //Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; - } - } - - Irp->IoStatus.Information = Information; - - if (Status != STATUS_PENDING) - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; + /*FIXME: This should never be called by upper drivers as they should only be dealing with the pdo. */ + DPRINT1("Upper Level Device Object shouldnt be calling this!!!!!!!!!!!!\n"); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] Wed Apr 13 04:33:14 2011 @@ -1,6 +1,7 @@ #pragma once #include <ntddk.h> +#include <usb.h> /* USB Command Register */ #define EHCI_USBCMD 0x00 @@ -98,8 +99,9 @@ ULONG DWord; } Token; ULONG BufferPointer[5]; - + //Software + ULONG BufferPointerVA[5]; ULONG PhysicalAddr; struct _QUEUE_TRANSFER_DESCRIPTOR *PreviousDescriptor; struct _QUEUE_TRANSFER_DESCRIPTOR *NextDescriptor; @@ -167,10 +169,13 @@ ULONG PhysicalAddr; struct _QUEUE_HEAD *PreviousQueueHead; struct _QUEUE_HEAD *NextQueueHead; - PQUEUE_TRANSFER_DESCRIPTOR TransferDescriptor; + ULONG NumberOfTransferDescriptors; + PQUEUE_TRANSFER_DESCRIPTOR FirstTransferDescriptor; + PQUEUE_TRANSFER_DESCRIPTOR DeadDescriptor; PIRP IrpToComplete; - PMDL MdlToFree; PKEVENT Event; + PMDL Mdl; + BOOLEAN FreeMdl; } QUEUE_HEAD, *PQUEUE_HEAD; /* USBCMD register 32 bits */ @@ -264,14 +269,27 @@ UCHAR PortRoute [8]; } EHCI_CAPS, *PEHCI_CAPS; +typedef struct _EHCIPORTS +{ + ULONG PortNumber; + ULONG PortType; + USHORT PortStatus; + USHORT PortChange; +} EHCIPORTS, *PEHCIPORTS; + typedef struct _EHCI_HOST_CONTROLLER { + PDMA_ADAPTER pDmaAdapter; + ULONG MapRegisters; ULONG OpRegisters; EHCI_CAPS ECHICaps; - PVOID CommonBufferVA; - PHYSICAL_ADDRESS CommonBufferPA; + ULONG NumberOfPorts; + EHCIPORTS Ports[127]; + PVOID CommonBufferVA[16]; + PHYSICAL_ADDRESS CommonBufferPA[16]; ULONG CommonBufferSize; PQUEUE_HEAD AsyncListQueue; + PQUEUE_HEAD CompletedListQueue; KSPIN_LOCK Lock; } EHCI_HOST_CONTROLLER, *PEHCI_HOST_CONTROLLER; @@ -305,3 +323,5 @@ ULONG GetPeriodicFrameListRegister(PEHCI_HOST_CONTROLLER hcd); +BOOLEAN +EnumControllerPorts(PEHCI_HOST_CONTROLLER hcd); Modified: trunk/reactos/drivers/usb/usbehci/hwiface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hwifac… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hwiface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hwiface.c [iso-8859-1] Wed Apr 13 04:33:14 2011 @@ -32,7 +32,6 @@ Descriptor->NextPointer = TERMINATE_POINTER; Descriptor->AlternateNextPointer = TERMINATE_POINTER; Descriptor->Token.Bits.DataToggle = TRUE; - Descriptor->Token.Bits.InterruptOnComplete = TRUE; Descriptor->Token.Bits.ErrorCounter = 0x03; Descriptor->Token.Bits.Active = TRUE; Descriptor->Token.Bits.PIDCode = PIDCode; @@ -47,9 +46,9 @@ } VOID -FreeDescriptor(PQUEUE_TRANSFER_DESCRIPTOR Descriptor) -{ - ReleaseMemory((ULONG)Descriptor); +FreeDescriptor(PEHCI_HOST_CONTROLLER hcd, PQUEUE_TRANSFER_DESCRIPTOR Descriptor) +{ + ReleaseMemory(hcd, (ULONG)Descriptor); } /* Queue Head */ @@ -87,14 +86,12 @@ KIRQL OldIrql; KeAcquireSpinLock(&hcd->Lock, &OldIrql); - CurrentQH = (PQUEUE_HEAD)AllocateMemory(hcd, sizeof(QUEUE_HEAD), &PhysicalAddress); RtlZeroMemory(CurrentQH, sizeof(QUEUE_HEAD)); ASSERT(CurrentQH); CurrentQH->PhysicalAddr = PhysicalAddress; CurrentQH->HorizontalLinkPointer = TERMINATE_POINTER; - CurrentQH->CurrentLinkPointer = TERMINATE_POINTER; CurrentQH->AlternateNextPointer = TERMINATE_POINTER; CurrentQH->NextPointer = TERMINATE_POINTER; @@ -107,7 +104,7 @@ CurrentQH->EndPointCharacteristics.NakCountReload = 0xF; /* Get the Initial Data Toggle from the QEDT */ - CurrentQH->EndPointCharacteristics.QEDTDataToggleControl = TRUE; + CurrentQH->EndPointCharacteristics.QEDTDataToggleControl = FALSE; /* High Speed Device */ CurrentQH->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; @@ -120,7 +117,7 @@ for (i=0; i<5; i++) CurrentQH->BufferPointer[i] = 0; - CurrentQH->Token.Bits.InterruptOnComplete = TRUE; + CurrentQH->Token.Bits.InterruptOnComplete = FALSE; KeReleaseSpinLock(&hcd->Lock, OldIrql); return CurrentQH; @@ -131,19 +128,17 @@ { KIRQL OldIrql; PQUEUE_HEAD CurrentHead = (PQUEUE_HEAD)hcd->AsyncListQueue; - PQUEUE_HEAD PreviousHead = CurrentHead->PreviousQueueHead; - - KeAcquireSpinLock(&hcd->Lock, &OldIrql); - - QueueHead->HorizontalLinkPointer = (CurrentHead->HorizontalLinkPointer | QH_TYPE_QH) & ~TERMINATE_POINTER; + PQUEUE_HEAD PreviousHead; + + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + PreviousHead = CurrentHead->PreviousQueueHead; QueueHead->NextQueueHead = CurrentHead; QueueHead->PreviousQueueHead = PreviousHead; - + PreviousHead->NextQueueHead = QueueHead; CurrentHead->PreviousQueueHead = QueueHead; - if (PreviousHead) - PreviousHead->NextQueueHead = QueueHead; - - CurrentHead->HorizontalLinkPointer = QueueHead->PhysicalAddr | QH_TYPE_QH; + + QueueHead->HorizontalLinkPointer = (CurrentHead->HorizontalLinkPointer | QH_TYPE_QH) & ~TERMINATE_POINTER; + PreviousHead->HorizontalLinkPointer = QueueHead->PhysicalAddr| QH_TYPE_QH; KeReleaseSpinLock(&hcd->Lock, OldIrql); } @@ -152,24 +147,80 @@ UnlinkQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead) { KIRQL OldIrql; - PQUEUE_HEAD PreviousHead = QueueHead->PreviousQueueHead; - PQUEUE_HEAD NextHead = QueueHead->NextQueueHead; - KeAcquireSpinLock(&hcd->Lock, &OldIrql); - - if (PreviousHead) + PQUEUE_HEAD PreviousHead; + PQUEUE_HEAD NextHead; + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + + PreviousHead = QueueHead->PreviousQueueHead; + NextHead = QueueHead->NextQueueHead; + + PreviousHead->NextQueueHead = NextHead; + NextHead->PreviousQueueHead = PreviousHead; + + PreviousHead->HorizontalLinkPointer = NextHead->HorizontalLinkPointer; + KeReleaseSpinLock(&hcd->Lock, OldIrql); +} + +VOID +LinkQueueHeadToCompletedList(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead) +{ + KIRQL OldIrql; + PQUEUE_HEAD CurrentHead = (PQUEUE_HEAD)hcd->CompletedListQueue; + PQUEUE_HEAD PreviousHead; + + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + + PreviousHead = CurrentHead->PreviousQueueHead; + QueueHead->NextQueueHead = CurrentHead; + QueueHead->PreviousQueueHead = PreviousHead; + PreviousHead->NextQueueHead = QueueHead; + CurrentHead->PreviousQueueHead = QueueHead; + + KeReleaseSpinLock(&hcd->Lock, OldIrql); + +} + +VOID +DeleteQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead) +{ + ReleaseMemory(hcd, (ULONG)QueueHead); +} + +VOID +CleanupAsyncList(PEHCI_HOST_CONTROLLER hcd) +{ + PQUEUE_TRANSFER_DESCRIPTOR Descriptor; + PQUEUE_HEAD QueueHead; + KIRQL OldIrql; + + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + + QueueHead = hcd->CompletedListQueue; + QueueHead = QueueHead->NextQueueHead; + + while (QueueHead != hcd->CompletedListQueue) { - PreviousHead->NextQueueHead = NextHead; - PreviousHead->HorizontalLinkPointer = QueueHead->HorizontalLinkPointer; + Descriptor = QueueHead->FirstTransferDescriptor; + while (Descriptor) + { + if (Descriptor->Token.Bits.PIDCode == PID_CODE_SETUP_TOKEN) + ReleaseMemory(hcd, Descriptor->BufferPointerVA[0]); + FreeDescriptor(hcd, Descriptor); + Descriptor = Descriptor->NextDescriptor; + } + + if (QueueHead->FreeMdl) + { + DPRINT("Freeing Mdl %x, StartVA %x\n", QueueHead->Mdl, QueueHead->Mdl->StartVa); + IoFreeMdl(QueueHead->Mdl); + } + + QueueHead = QueueHead->NextQueueHead; } - if (NextHead) - NextHead->PreviousQueueHead = PreviousHead; - - KeReleaseSpinLock(&hcd->Lock, OldIrql); -} - -VOID -DeleteQueueHead(PQUEUE_HEAD QueueHead) -{ - ReleaseMemory((ULONG)QueueHead); -} - + + hcd->CompletedListQueue->NextQueueHead = hcd->CompletedListQueue; + hcd->CompletedListQueue->PreviousQueueHead = hcd->CompletedListQueue; + + KeReleaseSpinLock(&hcd->Lock, OldIrql); +} + Modified: trunk/reactos/drivers/usb/usbehci/hwiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hwifac… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hwiface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hwiface.h [iso-8859-1] Wed Apr 13 04:33:14 2011 @@ -5,7 +5,7 @@ CreateDescriptor(PEHCI_HOST_CONTROLLER hcd, UCHAR PIDCode, ULONG TotalBytesToTransfer); VOID -FreeDescriptor(PQUEUE_TRANSFER_DESCRIPTOR Descriptor); +FreeDescriptor(PEHCI_HOST_CONTROLLER hcd, PQUEUE_TRANSFER_DESCRIPTOR Descriptor); VOID DumpQueueHeadList(PEHCI_HOST_CONTROLLER hcd); @@ -20,5 +20,10 @@ UnlinkQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead); VOID -DeleteQueueHead(PQUEUE_HEAD QueueHead); +DeleteQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead); +VOID +LinkQueueHeadToCompletedList(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead); + +VOID +CleanupAsyncList(PEHCI_HOST_CONTROLLER hcd);

13 years, 8 months

[janderwald] 51324: [USBEHCI] - Re-implement DMA buffer routines. It is now faster and consumes less memory overhead per allocated memory block. - IoGetDeviceProperty needs a PDO - Add few comments...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Apr 13 01:37:14 2011 New Revision: 51324 URL: http://svn.reactos.org/svn/reactos?rev=51324&view=rev Log: [USBEHCI] - Re-implement DMA buffer routines. It is now faster and consumes less memory overhead per allocated memory block. - IoGetDeviceProperty needs a PDO - Add few comments - No need to clear buffer twice in CreateQueueHead / CreateDescriptor Modified: branches/cmake-bringup/drivers/usb/usbehci/fdo.c branches/cmake-bringup/drivers/usb/usbehci/hardware.h branches/cmake-bringup/drivers/usb/usbehci/hwiface.c branches/cmake-bringup/drivers/usb/usbehci/hwiface.h branches/cmake-bringup/drivers/usb/usbehci/physmem.c branches/cmake-bringup/drivers/usb/usbehci/physmem.h branches/cmake-bringup/drivers/usb/usbehci/transfer.c branches/cmake-bringup/drivers/usb/usbehci/usbehci.h Modified: branches/cmake-bringup/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/fdo.c [iso-8859-1] Wed Apr 13 01:37:14 2011 @@ -69,7 +69,7 @@ { CompletedTD = NextTD; NextTD = NextTD->NextDescriptor; - FreeDescriptor(CompletedTD); + FreeDescriptor(hcd, CompletedTD); } /* If the Event is set then release waiter */ @@ -136,7 +136,7 @@ /* Unlink QueueHead */ UnlinkQueueHead(hcd, CompletedQH); /* Wait for a complete AsnycList tranversal before deleting? */ - DeleteQueueHead(CompletedQH); + DeleteQueueHead(hcd, CompletedQH); } /* Port Change */ @@ -279,7 +279,7 @@ FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - Status = IoGetDeviceProperty(FdoDeviceExtension->LowerDevice, + Status = IoGetDeviceProperty(FdoDeviceExtension->Pdo, DevicePropertyAddress, sizeof(ULONG), &DeviceAddress, @@ -289,7 +289,7 @@ DPRINT1("--->DeviceAddress: %x\n", DeviceAddress); } - Status = IoGetDeviceProperty(FdoDeviceExtension->LowerDevice, + Status = IoGetDeviceProperty(FdoDeviceExtension->Pdo, DevicePropertyBusNumber, sizeof(ULONG), &BusNumber, @@ -364,6 +364,7 @@ } } + /* initialize dpc */ KeInitializeDpc(&FdoDeviceExtension->DpcObject, EhciDefferedRoutine, FdoDeviceExtension); @@ -377,7 +378,7 @@ DeviceDescription.InterfaceType = PCIBus; DeviceDescription.MaximumLength = EHCI_MAX_SIZE_TRANSFER; - FdoDeviceExtension->pDmaAdapter = IoGetDmaAdapter(FdoDeviceExtension->LowerDevice, + FdoDeviceExtension->pDmaAdapter = IoGetDmaAdapter(FdoDeviceExtension->Pdo, &DeviceDescription, &FdoDeviceExtension->MapRegisters); @@ -416,14 +417,33 @@ return STATUS_UNSUCCESSFUL; } + /* Init SpinLock for host controller device lock */ + KeInitializeSpinLock(&FdoDeviceExtension->hcd.Lock); + FdoDeviceExtension->hcd.CommonBufferSize = PAGE_SIZE * 16; /* Zeroize it */ RtlZeroMemory(FdoDeviceExtension->hcd.CommonBufferVA, PAGE_SIZE * 16); - /* Init SpinLock for host controller device lock */ - KeInitializeSpinLock(&FdoDeviceExtension->hcd.Lock); + /* create memory allocator */ + Status = DmaMemAllocator_Create(&FdoDeviceExtension->hcd.DmaMemAllocator); + if (FdoDeviceExtension->hcd.DmaMemAllocator == 0) + { + /* FIXME cleanup */ + DPRINT1("Ehci: Failed to create dma memory allocator!\n"); + return STATUS_UNSUCCESSFUL; + } + + /* initialize memory allocator */ + Status = DmaMemAllocator_Initialize(FdoDeviceExtension->hcd.DmaMemAllocator, 32, &FdoDeviceExtension->hcd.Lock, FdoDeviceExtension->hcd.CommonBufferPA, FdoDeviceExtension->hcd.CommonBufferVA, FdoDeviceExtension->hcd.CommonBufferSize); + if (!NT_SUCCESS(Status)) + { + /* FIXME cleanup */ + DPRINT1("Ehci: Failed to initialize dma memory allocator %x\n", Status); + return Status; + } + /* Reserved a Queue Head that will always be in the AsyncList Address Register */ FdoDeviceExtension->hcd.AsyncListQueue = CreateQueueHead(&FdoDeviceExtension->hcd); @@ -436,7 +456,7 @@ Status = IoConnectInterrupt(&FdoDeviceExtension->EhciInterrupt, InterruptService, - FdoDeviceExtension->DeviceObject, + DeviceObject, NULL, FdoDeviceExtension->Vector, FdoDeviceExtension->Irql, @@ -621,7 +641,7 @@ } NTSTATUS NTAPI -AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT Pdo) +AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT PhysicalDeviceObject) { NTSTATUS Status = STATUS_UNSUCCESSFUL; PDEVICE_OBJECT Fdo; @@ -673,6 +693,7 @@ } } + /* FIXME */ swprintf(CharSymLinkName, L"\\Device\\HCD%d", UsbDeviceNumber); RtlInitUnicodeString(&SymLinkName, CharSymLinkName); Status = IoCreateSymbolicLink(&SymLinkName, &DeviceName); @@ -683,15 +704,19 @@ } FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) Fdo->DeviceExtension; - RtlZeroMemory(FdoDeviceExtension, sizeof(PFDO_DEVICE_EXTENSION)); - + RtlZeroMemory(FdoDeviceExtension, sizeof(FDO_DEVICE_EXTENSION)); + + /* initialize timer */ KeInitializeTimerEx(&FdoDeviceExtension->UpdateTimer, SynchronizationTimer); + /* initialize device extension */ FdoDeviceExtension->Common.IsFdo = TRUE; - FdoDeviceExtension->DeviceObject = Fdo; - - FdoDeviceExtension->LowerDevice = IoAttachDeviceToDeviceStack(Fdo, Pdo); - + FdoDeviceExtension->Common.DriverObject = DriverObject; + FdoDeviceExtension->Common.DeviceObject = Fdo; + FdoDeviceExtension->Pdo = PhysicalDeviceObject; + + /* attach to device stack */ + FdoDeviceExtension->LowerDevice = IoAttachDeviceToDeviceStack(Fdo, PhysicalDeviceObject); if (FdoDeviceExtension->LowerDevice == NULL) { DPRINT1("UsbEhci: Failed to attach to device stack!\n"); @@ -701,12 +726,13 @@ return STATUS_NO_SUCH_DEVICE; } - Fdo->Flags |= DO_BUFFERED_IO;// | DO_POWER_PAGABLE; - - ASSERT(FdoDeviceExtension->LowerDevice == Pdo); - - Status = GetBusInterface(FdoDeviceExtension->LowerDevice, &FdoDeviceExtension->BusInterface); - + /* setup device flags */ + Fdo->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + + /* get bus interface */ + Status = GetBusInterface(PhysicalDeviceObject, &FdoDeviceExtension->BusInterface); + + /* check for success */ if (!NT_SUCCESS(Status)) { DPRINT1("GetBusInterface() failed with %x\n", Status); @@ -716,6 +742,7 @@ return Status; } + /* read pci config space */ BytesRead = (*FdoDeviceExtension->BusInterface.GetBusData)( FdoDeviceExtension->BusInterface.Context, PCI_WHICHSPACE_CONFIG, @@ -723,7 +750,7 @@ 0, PCI_COMMON_HDR_LENGTH); - + /* check for success */ if (BytesRead != PCI_COMMON_HDR_LENGTH) { DPRINT1("GetBusData failed!\n"); @@ -746,12 +773,16 @@ DPRINT1("Vendor %x\n", PciConfig.VendorID); DPRINT1("Device %x\n", PciConfig.DeviceID); + FdoDeviceExtension->VendorId = PciConfig.VendorID; FdoDeviceExtension->DeviceId = PciConfig.DeviceID; + /* update state */ FdoDeviceExtension->DeviceState = DEVICEINTIALIZED; - Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_USB_HOST_CONTROLLER, NULL, &InterfaceSymLinkName); + + /* FIXME: delay this until IRP_MN_START arrives */ + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &GUID_DEVINTERFACE_USB_HOST_CONTROLLER, NULL, &InterfaceSymLinkName); if (!NT_SUCCESS(Status)) { DPRINT1("Unable to register device interface!\n"); @@ -759,11 +790,14 @@ } else { + /* enable device interface */ Status = IoSetDeviceInterfaceState(&InterfaceSymLinkName, TRUE); DPRINT1("SetInterfaceState %x\n", Status); if (!NT_SUCCESS(Status)) return Status; } + + /* device is initialized */ Fdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; @@ -782,6 +816,9 @@ /*FIXME: This should never be called by upper drivers as they should only be dealing with the pdo */ + ASSERT(0); + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) FdoDeviceExtension->Pdo->DeviceExtension; Modified: branches/cmake-bringup/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/hardware.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/hardware.h [iso-8859-1] Wed Apr 13 01:37:14 2011 @@ -264,6 +264,18 @@ UCHAR PortRoute [8]; } EHCI_CAPS, *PEHCI_CAPS; + +typedef struct +{ + PKSPIN_LOCK Lock; + RTL_BITMAP Bitmap; + PULONG BitmapBuffer; + ULONG BlockSize; + PVOID VirtualBase; + PHYSICAL_ADDRESS PhysicalBase; + ULONG Length; +}DMA_MEMORY_ALLOCATOR, *LPDMA_MEMORY_ALLOCATOR; + typedef struct _EHCI_HOST_CONTROLLER { ULONG OpRegisters; @@ -273,6 +285,7 @@ ULONG CommonBufferSize; PQUEUE_HEAD AsyncListQueue; KSPIN_LOCK Lock; + LPDMA_MEMORY_ALLOCATOR DmaMemAllocator; } EHCI_HOST_CONTROLLER, *PEHCI_HOST_CONTROLLER; ULONG Modified: branches/cmake-bringup/drivers/usb/usbehci/hwiface.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/hwiface.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/hwiface.c [iso-8859-1] Wed Apr 13 01:37:14 2011 @@ -18,16 +18,20 @@ /* Queue Element Transfer Descriptors */ PQUEUE_TRANSFER_DESCRIPTOR -CreateDescriptor(PEHCI_HOST_CONTROLLER hcd, UCHAR PIDCode, ULONG TotalBytesToTransfer) +CreateDescriptor( + PEHCI_HOST_CONTROLLER hcd, + UCHAR PIDCode, + ULONG TotalBytesToTransfer) { PQUEUE_TRANSFER_DESCRIPTOR Descriptor; ULONG PhysicalAddress; UCHAR i; - KIRQL OldIrql; + NTSTATUS Status; - KeAcquireSpinLock(&hcd->Lock, &OldIrql); + Status = DmaMemAllocator_Allocate(hcd->DmaMemAllocator, sizeof(QUEUE_TRANSFER_DESCRIPTOR), (PVOID*)&Descriptor, &PhysicalAddress); + if (!NT_SUCCESS(Status)) + return NULL; - Descriptor = (PQUEUE_TRANSFER_DESCRIPTOR)AllocateMemory(hcd, sizeof(QUEUE_TRANSFER_DESCRIPTOR), &PhysicalAddress); RtlZeroMemory(Descriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); Descriptor->NextPointer = TERMINATE_POINTER; Descriptor->AlternateNextPointer = TERMINATE_POINTER; @@ -38,18 +42,16 @@ Descriptor->Token.Bits.PIDCode = PIDCode; Descriptor->Token.Bits.TotalBytesToTransfer = TotalBytesToTransfer; Descriptor->PhysicalAddr = PhysicalAddress; - for (i=0;i<5;i++) - Descriptor->BufferPointer[i] = 0; - - KeReleaseSpinLock(&hcd->Lock, OldIrql); return Descriptor; } VOID -FreeDescriptor(PQUEUE_TRANSFER_DESCRIPTOR Descriptor) +FreeDescriptor( + PEHCI_HOST_CONTROLLER hcd, + PQUEUE_TRANSFER_DESCRIPTOR Descriptor) { - ReleaseMemory((ULONG)Descriptor); + DmaMemAllocator_Free(hcd->DmaMemAllocator, Descriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); } /* Queue Head */ @@ -84,16 +86,17 @@ CreateQueueHead(PEHCI_HOST_CONTROLLER hcd) { PQUEUE_HEAD CurrentQH; - ULONG PhysicalAddress , i; - KIRQL OldIrql; + NTSTATUS Status; + PHYSICAL_ADDRESS PhysicalAddress; - KeAcquireSpinLock(&hcd->Lock, &OldIrql); + Status = DmaMemAllocator_Allocate(hcd->DmaMemAllocator, sizeof(QUEUE_HEAD), (PVOID*)&CurrentQH, &PhysicalAddress); + if (!NT_SUCCESS(Status)) + return NULL; - CurrentQH = (PQUEUE_HEAD)AllocateMemory(hcd, sizeof(QUEUE_HEAD), &PhysicalAddress); RtlZeroMemory(CurrentQH, sizeof(QUEUE_HEAD)); ASSERT(CurrentQH); - CurrentQH->PhysicalAddr = PhysicalAddress; + CurrentQH->PhysicalAddr = PhysicalAddress.LowPart; CurrentQH->HorizontalLinkPointer = TERMINATE_POINTER; CurrentQH->CurrentLinkPointer = TERMINATE_POINTER; CurrentQH->AlternateNextPointer = TERMINATE_POINTER; @@ -118,12 +121,9 @@ CurrentQH->Token.DWord = 0; CurrentQH->NextQueueHead = NULL; CurrentQH->PreviousQueueHead = NULL; - for (i=0; i<5; i++) - CurrentQH->BufferPointer[i] = 0; - CurrentQH->Token.Bits.InterruptOnComplete = TRUE; - KeReleaseSpinLock(&hcd->Lock, OldIrql); + return CurrentQH; } @@ -169,8 +169,10 @@ } VOID -DeleteQueueHead(PQUEUE_HEAD QueueHead) +DeleteQueueHead( + PEHCI_HOST_CONTROLLER hcd, + PQUEUE_HEAD QueueHead) { - ReleaseMemory((ULONG)QueueHead); + DmaMemAllocator_Free(hcd->DmaMemAllocator, QueueHead, sizeof(QUEUE_HEAD)); } Modified: branches/cmake-bringup/drivers/usb/usbehci/hwiface.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/hwiface.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/hwiface.h [iso-8859-1] Wed Apr 13 01:37:14 2011 @@ -5,7 +5,7 @@ CreateDescriptor(PEHCI_HOST_CONTROLLER hcd, UCHAR PIDCode, ULONG TotalBytesToTransfer); VOID -FreeDescriptor(PQUEUE_TRANSFER_DESCRIPTOR Descriptor); +FreeDescriptor(PEHCI_HOST_CONTROLLER hcd, PQUEUE_TRANSFER_DESCRIPTOR Descriptor); VOID DumpQueueHeadList(PEHCI_HOST_CONTROLLER hcd); @@ -20,5 +20,5 @@ UnlinkQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead); VOID -DeleteQueueHead(PQUEUE_HEAD QueueHead); +DeleteQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead); Modified: branches/cmake-bringup/drivers/usb/usbehci/physmem.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/physmem.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/physmem.c [iso-8859-1] Wed Apr 13 01:37:14 2011 @@ -10,89 +10,207 @@ #include "physmem.h" #include "debug.h" -#define SMALL_ALLOCATION_SIZE 32 - VOID -DumpPages() -{ - //PMEM_HEADER MemBlock = (PMEM_HEADER)EhciSharedMemory.VirtualAddr; -} - -// Returns Virtual Address of Allocated Memory -ULONG -AllocateMemory(PEHCI_HOST_CONTROLLER hcd, ULONG Size, ULONG *PhysicalAddress) -{ - PMEM_HEADER MemoryPage = (PMEM_HEADER)hcd->CommonBufferVA; - ULONG PageCount = 0; - ULONG NumberOfPages = hcd->CommonBufferSize / PAGE_SIZE; - ULONG BlocksNeeded; - ULONG i,j, freeCount; - ULONG RetAddr = 0; - - Size = ((Size + SMALL_ALLOCATION_SIZE - 1) / SMALL_ALLOCATION_SIZE) * SMALL_ALLOCATION_SIZE; - BlocksNeeded = Size / SMALL_ALLOCATION_SIZE; +NTAPI +DmaMemAllocator_Destroy( + IN LPDMA_MEMORY_ALLOCATOR Allocator) +{ + /* is there a bitmap buffer */ + if (Allocator->BitmapBuffer) + { + /* free bitmap buffer */ + ExFreePool(Allocator->BitmapBuffer); + } + + /* free struct */ + ExFreePool(Allocator); +} + +NTSTATUS +NTAPI +DmaMemAllocator_Create( + IN LPDMA_MEMORY_ALLOCATOR *OutMemoryAllocator) +{ + LPDMA_MEMORY_ALLOCATOR Allocator; + + /* sanity check */ + ASSERT(OutMemoryAllocator); + + /* allocate struct - must be non paged as it contains a spin lock */ + Allocator = ExAllocatePool(NonPagedPool, sizeof(DMA_MEMORY_ALLOCATOR)); + if (!Allocator) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* zero struct */ + RtlZeroMemory(Allocator, sizeof(DMA_MEMORY_ALLOCATOR)); + + /* store result */ + *OutMemoryAllocator = Allocator; + + /* done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +DmaMemAllocator_Initialize( + IN OUT LPDMA_MEMORY_ALLOCATOR Allocator, + IN ULONG DefaultBlockSize, + IN PKSPIN_LOCK Lock, + IN PHYSICAL_ADDRESS PhysicalBase, + IN PVOID VirtualBase, + IN ULONG Length) +{ + PULONG BitmapBuffer; + ULONG BitmapLength; + + /* sanity checks */ + ASSERT(Length >= PAGE_SIZE); + ASSERT(Length % PAGE_SIZE == 0); + ASSERT(DefaultBlockSize == 32 || DefaultBlockSize == 64 || DefaultBlockSize == 128); + + /* calculate bitmap length */ + BitmapLength = (Length / DefaultBlockSize) / sizeof(ULONG); + + /* allocate bitmap buffer from nonpaged pool */ + BitmapBuffer = ExAllocatePool(NonPagedPool, BitmapLength); + if (!BitmapBuffer) + { + /* out of memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* initialize bitmap */ + RtlInitializeBitMap(&Allocator->Bitmap, BitmapBuffer, BitmapLength); + RtlClearAllBits(&Allocator->Bitmap); + + /* initialize rest of allocator */ + Allocator->PhysicalBase = PhysicalBase; + Allocator->VirtualBase = VirtualBase; + Allocator->Length = Length; + Allocator->BitmapBuffer = BitmapBuffer; + Allocator->Lock = Lock; + Allocator->BlockSize = DefaultBlockSize; + + /* done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +DmaMemAllocator_Allocate( + IN LPDMA_MEMORY_ALLOCATOR Allocator, + IN ULONG Size, + OUT PVOID *OutVirtualAddress, + OUT PPHYSICAL_ADDRESS OutPhysicalAddress) +{ + ULONG Length, BlockCount, FreeIndex, StartPage, EndPage; + KIRQL OldLevel; + + /* sanity check */ + ASSERT(Size < PAGE_SIZE); + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + /* align request size to block size */ + Length = (Size + Allocator->BlockSize -1) & ~(Allocator->BlockSize -1); + + /* sanity check */ + ASSERT(Length); + + /* convert to block count */ + BlockCount = Length / Allocator->BlockSize; + + /* acquire lock */ + KeAcquireSpinLock(Allocator->Lock, &OldLevel); + + + /* start search */ + FreeIndex = 0; do { - if (MemoryPage->IsFull) + + /* search for an free index */ + FreeIndex = RtlFindClearBits(&Allocator->Bitmap, BlockCount, FreeIndex); + + /* check if there were bits found */ + if (FreeIndex == MAXULONG) + break; + + /* check that the allocation does not spawn over page boundaries */ + StartPage = (FreeIndex * Allocator->BlockSize); + StartPage = (StartPage != 0 ? StartPage / PAGE_SIZE : 0); + EndPage = ((FreeIndex + BlockCount) * Allocator->BlockSize) / PAGE_SIZE; + + + if (StartPage == EndPage) { - PageCount++; - MemoryPage = (PMEM_HEADER)((ULONG)MemoryPage + PAGE_SIZE); - continue; + /* reserve bits */ + RtlSetBits(&Allocator->Bitmap, FreeIndex, BlockCount); + + /* done */ + break; } - freeCount = 0; - for (i = 0; i < sizeof(MemoryPage->Entry); i++) + else { - if (!MemoryPage->Entry[i].InUse) - { - freeCount++; - } - else - { - freeCount = 0; - } - - if ((i-freeCount+1 + BlocksNeeded) > sizeof(MemoryPage->Entry)) - { - freeCount = 0; - continue; - } - if (freeCount == BlocksNeeded) - { - for (j = 0; j < freeCount; j++) - { - MemoryPage->Entry[i-j].InUse = 1; - MemoryPage->Entry[i-j].Blocks = 0; - } - - MemoryPage->Entry[i-freeCount + 1].Blocks = BlocksNeeded; - - RetAddr = (ULONG)MemoryPage + (SMALL_ALLOCATION_SIZE * (i - freeCount + 1)) + sizeof(MEM_HEADER); - - *PhysicalAddress = (ULONG)hcd->CommonBufferPA.LowPart + (RetAddr - (ULONG)hcd->CommonBufferVA); - return RetAddr; - } + /* request spaws a page boundary */ + FreeIndex++; } - - PageCount++; - MemoryPage = (PMEM_HEADER)((ULONG)MemoryPage + PAGE_SIZE); - } while (PageCount < NumberOfPages); - - return 0; + } + while(TRUE); + + /* release bitmap lock */ + KeReleaseSpinLock(Allocator->Lock, OldLevel); + + /* check if allocation failed */ + if (FreeIndex == MAXULONG) + { + /* allocation failed */ + return STATUS_UNSUCCESSFUL; + } + + /* return result */ + *OutVirtualAddress = (PVOID)((ULONG_PTR)Allocator->VirtualBase + FreeIndex * Allocator->BlockSize); + OutPhysicalAddress->QuadPart = Allocator->PhysicalBase.QuadPart + FreeIndex * Allocator->BlockSize; + + /* done */ + return STATUS_SUCCESS; } VOID -ReleaseMemory(ULONG Address) -{ - PMEM_HEADER MemoryPage; - ULONG Index, i, BlockSize; - - MemoryPage = (PMEM_HEADER)(Address & ~(PAGE_SIZE - 1)); - - Index = (Address - ((ULONG)MemoryPage + sizeof(MEM_HEADER))) / SMALL_ALLOCATION_SIZE; - BlockSize = MemoryPage->Entry[Index].Blocks; - for (i = 0; i < BlockSize; i++) - { - MemoryPage->Entry[Index + i].InUse = 0; - MemoryPage->Entry[Index + i].Blocks = 0; - } -} +NTAPI +DmaMemAllocator_Free( + IN LPDMA_MEMORY_ALLOCATOR Allocator, + IN OPTIONAL PVOID VirtualAddress, + IN ULONG Size) +{ + KIRQL OldLevel; + ULONG BlockOffset = 0, BlockLength; + + /* sanity check */ + ASSERT(VirtualAddress); + + /* calculate block length */ + BlockLength = ((ULONG_PTR)VirtualAddress - (ULONG_PTR)Allocator->VirtualBase); + + /* is block offset zero */ + if (BlockLength) + { + /* divide by base block size */ + BlockOffset = BlockLength / Allocator->BlockSize; + } + + /* align size to base block */ + Size = (Size + Allocator->BlockSize - 1) & ~(Allocator->BlockSize - 1); + + /* acquire bitmap lock */ + KeAcquireSpinLock(Allocator->Lock, &OldLevel); + + /* clear bits */ + RtlClearBits(&Allocator->Bitmap, BlockOffset, Size); + + /* release bitmap lock */ + KeReleaseSpinLock(Allocator->Lock, OldLevel); +} Modified: branches/cmake-bringup/drivers/usb/usbehci/physmem.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/physmem.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/physmem.h [iso-8859-1] Wed Apr 13 01:37:14 2011 @@ -2,25 +2,42 @@ #include "hardware.h" -typedef struct _MEM_ENTRY -{ - UCHAR InUse:1; - UCHAR Blocks:7; -} MEM_ENTRY, *PMEM_ENTRY; +/* destroys memory allocator */ +VOID +NTAPI +DmaMemAllocator_Destroy( + IN LPDMA_MEMORY_ALLOCATOR Allocator); -typedef struct _MEM_HEADER -{ - UCHAR IsFull; - MEM_ENTRY Entry[124]; - UCHAR Reserved[3]; -} MEM_HEADER, *PMEM_HEADER; +/* create memory allocator */ +NTSTATUS +NTAPI +DmaMemAllocator_Create( + IN LPDMA_MEMORY_ALLOCATOR *OutMemoryAllocator); +/* initializes memory allocator */ +NTSTATUS +NTAPI +DmaMemAllocator_Initialize( + IN OUT LPDMA_MEMORY_ALLOCATOR Allocator, + IN ULONG DefaultBlockSize, + IN PKSPIN_LOCK Lock, + IN PHYSICAL_ADDRESS PhysicalBase, + IN PVOID VirtualBase, + IN ULONG Length); + +/* allocates memory from allocator */ +NTSTATUS +NTAPI +DmaMemAllocator_Allocate( + IN LPDMA_MEMORY_ALLOCATOR Allocator, + IN ULONG Size, + OUT PVOID *OutVirtualAddress, + OUT PPHYSICAL_ADDRESS OutPhysicalAddress); + +/* frees memory block from allocator */ VOID -DumpPages(VOID); - -ULONG -AllocateMemory(PEHCI_HOST_CONTROLLER hcd, ULONG Size, ULONG *PhysicalAddress); - -VOID -ReleaseMemory(ULONG Address); - +NTAPI +DmaMemAllocator_Free( + IN LPDMA_MEMORY_ALLOCATOR Allocator, + IN PVOID VirtualAddress, + IN ULONG Size); Modified: branches/cmake-bringup/drivers/usb/usbehci/transfer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/transfer.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/transfer.c [iso-8859-1] Wed Apr 13 01:37:14 2011 @@ -143,11 +143,13 @@ ULONG MdlPhysicalAddr; PKEVENT Event = NULL; PMDL pMdl = NULL; - PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetupVA, CtrlPhysicalPA; - - CtrlSetupVA = (PUSB_DEFAULT_PIPE_SETUP_PACKET)AllocateMemory(hcd, - sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), - (ULONG*)&CtrlPhysicalPA); + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetupVA; + NTSTATUS Status; + PHYSICAL_ADDRESS PhysicalAddress; + + /* allocate memory */ + Status = DmaMemAllocator_Allocate(hcd->DmaMemAllocator, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), (PVOID*)&CtrlSetupVA, &PhysicalAddress); + ASSERT(Status == STATUS_SUCCESS); RtlCopyMemory(CtrlSetupVA, CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); /* If no Irp then wait on completion */ @@ -214,7 +216,7 @@ } /* Assign the descritors buffers */ - Descriptor[0]->BufferPointer[0] = (ULONG)CtrlPhysicalPA; + Descriptor[0]->BufferPointer[0] = PhysicalAddress.LowPart; if (TransferBuffer) { Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/usbehci.h [iso-8859-1] Wed Apr 13 01:37:14 2011 @@ -104,8 +104,7 @@ typedef struct _FDO_DEVICE_EXTENSION { COMMON_DEVICE_EXTENSION Common; - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT Pdo; ULONG DeviceState;

13 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
30
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 April 2011