Ros-diffs

ros-diffs@reactos.org

11 participants
81011 discussions

[reactos] 01/01: [USETUP] Fix typo in Japanese (ja-JP) translation (#7219)

by Kenta Kubo

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ac536d78739bc8389051… commit 6ac536d78739bc8389051c4eaffae7014228df1f Author: Kenta Kubo <kabuto669(a)icloud.com> AuthorDate: Wed Aug 7 23:52:27 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 17:52:27 2024 +0300 [USETUP] Fix typo in Japanese (ja-JP) translation (#7219) Fix a typo in "ジドウテキニ" word: `\274\336\304\336\263\303\306` (ジドウテニ) that was introduced in 2009 year (commit 379ce6f163ac). The word "ジドウテキニ" is "自動的に" in Kanji, means "automatically". --- base/setup/usetup/lang/ja-JP.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 4bf79c460a9..2702a013d36 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -748,7 +748,7 @@ static MUI_ENTRY jaJPFlushPageEntries[] = { 10, 9, - "\266\335\330\256\263\272\336\244 \272\335\313\337\255\260\300\312 \274\336\304\336\263\303\306 \273\262\267\304\336\263 \273\332\317\275", + "\266\335\330\256\263\272\336\244 \272\335\313\337\255\260\300\312 \274\336\304\336\263\303\267\306 \273\262\267\304\336\263 \273\332\317\275", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

5 months

[reactos] 01/01: [UXTHEME] Add German (de-DE) translation (#7204)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ca6b319e34e5e9daf760… commit 0ca6b319e34e5e9daf760d3a4c422f445f9270c5 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Wed Aug 7 11:26:38 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 12:26:38 2024 +0300 [UXTHEME] Add German (de-DE) translation (#7204) Matches German translation in the desk.cpl applet. --- dll/win32/uxtheme/lang/de-DE.rc | 19 +++++++++++++++++++ dll/win32/uxtheme/uxtheme.rc | 3 +++ 2 files changed, 22 insertions(+) diff --git a/dll/win32/uxtheme/lang/de-DE.rc b/dll/win32/uxtheme/lang/de-DE.rc new file mode 100644 index 00000000000..d0e6e9030fc --- /dev/null +++ b/dll/win32/uxtheme/lang/de-DE.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: German resource file + * TRANSLATOR: Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_MESSAGEBOX "Dialogfeld" + IDS_ACTIVEWIN "Aktives Fenster" + IDS_INACTIVEWIN "Inaktives Fenster" + IDS_OK "OK" + IDS_WINTEXT "Fenstertext" +END diff --git a/dll/win32/uxtheme/uxtheme.rc b/dll/win32/uxtheme/uxtheme.rc index 9e1101293c0..65cb7424ecd 100644 --- a/dll/win32/uxtheme/uxtheme.rc +++ b/dll/win32/uxtheme/uxtheme.rc @@ -22,6 +22,9 @@ #ifdef LANGUAGE_CS_CZ #include "lang/cs-CZ.rc" #endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

5 months

[reactos] 01/01: [EXPLORER] Update Czech (cs-CZ) translation (#7203)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d23422dbc0208b3fd22a1… commit d23422dbc0208b3fd22a10f4590a4cecb6191969 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Wed Aug 7 11:14:21 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 12:14:21 2024 +0300 [EXPLORER] Update Czech (cs-CZ) translation (#7203) --- base/shell/explorer/lang/cs-CZ.rc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 8c8438e967f..96dacb3e5b2 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -2,7 +2,8 @@ * PROJECT: ReactOS Explorer * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Czech resource file - * TRANSLATOR: Copyright 2008-2015 Radek Liška aka Black_Fox <radekliska(a)gmail.com> + * TRANSLATORS: Copyright 2008-2015 Radek Liška (Black_Fox) <radekliska(a)gmail.com> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -78,7 +79,7 @@ BEGIN AUTOCHECKBOX "&Zobrazit hlavní panel nad ostatními okny", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Seskupovat podobná tlačítka hlavního panelu", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Zobrazit &panel Snadné spuštění", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "Použít &malé ikony", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,15 +102,15 @@ CAPTION "Oznamovací oblast" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 - GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + GROUPBOX "Ikony", IDC_STATIC, 6, 36, 240, 56 LTEXT "Přehlednost oznamovací oblasti lze zachovat pomocí skrytí nepoužívaných ikon.", IDC_STATIC, 13, 48, 223, 16 AUTOCHECKBOX "Sk&rýt neaktivní ikony", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 - GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 - LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + GROUPBOX "Systémové ikony", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Vyberte, které systémové ikony se mají zobrazovat vždy.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Zobrazit hodiny", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Zobrazit sekundy", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Plocha", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 @@ -211,7 +212,7 @@ END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Vlastnosti hlavního panelu a Start menu" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Hlavního panelu a nabídky Start" IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile"

5 months

[reactos] 01/01: [SYSDM] Improve for Chinese Simplified (zh-CN) translation (#7217)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2ae8e8cb2192c2a2b99f… commit d2ae8e8cb2192c2a2b99f6aaec0d1ce6de38ae2a Author: He Yang <1160386205(a)qq.com> AuthorDate: Wed Aug 7 16:51:09 2024 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 10:51:09 2024 +0200 [SYSDM] Improve for Chinese Simplified (zh-CN) translation (#7217) --- dll/cpl/sysdm/lang/zh-CN.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 9d9e24eb595..4163961fbb2 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -365,8 +365,8 @@ BEGIN IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。" - IDS_WARNINITIALRANGE "在所选驱动器上初始页面文件大小必须介于 2 MB 和 %lu MB 之间。" - IDS_WARNMAXIMUMRANGE "在所选驱动器上页面文件大小最大值必须大于或等于初始页面文件大小，但要小于 %lu MB。" + IDS_WARNINITIALRANGE "所选驱动器上分页文件的初始大小必须在 2 MB 和 %lu MB 之间。" + IDS_WARNMAXIMUMRANGE "所选驱动器上分页文件的最大大小必须大于或等于其初始大小，但要小于 %lu MB。" IDS_PAGEFILE_MB "%lu MB" IDS_PAGEFILE_NONE "无" IDS_PAGEFILE_SYSTEM "系统已托管"

5 months

[reactos] 01/01: [SHELL32] Simplify CExplorerBand::CompareTreeItems (#7214)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e51fddf030f80fc99fa38… commit e51fddf030f80fc99fa383d4d5212b71f3e92c4a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 7 10:33:48 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 10:33:48 2024 +0900 [SHELL32] Simplify CExplorerBand::CompareTreeItems (#7214) Reduce code. JIRA issue: CORE-19686 - Delete useless _ILIsSpecialFolder and GetDisplayName helper functions. - Simply use IShellFolder::CompareIDs for item comparison. --- dll/win32/shdocvw/CExplorerBand.cpp | 105 ++++-------------------------------- 1 file changed, 10 insertions(+), 95 deletions(-) diff --git a/dll/win32/shdocvw/CExplorerBand.cpp b/dll/win32/shdocvw/CExplorerBand.cpp index d47964f08ab..8a60321a706 100644 --- a/dll/win32/shdocvw/CExplorerBand.cpp +++ b/dll/win32/shdocvw/CExplorerBand.cpp @@ -20,51 +20,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); * - TESTING */ -typedef struct _PIDLDATA -{ - BYTE type; - BYTE data[1]; -} PIDLDATA, *LPPIDLDATA; - -#define PT_GUID 0x1F -#define PT_SHELLEXT 0x2E -#define PT_YAGUID 0x70 - -static BOOL _ILIsSpecialFolder (LPCITEMIDLIST pidl) -{ - LPPIDLDATA lpPData = (LPPIDLDATA)&pidl->mkid.abID; - - return (pidl && - ((lpPData && (PT_GUID == lpPData->type || PT_SHELLEXT== lpPData->type || - PT_YAGUID == lpPData->type)) || (pidl && pidl->mkid.cb == 0x00))); -} - -HRESULT GetDisplayName(LPCITEMIDLIST pidlDirectory,TCHAR *szDisplayName,UINT cchMax,DWORD uFlags) -{ - IShellFolder *pShellFolder = NULL; - LPCITEMIDLIST pidlRelative = NULL; - STRRET str; - HRESULT hr; - - if (pidlDirectory == NULL || szDisplayName == NULL) - { - return E_FAIL; - } - - hr = SHBindToParent(pidlDirectory, IID_PPV_ARG(IShellFolder, &pShellFolder), &pidlRelative); - - if (SUCCEEDED(hr)) - { - hr = pShellFolder->GetDisplayNameOf(pidlRelative,uFlags,&str); - if (SUCCEEDED(hr)) - { - hr = StrRetToBuf(&str,pidlDirectory,szDisplayName,cchMax); - } - pShellFolder->Release(); - } - return hr; -} - CExplorerBand::CExplorerBand() : m_pSite(NULL) , m_fVisible(FALSE) @@ -788,7 +743,7 @@ CExplorerBand::InsertItem( TVSORTCB sortCallback; sortCallback.hParent = hParent; sortCallback.lpfnCompare = CompareTreeItems; - sortCallback.lParam = (LPARAM)this; + sortCallback.lParam = (LPARAM)(PVOID)m_pDesktop; SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); } @@ -882,7 +837,7 @@ BOOL CExplorerBand::InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo) /* Let's do sorting */ sortCallback.hParent = hItem; sortCallback.lpfnCompare = CompareTreeItems; - sortCallback.lParam = (LPARAM)this; + sortCallback.lParam = (LPARAM)(PVOID)m_pDesktop; SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); /* Now we can redraw */ @@ -1014,55 +969,15 @@ BOOL CExplorerBand::NavigateToCurrentFolder() // *** Tree item sorting callback *** int CALLBACK CExplorerBand::CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3) { - /* - * We first sort drive letters (Path root), then PIDLs and then regular folder - * display name. - * This is not how Windows sorts item, but it gives decent results. - */ - NodeInfo *info1; - NodeInfo *info2; - CExplorerBand *pThis; - WCHAR wszFolder1[MAX_PATH]; - WCHAR wszFolder2[MAX_PATH]; - - info1 = (NodeInfo*)p1; - info2 = (NodeInfo*)p2; - pThis = (CExplorerBand*)p3; - - GetDisplayName(info1->absolutePidl, wszFolder1, MAX_PATH, SHGDN_FORPARSING); - GetDisplayName(info2->absolutePidl, wszFolder2, MAX_PATH, SHGDN_FORPARSING); - if (PathIsRoot(wszFolder1) && PathIsRoot(wszFolder2)) - { - return lstrcmpiW(wszFolder1,wszFolder2); - } - if (PathIsRoot(wszFolder1) && !PathIsRoot(wszFolder2)) - { - return -1; - } - if (!PathIsRoot(wszFolder1) && PathIsRoot(wszFolder2)) - { - return 1; - } - // Now, we compare non-root folders, grab display name - GetDisplayName(info1->absolutePidl, wszFolder1, MAX_PATH, SHGDN_INFOLDER); - GetDisplayName(info2->absolutePidl, wszFolder2, MAX_PATH, SHGDN_INFOLDER); + NodeInfo *info1 = (NodeInfo*)p1; + NodeInfo *info2 = (NodeInfo*)p2; + IShellFolder *pDesktop = (IShellFolder *)p3; - if (_ILIsSpecialFolder(info1->relativePidl) && !_ILIsSpecialFolder(info2->relativePidl)) - { - return -1; - } - if (!_ILIsSpecialFolder(info1->relativePidl) && _ILIsSpecialFolder(info2->relativePidl)) - { - return 1; - } - if (_ILIsSpecialFolder(info1->relativePidl) && !_ILIsSpecialFolder(info2->relativePidl)) - { - HRESULT hr; - hr = pThis->m_pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); - if (!hr) return 0; - return (hr > 0) ? -1 : 1; - } - return StrCmpLogicalW(wszFolder1, wszFolder2); + HRESULT hr = pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); + if (FAILED(hr)) + return 0; + + return (SHORT)HRESULT_CODE(hr); } // *** IOleWindow methods ***

5 months

[reactos] 01/01: [NTUSER] Implement BroadcastSystemMessage with 'Environment' parameter (#6884)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90de2b660b12919c2f60f… commit 90de2b660b12919c2f60f2f31ad41e37c123d662 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Aug 4 02:53:04 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 4 02:53:04 2024 -0500 [NTUSER] Implement BroadcastSystemMessage with 'Environment' parameter (#6884) * [NTUSER] Implement BroadcastSystemMessage with 'Environment' parameter CORE-19372 CORE-19583 * Changes based on reviewer comments. * Make sure that lParamMsg has a UNICODE_NULL in it. * Skip extra handling of 1 word messsages. --- win32ss/user/ntuser/message.c | 68 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index ce9da97c1a5..c86754abc56 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -13,8 +13,30 @@ DBG_DEFAULT_CHANNEL(UserMsg); #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) +/* Strings that are OK to pass between user and kernel mode. + * There may be other strings needed that can easily be added here. */ +WCHAR StrUserKernel[3][20] = {{L"intl"}, {L"Environment"}, {L"Policy"}}; + /* FUNCTIONS *****************************************************************/ +/* PosInArray checks for strings that can pass between user and kernel mode. + * See: https://learn.microsoft.com/en-us/windows/win32/winmsg/wm-settingchange + * It mentions 'Environment', 'intl', and 'Policy'. + * These strings are enumerated in the StrUserKernel definition. + * Returns: A positive integer indicating its position in the array if the + * string is found, or returns a minus one (-1) if the string is not found. */ +static INT PosInArray(_In_ PCWSTR String) +{ + INT i; + + for (i = 0; i < ARRAYSIZE(StrUserKernel); ++i) + { + if (wcsncmp(String, StrUserKernel[i], _countof(StrUserKernel[0])) == 0) + return i; + } + return -1; +} + NTSTATUS FASTCALL IntInitMessageImpl(VOID) { @@ -431,7 +453,7 @@ CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEnt NTSTATUS Status; PVOID KernelMem; - UINT Size; + UINT Size, i; *KernelModeMsg = *UserModeMsg; @@ -460,8 +482,42 @@ CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEnt if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) { TRACE("Copy Message %u from usermode buffer\n", KernelModeMsg->message); - Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) + /* Don't do extra testing for 1 word messages. For examples see + * https://wiki.winehq.org/List_Of_Windows_Messages. */ + if (Size > 1) + { + WCHAR lParamMsg[_countof(StrUserKernel[0]) + 1] = { 0 }; + _SEH2_TRY + { + if (UserModeMsg->lParam) + RtlCopyMemory(lParamMsg, (WCHAR*)UserModeMsg->lParam, sizeof(lParamMsg)); + /* Make sure that the last WCHAR is a UNICODE_NULL */ + for (i = 0; i < ARRAYSIZE(lParamMsg); ++i) + { + if (lParamMsg[i] == 0) + break; + } + /* If we did not find a UNICODE_NULL, then set last WCHAR to one */ + if (i == ARRAYSIZE(lParamMsg)) + lParamMsg[_countof(StrUserKernel[0])] = UNICODE_NULL; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_ACCESS_VIOLATION); + } + _SEH2_END; + + if (UserModeMsg->lParam && !UserModeMsg->wParam && + PosInArray(lParamMsg) >= 0) + { + TRACE("Copy String '%S' from usermode buffer\n", lParamMsg); + wcscpy(KernelMem, lParamMsg); + return STATUS_SUCCESS; + } + } + + Status = MmCopyFromCaller(KernelMem, (PVOID)UserModeMsg->lParam, Size); + if (!NT_SUCCESS(Status)) { ERR("Failed to copy message to kernel: invalid usermode lParam buffer\n"); ExFreePoolWithTag(KernelMem, TAG_MSG); @@ -2721,6 +2777,12 @@ NtUserMessageCall( HWND hWnd, } ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } + if (lParam && !wParam && wcsicmp((WCHAR*)lParam, L"Environment") == 0) + { + /* Handle Broadcast of WM_SETTINGCHAGE for Environment */ + co_IntDoSendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, + 0, (LPARAM)L"Environment", 0); + } Ret = TRUE; } }

5 months, 1 week

[reactos] 10/10: [ISAPNP] Make sure that APCs are disabled before acquiring a lock

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdc1d96dc1259093a07d6… commit fdc1d96dc1259093a07d6cd36c050716e831de74 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Jul 6 00:50:03 2024 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sat Aug 3 17:08:44 2024 +0600 [ISAPNP] Make sure that APCs are disabled before acquiring a lock Note: We could just use a fast mutex instead --- drivers/bus/isapnp/isapnp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 344cc23691d..8c58679d156 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -111,6 +111,8 @@ FORCEINLINE VOID IsaPnpAcquireBusDataLock(VOID) { + ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); + KeWaitForSingleObject(&BusSyncEvent, Executive, KernelMode, FALSE, NULL); } @@ -129,6 +131,8 @@ VOID IsaPnpAcquireDeviceDataLock( _In_ PISAPNP_FDO_EXTENSION FdoExt) { + ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); + KeWaitForSingleObject(&FdoExt->DeviceSyncEvent, Executive, KernelMode, FALSE, NULL); }

5 months, 1 week

[reactos] 09/10: [ISAPNP] Improvements around hardware access helpers

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6091dde0d348d138bc6f8… commit 6091dde0d348d138bc6f80fbe7354cc30627cbe2 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Fri May 3 20:43:40 2024 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sat Aug 3 17:08:43 2024 +0600 [ISAPNP] Improvements around hardware access helpers - Reimplement WriteWord using the WriteByte helper. - Remove inline qualifiers from the bus read and write functions. This code path is considered "cold" and using an inline for it is overkill. - Don't apply the IRQL restrictions to our PnP state transition helpers. They are only called at IRQL below dispatch level. --- drivers/bus/isapnp/hardware.c | 33 +++++++++++++++++++++++---------- drivers/bus/isapnp/isapnp.h | 8 ++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index ecaec120c14..443fb787bbd 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -48,12 +48,14 @@ ReadData( } static -inline +CODE_SEG("PAGE") VOID WriteByte( _In_ UCHAR Address, _In_ UCHAR Value) { + PAGED_CODE(); + WriteAddress(Address); WriteData(Value); } @@ -65,10 +67,8 @@ WriteWord( _In_ UCHAR Address, _In_ USHORT Value) { - WriteAddress(Address + 1); - WriteData((UCHAR)Value); - WriteAddress(Address); - WriteData(Value >> 8); + WriteByte(Address + 1, (UCHAR)Value); + WriteByte(Address, Value >> 8); } static @@ -83,12 +83,14 @@ WriteDoubleWord( } static -inline +CODE_SEG("PAGE") UCHAR ReadByte( _In_ PUCHAR ReadDataPort, _In_ UCHAR Address) { + PAGED_CODE(); + WriteAddress(Address); return ReadData(ReadDataPort); } @@ -325,11 +327,14 @@ NextLFSR( } static +CODE_SEG("PAGE") VOID SendKey(VOID) { UCHAR i, Lfsr; + PAGED_CODE(); + WriteAddress(0x00); WriteAddress(0x00); @@ -1634,37 +1639,45 @@ IsaHwConfigureDevice( return STATUS_SUCCESS; } -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwWakeDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { + PAGED_CODE(); + SendKey(); Wake(LogicalDevice->CSN); } -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwActivateDevice( _In_ PISAPNP_FDO_EXTENSION FdoExt, _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { + PAGED_CODE(); + ActivateDevice(FdoExt->ReadDataPort, LogicalDevice->LDN); } #ifndef UNIT_TEST -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwDeactivateDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { + PAGED_CODE(); + DeactivateDevice(LogicalDevice->LDN); } #endif /* UNIT_TEST */ -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwWaitForKey(VOID) { + PAGED_CODE(); + WaitForKey(); } diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 998c7e766f0..344cc23691d 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -244,23 +244,23 @@ IsaHwConfigureDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice, _In_ PCM_RESOURCE_LIST Resources); -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwWakeDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwDeactivateDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwActivateDevice( _In_ PISAPNP_FDO_EXTENSION FdoExt, _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwWaitForKey(VOID);

5 months, 1 week

[reactos] 08/10: [ISAPNP] Refactor the configuration code

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2981e63a310e635365a47… commit 2981e63a310e635365a476bd80a015acf783adf8 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Fri May 3 20:42:21 2024 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sat Aug 3 17:08:43 2024 +0600 [ISAPNP] Refactor the configuration code - Remove useless checks - Increase code readability --- drivers/bus/isapnp/hardware.c | 322 ++++++++++++++++++++---------------------- drivers/bus/isapnp/isapnp.c | 4 +- drivers/bus/isapnp/isapnphw.h | 1 + 3 files changed, 157 insertions(+), 170 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index 937923959a3..ecaec120c14 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -1079,7 +1079,7 @@ ReadCurrentResources( { LogDevice->Dma[i].CurrentChannel = ReadDmaChannel(ReadDataPort, i); - if (LogDevice->Dma[i].CurrentChannel == 4) + if (LogDevice->Dma[i].CurrentChannel == DMACHANNEL_NONE) break; } for (i = 0; i < RTL_NUMBER_OF(LogDevice->MemRange); i++) @@ -1128,165 +1128,119 @@ ReadCurrentResources( static CODE_SEG("PAGE") VOID -WriteResources( - _In_ PUCHAR ReadDataPort, - _In_ PISAPNP_LOGICAL_DEVICE LogDevice, - _In_ PCM_PARTIAL_RESOURCE_LIST PartialResourceList) +IsaProgramIoDecoder( + _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor, + _In_ UCHAR Index) { - UCHAR i, - NumberOfIo = 0, - NumberOfIrq = 0, - NumberOfDma = 0, - NumberOfMemory = 0, - NumberOfMemory32 = 0; - PAGED_CODE(); - WriteLogicalDeviceNumber(LogDevice->LDN); - - for (i = 0; i < PartialResourceList->Count; i++) - { - PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor = &PartialResourceList->PartialDescriptors[i]; + ASSERT(Descriptor->u.Port.Start.QuadPart <= 0xFFFF); - switch (Descriptor->Type) - { - case CmResourceTypePort: - { - (VOID)FindIoDescriptor(LogDevice, - 0, - Descriptor->u.Port.Start.LowPart, - Descriptor->u.Port.Start.LowPart + - Descriptor->u.Port.Length - 1, - NULL, - NULL); - - WriteWord(ISAPNP_IOBASE(NumberOfIo), (USHORT)Descriptor->u.Port.Start.LowPart); - - ++NumberOfIo; - break; - } - - case CmResourceTypeInterrupt: - { - (VOID)FindIrqDescriptor(LogDevice, Descriptor->u.Interrupt.Level); - - WriteByte(ISAPNP_IRQNO(NumberOfIrq), (UCHAR)Descriptor->u.Interrupt.Level); - WriteByte(ISAPNP_IRQTYPE(NumberOfIrq), - Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED - ? IRQTYPE_HIGH_EDGE : IRQTYPE_LOW_LEVEL); - - ++NumberOfIrq; - break; - } - - case CmResourceTypeDma: - { - (VOID)FindDmaDescriptor(LogDevice, Descriptor->u.Dma.Channel); + WriteWord(ISAPNP_IOBASE(Index), Descriptor->u.Port.Start.LowPart); +} - WriteByte(ISAPNP_DMACHANNEL(NumberOfDma), (UCHAR)Descriptor->u.Dma.Channel); +static +CODE_SEG("PAGE") +VOID +IsaProgramIrqSelect( + _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor, + _In_ UCHAR Index) +{ + UCHAR TypeSelect; - ++NumberOfDma; - break; - } + PAGED_CODE(); - case CmResourceTypeMemory: - { - UCHAR Information; - UCHAR MemoryControl = MEMORY_USE_8_BIT_DECODER; + ASSERT(Descriptor->u.Interrupt.Level <= 15); - (VOID)FindMemoryDescriptor(LogDevice, - Descriptor->u.Memory.Start.LowPart, - Descriptor->u.Memory.Start.LowPart + - Descriptor->u.Memory.Length - 1, - &Information); + if (Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) + TypeSelect = IRQTYPE_HIGH_EDGE; + else + TypeSelect = IRQTYPE_LOW_LEVEL; - if (LogicalDevice->Flags & ISAPNP_HAS_MEM24_DECODER) - { - if (Information & MEMRANGE_16_BIT_MEMORY_MASK) - MemoryControl = MEMORY_USE_16_BIT_DECODER; + WriteByte(ISAPNP_IRQNO(Index), Descriptor->u.Interrupt.Level); + WriteByte(ISAPNP_IRQTYPE(Index), TypeSelect); +} - WriteWord(ISAPNP_MEMBASE(NumberOfMemory), - (USHORT)(Descriptor->u.Memory.Start.LowPart >> 8)); +static +CODE_SEG("PAGE") +VOID +IsaProgramDmaSelect( + _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor, + _In_ UCHAR Index) +{ + PAGED_CODE(); - if (ReadMemoryControl(ReadDataPort, NumberOfMemory) & MEMORY_UPPER_LIMIT) - { - WriteByte(ISAPNP_MEMCONTROL(NumberOfMemory), - MemoryControl | MEMORY_UPPER_LIMIT); - WriteWord(ISAPNP_MEMLIMIT(NumberOfMemory), - (USHORT)((Descriptor->u.Memory.Start.LowPart + - Descriptor->u.Memory.Length) >> 8)); - } - else - { - WriteByte(ISAPNP_MEMCONTROL(NumberOfMemory), MemoryControl); - WriteWord(ISAPNP_MEMLIMIT(NumberOfMemory), - (USHORT)(LENGTH_TO_RANGE_LENGTH(Descriptor-> - u.Memory.Length) >> 8)); - } + ASSERT(Descriptor->u.Dma.Channel <= 7); - ++NumberOfMemory; - } - else - { - WriteDoubleWord(ISAPNP_MEMBASE32(NumberOfMemory32), - Descriptor->u.Memory.Start.LowPart); + WriteByte(ISAPNP_DMACHANNEL(Index), Descriptor->u.Dma.Channel); +} - if ((Information & MEMRANGE_16_BIT_MEMORY_MASK) == MEMRANGE_32_BIT_MEMORY_ONLY) - MemoryControl = MEMORY_USE_32_BIT_DECODER; - else if (Information & MEMRANGE_16_BIT_MEMORY_MASK) - MemoryControl = MEMORY_USE_16_BIT_DECODER; +static +CODE_SEG("PAGE") +NTSTATUS +IsaProgramMemoryDecoder( + _In_ PUCHAR ReadDataPort, + _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor, + _In_ BOOLEAN IsMemory32, + _In_ UCHAR Information, + _In_ UCHAR Index) +{ + UCHAR MemoryControl; + ULONG LengthLimit; - if (ReadMemoryControl32(ReadDataPort, NumberOfMemory32) & MEMORY_UPPER_LIMIT) - { - WriteByte(ISAPNP_MEMCONTROL32(NumberOfMemory32), - MemoryControl | MEMORY_UPPER_LIMIT); - WriteDoubleWord(ISAPNP_MEMLIMIT32(NumberOfMemory32), - Descriptor->u.Memory.Start.LowPart + - Descriptor->u.Memory.Length); - } - else - { - WriteByte(ISAPNP_MEMCONTROL32(NumberOfMemory32), MemoryControl); - WriteDoubleWord(ISAPNP_MEMLIMIT32(NumberOfMemory32), - LENGTH_TO_RANGE_LENGTH(Descriptor->u.Memory.Length)); - } + PAGED_CODE(); - ++NumberOfMemory32; - } + if (!IsMemory32) + { + /* The 24-bit memory address decoder always considers bits 0:7 to be zeros */ + if (Descriptor->u.Memory.Start.LowPart & 0xFF) + return STATUS_INVALID_PARAMETER; - break; - } + if (Information & MEMRANGE_16_BIT_MEMORY_MASK) + MemoryControl = MEMORY_USE_16_BIT_DECODER; + else + MemoryControl = MEMORY_USE_8_BIT_DECODER; - default: - break; + if (ReadMemoryControl(ReadDataPort, Index) & MEMORY_UPPER_LIMIT) + { + MemoryControl |= MEMORY_UPPER_LIMIT; + LengthLimit = Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length; } - } + else + { + LengthLimit = LENGTH_TO_RANGE_LENGTH(Descriptor->u.Memory.Length); + } + LengthLimit >>= 8; - for (i = NumberOfIo; i < RTL_NUMBER_OF(LogDevice->Io); i++) - { - WriteWord(ISAPNP_IOBASE(i), 0); + WriteWord(ISAPNP_MEMBASE(Index), Descriptor->u.Memory.Start.LowPart >> 8); + WriteByte(ISAPNP_MEMCONTROL(Index), MemoryControl); + WriteWord(ISAPNP_MEMLIMIT(Index), LengthLimit); } - for (i = NumberOfIrq; i < RTL_NUMBER_OF(LogDevice->Irq); i++) - { - WriteByte(ISAPNP_IRQNO(i), 0); - WriteByte(ISAPNP_IRQTYPE(i), 0); - } - for (i = NumberOfDma; i < RTL_NUMBER_OF(LogDevice->Dma); i++) - { - WriteByte(ISAPNP_DMACHANNEL(i), 4); - } - for (i = NumberOfMemory; i < RTL_NUMBER_OF(LogDevice->MemRange); i++) - { - WriteWord(ISAPNP_MEMBASE(i), 0); - WriteByte(ISAPNP_MEMCONTROL(i), 0); - WriteWord(ISAPNP_MEMLIMIT(i), 0); - } - for (i = NumberOfMemory32; i < RTL_NUMBER_OF(LogDevice->MemRange32); i++) + else { - WriteDoubleWord(ISAPNP_MEMBASE32(i), 0); - WriteByte(ISAPNP_MEMCONTROL32(i), 0); - WriteDoubleWord(ISAPNP_MEMLIMIT32(i), 0); + if ((Information & MEMRANGE_16_BIT_MEMORY_MASK) == MEMRANGE_32_BIT_MEMORY_ONLY) + MemoryControl = MEMORY_USE_32_BIT_DECODER; + else if (Information & MEMRANGE_16_BIT_MEMORY_MASK) + MemoryControl = MEMORY_USE_16_BIT_DECODER; + else + MemoryControl = MEMORY_USE_8_BIT_DECODER; + + if (ReadMemoryControl32(ReadDataPort, Index) & MEMORY_UPPER_LIMIT) + { + MemoryControl |= MEMORY_UPPER_LIMIT; + LengthLimit = Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length; + } + else + { + LengthLimit = LENGTH_TO_RANGE_LENGTH(Descriptor->u.Memory.Length); + } + + WriteDoubleWord(ISAPNP_MEMBASE32(Index), Descriptor->u.Memory.Start.LowPart); + WriteByte(ISAPNP_MEMCONTROL32(Index), MemoryControl); + WriteDoubleWord(ISAPNP_MEMLIMIT32(Index), LengthLimit); } + + return STATUS_SUCCESS; } CODE_SEG("PAGE") @@ -1554,18 +1508,20 @@ IsaHwConfigureDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice, _In_ PCM_RESOURCE_LIST Resources) { - UCHAR i, - NumberOfIo = 0, + ULONG i; + UCHAR NumberOfIo = 0, NumberOfIrq = 0, NumberOfDma = 0, - NumberOfMemory = 0; + NumberOfMemory = 0, + NumberOfMemory32 = 0; PAGED_CODE(); if (!Resources) return STATUS_INSUFFICIENT_RESOURCES; - /* Validate the resource list */ + WriteLogicalDeviceNumber(LogicalDevice->LDN); + for (i = 0; i < Resources->List[0].PartialResourceList.Count; i++) { PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor = @@ -1575,63 +1531,68 @@ IsaHwConfigureDevice( { case CmResourceTypePort: { - if (++NumberOfIo > RTL_NUMBER_OF(LogicalDevice->Io)) + if (NumberOfIo >= RTL_NUMBER_OF(LogicalDevice->Io)) return STATUS_INVALID_PARAMETER_1; - if (!FindIoDescriptor(LogicalDevice, - 0, - Descriptor->u.Port.Start.LowPart, - Descriptor->u.Port.Start.LowPart + - Descriptor->u.Port.Length - 1, - NULL, - NULL)) - { - return STATUS_RESOURCE_DATA_NOT_FOUND; - } - + IsaProgramIoDecoder(Descriptor, NumberOfIo++); break; } case CmResourceTypeInterrupt: { - if (++NumberOfIrq > RTL_NUMBER_OF(LogicalDevice->Irq)) + if (NumberOfIrq >= RTL_NUMBER_OF(LogicalDevice->Irq)) return STATUS_INVALID_PARAMETER_2; - if (!FindIrqDescriptor(LogicalDevice, Descriptor->u.Interrupt.Level)) - return STATUS_RESOURCE_DATA_NOT_FOUND; - + IsaProgramIrqSelect(Descriptor, NumberOfIrq++); break; } case CmResourceTypeDma: { - if (++NumberOfDma > RTL_NUMBER_OF(LogicalDevice->Dma)) + if (NumberOfDma >= RTL_NUMBER_OF(LogicalDevice->Dma)) return STATUS_INVALID_PARAMETER_3; - if (!FindDmaDescriptor(LogicalDevice, Descriptor->u.Dma.Channel)) - return STATUS_RESOURCE_DATA_NOT_FOUND; - + IsaProgramDmaSelect(Descriptor, NumberOfDma++); break; } case CmResourceTypeMemory: { - BOOLEAN Memory32; + BOOLEAN IsMemory32; + UCHAR Index, Information; + NTSTATUS Status; - if (++NumberOfMemory > RTL_NUMBER_OF(LogicalDevice->MemRange)) + if ((NumberOfMemory + NumberOfMemory32) >= RTL_NUMBER_OF(LogicalDevice->MemRange)) return STATUS_INVALID_PARAMETER_4; + /* + * The PNP ROM provides an information byte for each memory descriptor + * which is then used to program the memory control register. + */ if (!FindMemoryDescriptor(LogicalDevice, Descriptor->u.Memory.Start.LowPart, Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length - 1, - NULL)) + &Information)) { return STATUS_RESOURCE_DATA_NOT_FOUND; } - if ((LogicalDevice->Flags & ISAPNP_HAS_MEM24_DECODER) && (Descriptor->u.Memory.Start.LowPart & 0xFF)) - return STATUS_INVALID_PARAMETER; + /* We can have a 24- or 32-bit memory decoder, but not both */ + IsMemory32 = !!(LogicalDevice->Flags & ISAPNP_HAS_MEM32_DECODER); + + if (IsMemory32) + Index = NumberOfMemory32++; + else + Index = NumberOfMemory++; + + Status = IsaProgramMemoryDecoder(FdoExt->ReadDataPort, + Descriptor, + IsMemory32, + Information, + Index); + if (!NT_SUCCESS(Status)) + return Status; break; } @@ -1641,7 +1602,32 @@ IsaHwConfigureDevice( } } - WriteResources(FdoExt->ReadDataPort, LogicalDevice, &Resources->List[0].PartialResourceList); + /* Disable the unclaimed device resources */ + for (i = NumberOfIo; i < RTL_NUMBER_OF(LogicalDevice->Io); i++) + { + WriteWord(ISAPNP_IOBASE(i), 0); + } + for (i = NumberOfIrq; i < RTL_NUMBER_OF(LogicalDevice->Irq); i++) + { + WriteByte(ISAPNP_IRQNO(i), 0); + WriteByte(ISAPNP_IRQTYPE(i), 0); + } + for (i = NumberOfDma; i < RTL_NUMBER_OF(LogicalDevice->Dma); i++) + { + WriteByte(ISAPNP_DMACHANNEL(i), DMACHANNEL_NONE); + } + for (i = NumberOfMemory; i < RTL_NUMBER_OF(LogicalDevice->MemRange); i++) + { + WriteWord(ISAPNP_MEMBASE(i), 0); + WriteByte(ISAPNP_MEMCONTROL(i), 0); + WriteWord(ISAPNP_MEMLIMIT(i), 0); + } + for (i = NumberOfMemory32; i < RTL_NUMBER_OF(LogicalDevice->MemRange32); i++) + { + WriteDoubleWord(ISAPNP_MEMBASE32(i), 0); + WriteByte(ISAPNP_MEMCONTROL32(i), 0); + WriteDoubleWord(ISAPNP_MEMLIMIT32(i), 0); + } KeStallExecutionProcessor(10000); diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index bf5b6cde8c8..2450d367413 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -652,7 +652,7 @@ IsaPnpCreateLogicalDeviceResources( } for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) { - if (LogDev->Dma[i].CurrentChannel != 4) + if (LogDev->Dma[i].CurrentChannel != DMACHANNEL_NONE) ResourceCount++; else break; @@ -736,7 +736,7 @@ IsaPnpCreateLogicalDeviceResources( } for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) { - if (LogDev->Dma[i].CurrentChannel == 4) + if (LogDev->Dma[i].CurrentChannel == DMACHANNEL_NONE) break; Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; diff --git a/drivers/bus/isapnp/isapnphw.h b/drivers/bus/isapnp/isapnphw.h index 3c5a2590729..5eb62746450 100644 --- a/drivers/bus/isapnp/isapnphw.h +++ b/drivers/bus/isapnp/isapnphw.h @@ -46,6 +46,7 @@ extern "C" { #define IRQTYPE_LOW_LEVEL 0x01 #define IRQTYPE_HIGH_EDGE 0x02 #define ISAPNP_DMACHANNEL(n) (0x74 + (n)) +#define DMACHANNEL_NONE 4 #define ISAPNP_MEMBASE32(n) ((n) == 0 ? 0x76 : (0x70 + (n) * 16)) #define ISAPNP_MEMCONTROL32(n) ((n) == 0 ? 0x7A : (0x74 + (n) * 16)) #define ISAPNP_MEMLIMIT32(n) ((n) == 0 ? 0x7B : (0x75 + (n) * 16))

5 months, 1 week

[reactos] 07/10: [ISAPNP] Fix parsing of complex resource data

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76ec8411a44bd44a0c555… commit 76ec8411a44bd44a0c5559fefc5e1b4dd3fed66b Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Fri May 3 20:39:26 2024 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sat Aug 3 17:08:43 2024 +0600 [ISAPNP] Fix parsing of complex resource data - Properly handle the case when the dependent function is placed after fixed resources - Initialize the version and revision fields of resource lists - Improve validation of resource data - Add more debug prints CORE-18562 --- drivers/bus/isapnp/hardware.c | 381 ++++++++----------- drivers/bus/isapnp/isapnp.c | 819 ++++++++++++++++------------------------- drivers/bus/isapnp/isapnp.h | 13 +- drivers/bus/isapnp/isapnpres.h | 97 ++--- drivers/bus/isapnp/pdo.c | 24 +- 5 files changed, 530 insertions(+), 804 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index 135ab574a16..937923959a3 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -20,13 +20,6 @@ #endif /* UNIT_TEST */ -typedef enum -{ - dfNotStarted, - dfStarted, - dfDone -} DEPEDENT_FUNCTION_STATE; - static inline VOID @@ -390,24 +383,6 @@ Peek( } } -static -CODE_SEG("PAGE") -VOID -PeekCached( - _In_reads_bytes_(Length) PUCHAR ResourceData, - _Out_writes_bytes_all_(Length) PVOID Buffer, - _In_ USHORT Length) -{ - PUCHAR Dest = Buffer; - - PAGED_CODE(); - - while (Length--) - { - *Dest++ = *ResourceData++; - } -} - static CODE_SEG("PAGE") UCHAR @@ -454,19 +429,28 @@ ReadTags( _In_ PUCHAR ReadDataPort, _Out_writes_(ISAPNP_MAX_RESOURCEDATA) PUCHAR Buffer, _In_ ULONG MaxLength, - _Out_ PUSHORT MaxLogDev) + _Out_ PUSHORT MaxLogDev, + _Out_ PULONG MaxTagsPerDevice) { + ULONG TagCount = 0; + PAGED_CODE(); *MaxLogDev = 0; + *MaxTagsPerDevice = 0; while (TRUE) { UCHAR Tag; USHORT TagLen; + ++TagCount; + if (MaxLength < 1) + { + DPRINT("Too small tag\n"); return STATUS_BUFFER_OVERFLOW; + } Tag = PeekByte(ReadDataPort); if (Tag == 0) @@ -487,7 +471,10 @@ ReadTags( UCHAR Temp[2]; if (MaxLength < sizeof(Temp)) + { + DPRINT("Too small tag\n"); return STATUS_BUFFER_OVERFLOW; + } Peek(ReadDataPort, &Temp, sizeof(Temp)); *Buffer++ = Temp[0]; @@ -505,17 +492,28 @@ ReadTags( } if (TagLen > MaxLength) + { + DPRINT("Too large resource data structure\n"); return STATUS_BUFFER_OVERFLOW; + } Peek(ReadDataPort, Buffer, TagLen); MaxLength -= TagLen; Buffer += TagLen; if (Tag == ISAPNP_TAG_LOGDEVID) - (*MaxLogDev)++; + { + /* Attempt to guess the allocation size based on the tags available */ + *MaxTagsPerDevice = max(*MaxTagsPerDevice, TagCount); + TagCount = 0; - if (Tag == ISAPNP_TAG_END) + (*MaxLogDev)++; + } + else if (Tag == ISAPNP_TAG_END) + { + *MaxTagsPerDevice = max(*MaxTagsPerDevice, TagCount); break; + } } return STATUS_SUCCESS; @@ -534,8 +532,8 @@ FreeLogicalDevice( if (LogDevice->FriendlyName) ExFreePoolWithTag(LogDevice->FriendlyName, TAG_ISAPNP); - if (LogDevice->Alternatives) - ExFreePoolWithTag(LogDevice->Alternatives, TAG_ISAPNP); + if (LogDevice->Resources) + ExFreePoolWithTag(LogDevice->Resources, TAG_ISAPNP); Entry = LogDevice->CompatibleIdList.Flink; while (Entry != &LogDevice->CompatibleIdList) @@ -562,15 +560,10 @@ ParseTags( _Inout_ PISAPNP_LOGICAL_DEVICE LogDevice) { USHORT LogDev; - DEPEDENT_FUNCTION_STATE DfState = dfNotStarted; + ISAPNP_DEPENDENT_FUNCTION_STATE DfState = dfNotStarted; + PISAPNP_RESOURCE Resource = LogDevice->Resources; PUCHAR IdStrPos = NULL; USHORT IdStrLen = 0; - UCHAR NumberOfIo = 0, - NumberOfIrq = 0, - NumberOfDma = 0, - NumberOfMemRange = 0, - NumberOfMemRange32 = 0, - NumberOfDepedentSet = 0; PAGED_CODE(); @@ -613,7 +606,7 @@ ParseTags( goto SkipTag; } - PeekCached(ResourceData, &Temp, TagLen); + RtlCopyMemory(&Temp, ResourceData, TagLen); ResourceData += TagLen; DPRINT("Found tag 0x%X (len %u)\n" @@ -643,7 +636,7 @@ ParseTags( if (!CompatibleId) return STATUS_INSUFFICIENT_RESOURCES; - PeekCached(ResourceData, &Temp, TagLen); + RtlCopyMemory(&Temp, ResourceData, TagLen); ResourceData += TagLen; DPRINT("Found tag 0x%X (len %u)\n" @@ -665,30 +658,21 @@ ParseTags( { PISAPNP_IRQ_DESCRIPTION Description; - if (LogDev != 0 || - (TagLen > sizeof(ISAPNP_IRQ_DESCRIPTION) || - TagLen < (sizeof(ISAPNP_IRQ_DESCRIPTION) - 1)) || - NumberOfIrq >= RTL_NUMBER_OF(LogDevice->Irq)) - { + if (LogDev != 0) goto SkipTag; - } - if (DfState == dfStarted) + if (TagLen > sizeof(ISAPNP_IRQ_DESCRIPTION) || + TagLen < (sizeof(ISAPNP_IRQ_DESCRIPTION) - 1)) { - if (NumberOfDepedentSet >= ISAPNP_MAX_ALTERNATIVES) - goto SkipTag; - - Description = &LogDevice->Alternatives->Irq[NumberOfDepedentSet]; + DPRINT1("Invalid tag %x\n", ISAPNP_TAG_IRQ); + return STATUS_UNSUCCESSFUL; } - else - { - Description = &LogDevice->Irq[NumberOfIrq].Description; - LogDevice->Irq[NumberOfIrq].Index = NumberOfIrq; - ++NumberOfIrq; - } + Resource->Type = ISAPNP_RESOURCE_TYPE_IRQ; + Description = &Resource->IrqDescription; + ++Resource; - PeekCached(ResourceData, Description, TagLen); + RtlCopyMemory(Description, ResourceData, TagLen); ResourceData += TagLen; if (TagLen == (sizeof(ISAPNP_IRQ_DESCRIPTION) - 1)) @@ -708,28 +692,20 @@ ParseTags( { PISAPNP_DMA_DESCRIPTION Description; - if (LogDev != 0 || TagLen != sizeof(ISAPNP_DMA_DESCRIPTION) || - NumberOfDma >= RTL_NUMBER_OF(LogDevice->Dma)) - { + if (LogDev != 0) goto SkipTag; - } - if (DfState == dfStarted) + if (TagLen != sizeof(ISAPNP_DMA_DESCRIPTION)) { - if (NumberOfDepedentSet >= ISAPNP_MAX_ALTERNATIVES) - goto SkipTag; - - Description = &LogDevice->Alternatives->Dma[NumberOfDepedentSet]; + DPRINT1("Invalid tag %x\n", ISAPNP_TAG_DMA); + return STATUS_UNSUCCESSFUL; } - else - { - Description = &LogDevice->Dma[NumberOfDma].Description; - LogDevice->Dma[NumberOfDma].Index = NumberOfDma; - ++NumberOfDma; - } + Resource->Type = ISAPNP_RESOURCE_TYPE_DMA; + Description = &Resource->DmaDescription; + ++Resource; - PeekCached(ResourceData, Description, TagLen); + RtlCopyMemory(Description, ResourceData, TagLen); ResourceData += TagLen; DPRINT("Found tag 0x%X (len %u)\n" @@ -744,48 +720,39 @@ ParseTags( case ISAPNP_TAG_STARTDEP: { - if (LogDev != 0 || TagLen > 1 || - NumberOfDepedentSet >= ISAPNP_MAX_ALTERNATIVES) - { + if (LogDev != 0) goto SkipTag; + + if (TagLen > 1) + { + DPRINT1("Invalid tag %x\n", ISAPNP_TAG_STARTDEP); + return STATUS_UNSUCCESSFUL; } if (DfState == dfNotStarted) { - LogDevice->Alternatives = ExAllocatePoolZero(PagedPool, - sizeof(ISAPNP_ALTERNATIVES), - TAG_ISAPNP); - if (!LogDevice->Alternatives) - return STATUS_INSUFFICIENT_RESOURCES; - DfState = dfStarted; } - else if (DfState == dfStarted) - { - ++NumberOfDepedentSet; - } - else + else if (DfState != dfStarted) { goto SkipTag; } - ++LogDevice->Alternatives->Count; + Resource->Type = ISAPNP_RESOURCE_TYPE_START_DEPENDENT; + ++Resource; if (TagLen != 1) { - LogDevice->Alternatives->Priority[NumberOfDepedentSet] = 1; + Resource->Priority = 1; } else { - PeekCached(ResourceData, - &LogDevice->Alternatives->Priority[NumberOfDepedentSet], - TagLen); + RtlCopyMemory(&Resource->Priority, ResourceData, TagLen); ResourceData += TagLen; } - DPRINT("*** Start depedent set %u, priority %u ***\n", - NumberOfDepedentSet, - LogDevice->Alternatives->Priority[NumberOfDepedentSet]); + DPRINT("*** Start dependent set, priority %u ***\n", + Resource->Priority); break; } @@ -795,22 +762,14 @@ ParseTags( if (LogDev != 0 || DfState != dfStarted) goto SkipTag; + Resource->Type = ISAPNP_RESOURCE_TYPE_END_DEPENDENT; + ++Resource; + DfState = dfDone; ResourceData += TagLen; - if (HasIoAlternatives(LogDevice->Alternatives)) - LogDevice->Alternatives->IoIndex = NumberOfIo++; - if (HasIrqAlternatives(LogDevice->Alternatives)) - LogDevice->Alternatives->IrqIndex = NumberOfIrq++; - if (HasDmaAlternatives(LogDevice->Alternatives)) - LogDevice->Alternatives->DmaIndex = NumberOfDma++; - if (HasMemoryAlternatives(LogDevice->Alternatives)) - LogDevice->Alternatives->MemRangeIndex = NumberOfMemRange++; - if (HasMemory32Alternatives(LogDevice->Alternatives)) - LogDevice->Alternatives->MemRange32Index = NumberOfMemRange32++; - - DPRINT("*** End of depedent set ***\n"); + DPRINT("*** End of dependent set ***\n"); break; } @@ -819,28 +778,20 @@ ParseTags( { PISAPNP_IO_DESCRIPTION Description; - if (LogDev != 0 || TagLen != sizeof(ISAPNP_IO_DESCRIPTION) || - NumberOfIo >= RTL_NUMBER_OF(LogDevice->Io)) - { + if (LogDev != 0) goto SkipTag; - } - if (DfState == dfStarted) + if (TagLen != sizeof(ISAPNP_IO_DESCRIPTION)) { - if (NumberOfDepedentSet >= ISAPNP_MAX_ALTERNATIVES) - goto SkipTag; - - Description = &LogDevice->Alternatives->Io[NumberOfDepedentSet]; + DPRINT1("Invalid tag %x\n", ISAPNP_TAG_IOPORT); + return STATUS_UNSUCCESSFUL; } - else - { - Description = &LogDevice->Io[NumberOfIo].Description; - LogDevice->Io[NumberOfIo].Index = NumberOfIo; - ++NumberOfIo; - } + Resource->Type = ISAPNP_RESOURCE_TYPE_IO; + Description = &Resource->IoDescription; + ++Resource; - PeekCached(ResourceData, Description, TagLen); + RtlCopyMemory(Description, ResourceData, TagLen); ResourceData += TagLen; DPRINT("Found tag 0x%X (len %u)\n" @@ -864,28 +815,20 @@ ParseTags( ISAPNP_FIXED_IO_DESCRIPTION Temp; PISAPNP_IO_DESCRIPTION Description; - if (LogDev != 0 || TagLen != sizeof(ISAPNP_FIXED_IO_DESCRIPTION) || - NumberOfIo >= RTL_NUMBER_OF(LogDevice->Io)) - { + if (LogDev != 0) goto SkipTag; - } - if (DfState == dfStarted) + if (TagLen != sizeof(ISAPNP_FIXED_IO_DESCRIPTION)) { - if (NumberOfDepedentSet >= ISAPNP_MAX_ALTERNATIVES) - goto SkipTag; - - Description = &LogDevice->Alternatives->Io[NumberOfDepedentSet]; + DPRINT1("Invalid tag %x\n", ISAPNP_TAG_FIXEDIO); + return STATUS_UNSUCCESSFUL; } - else - { - Description = &LogDevice->Io[NumberOfIo].Description; - LogDevice->Io[NumberOfIo].Index = NumberOfIo; - ++NumberOfIo; - } + Resource->Type = ISAPNP_RESOURCE_TYPE_IO; + Description = &Resource->IoDescription; + ++Resource; - PeekCached(ResourceData, &Temp, TagLen); + RtlCopyMemory(&Temp, ResourceData, TagLen); ResourceData += TagLen; /* Save the address bits [0:9] */ @@ -919,7 +862,7 @@ ParseTags( if (!LogDevice->FriendlyName) return STATUS_INSUFFICIENT_RESOURCES; - PeekCached(IdStrPos, LogDevice->FriendlyName, IdStrLen); + RtlCopyMemory(LogDevice->FriendlyName, IdStrPos, IdStrLen); End = LogDevice->FriendlyName + IdStrLen - 1; while (End > LogDevice->FriendlyName && *End == ' ') @@ -929,6 +872,8 @@ ParseTags( *++End = ANSI_NULL; } + Resource->Type = ISAPNP_RESOURCE_TYPE_END; + return STATUS_SUCCESS; } @@ -936,28 +881,23 @@ ParseTags( { PISAPNP_MEMRANGE_DESCRIPTION Description; - if (LogDev != 0 || TagLen != sizeof(ISAPNP_MEMRANGE_DESCRIPTION) || - NumberOfMemRange >= RTL_NUMBER_OF(LogDevice->MemRange)) - { + if (LogDev != 0) goto SkipTag; - } - if (DfState == dfStarted) + if (TagLen != sizeof(ISAPNP_MEMRANGE_DESCRIPTION)) { - if (NumberOfDepedentSet >= ISAPNP_MAX_ALTERNATIVES) - goto SkipTag; - - Description = &LogDevice->Alternatives->MemRange[NumberOfDepedentSet]; + DPRINT1("Invalid tag %x\n", ISAPNP_TAG_MEMRANGE); + return STATUS_UNSUCCESSFUL; } - else - { - Description = &LogDevice->MemRange[NumberOfMemRange].Description; - LogDevice->MemRange[NumberOfMemRange].Index = NumberOfMemRange; - ++NumberOfMemRange; - } + LogDevice->Flags |= ISAPNP_HAS_MEM24_DECODER; + ASSERT(!(LogDevice->Flags & ISAPNP_HAS_MEM32_DECODER)); - PeekCached(ResourceData, Description, TagLen); + Resource->Type = ISAPNP_RESOURCE_TYPE_MEMRANGE; + Description = &Resource->MemRangeDescription; + ++Resource; + + RtlCopyMemory(Description, ResourceData, TagLen); ResourceData += TagLen; DPRINT("Found tag 0x%X (len %u)\n" @@ -1004,28 +944,23 @@ ParseTags( { PISAPNP_MEMRANGE32_DESCRIPTION Description; - if (LogDev != 0 || TagLen != sizeof(ISAPNP_MEMRANGE32_DESCRIPTION) || - NumberOfMemRange32 >= RTL_NUMBER_OF(LogDevice->MemRange32)) - { + if (LogDev != 0) goto SkipTag; - } - if (DfState == dfStarted) + if (TagLen != sizeof(ISAPNP_MEMRANGE32_DESCRIPTION)) { - if (NumberOfDepedentSet >= ISAPNP_MAX_ALTERNATIVES) - goto SkipTag; - - Description = &LogDevice->Alternatives->MemRange32[NumberOfDepedentSet]; + DPRINT1("Invalid tag %x\n", ISAPNP_TAG_MEM32RANGE); + return STATUS_UNSUCCESSFUL; } - else - { - Description = &LogDevice->MemRange32[NumberOfMemRange32].Description; - LogDevice->MemRange32[NumberOfMemRange32].Index = NumberOfMemRange32; - ++NumberOfMemRange32; - } + LogDevice->Flags |= ISAPNP_HAS_MEM32_DECODER; + ASSERT(!(LogDevice->Flags & ISAPNP_HAS_MEM24_DECODER)); + + Resource->Type = ISAPNP_RESOURCE_TYPE_MEMRANGE32; + Description = &Resource->MemRange32Description; + ++Resource; - PeekCached(ResourceData, Description, TagLen); + RtlCopyMemory(Description, ResourceData, TagLen); ResourceData += TagLen; DPRINT("Found tag 0x%X (len %u)\n" @@ -1049,28 +984,23 @@ ParseTags( ISAPNP_FIXEDMEMRANGE_DESCRIPTION Temp; PISAPNP_MEMRANGE32_DESCRIPTION Description; - if (LogDev != 0 || TagLen != sizeof(ISAPNP_FIXEDMEMRANGE_DESCRIPTION) || - NumberOfMemRange32 >= RTL_NUMBER_OF(LogDevice->MemRange32)) - { + if (LogDev != 0) goto SkipTag; - } - if (DfState == dfStarted) + if (TagLen != sizeof(ISAPNP_FIXEDMEMRANGE_DESCRIPTION)) { - if (NumberOfDepedentSet >= ISAPNP_MAX_ALTERNATIVES) - goto SkipTag; - - Description = &LogDevice->Alternatives->MemRange32[NumberOfDepedentSet]; + DPRINT1("Invalid tag %x\n", ISAPNP_TAG_FIXEDMEM32RANGE); + return STATUS_UNSUCCESSFUL; } - else - { - Description = &LogDevice->MemRange32[NumberOfMemRange32].Description; - LogDevice->MemRange32[NumberOfMemRange32].Index = NumberOfMemRange32; - ++NumberOfMemRange32; - } + LogDevice->Flags |= ISAPNP_HAS_MEM32_DECODER; + ASSERT(!(LogDevice->Flags & ISAPNP_HAS_MEM24_DECODER)); + + Resource->Type = ISAPNP_RESOURCE_TYPE_MEMRANGE32; + Description = &Resource->MemRange32Description; + ++Resource; - PeekCached(ResourceData, &Temp, TagLen); + RtlCopyMemory(&Temp, ResourceData, TagLen); ResourceData += TagLen; Description->Information = Temp.Information; @@ -1121,7 +1051,7 @@ ReadCurrentResources( WriteLogicalDeviceNumber(LogDevice->LDN); - /* If the device is not activated by BIOS we just report a NULL resource list */ + /* If the device is not activated by BIOS then the device has no boot resources */ if (!(ReadByte(ReadDataPort, ISAPNP_ACTIVATE) & 1)) { LogDevice->Flags &= ~ISAPNP_HAS_RESOURCES; @@ -1217,7 +1147,6 @@ WriteResources( for (i = 0; i < PartialResourceList->Count; i++) { PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor = &PartialResourceList->PartialDescriptors[i]; - UCHAR Index; switch (Descriptor->Type) { @@ -1229,10 +1158,9 @@ WriteResources( Descriptor->u.Port.Start.LowPart + Descriptor->u.Port.Length - 1, NULL, - NULL, - &Index); + NULL); - WriteWord(ISAPNP_IOBASE(Index), (USHORT)Descriptor->u.Port.Start.LowPart); + WriteWord(ISAPNP_IOBASE(NumberOfIo), (USHORT)Descriptor->u.Port.Start.LowPart); ++NumberOfIo; break; @@ -1240,10 +1168,10 @@ WriteResources( case CmResourceTypeInterrupt: { - (VOID)FindIrqDescriptor(LogDevice, Descriptor->u.Interrupt.Level, &Index); + (VOID)FindIrqDescriptor(LogDevice, Descriptor->u.Interrupt.Level); - WriteByte(ISAPNP_IRQNO(Index), (UCHAR)Descriptor->u.Interrupt.Level); - WriteByte(ISAPNP_IRQTYPE(Index), + WriteByte(ISAPNP_IRQNO(NumberOfIrq), (UCHAR)Descriptor->u.Interrupt.Level); + WriteByte(ISAPNP_IRQTYPE(NumberOfIrq), Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED ? IRQTYPE_HIGH_EDGE : IRQTYPE_LOW_LEVEL); @@ -1253,9 +1181,9 @@ WriteResources( case CmResourceTypeDma: { - (VOID)FindDmaDescriptor(LogDevice, Descriptor->u.Dma.Channel, &Index); + (VOID)FindDmaDescriptor(LogDevice, Descriptor->u.Dma.Channel); - WriteByte(ISAPNP_DMACHANNEL(Index), (UCHAR)Descriptor->u.Dma.Channel); + WriteByte(ISAPNP_DMACHANNEL(NumberOfDma), (UCHAR)Descriptor->u.Dma.Channel); ++NumberOfDma; break; @@ -1263,7 +1191,6 @@ WriteResources( case CmResourceTypeMemory: { - BOOLEAN Memory32; UCHAR Information; UCHAR MemoryControl = MEMORY_USE_8_BIT_DECODER; @@ -1271,30 +1198,28 @@ WriteResources( Descriptor->u.Memory.Start.LowPart, Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length - 1, - &Memory32, - &Information, - &Index); + &Information); - if (!Memory32) + if (LogicalDevice->Flags & ISAPNP_HAS_MEM24_DECODER) { if (Information & MEMRANGE_16_BIT_MEMORY_MASK) MemoryControl = MEMORY_USE_16_BIT_DECODER; - WriteWord(ISAPNP_MEMBASE(Index), + WriteWord(ISAPNP_MEMBASE(NumberOfMemory), (USHORT)(Descriptor->u.Memory.Start.LowPart >> 8)); - if (ReadMemoryControl(ReadDataPort, Index) & MEMORY_UPPER_LIMIT) + if (ReadMemoryControl(ReadDataPort, NumberOfMemory) & MEMORY_UPPER_LIMIT) { - WriteByte(ISAPNP_MEMCONTROL(Index), + WriteByte(ISAPNP_MEMCONTROL(NumberOfMemory), MemoryControl | MEMORY_UPPER_LIMIT); - WriteWord(ISAPNP_MEMLIMIT(Index), + WriteWord(ISAPNP_MEMLIMIT(NumberOfMemory), (USHORT)((Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length) >> 8)); } else { - WriteByte(ISAPNP_MEMCONTROL(Index), MemoryControl); - WriteWord(ISAPNP_MEMLIMIT(Index), + WriteByte(ISAPNP_MEMCONTROL(NumberOfMemory), MemoryControl); + WriteWord(ISAPNP_MEMLIMIT(NumberOfMemory), (USHORT)(LENGTH_TO_RANGE_LENGTH(Descriptor-> u.Memory.Length) >> 8)); } @@ -1303,7 +1228,7 @@ WriteResources( } else { - WriteDoubleWord(ISAPNP_MEMBASE32(Index), + WriteDoubleWord(ISAPNP_MEMBASE32(NumberOfMemory32), Descriptor->u.Memory.Start.LowPart); if ((Information & MEMRANGE_16_BIT_MEMORY_MASK) == MEMRANGE_32_BIT_MEMORY_ONLY) @@ -1311,18 +1236,18 @@ WriteResources( else if (Information & MEMRANGE_16_BIT_MEMORY_MASK) MemoryControl = MEMORY_USE_16_BIT_DECODER; - if (ReadMemoryControl32(ReadDataPort, Index) & MEMORY_UPPER_LIMIT) + if (ReadMemoryControl32(ReadDataPort, NumberOfMemory32) & MEMORY_UPPER_LIMIT) { - WriteByte(ISAPNP_MEMCONTROL32(Index), + WriteByte(ISAPNP_MEMCONTROL32(NumberOfMemory32), MemoryControl | MEMORY_UPPER_LIMIT); - WriteDoubleWord(ISAPNP_MEMLIMIT32(Index), + WriteDoubleWord(ISAPNP_MEMLIMIT32(NumberOfMemory32), Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length); } else { - WriteByte(ISAPNP_MEMCONTROL32(Index), MemoryControl); - WriteDoubleWord(ISAPNP_MEMLIMIT32(Index), + WriteByte(ISAPNP_MEMCONTROL32(NumberOfMemory32), MemoryControl); + WriteDoubleWord(ISAPNP_MEMLIMIT32(NumberOfMemory32), LENGTH_TO_RANGE_LENGTH(Descriptor->u.Memory.Length)); } @@ -1501,6 +1426,7 @@ IsaHwFillDeviceList( NTSTATUS Status; UCHAR TempId[3], LogDev; ISAPNP_IDENTIFIER Identifier; + ULONG MaxTagsPerDevice; USHORT MaxLogDev; Wake(Csn); @@ -1510,7 +1436,11 @@ IsaHwFillDeviceList( IsaPnpExtractAscii(TempId, Identifier.VendorId); Identifier.ProdId = RtlUshortByteSwap(Identifier.ProdId); - Status = ReadTags(FdoExt->ReadDataPort, ResourceData, ISAPNP_MAX_RESOURCEDATA, &MaxLogDev); + Status = ReadTags(FdoExt->ReadDataPort, + ResourceData, + ISAPNP_MAX_RESOURCEDATA, + &MaxLogDev, + &MaxTagsPerDevice); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to read tags with status 0x%08lx, CSN %u\n", Status, Csn); @@ -1572,6 +1502,16 @@ IsaHwFillDeviceList( LogDevice->CSN = Csn; LogDevice->LDN = LogDev; + LogDevice->Resources = ExAllocatePoolWithTag(PagedPool, + MaxTagsPerDevice * sizeof(ISAPNP_RESOURCE), + TAG_ISAPNP); + if (!LogDevice->Resources) + { + DPRINT1("Failed to allocate the resources array\n"); + FreeLogicalDevice(LogDevice); + goto Deactivate; + } + Status = ParseTags(ResourceData, LogDev, LogDevice); if (!NT_SUCCESS(Status)) { @@ -1644,7 +1584,6 @@ IsaHwConfigureDevice( Descriptor->u.Port.Start.LowPart + Descriptor->u.Port.Length - 1, NULL, - NULL, NULL)) { return STATUS_RESOURCE_DATA_NOT_FOUND; @@ -1658,7 +1597,7 @@ IsaHwConfigureDevice( if (++NumberOfIrq > RTL_NUMBER_OF(LogicalDevice->Irq)) return STATUS_INVALID_PARAMETER_2; - if (!FindIrqDescriptor(LogicalDevice, Descriptor->u.Interrupt.Level, NULL)) + if (!FindIrqDescriptor(LogicalDevice, Descriptor->u.Interrupt.Level)) return STATUS_RESOURCE_DATA_NOT_FOUND; break; @@ -1669,7 +1608,7 @@ IsaHwConfigureDevice( if (++NumberOfDma > RTL_NUMBER_OF(LogicalDevice->Dma)) return STATUS_INVALID_PARAMETER_3; - if (!FindDmaDescriptor(LogicalDevice, Descriptor->u.Dma.Channel, NULL)) + if (!FindDmaDescriptor(LogicalDevice, Descriptor->u.Dma.Channel)) return STATUS_RESOURCE_DATA_NOT_FOUND; break; @@ -1686,14 +1625,12 @@ IsaHwConfigureDevice( Descriptor->u.Memory.Start.LowPart, Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length - 1, - &Memory32, - NULL, NULL)) { return STATUS_RESOURCE_DATA_NOT_FOUND; } - if (!Memory32 && (Descriptor->u.Memory.Start.LowPart & 0xFF)) + if ((LogicalDevice->Flags & ISAPNP_HAS_MEM24_DECODER) && (Descriptor->u.Memory.Start.LowPart & 0xFF)) return STATUS_INVALID_PARAMETER; break; diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 7126166b092..bf5b6cde8c8 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -10,12 +10,8 @@ /* INCLUDES *******************************************************************/ #ifndef UNIT_TEST -#include "isapnp.h" -#endif /* UNIT_TEST */ -#include <search.h> - -#ifndef UNIT_TEST +#include "isapnp.h" #define NDEBUG #include <debug.h> @@ -32,46 +28,8 @@ LIST_ENTRY BusListHead; #endif /* UNIT_TEST */ -static PUCHAR Priority; - /* FUNCTIONS ******************************************************************/ -static -CODE_SEG("PAGE") -int -__cdecl -IsaComparePriority( - const void *A, - const void *B) -{ - PAGED_CODE(); - - return Priority[*(PUCHAR)A] - Priority[*(PUCHAR)B]; -} - -static -CODE_SEG("PAGE") -VOID -IsaDetermineBestConfig( - _Out_writes_all_(ISAPNP_MAX_ALTERNATIVES) PUCHAR BestConfig, - _In_ PISAPNP_ALTERNATIVES Alternatives) -{ - UCHAR i; - - PAGED_CODE(); - - for (i = 0; i < ISAPNP_MAX_ALTERNATIVES; i++) - { - BestConfig[i] = i; - } - - Priority = Alternatives->Priority; - qsort(BestConfig, - Alternatives->Count, - sizeof(*BestConfig), - IsaComparePriority); -} - static CODE_SEG("PAGE") VOID @@ -194,323 +152,298 @@ IsaConvertMemRange32Requirement( Description->Length - 1; } +/* + * For example, the PnP ROM + * 0x15, 0x04, ... // Logical device ID + * 0x47, 0x01, 0x30, 0x03, 0x30, 0x03, 0x04, 0x04, // IO 330, len 4, align 4 + * 0x30, // **** Start DF **** + * 0x22, 0x04, 0x00, // IRQ 2 + * 0x31, 0x02, // **** Start DF **** + * 0x22, 0xC0, 0x00, // IRQ 6 or 7 + * 0x38, // **** End DF ****** + * 0x2A, 0x20, 0x3A, // DMA 5 + * 0x22, 0x00, 0x08, // IRQ 12 + * 0x79, 0x00, // END + * + * becomes the following resource requirements list: + * Interface 1 Bus 0 Slot 0 AlternativeLists 2 + * + * AltList #0, AltList->Count 4 + * [Option 0, ShareDisposition 1, Flags 11] IO: Min 0:330, Max 0:333, Align 4 Len 4 + * [Option 0, ShareDisposition 1, Flags 1] INT: Min 2 Max 2 + * [Option 0, ShareDisposition 0, Flags 0] DMA: Min 5 Max 5 + * [Option 0, ShareDisposition 1, Flags 1] INT: Min B Max B + * + * AltList #1, AltList->Count 5 + * [Option 0, ShareDisposition 1, Flags 11] IO: Min 0:330, Max 0:333, Align 4 Len 4 + * [Option 0, ShareDisposition 1, Flags 1] INT: Min 6 Max 6 + * [Option 8, ShareDisposition 1, Flags 1] INT: Min 7 Max 7 + * [Option 0, ShareDisposition 0, Flags 0] DMA: Min 5 Max 5 + * [Option 0, ShareDisposition 1, Flags 1] INT: Min B Max B + */ static CODE_SEG("PAGE") NTSTATUS IsaPnpCreateLogicalDeviceRequirements( _In_ PISAPNP_PDO_EXTENSION PdoExt) { - PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; - RTL_BITMAP TempBitmap; - ULONG TempBuffer; - ULONG ResourceCount = 0, AltCount = 0, AltOptionalCount = 0; - ULONG ListSize, i, j; - BOOLEAN FirstDescriptor; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PIO_RESOURCE_DESCRIPTOR Descriptor; - PISAPNP_ALTERNATIVES Alternatives = LogDev->Alternatives; + ISAPNP_DEPENDENT_FUNCTION_STATE DfState; + ULONG FirstFixedDescriptors, LastFixedDescriptors; + ULONG ResourceCount, AltListCount, ListSize, i; + BOOLEAN IsFirstAltList, IsFirstDescriptor; + PIO_RESOURCE_LIST AltList; + PISAPNP_RESOURCE Resource; PAGED_CODE(); - /* Count number of requirements */ - for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) + /* Count the number of requirements */ + DfState = dfNotStarted; + FirstFixedDescriptors = 0; + LastFixedDescriptors = 0; + ResourceCount = 0; + AltListCount = 1; + Resource = PdoExt->IsaPnpDevice->Resources; + while (Resource->Type != ISAPNP_RESOURCE_TYPE_END) { - /* - * Use the continue statement to count the number of requirements. - * We handle a possible gap because depedent function can appear at - * any position in the logical device's requirements list. - */ - if (!LogDev->Io[i].Description.Length) - continue; + switch (Resource->Type) + { + case ISAPNP_RESOURCE_TYPE_START_DEPENDENT: + { + if (DfState == dfStarted) + ++AltListCount; - ResourceCount++; - } - for (i = 0; i < RTL_NUMBER_OF(LogDev->Irq); i++) - { - if (!LogDev->Irq[i].Description.Mask) - continue; - - TempBuffer = LogDev->Irq[i].Description.Mask; - RtlInitializeBitMap(&TempBitmap, - &TempBuffer, - RTL_BITS_OF(LogDev->Irq[i].Description.Mask)); - ResourceCount += RtlNumberOfSetBits(&TempBitmap); - } - for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) - { - if (!LogDev->Dma[i].Description.Mask) - continue; - - TempBuffer = LogDev->Dma[i].Description.Mask; - RtlInitializeBitMap(&TempBitmap, - &TempBuffer, - RTL_BITS_OF(LogDev->Dma[i].Description.Mask)); - ResourceCount += RtlNumberOfSetBits(&TempBitmap); - } - for (i = 0; i < RTL_NUMBER_OF(LogDev->MemRange); i++) - { - if (!LogDev->MemRange[i].Description.Length) - continue; + DfState = dfStarted; + break; + } - ResourceCount++; - } - for (i = 0; i < RTL_NUMBER_OF(LogDev->MemRange32); i++) - { - if (!LogDev->MemRange32[i].Description.Length) - continue; + case ISAPNP_RESOURCE_TYPE_END_DEPENDENT: + { + DfState = dfDone; + break; + } - ResourceCount++; - } - if (Alternatives) - { - ULONG BitCount; - - if (HasIoAlternatives(Alternatives)) - AltCount++; - if (HasIrqAlternatives(Alternatives)) - AltCount++; - if (HasDmaAlternatives(Alternatives)) - AltCount++; - if (HasMemoryAlternatives(Alternatives)) - AltCount++; - if (HasMemory32Alternatives(Alternatives)) - AltCount++; - ResourceCount += AltCount; - - if (HasIrqAlternatives(Alternatives)) - { - for (i = 0; i < Alternatives->Count; i++) + case ISAPNP_RESOURCE_TYPE_IRQ: + case ISAPNP_RESOURCE_TYPE_DMA: { - TempBuffer = Alternatives->Irq[i].Mask; - RtlInitializeBitMap(&TempBitmap, - &TempBuffer, - RTL_BITS_OF(Alternatives->Irq[i].Mask)); - BitCount = RtlNumberOfSetBits(&TempBitmap); - - if (BitCount > 1) - AltOptionalCount += BitCount - 1; + RTL_BITMAP ResourceBitmap; + ULONG BitmapSize, BitmapBuffer, BitCount; + + if (Resource->Type == ISAPNP_RESOURCE_TYPE_IRQ) + { + BitmapSize = RTL_BITS_OF(Resource->IrqDescription.Mask); + BitmapBuffer = Resource->IrqDescription.Mask; + } + else + { + BitmapSize = RTL_BITS_OF(Resource->DmaDescription.Mask); + BitmapBuffer = Resource->DmaDescription.Mask; + } + RtlInitializeBitMap(&ResourceBitmap, &BitmapBuffer, BitmapSize); + + BitCount = RtlNumberOfSetBits(&ResourceBitmap); + switch (DfState) + { + case dfNotStarted: + FirstFixedDescriptors += BitCount; + break; + + case dfStarted: + ResourceCount += BitCount; + break; + + case dfDone: + LastFixedDescriptors += BitCount; + break; + + DEFAULT_UNREACHABLE; + } + + break; } - } - if (HasDmaAlternatives(Alternatives)) - { - for (i = 0; i < Alternatives->Count; i++) + + case ISAPNP_RESOURCE_TYPE_IO: + case ISAPNP_RESOURCE_TYPE_MEMRANGE: + case ISAPNP_RESOURCE_TYPE_MEMRANGE32: { - TempBuffer = Alternatives->Dma[i].Mask; - RtlInitializeBitMap(&TempBitmap, - &TempBuffer, - RTL_BITS_OF(Alternatives->Dma[i].Mask)); - BitCount = RtlNumberOfSetBits(&TempBitmap); - - if (BitCount > 1) - AltOptionalCount += BitCount - 1; + switch (DfState) + { + case dfNotStarted: + ++FirstFixedDescriptors; + break; + + case dfStarted: + ++ResourceCount; + break; + + case dfDone: + ++LastFixedDescriptors; + break; + + DEFAULT_UNREACHABLE; + } + break; } + + default: + ASSERT(FALSE); + UNREACHABLE; + break; } + + ++Resource; } - if (ResourceCount == 0) + + /* This logical device has no resource requirements */ + if ((ResourceCount == 0) && (FirstFixedDescriptors == 0) && (LastFixedDescriptors == 0)) return STATUS_SUCCESS; /* Allocate memory to store requirements */ - ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST); - if (Alternatives) - { - ListSize += sizeof(IO_RESOURCE_DESCRIPTOR) * (ResourceCount - 1) * Alternatives->Count - + sizeof(IO_RESOURCE_LIST) * (Alternatives->Count - 1) - + sizeof(IO_RESOURCE_DESCRIPTOR) * AltOptionalCount; - } - else - { - ListSize += sizeof(IO_RESOURCE_DESCRIPTOR) * (ResourceCount - 1); - } + ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List) + + FIELD_OFFSET(IO_RESOURCE_LIST, Descriptors) * AltListCount + + sizeof(IO_RESOURCE_DESCRIPTOR) * ResourceCount + + sizeof(IO_RESOURCE_DESCRIPTOR) * AltListCount * + (FirstFixedDescriptors + LastFixedDescriptors); RequirementsList = ExAllocatePoolZero(PagedPool, ListSize, TAG_ISAPNP); if (!RequirementsList) return STATUS_NO_MEMORY; RequirementsList->ListSize = ListSize; RequirementsList->InterfaceType = Isa; - RequirementsList->AlternativeLists = Alternatives ? Alternatives->Count : 1; + RequirementsList->AlternativeLists = AltListCount; RequirementsList->List[0].Version = 1; RequirementsList->List[0].Revision = 1; - RequirementsList->List[0].Count = ResourceCount; /* Store requirements */ - Descriptor = RequirementsList->List[0].Descriptors; - for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) - { - if (!LogDev->Io[i].Description.Length) - break; - - IsaConvertIoRequirement(Descriptor++, &LogDev->Io[i].Description); - } - for (i = 0; i < RTL_NUMBER_OF(LogDev->Irq); i++) - { - if (!LogDev->Irq[i].Description.Mask) - continue; - - FirstDescriptor = TRUE; - - for (j = 0; j < RTL_BITS_OF(LogDev->Irq[i].Description.Mask); j++) - { - if (!(LogDev->Irq[i].Description.Mask & (1 << j))) - continue; - - IsaConvertIrqRequirement(Descriptor++, - &LogDev->Irq[i].Description, - j, - FirstDescriptor); - - if (FirstDescriptor) - FirstDescriptor = FALSE; - } - } - for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) + IsFirstAltList = TRUE; + AltList = &RequirementsList->List[0]; + Descriptor = &RequirementsList->List[0].Descriptors[0]; + Resource = PdoExt->IsaPnpDevice->Resources; + while (Resource->Type != ISAPNP_RESOURCE_TYPE_END) { - if (!LogDev->Dma[i].Description.Mask) - continue; - - FirstDescriptor = TRUE; - - for (j = 0; j < RTL_BITS_OF(LogDev->Dma[i].Description.Mask); j++) + switch (Resource->Type) { - if (!(LogDev->Dma[i].Description.Mask & (1 << j))) - continue; - - IsaConvertDmaRequirement(Descriptor++, - &LogDev->Dma[i].Description, - j, - FirstDescriptor); - - if (FirstDescriptor) - FirstDescriptor = FALSE; - } - } - for (i = 0; i < RTL_NUMBER_OF(LogDev->MemRange); i++) - { - if (!LogDev->MemRange[i].Description.Length) - continue; + case ISAPNP_RESOURCE_TYPE_START_DEPENDENT: + { + if (!IsFirstAltList) + { + /* Add room for the fixed descriptors */ + AltList->Count += LastFixedDescriptors; - IsaConvertMemRangeRequirement(Descriptor++, - &LogDev->MemRange[i].Description); - } - for (i = 0; i < RTL_NUMBER_OF(LogDev->MemRange32); i++) - { - if (!LogDev->MemRange32[i].Description.Length) - continue; + /* Move on to the next list */ + AltList = (PIO_RESOURCE_LIST)(AltList->Descriptors + AltList->Count); + AltList->Version = 1; + AltList->Revision = 1; - IsaConvertMemRange32Requirement(Descriptor++, - &LogDev->MemRange32[i].Description); - } - if (Alternatives) - { - UCHAR BestConfig[ISAPNP_MAX_ALTERNATIVES]; - PIO_RESOURCE_LIST AltList = &RequirementsList->List[0]; - PIO_RESOURCE_LIST NextList = AltList; + /* Propagate the fixed resources to our new list */ + RtlCopyMemory(&AltList->Descriptors, + RequirementsList->List[0].Descriptors, + sizeof(IO_RESOURCE_DESCRIPTOR) * FirstFixedDescriptors); + AltList->Count += FirstFixedDescriptors; - IsaDetermineBestConfig(BestConfig, Alternatives); + Descriptor = &AltList->Descriptors[FirstFixedDescriptors]; + } - for (i = 0; i < RequirementsList->AlternativeLists; i++) - { - RtlMoveMemory(NextList, AltList, sizeof(IO_RESOURCE_LIST)); - - /* Just because the 'NextList->Count++' correction */ - NextList->Count = ResourceCount; - /* - * For example, the ROM - * 0x15, ... // Logical device ID - * 0x30, // Start DF - * 0x22, 0x04, 0x00 // IRQ - * 0x30, // Start DF - * 0x22, 0xC0, 0x00 // IRQ - * 0x38, // End DF - * 0x2A, 0x20, 0x3A // DMA - * 0x22, 0x00, 0x08 // IRQ - * 0x79, 0x00 // END - * - * will be represented as the following resource requirements list: - * Interface 1 Bus 0 Slot 0 AlternativeLists 2 - * AltList 1, AltList->Count 3 - * [Option 0, ShareDisposition 1, Flags 1] INT: Min B Max B - * [Option 0, ShareDisposition 0, Flags 0] DMA: Min 5 Max 5 - * [Option 0, ShareDisposition 1, Flags 1] INT: Min 2 Max 2 - * End Descriptors - * AltList 2, AltList->Count 4 - * [Option 0, ShareDisposition 1, Flags 1] INT: Min B Max B - * [Option 0, ShareDisposition 0, Flags 0] DMA: Min 5 Max 5 - * [Option 0, ShareDisposition 1, Flags 1] INT: Min 6 Max 6 - * [Option 8, ShareDisposition 1, Flags 1] INT: Min 7 Max 7 - * End Descriptors - */ - - /* Propagate the fixed resources to our new list */ - for (j = 0; j < AltList->Count - AltCount; j++) - { - RtlMoveMemory(&NextList->Descriptors[j], - &AltList->Descriptors[j], - sizeof(IO_RESOURCE_DESCRIPTOR)); + IsFirstAltList = FALSE; + break; } - Descriptor = &NextList->Descriptors[NextList->Count - AltCount]; + case ISAPNP_RESOURCE_TYPE_END_DEPENDENT: + break; - /* - * Append alternatives. - * NOTE: To keep it simple, we append these to the end of the list. - */ - if (HasIoAlternatives(Alternatives)) + case ISAPNP_RESOURCE_TYPE_IO: { - IsaConvertIoRequirement(Descriptor++, - &Alternatives->Io[BestConfig[i]]); + IsaConvertIoRequirement(Descriptor++, &Resource->IoDescription); + + ++AltList->Count; + break; } - if (HasIrqAlternatives(Alternatives)) + + case ISAPNP_RESOURCE_TYPE_IRQ: { - FirstDescriptor = TRUE; + IsFirstDescriptor = TRUE; - for (j = 0; j < RTL_BITS_OF(Alternatives->Irq[BestConfig[i]].Mask); j++) + for (i = 0; i < RTL_BITS_OF(Resource->IrqDescription.Mask); i++) { - if (!(Alternatives->Irq[BestConfig[i]].Mask & (1 << j))) + if (!(Resource->IrqDescription.Mask & (1 << i))) continue; IsaConvertIrqRequirement(Descriptor++, - &Alternatives->Irq[BestConfig[i]], - j, - FirstDescriptor); - - if (FirstDescriptor) - FirstDescriptor = FALSE; - else - NextList->Count++; + &Resource->IrqDescription, + i, + IsFirstDescriptor); + ++AltList->Count; + + IsFirstDescriptor = FALSE; } + + break; } - if (HasDmaAlternatives(Alternatives)) + + case ISAPNP_RESOURCE_TYPE_DMA: { - FirstDescriptor = TRUE; + IsFirstDescriptor = TRUE; - for (j = 0; j < RTL_BITS_OF(Alternatives->Dma[BestConfig[i]].Mask); j++) + for (i = 0; i < RTL_BITS_OF(Resource->DmaDescription.Mask); i++) { - if (!(Alternatives->Dma[BestConfig[i]].Mask & (1 << j))) + if (!(Resource->DmaDescription.Mask & (1 << i))) continue; IsaConvertDmaRequirement(Descriptor++, - &Alternatives->Dma[BestConfig[i]], - j, - FirstDescriptor); - - if (FirstDescriptor) - FirstDescriptor = FALSE; - else - NextList->Count++; + &Resource->DmaDescription, + i, + IsFirstDescriptor); + ++AltList->Count; + + IsFirstDescriptor = FALSE; } + + break; } - if (HasMemoryAlternatives(Alternatives)) + + case ISAPNP_RESOURCE_TYPE_MEMRANGE: { - IsaConvertMemRangeRequirement(Descriptor++, - &Alternatives->MemRange[BestConfig[i]]); + IsaConvertMemRangeRequirement(Descriptor++, &Resource->MemRangeDescription); + + ++AltList->Count; + break; } - if (HasMemory32Alternatives(Alternatives)) + + case ISAPNP_RESOURCE_TYPE_MEMRANGE32: { - IsaConvertMemRange32Requirement(Descriptor++, - &Alternatives->MemRange32[BestConfig[i]]); + IsaConvertMemRange32Requirement(Descriptor++, &Resource->MemRange32Description); + + ++AltList->Count; + break; } + default: + ASSERT(FALSE); + UNREACHABLE; + break; + } + + ++Resource; + } + + /* Append the fixed resources */ + if (LastFixedDescriptors) + { + PIO_RESOURCE_LIST NextList = &RequirementsList->List[0]; + + /* Make the descriptor point to the fixed resources */ + Descriptor -= LastFixedDescriptors; + + /* Propagate the fixed resources onto previous lists */ + AltListCount = RequirementsList->AlternativeLists - 1; + for (i = 0; i < AltListCount; i++) + { + RtlCopyMemory(&NextList->Descriptors[NextList->Count - LastFixedDescriptors], + Descriptor, + sizeof(IO_RESOURCE_DESCRIPTOR) * LastFixedDescriptors); + NextList = (PIO_RESOURCE_LIST)(NextList->Descriptors + NextList->Count); } } @@ -527,58 +460,42 @@ FindIoDescriptor( _In_ ULONG RangeStart, _In_ ULONG RangeEnd, _Out_opt_ PUCHAR Information, - _Out_opt_ PULONG Length, - _Out_opt_ PUCHAR WriteOrder) + _Out_opt_ PULONG Length) { - ULONG i; - BOOLEAN Match; - PISAPNP_IO_DESCRIPTION Description; + PISAPNP_RESOURCE Resource; PAGED_CODE(); - for (i = 0; i < RTL_NUMBER_OF(LogDevice->Io); i++) + Resource = LogDevice->Resources; + while (Resource->Type != ISAPNP_RESOURCE_TYPE_END) { - Description = &LogDevice->Io[i].Description; - - Match = Base ? (Base >= Description->Minimum) && (Base <= Description->Maximum) - : (RangeStart >= Description->Minimum) && - (RangeEnd <= (ULONG)(Description->Maximum + Description->Length - 1)); - - if (Match) + if (Resource->Type == ISAPNP_RESOURCE_TYPE_IO) { - if (Information) - *Information = Description->Information; - if (Length) - *Length = Description->Length; - if (WriteOrder) - *WriteOrder = LogDevice->Io[i].Index; - - return TRUE; - } - } - - if (!LogDevice->Alternatives) - return FALSE; + PISAPNP_IO_DESCRIPTION Description = &Resource->IoDescription; + BOOLEAN Match; - for (i = 0; i < LogDevice->Alternatives->Count; i++) - { - Description = &LogDevice->Alternatives->Io[i]; + if (Base) + { + Match = (Base >= Description->Minimum) && (Base <= Description->Maximum); + } + else + { + Match = (RangeStart >= Description->Minimum) && + (RangeEnd <= (ULONG)(Description->Maximum + Description->Length - 1)); + } - Match = Base ? (Base >= Description->Minimum) && (Base <= Description->Maximum) - : (RangeStart >= Description->Minimum) && - (RangeEnd <= (ULONG)(Description->Maximum + Description->Length - 1)); + if (Match) + { + if (Information) + *Information = Description->Information; + if (Length) + *Length = Description->Length; - if (Match) - { - if (Information) - *Information = Description->Information; - if (Length) - *Length = Description->Length; - if (WriteOrder) - *WriteOrder = LogDevice->Alternatives->IoIndex; - - return TRUE; + return TRUE; + } } + + ++Resource; } return FALSE; @@ -588,53 +505,24 @@ CODE_SEG("PAGE") BOOLEAN FindIrqDescriptor( _In_ PISAPNP_LOGICAL_DEVICE LogDevice, - _In_ ULONG Vector, - _Out_opt_ PUCHAR WriteOrder) + _In_ ULONG Vector) { - ULONG i, j; - PISAPNP_IRQ_DESCRIPTION Description; + PISAPNP_RESOURCE Resource; PAGED_CODE(); - for (i = 0; i < RTL_NUMBER_OF(LogDevice->Irq); i++) + Resource = LogDevice->Resources; + while (Resource->Type != ISAPNP_RESOURCE_TYPE_END) { - Description = &LogDevice->Irq[i].Description; - - for (j = 0; j < RTL_BITS_OF(Description->Mask); j++) + if (Resource->Type == ISAPNP_RESOURCE_TYPE_IRQ) { - if (Description->Mask & (1 << j)) - { - if (j == Vector) - { - if (WriteOrder) - *WriteOrder = LogDevice->Irq[i].Index; + PISAPNP_IRQ_DESCRIPTION Description = &Resource->IrqDescription; - return TRUE; - } - } + if (Description->Mask & (1 << Vector)) + return TRUE; } - } - - if (!LogDevice->Alternatives) - return FALSE; - - for (i = 0; i < LogDevice->Alternatives->Count; i++) - { - Description = &LogDevice->Alternatives->Irq[i]; - - for (j = 0; j < RTL_BITS_OF(Description->Mask); j++) - { - if (Description->Mask & (1 << j)) - { - if (j == Vector) - { - if (WriteOrder) - *WriteOrder = LogDevice->Alternatives->IrqIndex; - return TRUE; - } - } - } + ++Resource; } return FALSE; @@ -644,53 +532,24 @@ CODE_SEG("PAGE") BOOLEAN FindDmaDescriptor( _In_ PISAPNP_LOGICAL_DEVICE LogDevice, - _In_ ULONG Channel, - _Out_opt_ PUCHAR WriteOrder) + _In_ ULONG Channel) { - ULONG i, j; - PISAPNP_DMA_DESCRIPTION Description; + PISAPNP_RESOURCE Resource; PAGED_CODE(); - for (i = 0; i < RTL_NUMBER_OF(LogDevice->Dma); i++) + Resource = LogDevice->Resources; + while (Resource->Type != ISAPNP_RESOURCE_TYPE_END) { - Description = &LogDevice->Dma[i].Description; - - for (j = 0; j < RTL_BITS_OF(Description->Mask); j++) + if (Resource->Type == ISAPNP_RESOURCE_TYPE_DMA) { - if (Description->Mask & (1 << j)) - { - if (j == Channel) - { - if (WriteOrder) - *WriteOrder = LogDevice->Dma[i].Index; + PISAPNP_DMA_DESCRIPTION Description = &Resource->DmaDescription; - return TRUE; - } - } + if (Description->Mask & (1 << Channel)) + return TRUE; } - } - - if (!LogDevice->Alternatives) - return FALSE; - - for (i = 0; i < LogDevice->Alternatives->Count; i++) - { - Description = &LogDevice->Alternatives->Dma[i]; - - for (j = 0; j < RTL_BITS_OF(Description->Mask); j++) - { - if (Description->Mask & (1 << j)) - { - if (j == Channel) - { - if (WriteOrder) - *WriteOrder = LogDevice->Alternatives->DmaIndex; - return TRUE; - } - } - } + ++Resource; } return FALSE; @@ -702,87 +561,57 @@ FindMemoryDescriptor( _In_ PISAPNP_LOGICAL_DEVICE LogDevice, _In_ ULONG RangeStart, _In_ ULONG RangeEnd, - _Out_opt_ PBOOLEAN Memory32, - _Out_opt_ PUCHAR Information, - _Out_opt_ PUCHAR WriteOrder) + _Out_opt_ PUCHAR Information) { - ULONG i; - PISAPNP_MEMRANGE_DESCRIPTION Description; - PISAPNP_MEMRANGE32_DESCRIPTION Description32; + PISAPNP_RESOURCE Resource; PAGED_CODE(); - for (i = 0; i < RTL_NUMBER_OF(LogDevice->MemRange); i++) + Resource = LogDevice->Resources; + while (Resource->Type != ISAPNP_RESOURCE_TYPE_END) { - Description = &LogDevice->MemRange[i].Description; - - if ((RangeStart >= (ULONG)(Description->Minimum << 8)) && - (RangeEnd <= (ULONG)((Description->Maximum << 8) + (Description->Length << 8) - 1))) + switch (Resource->Type) { - if (Memory32) - *Memory32 = FALSE; - if (Information) - *Information = Description->Information; - if (WriteOrder) - *WriteOrder = LogDevice->MemRange[i].Index; - - return TRUE; - } - } - for (i = 0; i < RTL_NUMBER_OF(LogDevice->MemRange32); i++) - { - Description32 = &LogDevice->MemRange32[i].Description; + case ISAPNP_RESOURCE_TYPE_MEMRANGE: + { + PISAPNP_MEMRANGE_DESCRIPTION Description; - if ((RangeStart >= Description32->Minimum) && - (RangeEnd <= (Description32->Maximum + Description32->Length - 1))) - { - if (Memory32) - *Memory32 = TRUE; - if (Information) - *Information = Description32->Information; - if (WriteOrder) - *WriteOrder = LogDevice->MemRange32[i].Index; - - return TRUE; - } - } + Description = &Resource->MemRangeDescription; - if (!LogDevice->Alternatives) - return FALSE; + if ((RangeStart >= (ULONG)(Description->Minimum << 8)) && + (RangeEnd <= (ULONG)((Description->Maximum << 8) + + (Description->Length << 8) - 1))) + { + if (Information) + *Information = Description->Information; - for (i = 0; i < LogDevice->Alternatives->Count; i++) - { - Description = &LogDevice->Alternatives->MemRange[i]; + return TRUE; + } + break; + } - if ((RangeStart >= (ULONG)(Description->Minimum << 8)) && - (RangeEnd <= (ULONG)((Description->Maximum << 8) + (Description->Length << 8) - 1))) - { - if (Memory32) - *Memory32 = FALSE; - if (Information) - *Information = Description->Information; - if (WriteOrder) - *WriteOrder = LogDevice->Alternatives->MemRangeIndex; - - return TRUE; - } - } - for (i = 0; i < LogDevice->Alternatives->Count; i++) - { - Description32 = &LogDevice->Alternatives->MemRange32[i]; + case ISAPNP_RESOURCE_TYPE_MEMRANGE32: + { + PISAPNP_MEMRANGE32_DESCRIPTION Description32; - if ((RangeStart >= Description32->Minimum) && - (RangeEnd <= (Description32->Maximum + Description32->Length - 1))) - { - if (Memory32) - *Memory32 = TRUE; - if (Information) - *Information = Description32->Information; - if (WriteOrder) - *WriteOrder = LogDevice->Alternatives->MemRange32Index; - - return TRUE; + Description32 = &Resource->MemRange32Description; + + if ((RangeStart >= Description32->Minimum) && + (RangeEnd <= (Description32->Maximum + Description32->Length - 1))) + { + if (Information) + *Information = Description32->Information; + + return TRUE; + } + break; + } + + default: + break; } + + ++Resource; } return FALSE; @@ -872,9 +701,9 @@ IsaPnpCreateLogicalDeviceResources( 0, 0, &Information, - &CurrentLength, - NULL)) + &CurrentLength)) { + DPRINT1("I/O entry #%lu %x not found\n", i, LogDev->Io[i].CurrentBase); goto InvalidBiosResources; } @@ -894,9 +723,6 @@ IsaPnpCreateLogicalDeviceResources( if (!LogDev->Irq[i].CurrentNo) break; - if (!FindIrqDescriptor(LogDev, LogDev->Irq[i].CurrentNo, NULL)) - goto InvalidBiosResources; - Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; Descriptor->Type = CmResourceTypeInterrupt; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; @@ -906,16 +732,13 @@ IsaPnpCreateLogicalDeviceResources( Descriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; Descriptor->u.Interrupt.Level = LogDev->Irq[i].CurrentNo; Descriptor->u.Interrupt.Vector = LogDev->Irq[i].CurrentNo; - Descriptor->u.Interrupt.Affinity = 0xFFFFFFFF; + Descriptor->u.Interrupt.Affinity = (KAFFINITY)-1; } for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) { if (LogDev->Dma[i].CurrentChannel == 4) break; - if (!FindDmaDescriptor(LogDev, LogDev->Dma[i].CurrentChannel, NULL)) - goto InvalidBiosResources; - Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; Descriptor->Type = CmResourceTypeDma; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; @@ -930,10 +753,12 @@ IsaPnpCreateLogicalDeviceResources( if (!FindMemoryDescriptor(LogDev, LogDev->MemRange[i].CurrentBase, LogDev->MemRange[i].CurrentLength, - NULL, - &Information, - NULL)) + &Information)) { + DPRINT1("MEM entry #%lu %lx %lx not found\n", + i, + LogDev->MemRange[i].CurrentBase, + LogDev->MemRange[i].CurrentLength); goto InvalidBiosResources; } @@ -956,10 +781,12 @@ IsaPnpCreateLogicalDeviceResources( if (!FindMemoryDescriptor(LogDev, LogDev->MemRange32[i].CurrentBase, LogDev->MemRange32[i].CurrentLength, - NULL, - &Information, - NULL)) + &Information)) { + DPRINT1("MEM32 entry #%lu %lx %lx not found\n", + i, + LogDev->MemRange32[i].CurrentBase, + LogDev->MemRange32[i].CurrentLength); goto InvalidBiosResources; } @@ -980,7 +807,7 @@ IsaPnpCreateLogicalDeviceResources( return STATUS_SUCCESS; InvalidBiosResources: - DPRINT("Invalid boot resources! (CSN %u, LDN %u)\n", LogDev->CSN, LogDev->LDN); + DPRINT1("Invalid boot resources! (CSN %u, LDN %u)\n", LogDev->CSN, LogDev->LDN); LogDev->Flags &= ~ISAPNP_HAS_RESOURCES; ExFreePoolWithTag(ResourceList, TAG_ISAPNP); diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 17945dbe06a..998c7e766f0 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -151,22 +151,19 @@ FindIoDescriptor( _In_ ULONG RangeStart, _In_ ULONG RangeEnd, _Out_opt_ PUCHAR Information, - _Out_opt_ PULONG Length, - _Out_opt_ PUCHAR WriteOrder); + _Out_opt_ PULONG Length); CODE_SEG("PAGE") BOOLEAN FindIrqDescriptor( _In_ PISAPNP_LOGICAL_DEVICE LogDevice, - _In_ ULONG Vector, - _Out_opt_ PUCHAR WriteOrder); + _In_ ULONG Vector); CODE_SEG("PAGE") BOOLEAN FindDmaDescriptor( _In_ PISAPNP_LOGICAL_DEVICE LogDevice, - _In_ ULONG Channel, - _Out_opt_ PUCHAR WriteOrder); + _In_ ULONG Channel); CODE_SEG("PAGE") BOOLEAN @@ -174,9 +171,7 @@ FindMemoryDescriptor( _In_ PISAPNP_LOGICAL_DEVICE LogDevice, _In_ ULONG RangeStart, _In_ ULONG RangeEnd, - _Out_opt_ PBOOLEAN Memory32, - _Out_opt_ PUCHAR Information, - _Out_opt_ PUCHAR WriteOrder); + _Out_opt_ PUCHAR Information); CODE_SEG("PAGE") PIO_RESOURCE_REQUIREMENTS_LIST diff --git a/drivers/bus/isapnp/isapnpres.h b/drivers/bus/isapnp/isapnpres.h index 16c21646a0f..a21299a1710 100644 --- a/drivers/bus/isapnp/isapnpres.h +++ b/drivers/bus/isapnp/isapnpres.h @@ -9,10 +9,7 @@ #pragma once /** @brief Maximum size of resource data structure supported by the driver. */ -#define ISAPNP_MAX_RESOURCEDATA 0x1000 - -/** @brief Maximum number of Start DF tags supported by the driver. */ -#define ISAPNP_MAX_ALTERNATIVES 8 +#define ISAPNP_MAX_RESOURCEDATA 0x1000 typedef struct _ISAPNP_IO { @@ -59,23 +56,35 @@ typedef struct _ISAPNP_COMPATIBLE_ID_ENTRY LIST_ENTRY IdLink; } ISAPNP_COMPATIBLE_ID_ENTRY, *PISAPNP_COMPATIBLE_ID_ENTRY; -typedef struct _ISAPNP_ALTERNATIVES +typedef enum +{ + dfNotStarted, + dfStarted, + dfDone +} ISAPNP_DEPENDENT_FUNCTION_STATE; + +typedef struct _ISAPNP_RESOURCE { - ISAPNP_IO_DESCRIPTION Io[ISAPNP_MAX_ALTERNATIVES]; - ISAPNP_IRQ_DESCRIPTION Irq[ISAPNP_MAX_ALTERNATIVES]; - ISAPNP_DMA_DESCRIPTION Dma[ISAPNP_MAX_ALTERNATIVES]; - ISAPNP_MEMRANGE_DESCRIPTION MemRange[ISAPNP_MAX_ALTERNATIVES]; - ISAPNP_MEMRANGE32_DESCRIPTION MemRange32[ISAPNP_MAX_ALTERNATIVES]; - UCHAR Priority[ISAPNP_MAX_ALTERNATIVES]; - UCHAR IoIndex; - UCHAR IrqIndex; - UCHAR DmaIndex; - UCHAR MemRangeIndex; - UCHAR MemRange32Index; - - _Field_range_(0, ISAPNP_MAX_ALTERNATIVES) - UCHAR Count; -} ISAPNP_ALTERNATIVES, *PISAPNP_ALTERNATIVES; + UCHAR Type; +#define ISAPNP_RESOURCE_TYPE_END 0 +#define ISAPNP_RESOURCE_TYPE_IO 1 +#define ISAPNP_RESOURCE_TYPE_IRQ 2 +#define ISAPNP_RESOURCE_TYPE_DMA 3 +#define ISAPNP_RESOURCE_TYPE_MEMRANGE 4 +#define ISAPNP_RESOURCE_TYPE_MEMRANGE32 5 +#define ISAPNP_RESOURCE_TYPE_START_DEPENDENT 6 +#define ISAPNP_RESOURCE_TYPE_END_DEPENDENT 7 + + union + { + ISAPNP_IO_DESCRIPTION IoDescription; + ISAPNP_IRQ_DESCRIPTION IrqDescription; + ISAPNP_DMA_DESCRIPTION DmaDescription; + ISAPNP_MEMRANGE_DESCRIPTION MemRangeDescription; + ISAPNP_MEMRANGE32_DESCRIPTION MemRange32Description; + UCHAR Priority; + }; +} ISAPNP_RESOURCE, *PISAPNP_RESOURCE; typedef struct _ISAPNP_LOGICAL_DEVICE { @@ -92,6 +101,12 @@ typedef struct _ISAPNP_LOGICAL_DEVICE /** Cleared when the device has no boot resources */ #define ISAPNP_HAS_RESOURCES 0x00000004 +/** The card implements 24-bit memory decoder */ +#define ISAPNP_HAS_MEM24_DECODER 0x00000008 + +/** The card implements 32-bit memory decoder */ +#define ISAPNP_HAS_MEM32_DECODER 0x00000010 + /** * @name The card data. * @{ @@ -109,7 +124,7 @@ typedef struct _ISAPNP_LOGICAL_DEVICE UCHAR LDN; UCHAR LogVendorId[3]; USHORT LogProdId; - PISAPNP_ALTERNATIVES Alternatives; + PISAPNP_RESOURCE Resources; PSTR FriendlyName; LIST_ENTRY CompatibleIdList; @@ -120,43 +135,3 @@ typedef struct _ISAPNP_LOGICAL_DEVICE ISAPNP_MEMRANGE32 MemRange32[4]; /**@}*/ } ISAPNP_LOGICAL_DEVICE, *PISAPNP_LOGICAL_DEVICE; - -FORCEINLINE -BOOLEAN -HasIoAlternatives( - _In_ PISAPNP_ALTERNATIVES Alternatives) -{ - return (Alternatives->Io[0].Length != 0); -} - -FORCEINLINE -BOOLEAN -HasIrqAlternatives( - _In_ PISAPNP_ALTERNATIVES Alternatives) -{ - return (Alternatives->Irq[0].Mask != 0); -} - -FORCEINLINE -BOOLEAN -HasDmaAlternatives( - _In_ PISAPNP_ALTERNATIVES Alternatives) -{ - return (Alternatives->Dma[0].Mask != 0); -} - -FORCEINLINE -BOOLEAN -HasMemoryAlternatives( - _In_ PISAPNP_ALTERNATIVES Alternatives) -{ - return (Alternatives->MemRange[0].Length != 0); -} - -FORCEINLINE -BOOLEAN -HasMemory32Alternatives( - _In_ PISAPNP_ALTERNATIVES Alternatives) -{ - return (Alternatives->MemRange32[0].Length != 0); -} diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 5e8979ad274..26d4cfc8a94 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -488,12 +488,6 @@ IsaPdoQueryResources( return STATUS_SUCCESS; } - if (!(PdoExt->IsaPnpDevice->Flags & ISAPNP_HAS_RESOURCES)) - { - Irp->IoStatus.Information = 0; - return STATUS_SUCCESS; - } - if (!PdoExt->ResourceList) return Irp->IoStatus.Status; @@ -847,8 +841,8 @@ IsaPnpRemoveLogicalDeviceDO( if (LogDev->FriendlyName) ExFreePoolWithTag(LogDev->FriendlyName, TAG_ISAPNP); - if (LogDev->Alternatives) - ExFreePoolWithTag(LogDev->Alternatives, TAG_ISAPNP); + if (LogDev->Resources) + ExFreePoolWithTag(LogDev->Resources, TAG_ISAPNP); Entry = LogDev->CompatibleIdList.Flink; while (Entry != &LogDev->CompatibleIdList) @@ -983,18 +977,16 @@ IsaPdoPnp( break; case IRP_MN_SURPRISE_REMOVAL: - if (PdoExt->Common.Signature == IsaPnpLogicalDevice) - Status = IsaPdoRemoveDevice(PdoExt, FALSE); - else - Status = IsaReadPortRemoveDevice(PdoExt, FALSE); - break; - case IRP_MN_REMOVE_DEVICE: + { + BOOLEAN FinalRemove = (IrpSp->MinorFunction == IRP_MN_REMOVE_DEVICE); + if (PdoExt->Common.Signature == IsaPnpLogicalDevice) - Status = IsaPdoRemoveDevice(PdoExt, TRUE); + Status = IsaPdoRemoveDevice(PdoExt, FinalRemove); else - Status = IsaReadPortRemoveDevice(PdoExt, TRUE); + Status = IsaReadPortRemoveDevice(PdoExt, FinalRemove); break; + } case IRP_MN_QUERY_PNP_DEVICE_STATE: Status = IsaPdoQueryPnpDeviceState(PdoExt, Irp);

5 months, 1 week

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs