Ros-diffs March 2025

ros-diffs@reactos.org

15 participants
66 discussions

[reactos] 01/01: [BOOTDATA] Arabic, Hong Kong, Singapore, come back! (#7795)
by Katayama Hirofumi MZ 19 Mar '25

19 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bc97ad1450425135d092… commit 4bc97ad1450425135d092c52d4e26769177d0328 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 19 09:40:38 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 19 09:40:38 2025 +0900 [BOOTDATA] Arabic, Hong Kong, Singapore, come back! (#7795) JIRA issue: CORE-19496 Modify boot/bootdata/hivesys.inf to change the values of registry key HKEY_LOCAL_MACHINE\ SYSTEM\CurrentControlSet\Control\Nls\Locale. --- boot/bootdata/hivesys.inf | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 1febd390b14..465f285b4bb 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1190,25 +1190,27 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","InstallLanguage",0x0000000 ; If you add/uncomment an entry here, please also add the appropriate Language ; in the previous section. HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000401",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000801",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000c01",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001001",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001401",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001801",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001c01",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002001",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002401",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002801",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002c01",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003001",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003401",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003801",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003c01",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00004001",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000401",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000801",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000c01",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001001",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001401",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001801",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001c01",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002001",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002401",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002801",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002c01",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003001",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003401",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003801",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003c01",0x00000000,"d" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00004001",0x00000000,"d" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000403",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000404",0x00000000,"9" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000c04",0x00000000,"9" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001004",0x00000000,"a" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000804",0x00000000,"a" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000405",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000406",0x00000000,"1"

1 0

[reactos] 01/01: [NTDLL][SHLWAPI][SYSDM] ReportAsWorkstation should always override the product type (#7052)
by Whindmar Saksit 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a1877d0f6c9d35fd007b… commit 4a1877d0f6c9d35fd007ba88106efa126cff4f63 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Mar 19 00:10:46 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 19 00:10:46 2025 +0100 [NTDLL][SHLWAPI][SYSDM] ReportAsWorkstation should always override the product type (#7052) Allows "ROS as a workstation" installs to report itself as a basic server to Win32 applications when the user toggles the sysdm.cpl checkbox (to unchecked in this case). --- dll/cpl/sysdm/advanced.c | 18 +++++----- dll/ntdll/rtl/version.c | 42 +++++++++++++++++----- dll/win32/shlwapi/ordinal.c | 23 +++++++++++- .../rostests/apitests/ntdll/RtlGetNtProductType.c | 25 ++++++++++++- 4 files changed, 87 insertions(+), 21 deletions(-) diff --git a/dll/cpl/sysdm/advanced.c b/dll/cpl/sysdm/advanced.c index ce8a5942235..4b8c0bd6929 100644 --- a/dll/cpl/sysdm/advanced.c +++ b/dll/cpl/sysdm/advanced.c @@ -9,6 +9,8 @@ */ #include "precomp.h" +#define WIN32_NO_STATUS +#include "pstypes.h" /* SharedUserData */ static TCHAR BugLink[] = _T("http://jira.reactos.org/"); static TCHAR ReportAsWorkstationKey[] = _T("SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"); @@ -51,9 +53,10 @@ static VOID OnInitSysSettingsDialog(HWND hwndDlg) { HKEY hKey; - DWORD dwVal; + DWORD dwVal = 0; DWORD dwType = REG_DWORD; DWORD cbData = sizeof(DWORD); + BOOL ReportAsWorkstation = SharedUserData->NtProductType == VER_NT_WORKSTATION; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, ReportAsWorkstationKey, @@ -68,19 +71,14 @@ OnInitSysSettingsDialog(HWND hwndDlg) (LPBYTE)&dwVal, &cbData) == ERROR_SUCCESS) { - if (dwVal != FALSE) - { - // set the check box - SendDlgItemMessageW(hwndDlg, - IDC_REPORTASWORKSTATION, - BM_SETCHECK, - BST_CHECKED, - 0); - } + if (cbData == sizeof(DWORD)) + ReportAsWorkstation = dwVal != FALSE; } RegCloseKey(hKey); } + SendDlgItemMessageW(hwndDlg, IDC_REPORTASWORKSTATION, BM_SETCHECK, + ReportAsWorkstation ? BST_CHECKED : BST_UNCHECKED, 0); } INT_PTR CALLBACK diff --git a/dll/ntdll/rtl/version.c b/dll/ntdll/rtl/version.c index 96a9be1f162..63f94592f88 100644 --- a/dll/ntdll/rtl/version.c +++ b/dll/ntdll/rtl/version.c @@ -17,6 +17,8 @@ /* FUNCTIONS ******************************************************************/ +static signed char g_ReportProductType = 0; + /* HACK: ReactOS specific changes, see bug-reports CORE-6611 and CORE-4620 (aka. #5003) */ static VOID NTAPI SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation) @@ -24,7 +26,6 @@ SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation) CHAR Buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG)]; PKEY_VALUE_PARTIAL_INFORMATION kvpInfo = (PVOID)Buffer; OBJECT_ATTRIBUTES ObjectAttributes; - ULONG ReportAsWorkstation = 0; HANDLE hKey; ULONG Length; NTSTATUS Status; @@ -38,7 +39,7 @@ SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation) NULL); /* Don't change anything if the key doesn't exist */ - Status = NtOpenKey(&hKey, KEY_READ, &ObjectAttributes); + Status = (g_ReportProductType == 0) ? NtOpenKey(&hKey, KEY_READ, &ObjectAttributes) : STATUS_CANCELLED; if (NT_SUCCESS(Status)) { /* Get the value from the registry and make sure it's a 32-bit value */ @@ -52,20 +53,28 @@ SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation) (kvpInfo->Type == REG_DWORD) && (kvpInfo->DataLength == sizeof(ULONG))) { - /* Is the value set? */ - ReportAsWorkstation = *(PULONG)kvpInfo->Data; - if ((VersionInformation->wProductType == VER_NT_SERVER) && - (ReportAsWorkstation != 0)) + ULONG IsWorkstation = SharedUserData->NtProductType == NtProductWinNt; + ULONG ReportAsWorkstation = (*(PULONG)kvpInfo->Data) != 0; + if (IsWorkstation != ReportAsWorkstation) { - /* It is, modify the product type to report a workstation */ - VersionInformation->wProductType = VER_NT_WORKSTATION; - DPRINT("We modified the reported OS from NtProductServer to NtProductWinNt\n"); + g_ReportProductType = ReportAsWorkstation ? NtProductWinNt : NtProductServer; } } /* Close the handle */ NtClose(hKey); } + + if (g_ReportProductType > 0) + { + VersionInformation->wProductType = g_ReportProductType; + DPRINT("We modified the reported OS product type from %d to %d\n", + SharedUserData->NtProductType, VersionInformation->wProductType); + } + else + { + g_ReportProductType = -1; + } } /********************************************************************** @@ -96,6 +105,21 @@ BOOLEAN NTAPI RtlGetNtProductType(_Out_ PNT_PRODUCT_TYPE ProductType) { *ProductType = SharedUserData->NtProductType; + + if (g_ReportProductType == 0) + { + /* Initialize cached value */ + RTL_OSVERSIONINFOEXW ovi; + ovi.dwOSVersionInfoSize = sizeof(ovi); + ovi.wProductType = *ProductType; + SetRosSpecificInfo(&ovi); + } + + if (g_ReportProductType > 0) + { + *ProductType = g_ReportProductType; + DPRINT("Overriding RtlGetNtProductType to return %d\n", *ProductType); + } return TRUE; } diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 3d506b0285e..3646c54153c 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -4106,6 +4106,23 @@ HRESULT WINAPI CLSIDFromStringWrap(LPCWSTR idstr, CLSID *id) */ BOOL WINAPI IsOS(DWORD feature) { +#ifdef __REACTOS__ + OSVERSIONINFOEXA osvi; + DWORD platform, majorv, minorv; + + osvi.dwOSVersionInfoSize = sizeof(osvi); + if (!GetVersionExA((OSVERSIONINFOA*)&osvi)) + { + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); + if (!GetVersionExA((OSVERSIONINFOA*)&osvi)) + { + ERR("GetVersionEx failed\n"); + return FALSE; + } + osvi.wProductType = VER_NT_WORKSTATION; + osvi.wSuiteMask = 0; + } +#else OSVERSIONINFOA osvi; DWORD platform, majorv, minorv; @@ -4114,7 +4131,7 @@ BOOL WINAPI IsOS(DWORD feature) ERR("GetVersionEx failed\n"); return FALSE; } - +#endif majorv = osvi.dwMajorVersion; minorv = osvi.dwMinorVersion; platform = osvi.dwPlatformId; @@ -4189,7 +4206,11 @@ BOOL WINAPI IsOS(DWORD feature) FIXME("(OS_DOMAINMEMBER) What should we return here?\n"); return TRUE; case OS_ANYSERVER: +#ifdef __REACTOS__ + ISOS_RETURN(osvi.wProductType > VER_NT_WORKSTATION) +#else ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) +#endif case OS_WOW6432: { BOOL is_wow64; diff --git a/modules/rostests/apitests/ntdll/RtlGetNtProductType.c b/modules/rostests/apitests/ntdll/RtlGetNtProductType.c index 03ac8238e07..29051810ec2 100644 --- a/modules/rostests/apitests/ntdll/RtlGetNtProductType.c +++ b/modules/rostests/apitests/ntdll/RtlGetNtProductType.c @@ -91,7 +91,7 @@ ChangeNtProductType(DWORD NtProductType) } else { - ok(FALSE, "Passed invalid product type to CHangeNtProduct: %lu", NtProductType); + ok(FALSE, "Passed invalid product type to ChangeNtProduct: %lu", NtProductType); } Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -129,6 +129,19 @@ START_TEST(RtlGetNtProductType) DWORD ProductNtType; NT_PRODUCT_TYPE ProductType = NtProductWinNt, ProductType2; + /* Remove ReportAsWorkstation override during tests */ + DWORD ReportAsWorkstation = 0xbaadf00d; + HKEY hKey; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version", + 0, KEY_READ | KEY_WRITE, &hKey) == ERROR_SUCCESS) + { + DWORD cb = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"ReportAsWorkstation", NULL, NULL, (PBYTE)&ReportAsWorkstation, &cb)) + ReportAsWorkstation = 0xbaadf00d; + RegDeleteValueW(hKey, L"ReportAsWorkstation"); + RegCloseKey(hKey); + } + /* * Wrap the call in SEH. This ensures the testcase won't crash but also * it proves to us that RtlGetNtProductType() throws an exception if a NULL @@ -164,4 +177,14 @@ START_TEST(RtlGetNtProductType) ok_long(ProductType2, ProductType); ok_char(ChangeNtProductType(ProductType), TRUE); + + + /* Restore ReportAsWorkstation */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version", + 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) + { + if (ReportAsWorkstation != 0xbaadf00d) + RegSetValueExW(hKey, L"ReportAsWorkstation", 0, REG_DWORD, (PBYTE)&ReportAsWorkstation, sizeof(DWORD)); + RegCloseKey(hKey); + } }

1 0

[reactos] 01/01: [BOOTSECT][FREELDR] Fix wrong comment of conditional jump on `ext.S` and `extldr.S` (#7798)
by Daniel Victor 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19c1f5661f4e39b63e5df… commit 19c1f5661f4e39b63e5dfb4eb0d51d94afb65292 Author: Daniel Victor <ilauncherdeveloper(a)gmail.com> AuthorDate: Tue Mar 18 19:52:56 2025 -0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 18 23:52:56 2025 +0100 [BOOTSECT][FREELDR] Fix wrong comment of conditional jump on `ext.S` and `extldr.S` (#7798) --- boot/freeldr/bootsect/ext.S | 2 +- boot/freeldr/bootsect/extldr.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/bootsect/ext.S b/boot/freeldr/bootsect/ext.S index 4a449b632d4..f0c35ea520c 100644 --- a/boot/freeldr/bootsect/ext.S +++ b/boot/freeldr/bootsect/ext.S @@ -608,7 +608,7 @@ SearchFile: mov di, offset ExtLdrFileName // Load target filename address mov cx, offset ExtLdrFileNameEnd - ExtLdrFileName // Length of filename to compare cmp byte ptr ds:[si + EXT_DIRECTORY_ENTRY_NAME_LENGTH_OFFSET], cl // Compare if both names have the same length - jnz .Skip // Skip this entry if yes + jnz .Skip // Skip this entry if not add si, EXT_DIRECTORY_ENTRY_NAME_OFFSET // Move to filename in entry repe cmpsb // Compare filenames pop si // Restore SI diff --git a/boot/freeldr/bootsect/extldr.S b/boot/freeldr/bootsect/extldr.S index 08074831392..5633f1597db 100644 --- a/boot/freeldr/bootsect/extldr.S +++ b/boot/freeldr/bootsect/extldr.S @@ -54,7 +54,7 @@ ExtLdrEntryPoint: mov di, offset FreeLdrFileName // Load target filename address mov cx, offset FreeLdrFileNameEnd - FreeLdrFileName // Length of filename to compare cmp byte ptr ds:[si + EXT_DIRECTORY_ENTRY_NAME_LENGTH_OFFSET], cl // Compare if both names have the same length - jnz .FSkip2 // Skip this entry if yes + jnz .FSkip2 // Skip this entry if not add si, EXT_DIRECTORY_ENTRY_NAME_OFFSET // Move to filename in entry repe cmpsb // Compare filenames pop si // Restore SI

1 0

[reactos] 01/01: [SYSSETUP] Apply theming from unattend files very early on when booting the LiveCD or a new install (#7797)
by Hermès Bélusca-Maïto 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e47094764559867d1314… commit 2e47094764559867d1314076a8a215e7b3e79972 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 18 13:52:39 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 18 23:02:34 2025 +0100 [SYSSETUP] Apply theming from unattend files very early on when booting the LiveCD or a new install (#7797) Use a `[Shell]` section with `DefaultThemesOff` and `CustomDefaultThemeFile` values, specifying respectively whether to use the classic theme or a custom one, and the complete path to the custom .theme (or .msstyles) file. These values are compatible with those documented in the "MS Windows Preinstallation Reference" help file of the Windows installation CD (DEPLOY.CAB\ref.chm) [BOOTDATA] bootcd/unattend.inf: Use the Shell/CustomDefaultThemeFile value to specify which theme to use --- boot/bootdata/bootcd/unattend.inf | 13 +++--- dll/win32/syssetup/install.c | 60 +++++++++++++++++++++++- dll/win32/syssetup/wizard.c | 96 +++++++++++++++++++++++++++++++++++---- 3 files changed, 153 insertions(+), 16 deletions(-) diff --git a/boot/bootdata/bootcd/unattend.inf b/boot/bootdata/bootcd/unattend.inf index ec41adcc97b..3dcffae4cd5 100644 --- a/boot/bootdata/bootcd/unattend.inf +++ b/boot/bootdata/bootcd/unattend.inf @@ -59,16 +59,12 @@ LocaleID = 409 ; 1: ReactOS Workstation ProductOption = 0 -; enable this section to automatically launch programs +; Enable this section to automatically launch programs ; after 3rd boot -; ; [GuiRunOnce] ; %SystemRoot%\system32\cmd.exe -; Enable the next line (+ the GuiRunOnce section) to enable the lautus theme -; "rundll32.exe shell32.dll,Control_RunDLL desk.cpl desk,@Appearance /Action:ActivateMSTheme /file:%SYSTEMROOT%\Resources\themes\lautus\lautus.msstyles" - -; enable this section to change resolution / bpp +; Enable this section to change resolution / bpp ; setting a value to 0 or skipping it will leave it unchanged ; [Display] ; BitsPerPel = 32 @@ -80,3 +76,8 @@ ProductOption = 0 ;[Env] ;WINETEST_PLATFORM=reactos +; Enable this section to enable the default ReactOS theme +; [Shell] +; DefaultThemesOff = no +; CustomDefaultThemeFile = "%WINDIR%\Resources\Themes\Lautus\lautus.msstyles" + diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 74b7148a096..8895e0628c0 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -985,6 +985,61 @@ cleanup: return bConsoleBoot; } +extern VOID +EnableVisualTheme( + _In_opt_ HWND hwndParent, + _In_opt_ PCWSTR ThemeFile); + +/** + * @brief + * Pre-process unattended file to apply early settings. + * + * @param[in] IsInstall + * TRUE if this is ReactOS installation, invoked from InstallReactOS(), + * FALSE if this is run as part of LiveCD, invoked form InstallLiveCD(). + **/ +static VOID +PreprocessUnattend( + _In_ BOOL IsInstall) +{ + WCHAR szPath[MAX_PATH]; + WCHAR szValue[MAX_PATH]; + BOOL bDefaultThemesOff; + + if (IsInstall) + { + /* See also wizard.c!ProcessSetupInf() + * Retrieve the path of the setup INF */ + GetSystemDirectoryW(szPath, _countof(szPath)); + wcscat(szPath, L"\\$winnt$.inf"); + } + else + { + /* See also userinit/livecd.c!RunLiveCD() */ + GetWindowsDirectoryW(szPath, _countof(szPath)); + wcscat(szPath, L"\\unattend.inf"); + } + + /* + * Apply initial default theming + */ + + /* Check whether to use the classic theme (TRUE) instead of the default theme */ + bDefaultThemesOff = FALSE; + if (GetPrivateProfileStringW(L"Shell", L"DefaultThemesOff", L"no", szValue, _countof(szValue), szPath) && *szValue) + bDefaultThemesOff = (_wcsicmp(szValue, L"yes") == 0); + + if (!bDefaultThemesOff) + { + /* Retrieve the complete path to a .theme (or for ReactOS, a .msstyles) file */ + if (!GetPrivateProfileStringW(L"Shell", L"CustomDefaultThemeFile", NULL, szValue, _countof(szValue), szPath) || !*szValue) + bDefaultThemesOff = TRUE; // None specified, fall back to the classic theme. + } + + /* Enable the chosen theme, or use the classic theme */ + EnableVisualTheme(NULL, bDefaultThemesOff ? NULL : szValue); +} + static BOOL CommonInstall(VOID) { @@ -1007,7 +1062,7 @@ CommonInstall(VOID) goto Exit; } - if(!InstallSysSetupInfComponents()) + if (!InstallSysSetupInfComponents()) { FatalError("InstallSysSetupInfComponents() failed!\n"); goto Exit; @@ -1038,7 +1093,6 @@ CommonInstall(VOID) bResult = TRUE; Exit: - if (bResult == FALSE) { SetupCloseInfFile(hSysSetupInf); @@ -1062,6 +1116,7 @@ InstallLiveCD(VOID) PROCESS_INFORMATION ProcessInformation; BOOL bRes; + PreprocessUnattend(FALSE); if (!CommonInstall()) goto error; @@ -1579,6 +1634,7 @@ InstallReactOS(VOID) hHotkeyThread = CreateThread(NULL, 0, HotkeyThread, NULL, 0, NULL); + PreprocessUnattend(TRUE); if (!CommonInstall()) return 0; diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index ade3c295a3f..9ec3d167db7 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -52,7 +52,6 @@ typedef struct _TIMEZONE_ENTRY extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); - static VOID CenterWindow(HWND hWnd) { @@ -1367,6 +1366,90 @@ RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters) return TRUE; } + +VOID +EnableVisualTheme( + _In_opt_ HWND hwndParent, + _In_opt_ PCWSTR ThemeFile) +{ + enum { THEME_FILE, STYLE_FILE, UNKNOWN } fType; + WCHAR szPath[MAX_PATH]; // Expanded path of the file to use. + WCHAR szStyleFile[MAX_PATH]; + + fType = THEME_FILE; // Default to Classic theme. + if (ThemeFile) + { + /* Expand the path if possible */ + if (ExpandEnvironmentStringsW(ThemeFile, szPath, _countof(szPath)) != 0) + ThemeFile = szPath; + + /* Determine the file type from its extension */ + fType = UNKNOWN; { + PCWSTR pszExt = wcsrchr(ThemeFile, L'.'); // PathFindExtensionW(ThemeFile); + if (pszExt) + { + if (_wcsicmp(pszExt, L".theme") == 0) + fType = THEME_FILE; + else if (_wcsicmp(pszExt, L".msstyles") == 0) + fType = STYLE_FILE; + } } + if (fType == UNKNOWN) + { + DPRINT1("EnableVisualTheme(): Unknown file '%S'\n", ThemeFile); + return; + } + } + + DPRINT1("Applying visual %s '%S'\n", + (fType == THEME_FILE) ? "theme" : "style", + ThemeFile ? ThemeFile : L"(Classic)"); + +// +// TODO: Use instead uxtheme!SetSystemVisualStyle() once it is implemented, +// https://stackoverflow.com/a/1036903 +// https://pinvoke.net/default.aspx/uxtheme.SetSystemVisualStyle +// or ApplyTheme(NULL, 0, NULL) for restoring the classic theme. +// +// NOTE: The '/Action:ActivateMSTheme' is ReactOS-specific. +// + + if (ThemeFile && (fType == THEME_FILE)) + { + /* Retrieve the visual style specified in the theme file. + * If none, fall back to the classic theme. */ + if (GetPrivateProfileStringW(L"VisualStyles", L"Path", NULL, + szStyleFile, _countof(szStyleFile), ThemeFile) && *szStyleFile) + { + /* Expand the path if possible */ + ThemeFile = szStyleFile; + if (ExpandEnvironmentStringsW(ThemeFile, szPath, _countof(szPath)) != 0) + ThemeFile = szPath; + } + else + { + ThemeFile = NULL; + } + + DPRINT1("--> Applying visual style '%S'\n", + ThemeFile ? ThemeFile : L"(Classic)"); + } + + if (ThemeFile) + { + WCHAR wszParams[1024]; + // FIXME: L"desk.cpl desk,@Appearance" regression, see commit 50d260a7f0 + PCWSTR format = L"desk.cpl,,2 /Action:ActivateMSTheme /file:\"%s\""; + + StringCchPrintfW(wszParams, _countof(wszParams), format, ThemeFile); + RunControlPanelApplet(hwndParent, wszParams); + } + else + { + RunControlPanelApplet(hwndParent, L"desk.cpl,,2 /Action:ActivateMSTheme"); + } +} + + static VOID WriteUserLocale(VOID) { @@ -1927,13 +2010,14 @@ ThemePageDlgProc(HWND hwndDlg, /* Register the imagelist */ ListView_SetImageList(hListView, himl, LVSIL_NORMAL); - /* Transparant background */ + /* Transparent background */ ListView_SetBkColor(hListView, CLR_NONE); ListView_SetTextBkColor(hListView, CLR_NONE); /* Reduce the size between the items */ ListView_SetIconSpacing(hListView, 190, 173); break; } + case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) { @@ -1947,17 +2031,13 @@ ThemePageDlgProc(HWND hwndDlg, if (Themes[iTheme].ThemeFile) { - WCHAR wszParams[1024]; WCHAR wszTheme[MAX_PATH]; - WCHAR* format = L"desk.cpl,,2 /Action:ActivateMSTheme /file:\"%s\""; - SHGetFolderPathAndSubDirW(0, CSIDL_RESOURCES, NULL, SHGFP_TYPE_DEFAULT, Themes[iTheme].ThemeFile, wszTheme); - swprintf(wszParams, format, wszTheme); - RunControlPanelApplet(hwndDlg, wszParams); + EnableVisualTheme(hwndDlg, wszTheme); } else { - RunControlPanelApplet(hwndDlg, L"desk.cpl,,2 /Action:ActivateMSTheme"); + EnableVisualTheme(hwndDlg, Themes[iTheme].ThemeFile); } } break;

1 0

[reactos] 01/01: [PING] Update SendBuffer fill method (#7782)
by Curtis Wilson 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e2d1b358c91b7e91fb8a… commit 8e2d1b358c91b7e91fb8aa093a2e5bb2ee474564 Author: Curtis Wilson <cwilson2016(a)outlook.com> AuthorDate: Tue Mar 18 17:05:06 2025 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 18 22:05:06 2025 +0100 [PING] Update SendBuffer fill method (#7782) The ping utility found in various versions of Windows fills the optional data field in the ICMP echo request structure with ASCII characters from 'a' to 'w' wrapping back around until SendBuffer is full. Future TO-DO: Compare ReplyBuffer data to SendBuffer. --- base/applications/network/ping/ping.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/network/ping/ping.c b/base/applications/network/ping/ping.c index 17afdfc5738..d0ebc0397ae 100644 --- a/base/applications/network/ping/ping.c +++ b/base/applications/network/ping/ping.c @@ -432,7 +432,11 @@ Ping(void) exit(1); } - ZeroMemory(SendBuffer, RequestSize); + /* Windows ping utility fills the optional data field with + * ASCII characters from 'a' to 'w', wrapping back around + * until SendBuffer is full. */ + for (ULONG i = 0; i < RequestSize; i++) + ((PUCHAR)SendBuffer)[i] = (UCHAR)('a' + (i % ('w' - 'a' + 1))); } if (Family == AF_INET6) @@ -483,6 +487,7 @@ Ping(void) ReplyBuffer, ReplySize, Timeout); } + /* TODO: Compare ReplyBuffer data to SendBuffer. */ free(SendBuffer); if (Status == 0)

1 0

[reactos] 01/01: [FREELDR] Refactor and optimize the IDE driver (#7728)
by Dmitry Borisov 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=787f81f3f5552a23890b2… commit 787f81f3f5552a23890b244b2ab1eb07d80737e4 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Mar 19 02:56:25 2025 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 18 21:56:25 2025 +0100 [FREELDR] Refactor and optimize the IDE driver (#7728) [DDK] Update IDENTIFY data and other ATA definitions. Based on the MinGW header. [FREELDR] Refactor and optimize the IDE driver. Fix long-standing bugs, which have a negative impact on the boot stability. - Make the driver more ATA specification compliant. - Improve the speed of device detection. - Remove inconsistent delays. - Support modern hard drives with sector size greater than 512 bytes. - Add basic error recovery. - Move private definitions to a separate private header. - Remove the useless AtaFree API method. --- boot/freeldr/freeldr/arch/drivers/hwide.c | 1749 +++++++++++++-------- boot/freeldr/freeldr/arch/drivers/hwidep.h | 387 +++++ boot/freeldr/freeldr/arch/i386/pc98/machpc98.c | 1 - boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c | 9 +- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 1 - boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c | 51 +- boot/freeldr/freeldr/include/arch/i386/machpc98.h | 1 - boot/freeldr/freeldr/include/arch/i386/machxbox.h | 1 - boot/freeldr/freeldr/include/hwide.h | 341 +--- sdk/include/ddk/ata.h | 558 ++++++- 10 files changed, 2002 insertions(+), 1097 deletions(-) diff --git a/boot/freeldr/freeldr/arch/drivers/hwide.c b/boot/freeldr/freeldr/arch/drivers/hwide.c index 9eb92ada048..2baffe48345 100644 --- a/boot/freeldr/freeldr/arch/drivers/hwide.c +++ b/boot/freeldr/freeldr/arch/drivers/hwide.c @@ -1,371 +1,750 @@ /* * PROJECT: FreeLoader - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: MIT (https://spdx.org/licenses/MIT) * PURPOSE: ATA/ATAPI programmed I/O driver. - * COPYRIGHT: Copyright 2019-2020 Dmitry Borisov (di.sean(a)protonmail.com) + * COPYRIGHT: Copyright 2019-2025 Dmitry Borisov (di.sean(a)protonmail.com) */ /* INCLUDES *******************************************************************/ #include <freeldr.h> -#include <hwide.h> /* DDK */ #include <ata.h> #include <scsi.h> +#include <hwide.h> +#include "hwidep.h" + #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); /* GLOBALS ********************************************************************/ -#define TAG_ATA_DEVICE 'DatA' -#define ATAPI_PACKET_SIZE(IdentifyData) (IdentifyData.AtapiCmdSize ? 16 : 12) -#define ATA_STATUS_TIMEOUT 31e5 - -#define AtaWritePort(Channel, Port, Data) \ - WRITE_PORT_UCHAR(UlongToPtr(BaseArray[(Channel)] + (Port)), (Data)) - -#define AtaReadPort(Channel, Port) \ - READ_PORT_UCHAR(UlongToPtr(BaseArray[(Channel)] + (Port))) - -#define AtaWriteBuffer(Channel, Buffer, Count) \ - WRITE_PORT_BUFFER_USHORT(UlongToPtr(BaseArray[(Channel)] + IDX_IO1_o_Data), \ - (PUSHORT)(Buffer), (Count)/sizeof(USHORT)) - -#define AtaReadBuffer(Channel, Buffer, Count) \ - READ_PORT_BUFFER_USHORT(UlongToPtr(BaseArray[(Channel)] + IDX_IO1_i_Data), \ - (PUSHORT)(Buffer), (Count)/sizeof(USHORT)) - -/* IDE/ATA Channels base - Primary, Secondary, Tertiary, Quaternary */ -static const ULONG BaseArray[] = +/** IDE Channels base - Primary, Secondary, Tertiary, Quaternary */ +static const IDE_REG AtapChannelBaseArray[] = { -#if defined(SARCH_XBOX) +#if defined(SARCH_PC98) + 0x640 +#elif defined(SARCH_XBOX) 0x1F0 -#elif defined(SARCH_PC98) - 0x640, 0x640 #else 0x1F0, 0x170, 0x1E8, 0x168 #endif }; +#define CHANNEL_MAX_CHANNELS RTL_NUMBER_OF(AtapChannelBaseArray) -#define MAX_CHANNELS RTL_NUMBER_OF(BaseArray) -#define MAX_DEVICES 2 /* Master/Slave */ +static PHW_DEVICE_UNIT AtapUnits[CHANNEL_MAX_CHANNELS * CHANNEL_MAX_DEVICES]; -static PDEVICE_UNIT Units[MAX_CHANNELS * MAX_DEVICES]; - -/* PRIVATE PROTOTYPES *********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ +#if defined(ATA_SUPPORT_32_BIT_IO) static +inline BOOLEAN -WaitForFlags( - IN UCHAR Channel, - IN UCHAR Flags, - IN UCHAR ExpectedValue, - IN ULONG Timeout -); +AtapIs32BitIoSupported( + _In_ PHW_DEVICE_UNIT DeviceUnit) +{ +#if defined(ATA_ALWAYS_DO_32_BIT_IO) + return TRUE; +#else + return !!(DeviceUnit->P.Flags & ATA_DEVICE_FLAG_IO32); +#endif +} +#endif static -BOOLEAN -WaitForFlagsOr( - IN UCHAR Channel, - IN UCHAR FirstValue, - IN UCHAR SecondValue, - IN ULONG Timeout -); +VOID +AtapSelectDevice( + _In_ PIDE_REGISTERS Registers, + _In_range_(0, 3) UCHAR DeviceNumber) +{ +#if defined(SARCH_PC98) + /* Select the primary (0) or secondary (1) IDE channel */ + ATA_WRITE(0x432, DeviceNumber >> 1); +#endif + + ATA_WRITE(Registers->Device, (DEV_SLAVE(DeviceNumber) << 4) | IDE_DRIVE_SELECT); + ATA_IO_WAIT(); +} static BOOLEAN -WaitForBusy( - IN UCHAR Channel, - IN ULONG Timeout -); +AtapWaitForNotBusy( + _In_ PIDE_REGISTERS Registers, + _In_range_(>, 0) ULONG Timeout, + _Out_opt_ PUCHAR Result) +{ + UCHAR IdeStatus; + ULONG i; -static -VOID -SelectDevice( - IN UCHAR Channel, - IN UCHAR DeviceNumber -); + ASSERT(Timeout != 0); + + for (i = 0; i < Timeout; ++i) + { + IdeStatus = ATA_READ(Registers->Status); + if (!(IdeStatus & IDE_STATUS_BUSY)) + { + if (Result) + *Result = IdeStatus; + return TRUE; + } + + if (IdeStatus == 0xFF) + break; + + StallExecutionProcessor(10); + } + + if (Result) + *Result = IdeStatus; + return FALSE; +} static BOOLEAN -IdentifyDevice( - IN UCHAR Channel, - IN UCHAR DeviceNumber, - OUT PDEVICE_UNIT *DeviceUnit -); +AtapWaitForIdle( + _In_ PIDE_REGISTERS Registers, + _Out_ PUCHAR Result) +{ + UCHAR IdeStatus; + ULONG i; + + for (i = 0; i < ATA_TIME_DRQ_CLEAR; ++i) + { + IdeStatus = ATA_READ(Registers->Status); + if (!(IdeStatus & (IDE_STATUS_DRQ | IDE_STATUS_BUSY))) + { + *Result = IdeStatus; + return TRUE; + } + + StallExecutionProcessor(2); + } + + *Result = IdeStatus; + return FALSE; +} static -BOOLEAN -AtapiRequestSense( - IN PDEVICE_UNIT DeviceUnit, - OUT PSENSE_DATA SenseData -); +VOID +AtapSendCdb( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request) +{ +#if defined(ATA_SUPPORT_32_BIT_IO) + if (AtapIs32BitIoSupported(DeviceUnit)) + { + ATA_WRITE_BLOCK_32(DeviceUnit->Registers.Data, + Request->Cdb, + DeviceUnit->CdbSize / sizeof(USHORT)); + } + else +#endif + { + ATA_WRITE_BLOCK_16(DeviceUnit->Registers.Data, + Request->Cdb, + DeviceUnit->CdbSize); + } + + /* + * In polled mode (interrupts disabled) + * the NEC CDR-260 drive clears BSY before updating the interrupt reason register. + * As a workaround, we will wait for the phase change. + */ + if (DeviceUnit->P.Flags & ATA_DEVICE_IS_NEC_CDR260) + { + ULONG i; + + ATA_IO_WAIT(); + + for (i = 0; i < ATA_TIME_PHASE_CHANGE; ++i) + { + UCHAR InterruptReason = ATA_READ(DeviceUnit->Registers.InterruptReason); + if (InterruptReason != ATAPI_INT_REASON_COD) + break; + + StallExecutionProcessor(10); + } + } +} static VOID -AtapiPrintSenseData( - IN PDEVICE_UNIT DeviceUnit -); +AtapPioDataIn( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ ULONG ByteCount) +{ + ByteCount = min(ByteCount, DeviceUnit->BytesToTransfer); + +#if defined(ATA_SUPPORT_32_BIT_IO) + if (AtapIs32BitIoSupported(DeviceUnit)) + { + ATA_READ_BLOCK_32(DeviceUnit->Registers.Data, + (PULONG)DeviceUnit->DataBuffer, + ByteCount / sizeof(ULONG)); + } + else +#endif + { + ATA_READ_BLOCK_16(DeviceUnit->Registers.Data, + (PUSHORT)DeviceUnit->DataBuffer, + ByteCount / sizeof(USHORT)); + } + + DeviceUnit->DataBuffer += ByteCount; + DeviceUnit->BytesToTransfer -= ByteCount; +} static BOOLEAN -AtapiReadyCheck( - IN OUT PDEVICE_UNIT DeviceUnit -); +AtapWaitForRegisterAccess( + _In_ PIDE_REGISTERS Registers, + _In_range_(0, 3) UCHAR DeviceNumber) +{ + ULONG i; + + for (i = 0; i < ATA_TIME_RESET_SELECT; ++i) + { + /* Select the device again */ + AtapSelectDevice(Registers, DeviceNumber); + + /* Check whether the selection was successful */ + ATA_WRITE(Registers->ByteCountLow, 0xAA); + ATA_WRITE(Registers->ByteCountLow, 0x55); + ATA_WRITE(Registers->ByteCountLow, 0xAA); + if (ATA_READ(Registers->ByteCountLow) == 0xAA) + return TRUE; + + StallExecutionProcessor(10); + } + + return FALSE; +} static -BOOLEAN -AtapiReadLogicalSectorLBA( - IN PDEVICE_UNIT DeviceUnit, - IN ULONGLONG SectorNumber, - OUT PVOID Buffer -); +VOID +AtapSoftwareReset( + _In_ PIDE_REGISTERS Registers) +{ + ATA_WRITE(Registers->Control, IDE_DC_RESET_CONTROLLER | IDE_DC_ALWAYS); + StallExecutionProcessor(20); + ATA_WRITE(Registers->Control, IDE_DC_DISABLE_INTERRUPTS | IDE_DC_ALWAYS); + StallExecutionProcessor(20); +} static BOOLEAN -AtaReadLogicalSectorsLBA( - IN PDEVICE_UNIT DeviceUnit, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - OUT PVOID Buffer -); +AtapPerformSoftwareReset( + _In_ PHW_DEVICE_UNIT DeviceUnit) +{ + PIDE_REGISTERS Registers = &DeviceUnit->Registers; -/* FUNCTIONS ******************************************************************/ + ERR("Reset device at %X:%u\n", Registers->Data, DeviceUnit->DeviceNumber); -/* Don't call this before running the system timer calibration and MM initialization */ -BOOLEAN -AtaInit(OUT PUCHAR DetectedCount) -{ - UCHAR Channel, DeviceNumber; - PDEVICE_UNIT DeviceUnit = NULL; + /* Perform a software reset */ + AtapSoftwareReset(Registers); - TRACE("AtaInit()\n"); + /* The reset will cause the master device to be selected */ + if (DEV_SLAVE(DeviceUnit->DeviceNumber)) + { + if (!AtapWaitForRegisterAccess(Registers, DeviceUnit->DeviceNumber)) + return FALSE; + } - *DetectedCount = 0; + /* Now wait for busy to clear */ + if (!AtapWaitForNotBusy(Registers, ATA_TIME_BUSY_RESET, NULL)) + return FALSE; - RtlZeroMemory(&Units, sizeof(Units)); + return TRUE; +} - /* Detect and enumerate ATA/ATAPI devices */ - for (Channel = 0; Channel < MAX_CHANNELS; ++Channel) +static +UCHAR +AtapProcessAtapiRequest( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request, + _In_ UCHAR IdeStatus) +{ + UCHAR InterruptReason; + + InterruptReason = ATA_READ(DeviceUnit->Registers.InterruptReason); + InterruptReason &= ATAPI_INT_REASON_MASK; + InterruptReason |= IdeStatus & IDE_STATUS_DRQ; + + switch (InterruptReason) { - for (DeviceNumber = 0; DeviceNumber < MAX_DEVICES; ++DeviceNumber) + case ATAPI_INT_REASON_AWAIT_CDB: { - if (IdentifyDevice(Channel, DeviceNumber, &DeviceUnit)) - { - Units[(*DetectedCount)++] = DeviceUnit; - } + if (!(Request->Flags & REQUEST_FLAG_AWAIT_CDB)) + return ATA_STATUS_RESET; + + Request->Flags &= ~REQUEST_FLAG_AWAIT_CDB; + + AtapSendCdb(DeviceUnit, Request); + return ATA_STATUS_PENDING; } + + case ATAPI_INT_REASON_DATA_IN: + { + ULONG ByteCount; + + if (!Request->DataBuffer || (Request->Flags & REQUEST_FLAG_AWAIT_CDB)) + return ATA_STATUS_RESET; + + ByteCount = ATA_READ(DeviceUnit->Registers.ByteCountLow); + ByteCount |= ATA_READ(DeviceUnit->Registers.ByteCountHigh) << 8; + + AtapPioDataIn(DeviceUnit, ByteCount); + return ATA_STATUS_PENDING; + } + + case ATAPI_INT_REASON_STATUS_NEC: + { + /* The NEC CDR-260 drive always clears CoD and IO on command completion */ + if (!(DeviceUnit->P.Flags & ATA_DEVICE_IS_NEC_CDR260)) + return ATA_STATUS_RESET; + + __fallthrough; + } + case ATAPI_INT_REASON_STATUS: + { + if (IdeStatus & (IDE_STATUS_ERROR | IDE_STATUS_DEVICE_FAULT)) + return ATA_STATUS_ERROR; + + break; + } + + default: + return ATA_STATUS_RESET; } - return (*DetectedCount > 0); + return ATA_STATUS_SUCCESS; +} + +static +UCHAR +AtapProcessAtaRequest( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request, + _In_ UCHAR IdeStatus) +{ + /* Check for errors */ + if (IdeStatus & (IDE_STATUS_ERROR | IDE_STATUS_DEVICE_FAULT)) + { + if (IdeStatus & IDE_STATUS_DRQ) + return ATA_STATUS_RESET; + else + return ATA_STATUS_ERROR; + } + + /* Read command */ + if (Request->DataBuffer) + { + if (!(IdeStatus & IDE_STATUS_DRQ)) + return ATA_STATUS_RESET; + + /* Read the next data block */ + AtapPioDataIn(DeviceUnit, DeviceUnit->DrqByteCount); + + if (DeviceUnit->BytesToTransfer != 0) + return ATA_STATUS_PENDING; + + /* All data has been transferred, wait for DRQ to clear */ + if (!AtapWaitForIdle(&DeviceUnit->Registers, &IdeStatus)) + return ATA_STATUS_RESET; + + if (IdeStatus & (IDE_STATUS_ERROR | IDE_STATUS_DEVICE_FAULT)) + return ATA_STATUS_ERROR; + } + + /* Status phase or non-data ATA command */ + return ATA_STATUS_SUCCESS; } +static +BOOLEAN +AtapProcessRequest( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request, + _In_ UCHAR IdeStatus) +{ + if (Request->Flags & REQUEST_FLAG_PACKET_COMMAND) + return AtapProcessAtapiRequest(DeviceUnit, Request, IdeStatus); + else + return AtapProcessAtaRequest(DeviceUnit, Request, IdeStatus); +} + +static +VOID +AtapIssuePacketCommand( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request) +{ + USHORT ByteCount; + + Request->Flags |= REQUEST_FLAG_AWAIT_CDB; + + /* + * If a larger transfer is attempted, the 16-bit ByteCount register might overflow. + * In this case we round down the length to the closest multiple of 2. + */ + ByteCount = min(Request->DataTransferLength, 0xFFFE); + + /* Prepare to transfer a device command */ + ATA_WRITE(DeviceUnit->Registers.ByteCountLow, (UCHAR)(ByteCount >> 0)); + ATA_WRITE(DeviceUnit->Registers.ByteCountHigh, (UCHAR)(ByteCount >> 8)); + ATA_WRITE(DeviceUnit->Registers.Features, IDE_FEATURE_PIO); + ATA_WRITE(DeviceUnit->Registers.Command, IDE_COMMAND_ATAPI_PACKET); +} + +static VOID -AtaFree(VOID) +AtapLoadTaskFile( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request) { - UCHAR i; + PATA_TASKFILE TaskFile = &Request->TaskFile; + ULONG i, BlockCount; - for (i = 0; i < RTL_NUMBER_OF(Units); ++i) + /* Store the extra information in the second byte of FIFO for 48-bit commands */ + i = (Request->Flags & REQUEST_FLAG_LBA48) ? 2 : 1; + + while (i--) + { + ATA_WRITE(DeviceUnit->Registers.Features, TaskFile->Data[i].Feature); + ATA_WRITE(DeviceUnit->Registers.SectorCount, TaskFile->Data[i].SectorCount); + ATA_WRITE(DeviceUnit->Registers.LbaLow, TaskFile->Data[i].LowLba); + ATA_WRITE(DeviceUnit->Registers.LbaMid, TaskFile->Data[i].MidLba); + ATA_WRITE(DeviceUnit->Registers.LbaHigh, TaskFile->Data[i].HighLba); + } + if (Request->Flags & REQUEST_FLAG_SET_DEVICE_REGISTER) { - if (Units[i]) - FrLdrTempFree(Units[i], TAG_ATA_DEVICE); + ATA_WRITE(DeviceUnit->Registers.Device, TaskFile->DriveSelect); } + ATA_WRITE(DeviceUnit->Registers.Command, TaskFile->Command); + + /* Set the byte count per DRQ data block */ + if (Request->Flags & REQUEST_FLAG_READ_WRITE_MULTIPLE) + BlockCount = DeviceUnit->MultiSectorTransfer; + else + BlockCount = 1; + DeviceUnit->DrqByteCount = BlockCount * DeviceUnit->P.SectorSize; } -PDEVICE_UNIT -AtaGetDevice(IN UCHAR UnitNumber) +static +UCHAR +AtapSendCommand( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request) { - if (UnitNumber < RTL_NUMBER_OF(Units)) - return Units[UnitNumber]; + UCHAR AtaStatus; + + DeviceUnit->BytesToTransfer = Request->DataTransferLength; + DeviceUnit->DataBuffer = Request->DataBuffer; + + /* Select the device */ + AtapSelectDevice(&DeviceUnit->Registers, DeviceUnit->DeviceNumber); + if (!AtapWaitForNotBusy(&DeviceUnit->Registers, ATA_TIME_BUSY_SELECT, NULL)) + return ATA_STATUS_RETRY; + + /* Always disable interrupts, otherwise it may lead to problems in underlying BIOS firmware */ + ATA_WRITE(DeviceUnit->Registers.Control, IDE_DC_DISABLE_INTERRUPTS | IDE_DC_ALWAYS); + + if (Request->Flags & REQUEST_FLAG_PACKET_COMMAND) + AtapIssuePacketCommand(DeviceUnit, Request); else - return NULL; + AtapLoadTaskFile(DeviceUnit, Request); + + while (TRUE) + { + UCHAR IdeStatus; + + ATA_IO_WAIT(); + + if (!AtapWaitForNotBusy(&DeviceUnit->Registers, ATA_TIME_BUSY_POLL, &IdeStatus)) + return ATA_STATUS_RESET; + + AtaStatus = AtapProcessRequest(DeviceUnit, Request, IdeStatus); + if (AtaStatus != ATA_STATUS_PENDING) + break; + } + + return AtaStatus; } +static +VOID +AtapAtapiBuildRequestSense( + _In_ PATA_DEVICE_REQUEST Request, + _Out_ PSENSE_DATA SenseData) +{ + Request->Flags = REQUEST_FLAG_PACKET_COMMAND; + Request->DataBuffer = SenseData; + Request->DataTransferLength = sizeof(*SenseData); + Request->Cdb[0] = SCSIOP_REQUEST_SENSE; + Request->Cdb[4] = (UCHAR)Request->DataTransferLength; +} + +static BOOLEAN -AtaAtapiReadLogicalSectorsLBA( - IN OUT PDEVICE_UNIT DeviceUnit, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - OUT PVOID Buffer) +AtapAtapiHandleError( + _In_ PHW_DEVICE_UNIT DeviceUnit) { - UCHAR RetryCount; - BOOLEAN Success; + ATA_DEVICE_REQUEST Request = { 0 }; + SENSE_DATA SenseData; - if (DeviceUnit == NULL || SectorCount == 0) + AtapAtapiBuildRequestSense(&Request, &SenseData); + if (AtapSendCommand(DeviceUnit, &Request) != ATA_STATUS_SUCCESS) return FALSE; - if (DeviceUnit->Flags & ATA_DEVICE_ATAPI) + ERR("SK %02X, ASC %02X, ASCQ %02X\n", + SenseData.SenseKey, + SenseData.AdditionalSenseCode, + SenseData.AdditionalSenseCodeQualifier); + + return TRUE; +} + +static +BOOLEAN +AtapIssueCommand( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request) +{ + ULONG RetryCount; + + for (RetryCount = 0; RetryCount < 3; ++RetryCount) { - if ((DeviceUnit->Flags & ATA_DEVICE_NO_MEDIA) || (DeviceUnit->Flags & ATA_DEVICE_NOT_READY)) + UCHAR AtaStatus; + + AtaStatus = AtapSendCommand(DeviceUnit, Request); + + if ((AtaStatus != ATA_STATUS_SUCCESS) && + !(Request->Flags & REQUEST_FLAG_IDENTIFY_COMMAND)) { - /* Retry 4 times */ - for (RetryCount = 0; RetryCount < 4; ++RetryCount) + ERR("ATA%s command %02X failed %u %02X:%02X at %X:%u\n", + (Request->Flags & REQUEST_FLAG_PACKET_COMMAND) ? "PI" : "", + (Request->Flags & REQUEST_FLAG_PACKET_COMMAND) ? + Request->Cdb[0] : Request->TaskFile.Command, + AtaStatus, + ATA_READ(DeviceUnit->Registers.Status), + ATA_READ(DeviceUnit->Registers.Error), + DeviceUnit->Registers.Data, + DeviceUnit->DeviceNumber); + } + + switch (AtaStatus) + { + case ATA_STATUS_SUCCESS: + return TRUE; + + case ATA_STATUS_RETRY: + break; + + case ATA_STATUS_RESET: { - /* Make the device ready */ - if (AtapiReadyCheck(DeviceUnit)) - break; + if (Request->Flags & REQUEST_FLAG_IDENTIFY_COMMAND) + { + /* + * Some controllers indicate status 0x00 + * when the selected device does not exist, + * no point in going further. + */ + if (ATA_READ(DeviceUnit->Registers.Status) == 0) + return FALSE; + } + + /* Turn off various things and retry the command */ + DeviceUnit->MultiSectorTransfer = 0; + DeviceUnit->P.Flags &= ~ATA_DEVICE_FLAG_IO32; + + if (!AtapPerformSoftwareReset(DeviceUnit)) + return FALSE; + + break; } - if (RetryCount >= 4) + + default: { - ERR("AtaAtapiReadLogicalSectorsLBA(): Device not ready.\n"); - return FALSE; - } - } - if (SectorNumber + SectorCount > DeviceUnit->TotalSectors + 1) - { - ERR("AtaAtapiReadLogicalSectorsLBA(): Attempt to read more than there is to read.\n"); - return FALSE; - } + if (Request->Flags & REQUEST_FLAG_PACKET_COMMAND) + { + if (!AtapAtapiHandleError(DeviceUnit)) + return FALSE; + } - while (SectorCount > 0) - { - /* Read a single sector */ - Success = AtapiReadLogicalSectorLBA(DeviceUnit, SectorNumber, Buffer); - if (!Success) - return FALSE; - - --SectorCount; - ++SectorNumber; - Buffer = (PVOID)((ULONG_PTR)Buffer + DeviceUnit->SectorSize); + /* Only retry failed read commands */ + if (!(Request->Flags & REQUEST_FLAG_READ_COMMAND)) + return FALSE; + + break; + } } } - else + + return FALSE; +} + +static +UCHAR +AtapGetReadCommand( + _In_ PATA_DEVICE_REQUEST Request) +{ + static const UCHAR AtapReadCommandMap[2][2] = { - /* Retry 3 times */ - for (RetryCount = 0; RetryCount < 3; ++RetryCount) - { - /* Read a multiple sectors */ - Success = AtaReadLogicalSectorsLBA(DeviceUnit, SectorNumber, SectorCount, Buffer); - if (Success) - return TRUE; - } - return FALSE; - } + /* Read Read EXT */ + { IDE_COMMAND_READ, IDE_COMMAND_READ_EXT }, // PIO single + { IDE_COMMAND_READ_MULTIPLE, IDE_COMMAND_READ_MULTIPLE_EXT }, // PIO multiple + }; - return TRUE; + return AtapReadCommandMap[(Request->Flags & REQUEST_FLAG_READ_WRITE_MULTIPLE) ? 1 : 0] + [(Request->Flags & REQUEST_FLAG_LBA48) ? 1 : 0]; } static -BOOLEAN -AtaReadLogicalSectorsLBA( - IN PDEVICE_UNIT DeviceUnit, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - OUT PVOID Buffer) -{ - UCHAR Command; - ULONG ChsTemp; - USHORT Cylinder; - UCHAR Head; - UCHAR Sector; - ULONG BlockCount; - ULONG RemainingBlockCount; - ULONGLONG Lba; - BOOLEAN UseLBA48; - - UseLBA48 = (DeviceUnit->Flags & ATA_DEVICE_LBA48) && - (((SectorNumber + SectorCount) >= UINT64_C(0x0FFFFF80)) || SectorCount > 256); +VOID +AtapBuildReadTaskFile( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ PATA_DEVICE_REQUEST Request, + _In_ ULONG64 Lba, + _In_ ULONG SectorCount) +{ + PATA_TASKFILE TaskFile = &Request->TaskFile; + UCHAR DriveSelect; - while (SectorCount > 0) + Request->Flags = REQUEST_FLAG_READ_COMMAND | REQUEST_FLAG_SET_DEVICE_REGISTER; + + if (DeviceUnit->MultiSectorTransfer != 0) { - /* Prevent sector count overflow, divide it into maximum possible chunks and loop each one */ - if (UseLBA48) - BlockCount = min(SectorCount, USHRT_MAX); - else - BlockCount = min(SectorCount, UCHAR_MAX); + Request->Flags |= REQUEST_FLAG_READ_WRITE_MULTIPLE; + } - /* Convert LBA into a format CHS if needed */ - if (DeviceUnit->Flags & ATA_DEVICE_CHS) + if (DeviceUnit->P.Flags & ATA_DEVICE_LBA) + { + DriveSelect = IDE_LBA_MODE; + + TaskFile->Data[0].SectorCount = (UCHAR)SectorCount; + TaskFile->Data[0].LowLba = (UCHAR)Lba; // LBA bits 0-7 + TaskFile->Data[0].MidLba = (UCHAR)(Lba >> 8); // LBA bits 8-15 + TaskFile->Data[0].HighLba = (UCHAR)(Lba >> 16); // LBA bits 16-23 + + if ((DeviceUnit->P.Flags & ATA_DEVICE_LBA48) && (AtaCommandUseLba48(Lba, SectorCount))) { - ChsTemp = DeviceUnit->IdentifyData.SectorsPerTrack * DeviceUnit->IdentifyData.NumberOfHeads; - if (ChsTemp) - { - Cylinder = SectorNumber / ChsTemp; - Head = (SectorNumber % ChsTemp) / DeviceUnit->IdentifyData.SectorsPerTrack; - Sector = (SectorNumber % DeviceUnit->IdentifyData.SectorsPerTrack) + 1; - } - else - { - Cylinder = 0; - Head = 0; - Sector = 1; - } - Lba = (Sector & 0xFF) | ((Cylinder & 0xFFFFF) << 8) | ((Head & 0x0F) << 24); + ASSERT((Lba + SectorCount) <= ATA_MAX_LBA_48); + + /* 48-bit command */ + TaskFile->Data[1].SectorCount = (UCHAR)(SectorCount >> 8); + TaskFile->Data[1].LowLba = (UCHAR)(Lba >> 24); // LBA bits 24-31 + TaskFile->Data[1].MidLba = (UCHAR)(Lba >> 32); // LBA bits 32-39 + TaskFile->Data[1].HighLba = (UCHAR)(Lba >> 40); // LBA bits 40-47 + + Request->Flags |= REQUEST_FLAG_LBA48; } else { - Lba = SectorNumber; + ASSERT((Lba + SectorCount) <= ATA_MAX_LBA_28); + + /* 28-bit command */ + DriveSelect |= ((Lba >> 24) & 0x0F); // LBA bits 24-27 } + } + else + { + ULONG ChsTemp, Cylinder, Head, Sector; + + ChsTemp = (ULONG)Lba / DeviceUnit->P.SectorsPerTrack; + + /* Legacy CHS translation */ + Cylinder = ChsTemp / DeviceUnit->P.Heads; + Head = ChsTemp % DeviceUnit->P.Heads; + Sector = ((ULONG)Lba % DeviceUnit->P.SectorsPerTrack) + 1; + + ASSERT(Cylinder <= 65535 && Head <= 15 && Sector <= 255); + + TaskFile->Data[0].SectorCount = (UCHAR)SectorCount; + TaskFile->Data[0].LowLba = (UCHAR)Sector; + TaskFile->Data[0].MidLba = (UCHAR)Cylinder; + TaskFile->Data[0].HighLba = (UCHAR)(Cylinder >> 8); + + DriveSelect = Head; + } + TaskFile->DriveSelect = DeviceUnit->DeviceSelect | DriveSelect; + TaskFile->Command = AtapGetReadCommand(Request); +} - /* Select the drive */ - SelectDevice(DeviceUnit->Channel, DeviceUnit->DeviceNumber); - if (!WaitForBusy(DeviceUnit->Channel, ATA_STATUS_TIMEOUT)) - { - ERR("AtaReadLogicalSectorsLBA() failed. Device is busy.\n"); - return FALSE; - } +static +VOID +AtapBuildReadPacketCommand( + _In_ PATA_DEVICE_REQUEST Request, + _In_ ULONG64 Lba, + _In_ ULONG SectorCount) +{ + Request->Flags = REQUEST_FLAG_READ_COMMAND | REQUEST_FLAG_PACKET_COMMAND; - /* Disable interrupts */ - AtaWritePort(DeviceUnit->Channel, IDX_IO2_o_Control, IDE_DC_DISABLE_INTERRUPTS); - StallExecutionProcessor(1); + RtlZeroMemory(Request->Cdb, sizeof(Request->Cdb)); - if (UseLBA48) - { - /* FIFO */ - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_Feature, 0); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_Feature, ATA_PIO); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_BlockCount, (BlockCount >> 8) & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_BlockCount, BlockCount & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_BlockNumber, (Lba >> 24) & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_BlockNumber, Lba & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_CylinderLow, (Lba >> 32) & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_CylinderLow, (Lba >> 8) & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_CylinderHigh, (Lba >> 40) & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_CylinderHigh, (Lba >> 16) & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_DriveSelect, - IDE_USE_LBA | (DeviceUnit->DeviceNumber ? IDE_DRIVE_2 : IDE_DRIVE_1)); - Command = IDE_COMMAND_READ_EXT; - } - else - { - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_Feature, ATA_PIO); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_BlockCount, BlockCount & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_BlockNumber, Lba & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_CylinderLow, (Lba >> 8) & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_CylinderHigh, (Lba >> 16) & 0xFF); - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_DriveSelect, - ((Lba >> 24) & 0x0F) | - (DeviceUnit->Flags & ATA_DEVICE_CHS ? 0x00 : IDE_USE_LBA) | - (DeviceUnit->DeviceNumber ? IDE_DRIVE_SELECT_2 : IDE_DRIVE_SELECT_1)); - Command = IDE_COMMAND_READ; - } + if (Lba > MAXULONG) + { + /* READ (16) */ + Request->Cdb[0] = SCSIOP_READ16; + Request->Cdb[2] = (UCHAR)(Lba >> 56); + Request->Cdb[3] = (UCHAR)(Lba >> 48); + Request->Cdb[4] = (UCHAR)(Lba >> 40); + Request->Cdb[5] = (UCHAR)(Lba >> 32); + Request->Cdb[6] = (UCHAR)(Lba >> 24); + Request->Cdb[7] = (UCHAR)(Lba >> 16); + Request->Cdb[8] = (UCHAR)(Lba >> 8); + Request->Cdb[9] = (UCHAR)(Lba >> 0); + Request->Cdb[10] = (UCHAR)(SectorCount >> 24); + Request->Cdb[11] = (UCHAR)(SectorCount >> 16); + Request->Cdb[12] = (UCHAR)(SectorCount >> 8); + Request->Cdb[13] = (UCHAR)(SectorCount >> 0); + } + else + { + /* READ (10) */ + Request->Cdb[0] = SCSIOP_READ; + Request->Cdb[2] = (UCHAR)(Lba >> 24); + Request->Cdb[3] = (UCHAR)(Lba >> 16); + Request->Cdb[4] = (UCHAR)(Lba >> 8); + Request->Cdb[5] = (UCHAR)(Lba >> 0); + Request->Cdb[7] = (UCHAR)(SectorCount >> 8); + Request->Cdb[8] = (UCHAR)(SectorCount >> 0); + } +} + +static +BOOLEAN +AtapIsDevicePresent( + _In_ PHW_DEVICE_UNIT DeviceUnit) +{ + PIDE_REGISTERS Registers = &DeviceUnit->Registers; + UCHAR IdeStatus; - /* Send read command */ - AtaWritePort(DeviceUnit->Channel, IDX_IO1_o_Command, Command); - StallExecutionProcessor(5); + AtapSelectDevice(Registers, DeviceUnit->DeviceNumber); - for (RemainingBlockCount = BlockCount; RemainingBlockCount > 0; --RemainingBlockCount) - { - /* Wait for ready to transfer data block */ - if (!WaitForFlags(DeviceUnit->Channel, IDE_STATUS_DRQ, - IDE_STATUS_DRQ, ATA_STATUS_TIMEOUT)) - { - ERR("AtaReadLogicalSectorsLBA() failed. Status: 0x%02x, Error: 0x%02x\n", - AtaReadPort(DeviceUnit->Channel, IDX_IO1_i_Status), - AtaReadPort(DeviceUnit->Channel, IDX_IO1_i_Error)); - return FALSE; - } + IdeStatus = ATA_READ(Registers->Status); + if (IdeStatus == 0xFF || IdeStatus == 0x7F) + return FALSE; - /* Transfer the data block */ - AtaReadBuffer(DeviceUnit->Channel, Buffer, DeviceUnit->SectorSize); + ATA_WRITE(Registers->ByteCountLow, 0x55); + ATA_WRITE(Registers->ByteCountLow, 0xAA); + ATA_WRITE(Registers->ByteCountLow, 0x55); + if (ATA_READ(Registers->ByteCountLow) != 0x55) + return FALSE; + ATA_WRITE(Registers->ByteCountHigh, 0xAA); + ATA_WRITE(Registers->ByteCountHigh, 0x55); + ATA_WRITE(Registers->ByteCountHigh, 0xAA); + if (ATA_READ(Registers->ByteCountHigh) != 0xAA) + return FALSE; - Buffer = (PVOID)((ULONG_PTR)Buffer + DeviceUnit->SectorSize); - } + if (!AtapWaitForNotBusy(Registers, ATA_TIME_BUSY_ENUM, &IdeStatus)) + { + ERR("Device %X:%u is busy %02x\n", Registers->Data, DeviceUnit->DeviceNumber, IdeStatus); - SectorNumber += BlockCount; - SectorCount -= BlockCount; + /* Bring the device into a known state */ + if (!AtapPerformSoftwareReset(DeviceUnit)) + return FALSE; } return TRUE; @@ -373,569 +752,577 @@ AtaReadLogicalSectorsLBA( static BOOLEAN -AtaSendAtapiPacket( - IN UCHAR Channel, - IN PUCHAR AtapiPacket, - IN UCHAR PacketSize, - IN USHORT ByteCount) +AtapReadIdentifyData( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ UCHAR Command) { + ATA_DEVICE_REQUEST Request = { 0 }; + PIDENTIFY_DEVICE_DATA Id = &DeviceUnit->IdentifyDeviceData; + + /* Send the identify command */ + Request.Flags = REQUEST_FLAG_IDENTIFY_COMMAND; + Request.DataBuffer = Id; + Request.DataTransferLength = sizeof(*Id); + Request.TaskFile.Command = Command; + + return AtapIssueCommand(DeviceUnit, &Request); +} + +static +ATA_DEVICE_CLASS +AtapIdentifyDevice( + _In_ PHW_DEVICE_UNIT DeviceUnit) +{ + if (!AtapIsDevicePresent(DeviceUnit)) + return DEV_NONE; + /* - * REQUEST SENSE is used by driver to clear the ATAPI 'Bus reset' indication. - * TEST UNIT READY doesn't require space for returned data. + * We don't check the device signature here, + * because the NEC CDR-260 drive reports an ATA signature. */ - UCHAR ExpectedFlagsMask = (AtapiPacket[0] == SCSIOP_REQUEST_SENSE) ? - IDE_STATUS_DRDY : (IDE_STATUS_DRQ | IDE_STATUS_DRDY); - UCHAR ExpectedFlags = ((AtapiPacket[0] == SCSIOP_TEST_UNIT_READY) || - (AtapiPacket[0] == SCSIOP_REQUEST_SENSE)) ? - IDE_STATUS_DRDY : (IDE_STATUS_DRQ | IDE_STATUS_DRDY); - - /* PIO mode */ - AtaWritePort(Channel, IDX_ATAPI_IO1_o_Feature, ATA_PIO); - - /* Maximum byte count that is to be transferred */ - AtaWritePort(Channel, IDX_ATAPI_IO1_o_ByteCountLow, ByteCount & 0xFF); - AtaWritePort(Channel, IDX_ATAPI_IO1_o_ByteCountHigh, (ByteCount >> 8) & 0xFF); - - /* Prepare to transfer a device command via a command packet */ - AtaWritePort(Channel, IDX_ATAPI_IO1_o_Command, IDE_COMMAND_ATAPI_PACKET); - StallExecutionProcessor(50); - if (!WaitForFlagsOr(Channel, IDE_STATUS_DRQ, IDE_STATUS_DRDY, ATA_STATUS_TIMEOUT)) - { - ERR("AtaSendAtapiPacket(0x%x) failed. A device error occurred Status: 0x%02x, Error: 0x%02x\n", - AtapiPacket[0], AtaReadPort(Channel, IDX_ATAPI_IO1_i_Status), AtaReadPort(Channel, IDX_ATAPI_IO1_i_Error)); - return FALSE; - } - /* Command packet transfer */ - AtaWriteBuffer(Channel, AtapiPacket, PacketSize); - if (!WaitForFlags(Channel, ExpectedFlagsMask, ExpectedFlags, ATA_STATUS_TIMEOUT)) - { - TRACE("AtaSendAtapiPacket(0x%x) failed. An execution error occurred Status: 0x%02x, Error: 0x%02x\n", - AtapiPacket[0], AtaReadPort(Channel, IDX_ATAPI_IO1_i_Status), AtaReadPort(Channel, IDX_ATAPI_IO1_i_Error)); - return FALSE; - } + /* Check for ATA */ + if (AtapReadIdentifyData(DeviceUnit, IDE_COMMAND_IDENTIFY)) + return DEV_ATA; - return TRUE; + /* Check for ATAPI */ + if (AtapReadIdentifyData(DeviceUnit, IDE_COMMAND_ATAPI_IDENTIFY)) + return DEV_ATAPI; + + return DEV_NONE; } static BOOLEAN -AtapiReadLogicalSectorLBA( - IN PDEVICE_UNIT DeviceUnit, - IN ULONGLONG SectorNumber, - OUT PVOID Buffer) +AtapAtapiReadCapacity16( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _Out_ PREAD_CAPACITY16_DATA CapacityData) { - UCHAR AtapiPacket[16]; - USHORT DataSize; - BOOLEAN Success; + ATA_DEVICE_REQUEST Request = { 0 }; - /* Select the drive */ - SelectDevice(DeviceUnit->Channel, DeviceUnit->DeviceNumber); - if (!WaitForBusy(DeviceUnit->Channel, ATA_STATUS_TIMEOUT)) - { - ERR("AtapiReadLogicalSectorLBA() failed. Device is busy!\n"); - return FALSE; - } + /* Send the SCSI READ CAPACITY(16) command */ + Request.Flags = REQUEST_FLAG_PACKET_COMMAND; + Request.DataBuffer = CapacityData; + Request.DataTransferLength = sizeof(*CapacityData); + Request.Cdb[0] = SCSIOP_SERVICE_ACTION_IN16; + Request.Cdb[1] = SERVICE_ACTION_READ_CAPACITY16; + Request.Cdb[13] = sizeof(*CapacityData); - /* Disable interrupts */ - AtaWritePort(DeviceUnit->Channel, IDX_IO2_o_Control, IDE_DC_DISABLE_INTERRUPTS); - StallExecutionProcessor(1); - - /* Send the SCSI READ command */ - RtlZeroMemory(&AtapiPacket, sizeof(AtapiPacket)); - AtapiPacket[0] = SCSIOP_READ; - AtapiPacket[2] = (SectorNumber >> 24) & 0xFF; - AtapiPacket[3] = (SectorNumber >> 16) & 0xFF; - AtapiPacket[4] = (SectorNumber >> 8) & 0xFF; - AtapiPacket[5] = SectorNumber & 0xFF; - AtapiPacket[8] = 1; - Success = AtaSendAtapiPacket(DeviceUnit->Channel, - AtapiPacket, - ATAPI_PACKET_SIZE(DeviceUnit->IdentifyData), - DeviceUnit->SectorSize); - if (!Success) - { - ERR("AtapiReadLogicalSectorLBA() failed. A read error occurred.\n"); - AtapiPrintSenseData(DeviceUnit); - return FALSE; - } + return AtapIssueCommand(DeviceUnit, &Request); +} - DataSize = (AtaReadPort(DeviceUnit->Channel, IDX_ATAPI_IO1_i_ByteCountHigh) << 8) | - AtaReadPort(DeviceUnit->Channel, IDX_ATAPI_IO1_i_ByteCountLow); +static +BOOLEAN +AtapAtapiReadCapacity10( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _Out_ PREAD_CAPACITY_DATA CapacityData) +{ + ATA_DEVICE_REQUEST Request = { 0 }; - /* Transfer the data block */ - AtaReadBuffer(DeviceUnit->Channel, Buffer, DataSize); + /* Send the SCSI READ CAPACITY(10) command */ + Request.Flags = REQUEST_FLAG_PACKET_COMMAND; + Request.DataBuffer = CapacityData; + Request.DataTransferLength = sizeof(*CapacityData); + Request.Cdb[0] = SCSIOP_READ_CAPACITY; - return TRUE; + return AtapIssueCommand(DeviceUnit, &Request); } static VOID -AtapiCapacityDetect( - IN PDEVICE_UNIT DeviceUnit, - OUT PULONGLONG TotalSectors, - OUT PULONG SectorSize) +AtapAtapiDetectCapacity( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _Out_ PULONG64 TotalSectors, + _Out_ PULONG SectorSize) { - UCHAR AtapiPacket[16]; - UCHAR AtapiCapacity[8]; - - /* Send the SCSI READ CAPACITY(10) command */ - RtlZeroMemory(&AtapiPacket, sizeof(AtapiPacket)); - AtapiPacket[0] = SCSIOP_READ_CAPACITY; - if (AtaSendAtapiPacket(DeviceUnit->Channel, AtapiPacket, ATAPI_PACKET_SIZE(DeviceUnit->IdentifyData), 8)) + union { - AtaReadBuffer(DeviceUnit->Channel, &AtapiCapacity, 8); + READ_CAPACITY_DATA Cmd10; + READ_CAPACITY16_DATA Cmd16; + } CapacityData; + ULONG LastLba; - *TotalSectors = (AtapiCapacity[0] << 24) | (AtapiCapacity[1] << 16) | - (AtapiCapacity[2] << 8) | AtapiCapacity[3]; + *TotalSectors = 0; + *SectorSize = 0; - *SectorSize = (AtapiCapacity[4] << 24) | (AtapiCapacity[5] << 16) | - (AtapiCapacity[6] << 8) | AtapiCapacity[7]; + if (!AtapAtapiReadCapacity10(DeviceUnit, &CapacityData.Cmd10)) + return; - /* If device reports a non-zero block length, reset to defaults (we use READ command instead of READ CD) */ - if (*SectorSize != 0) - *SectorSize = 2048; + LastLba = RtlUlongByteSwap(CapacityData.Cmd10.LogicalBlockAddress); + if (LastLba == MAXULONG) + { + if (!AtapAtapiReadCapacity16(DeviceUnit, &CapacityData.Cmd16)) + return; + + *TotalSectors = RtlUlonglongByteSwap(CapacityData.Cmd16.LogicalBlockAddress.QuadPart) + 1; + *SectorSize = RtlUlongByteSwap(CapacityData.Cmd16.BytesPerBlock); } else { - *TotalSectors = 0; - *SectorSize = 0; - - AtapiPrintSenseData(DeviceUnit); + *TotalSectors = LastLba + 1; + *SectorSize = RtlUlongByteSwap(CapacityData.Cmd10.BytesPerBlock); } + + /* + * If device reports a non-zero block length, reset to defaults + * (we use a READ command instead of READ CD). + */ + if (*SectorSize != 0) + *SectorSize = 2048; } static BOOLEAN -AtapiRequestSense( - IN PDEVICE_UNIT DeviceUnit, - OUT PSENSE_DATA SenseData) -{ - UCHAR AtapiPacket[16]; - BOOLEAN Success; - - RtlZeroMemory(&AtapiPacket, sizeof(AtapiPacket)); - RtlZeroMemory(SenseData, sizeof(SENSE_DATA)); - AtapiPacket[0] = SCSIOP_REQUEST_SENSE; - AtapiPacket[4] = SENSE_BUFFER_SIZE; - Success = AtaSendAtapiPacket(DeviceUnit->Channel, - AtapiPacket, - ATAPI_PACKET_SIZE(DeviceUnit->IdentifyData), - SENSE_BUFFER_SIZE); - if (Success) - { - AtaReadBuffer(DeviceUnit->Channel, SenseData, SENSE_BUFFER_SIZE); - return TRUE; - } - else - { - ERR("Cannot read the sense data.\n"); - return FALSE; - } +AtapAtapiTestUnitReady( + _In_ PHW_DEVICE_UNIT DeviceUnit) +{ + ATA_DEVICE_REQUEST Request = { 0 }; + + /* Send the SCSI TEST UNIT READY command */ + Request.Flags = REQUEST_FLAG_PACKET_COMMAND; + Request.Cdb[0] = SCSIOP_TEST_UNIT_READY; + + return AtapIssueCommand(DeviceUnit, &Request); } static -VOID -AtapiPrintSenseData(IN PDEVICE_UNIT DeviceUnit) +BOOLEAN +AtapAtapiRequestSense( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _Out_ PSENSE_DATA SenseData) { - SENSE_DATA SenseData; + ATA_DEVICE_REQUEST Request = { 0 }; - if (AtapiRequestSense(DeviceUnit, &SenseData)) - { - ERR("SK 0x%x, ASC 0x%x, ASCQ 0x%x\n", - SenseData.SenseKey, - SenseData.AdditionalSenseCode, - SenseData.AdditionalSenseCodeQualifier); - } + AtapAtapiBuildRequestSense(&Request, SenseData); + return AtapIssueCommand(DeviceUnit, &Request); } static BOOLEAN -AtapiReadyCheck(IN OUT PDEVICE_UNIT DeviceUnit) +AtapAtapiReadToc( + _In_ PHW_DEVICE_UNIT DeviceUnit) { - UCHAR AtapiPacket[16]; + ATA_DEVICE_REQUEST Request = { 0 }; UCHAR DummyData[MAXIMUM_CDROM_SIZE]; + + /* Send the SCSI READ TOC command */ + Request.Flags = REQUEST_FLAG_PACKET_COMMAND; + Request.DataBuffer = DummyData; + Request.DataTransferLength = sizeof(DummyData); + Request.Cdb[0] = SCSIOP_READ_TOC; + Request.Cdb[7] = (MAXIMUM_CDROM_SIZE >> 8) & 0xFF; + Request.Cdb[8] = MAXIMUM_CDROM_SIZE & 0xFF; + Request.Cdb[9] = READ_TOC_FORMAT_SESSION << 6; + + return AtapIssueCommand(DeviceUnit, &Request); +} + +static +BOOLEAN +AtapAtapiReadyCheck( + _In_ PHW_DEVICE_UNIT DeviceUnit) +{ SENSE_DATA SenseData; - BOOLEAN Success; - /* Select the drive */ - SelectDevice(DeviceUnit->Channel, DeviceUnit->DeviceNumber); - if (!WaitForBusy(DeviceUnit->Channel, ATA_STATUS_TIMEOUT)) + if (!AtapAtapiTestUnitReady(DeviceUnit)) return FALSE; - /* Send the SCSI TEST UNIT READY command */ - RtlZeroMemory(&AtapiPacket, sizeof(AtapiPacket)); - AtapiPacket[0] = SCSIOP_TEST_UNIT_READY; - AtaSendAtapiPacket(DeviceUnit->Channel, - AtapiPacket, - ATAPI_PACKET_SIZE(DeviceUnit->IdentifyData), - 0); - - if (!AtapiRequestSense(DeviceUnit, &SenseData)) + if (!AtapAtapiRequestSense(DeviceUnit, &SenseData)) return FALSE; - AtaReadBuffer(DeviceUnit->Channel, &SenseData, SENSE_BUFFER_SIZE); - TRACE("SK 0x%x, ASC 0x%x, ASCQ 0x%x\n", - SenseData.SenseKey, - SenseData.AdditionalSenseCode, - SenseData.AdditionalSenseCodeQualifier); - if (SenseData.SenseKey == SCSI_SENSE_NOT_READY) { + if (SenseData.AdditionalSenseCode == SCSI_ADSENSE_NO_MEDIA_IN_DEVICE) + return FALSE; + if (SenseData.AdditionalSenseCode == SCSI_ADSENSE_LUN_NOT_READY) { switch (SenseData.AdditionalSenseCodeQualifier) { case SCSI_SENSEQ_BECOMING_READY: /* Wait until the CD is spun up */ - StallExecutionProcessor(4e6); + StallExecutionProcessor(2e6); return FALSE; case SCSI_SENSEQ_INIT_COMMAND_REQUIRED: - /* The drive needs to be spun up, send the SCSI READ TOC command */ - RtlZeroMemory(&AtapiPacket, sizeof(AtapiPacket)); - AtapiPacket[0] = SCSIOP_READ_TOC; - AtapiPacket[7] = (MAXIMUM_CDROM_SIZE << 8) & 0xFF; - AtapiPacket[8] = MAXIMUM_CDROM_SIZE & 0xFF; - AtapiPacket[9] = READ_TOC_FORMAT_SESSION << 6; - Success = AtaSendAtapiPacket(DeviceUnit->Channel, - AtapiPacket, - ATAPI_PACKET_SIZE(DeviceUnit->IdentifyData), - MAXIMUM_CDROM_SIZE); - if (!Success) - { - AtapiPrintSenseData(DeviceUnit); - return FALSE; - } - - AtaReadBuffer(DeviceUnit->Channel, &DummyData, MAXIMUM_CDROM_SIZE); - /* fall through */ + /* The drive needs to be spun up */ + AtapAtapiReadToc(DeviceUnit); + return FALSE; default: - DeviceUnit->Flags &= ~ATA_DEVICE_NOT_READY; return FALSE; - } } - else if (SenseData.AdditionalSenseCode == SCSI_ADSENSE_NO_MEDIA_IN_DEVICE) + } + + return TRUE; +} + +static +VOID +AtapAtapiClearUnitAttention( + _In_ PHW_DEVICE_UNIT DeviceUnit) +{ + SENSE_DATA SenseData; + ULONG i; + + for (i = 0; i < 5; ++i) + { + if (!AtapAtapiRequestSense(DeviceUnit, &SenseData)) + continue; + + if ((SenseData.SenseKey != SCSI_SENSE_UNIT_ATTENTION) && + (SenseData.AdditionalSenseCode != SCSI_ADSENSE_BUS_RESET)) { - DeviceUnit->Flags |= ATA_DEVICE_NO_MEDIA; - return FALSE; + break; } } - else +} + +static +BOOLEAN +AtapAtapiInitDevice( + _In_ PHW_DEVICE_UNIT DeviceUnit) +{ + PIDENTIFY_PACKET_DATA IdentifyPacketData = &DeviceUnit->IdentifyPacketData; + ULONG i; + + DeviceUnit->CdbSize = AtaDevCdbSizeInWords(IdentifyPacketData); + + /* Clear the ATAPI 'Bus reset' indication */ + AtapAtapiClearUnitAttention(DeviceUnit); + + /* Make the device ready */ + for (i = 4; i > 0; i--) + { + if (AtapAtapiReadyCheck(DeviceUnit)) + break; + } + if (i == 0) { - DeviceUnit->Flags &= ~ATA_DEVICE_NOT_READY; + ERR("Device not ready\n"); + return FALSE; } - if (DeviceUnit->Flags & ATA_DEVICE_NO_MEDIA) + /* Detect a medium's capacity */ + AtapAtapiDetectCapacity(DeviceUnit, + &DeviceUnit->P.TotalSectors, + &DeviceUnit->P.SectorSize); + if (DeviceUnit->P.SectorSize == 0 || DeviceUnit->P.TotalSectors == 0) { - /* Detect a medium's capacity */ - AtapiCapacityDetect(DeviceUnit, &DeviceUnit->TotalSectors, &DeviceUnit->SectorSize); + TRACE("No media found\n"); + return FALSE; + } - /* If nothing was returned, reset to defaults */ - if (DeviceUnit->SectorSize == 0) - DeviceUnit->SectorSize = 2048; - if (DeviceUnit->TotalSectors == 0) - DeviceUnit->TotalSectors = 0xFFFFFFFF; + DeviceUnit->P.Cylinders = MAXULONG; + DeviceUnit->P.Heads = MAXULONG; + DeviceUnit->P.SectorsPerTrack = MAXULONG; - DeviceUnit->Flags &= ~ATA_DEVICE_NO_MEDIA; - } + DeviceUnit->MaximumTransferLength = 0xFFFF; return TRUE; } static -BOOLEAN -WaitForFlags( - IN UCHAR Channel, - IN UCHAR Flags, - IN UCHAR ExpectedValue, - IN ULONG Timeout) +VOID +AtapAtaSetMultipleMode( + _In_ PHW_DEVICE_UNIT DeviceUnit) { - UCHAR Status; + ATA_DEVICE_REQUEST Request = { 0 }; - ASSERT(Timeout != 0); +#if !defined(ATA_ENABLE_MULTIPLE_MODE) + /* Inherit multiple mode from the state the BIOS firmware left the device in during boot */ + DeviceUnit->MultiSectorTransfer = AtaDevCurrentSectorsPerDrq(&DeviceUnit->IdentifyDeviceData); + if (DeviceUnit->MultiSectorTransfer != 0) + return; +#endif - WaitForBusy(Channel, ATA_STATUS_TIMEOUT); + /* Use the maximum possible value */ + DeviceUnit->MultiSectorTransfer = AtaDevMaximumSectorsPerDrq(&DeviceUnit->IdentifyDeviceData); + if (DeviceUnit->MultiSectorTransfer == 0) + return; - while (Timeout--) + Request.TaskFile.Command = IDE_COMMAND_SET_MULTIPLE; + Request.TaskFile.Data[0].SectorCount = DeviceUnit->MultiSectorTransfer; + if (!AtapIssueCommand(DeviceUnit, &Request)) { - StallExecutionProcessor(10); - - Status = AtaReadPort(Channel, IDX_IO1_i_Status); - if (Status & IDE_STATUS_ERROR) - return FALSE; - else if ((Status & Flags) == ExpectedValue) - return TRUE; + DeviceUnit->MultiSectorTransfer = 0; } - return FALSE; } static BOOLEAN -WaitForFlagsOr( - IN UCHAR Channel, - IN UCHAR FirstValue, - IN UCHAR SecondValue, - IN ULONG Timeout) +AtapAtaInitDevice( + _In_ PHW_DEVICE_UNIT DeviceUnit) { - UCHAR Status; + PIDENTIFY_DEVICE_DATA IdentifyData = &DeviceUnit->IdentifyDeviceData; + ULONG64 TotalSectors; + USHORT Cylinders, Heads, SectorsPerTrack; - ASSERT(Timeout != 0); + DeviceUnit->MaximumTransferLength = 0xFF; - WaitForBusy(Channel, ATA_STATUS_TIMEOUT); + if (AtaDevIsCurrentGeometryValid(IdentifyData)) + AtaDevCurrentChsTranslation(IdentifyData, &Cylinders, &Heads, &SectorsPerTrack); + else + AtaDevDefaultChsTranslation(IdentifyData, &Cylinders, &Heads, &SectorsPerTrack); - while (Timeout--) + /* Using LBA addressing mode */ + if (AtaDevHasLbaTranslation(IdentifyData)) { - StallExecutionProcessor(10); + DeviceUnit->P.Flags |= ATA_DEVICE_LBA; - Status = AtaReadPort(Channel, IDX_IO1_i_Status); - if (Status & IDE_STATUS_ERROR) - return FALSE; - else if ((Status & FirstValue) || (Status & SecondValue)) - return TRUE; + if (AtaDevHas48BitAddressFeature(IdentifyData)) + { + /* Using LBA48 addressing mode */ + TotalSectors = AtaDevUserAddressableSectors48Bit(IdentifyData); + ASSERT(TotalSectors <= ATA_MAX_LBA_48); + + DeviceUnit->P.Flags |= ATA_DEVICE_LBA48; + DeviceUnit->MaximumTransferLength = 0x10000; + } + else + { + /* Using LBA28 addressing mode */ + TotalSectors = AtaDevUserAddressableSectors28Bit(IdentifyData); + ASSERT(TotalSectors <= ATA_MAX_LBA_28); + } } - return FALSE; + else + { + /* Using CHS addressing mode */ + TotalSectors = Cylinders * Heads * SectorsPerTrack; + } + + if (TotalSectors == 0) + { + ERR("Unknown geometry\n"); + return FALSE; + } + + DeviceUnit->P.TotalSectors = TotalSectors; + DeviceUnit->P.Cylinders = Cylinders; + DeviceUnit->P.Heads = Heads; + DeviceUnit->P.SectorsPerTrack = SectorsPerTrack; + DeviceUnit->P.SectorSize = AtaDevBytesPerLogicalSector(IdentifyData); + ASSERT(DeviceUnit->P.SectorSize >= 512); + DeviceUnit->P.SectorSize = max(DeviceUnit->P.SectorSize, 512); + + AtapAtaSetMultipleMode(DeviceUnit); + + TRACE("Multiple sector setting %u\n", DeviceUnit->MultiSectorTransfer); + + return TRUE; } static BOOLEAN -WaitForBusy( - IN UCHAR Channel, - IN ULONG Timeout) +AtapAnalyzeIdentifyData( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ ATA_DEVICE_CLASS DeviceClass) { - ASSERT(Timeout != 0); + PIDENTIFY_DEVICE_DATA Id = &DeviceUnit->IdentifyDeviceData; + ULONG i; - while (Timeout--) + /* Verify the checksum */ + if (!AtaDevIsIdentifyDataValid(Id)) { - StallExecutionProcessor(10); + ERR("Identify data CRC error\n"); + return FALSE; + } - if ((AtaReadPort(Channel, IDX_IO1_i_Status) & IDE_STATUS_BUSY) == 0) - return TRUE; + if (DeviceClass == DEV_ATAPI) + { + DeviceUnit->P.Flags |= ATA_DEVICE_ATAPI | ATA_DEVICE_LBA; + + /* The returned string is not byteswapped */ + if (Id->ModelNumber[0] == 'N' && + Id->ModelNumber[1] == 'E' && + Id->ModelNumber[2] == 'C' && + Id->ModelNumber[3] == ' ') + { + DeviceUnit->P.Flags |= ATA_DEVICE_IS_NEC_CDR260; + } } - return FALSE; + + /* Swap byte order of the ASCII data */ + for (i = 0; i < sizeof(Id->SerialNumber) / 2; ++i) + ((PUSHORT)Id->SerialNumber)[i] = RtlUshortByteSwap(((PUSHORT)Id->SerialNumber)[i]); + + for (i = 0; i < sizeof(Id->FirmwareRevision) / 2; ++i) + ((PUSHORT)Id->FirmwareRevision)[i] = RtlUshortByteSwap(((PUSHORT)Id->FirmwareRevision)[i]); + + for (i = 0; i < sizeof(Id->ModelNumber) / 2; ++i) + ((PUSHORT)Id->ModelNumber)[i] = RtlUshortByteSwap(((PUSHORT)Id->ModelNumber)[i]); + + TRACE("MN '%.*s'\n", sizeof(Id->ModelNumber), Id->ModelNumber); + TRACE("FR '%.*s'\n", sizeof(Id->FirmwareRevision), Id->FirmwareRevision); + TRACE("S/N '%.*s'\n", sizeof(Id->SerialNumber), Id->SerialNumber); + + return TRUE; } static -VOID -AtaHardReset(IN UCHAR Channel) +BOOLEAN +AtapInitDevice( + _In_ PHW_DEVICE_UNIT DeviceUnit, + _In_ ATA_DEVICE_CLASS DeviceClass) { - TRACE("AtaHardReset(Controller %d)\n", Channel); + if (!AtapAnalyzeIdentifyData(DeviceUnit, DeviceClass)) + return FALSE; - AtaWritePort(Channel, IDX_IO2_o_Control, IDE_DC_RESET_CONTROLLER); - StallExecutionProcessor(100000); - AtaWritePort(Channel, IDX_IO2_o_Control, IDE_DC_REENABLE_CONTROLLER); - StallExecutionProcessor(5); - WaitForBusy(Channel, ATA_STATUS_TIMEOUT); + if (DeviceClass == DEV_ATAPI) + return AtapAtapiInitDevice(DeviceUnit); + else + return AtapAtaInitDevice(DeviceUnit); } static -VOID -SelectDevice(IN UCHAR Channel, IN UCHAR DeviceNumber) +BOOLEAN +AtapIdentifyChannel( + _In_ ULONG ChannelNumber, + _Out_ PIDE_REGISTERS Registers) { + const IDE_REG IoBase = AtapChannelBaseArray[ChannelNumber]; + ULONG Spare; + +#if defined(SARCH_PC98) + if (ATA_READ(0x432) == 0xFF) + return FALSE; +#endif + #if defined(SARCH_PC98) - /* Select IDE Channel */ - WRITE_PORT_UCHAR((PUCHAR)IDE_IO_o_BankSelect, Channel); - StallExecutionProcessor(5); + Spare = 2; + Registers->Control = 0x74C; +#else + Spare = 1; + Registers->Control = IoBase + 0x206; #endif + Registers->Data = IoBase + 0 * Spare; + Registers->Error = IoBase + 1 * Spare; + Registers->SectorCount = IoBase + 2 * Spare; + Registers->LbaLow = IoBase + 3 * Spare; + Registers->LbaMid = IoBase + 4 * Spare; + Registers->LbaHigh = IoBase + 5 * Spare; + Registers->Device = IoBase + 6 * Spare; + Registers->Status = IoBase + 7 * Spare; - AtaWritePort(Channel, IDX_IO1_o_DriveSelect, - DeviceNumber ? IDE_DRIVE_SELECT_2 : IDE_DRIVE_SELECT_1); - StallExecutionProcessor(5); + return TRUE; } -static +/* PUBLIC FUNCTIONS ***********************************************************/ + BOOLEAN -IdentifyDevice( - IN UCHAR Channel, - IN UCHAR DeviceNumber, - OUT PDEVICE_UNIT *DeviceUnit) -{ - UCHAR SignatureLow, SignatureHigh, SignatureCount, SignatureNumber; - UCHAR Command; - IDENTIFY_DATA Id; - SENSE_DATA SenseData; - ULONG i; - ULONG SectorSize; - ULONGLONG TotalSectors; - USHORT Flags = 0; - - TRACE("IdentifyDevice() Channel = %x, Device = %x, BaseIoAddress = 0x%x\n", - Channel, DeviceNumber, BaseArray[Channel]); - - /* Look at controller */ - SelectDevice(Channel, DeviceNumber); - StallExecutionProcessor(5); - AtaWritePort(Channel, IDX_IO1_o_BlockNumber, 0x55); - AtaWritePort(Channel, IDX_IO1_o_BlockNumber, 0x55); - StallExecutionProcessor(5); - if (AtaReadPort(Channel, IDX_IO1_i_BlockNumber) != 0x55) - goto Failure; - - /* Reset the controller */ - AtaHardReset(Channel); - - /* Select the drive */ - SelectDevice(Channel, DeviceNumber); - if (!WaitForBusy(Channel, ATA_STATUS_TIMEOUT)) - goto Failure; - - /* Signature check */ - SignatureLow = AtaReadPort(Channel, IDX_IO1_i_CylinderLow); - SignatureHigh = AtaReadPort(Channel, IDX_IO1_i_CylinderHigh); - SignatureCount = AtaReadPort(Channel, IDX_IO1_i_BlockCount); - SignatureNumber = AtaReadPort(Channel, IDX_IO1_i_BlockNumber); - TRACE("IdentifyDevice(): SL = 0x%x, SH = 0x%x, SC = 0x%x, SN = 0x%x\n", - SignatureLow, SignatureHigh, SignatureCount, SignatureNumber); - if (SignatureLow == 0x00 && SignatureHigh == 0x00 && - SignatureCount == 0x01 && SignatureNumber == 0x01) - { - TRACE("IdentifyDevice(): Found PATA device at %d:%d\n", Channel, DeviceNumber); - Command = IDE_COMMAND_IDENTIFY; - } - else if (SignatureLow == ATAPI_MAGIC_LSB && - SignatureHigh == ATAPI_MAGIC_MSB) - { - TRACE("IdentifyDevice(): Found ATAPI device at %d:%d\n", Channel, DeviceNumber); - Flags |= ATA_DEVICE_ATAPI | ATA_DEVICE_LBA | ATA_DEVICE_NOT_READY; - Command = IDE_COMMAND_ATAPI_IDENTIFY; - } - else - { - goto Failure; - } +AtaReadLogicalSectors( + _In_ PDEVICE_UNIT DeviceUnit, + _In_ ULONG64 SectorNumber, + _In_ ULONG SectorCount, + _Out_writes_bytes_all_(SectorCount * DeviceUnit->SectorSize) PVOID Buffer) +{ + PHW_DEVICE_UNIT Unit = (PHW_DEVICE_UNIT)DeviceUnit; + ATA_DEVICE_REQUEST Request = { 0 }; - /* Disable interrupts */ - AtaWritePort(Channel, IDX_IO2_o_Control, IDE_DC_DISABLE_INTERRUPTS); - StallExecutionProcessor(5); + ASSERT((SectorNumber + SectorCount) <= Unit->P.TotalSectors); + ASSERT(SectorCount != 0); - /* Send the identify command */ - AtaWritePort(Channel, IDX_IO1_o_Command, Command); - StallExecutionProcessor(50); - if (!WaitForFlags(Channel, IDE_STATUS_DRQ, IDE_STATUS_DRQ, ATA_STATUS_TIMEOUT)) + while (SectorCount > 0) { - ERR("IdentifyDevice(): Identify command failed.\n"); - goto Failure; - } + ULONG BlockCount; - /* Receive parameter information from the device */ - AtaReadBuffer(Channel, &Id, IDENTIFY_DATA_SIZE); + BlockCount = min(SectorCount, Unit->MaximumTransferLength); - /* Swap byte order of the ASCII data */ - for (i = 0; i < RTL_NUMBER_OF(Id.SerialNumber); ++i) - Id.SerialNumber[i] = RtlUshortByteSwap(Id.SerialNumber[i]); + Request.DataBuffer = Buffer; + Request.DataTransferLength = BlockCount * Unit->P.SectorSize; - for (i = 0; i < RTL_NUMBER_OF(Id.FirmwareRevision); ++i) - Id.FirmwareRevision[i] = RtlUshortByteSwap(Id.FirmwareRevision[i]); + if (Unit->P.Flags & ATA_DEVICE_ATAPI) + AtapBuildReadPacketCommand(&Request, SectorNumber, BlockCount); + else + AtapBuildReadTaskFile(Unit, &Request, SectorNumber, BlockCount); - for (i = 0; i < RTL_NUMBER_OF(Id.ModelNumber); ++i) - Id.ModelNumber[i] = RtlUshortByteSwap(Id.ModelNumber[i]); + if (!AtapIssueCommand(Unit, &Request)) + return FALSE; - TRACE("S/N %.*s\n", sizeof(Id.SerialNumber), Id.SerialNumber); - TRACE("FR %.*s\n", sizeof(Id.FirmwareRevision), Id.FirmwareRevision); - TRACE("MN %.*s\n", sizeof(Id.ModelNumber), Id.ModelNumber); + SectorNumber += BlockCount; + SectorCount -= BlockCount; - /* Allocate a new device unit structure */ - *DeviceUnit = FrLdrTempAlloc(sizeof(DEVICE_UNIT), TAG_ATA_DEVICE); - if (*DeviceUnit == NULL) - { - ERR("Failed to allocate device unit!\n"); - return FALSE; + Buffer = (PVOID)((ULONG_PTR)Buffer + Unit->P.SectorSize); } - RtlZeroMemory(*DeviceUnit, sizeof(DEVICE_UNIT)); - (*DeviceUnit)->Channel = Channel; - (*DeviceUnit)->DeviceNumber = DeviceNumber; - (*DeviceUnit)->IdentifyData = Id; + return TRUE; +} - if (Flags & ATA_DEVICE_ATAPI) - { - /* Clear the ATAPI 'Bus reset' indication */ - for (i = 0; i < 10; ++i) - { - AtapiRequestSense(*DeviceUnit, &SenseData); - StallExecutionProcessor(10); - } +PDEVICE_UNIT +AtaGetDevice( + _In_ UCHAR UnitNumber) +{ + if (UnitNumber < RTL_NUMBER_OF(AtapUnits)) + return (PDEVICE_UNIT)AtapUnits[UnitNumber]; - /* Detect a medium's capacity */ - AtapiCapacityDetect(*DeviceUnit, &TotalSectors, &SectorSize); - if (SectorSize == 0 || TotalSectors == 0) - { - /* It's ok and can be used to show alert like "Please insert the CD" */ - TRACE("No media found.\n"); - Flags |= ATA_DEVICE_NO_MEDIA; - } - } - else + return NULL; +} + +BOOLEAN +AtaInit( + _Out_ PUCHAR DetectedCount) +{ + ULONG ChannelNumber; + + *DetectedCount = 0; + + /* Enumerate IDE channels */ + for (ChannelNumber = 0; ChannelNumber < CHANNEL_MAX_CHANNELS; ++ChannelNumber) { - if (Id.SupportLba || (Id.MajorRevision && Id.UserAddressableSectors)) - { - if (Id.FeaturesSupport.Address48) - { - TRACE("Using LBA48 addressing mode.\n"); - Flags |= ATA_DEVICE_LBA48 | ATA_DEVICE_LBA; - TotalSectors = Id.UserAddressableSectors48; - } - else - { - TRACE("Using LBA28 addressing mode.\n"); - Flags |= ATA_DEVICE_LBA; - TotalSectors = Id.UserAddressableSectors; - } + UCHAR DeviceNumber; + IDE_REGISTERS Registers; - /* LBA ATA drives always have a sector size of 512 */ - SectorSize = 512; - } - else + if (!AtapIdentifyChannel(ChannelNumber, &Registers)) + continue; + + /* Check for devices attached to the bus */ + for (DeviceNumber = 0; DeviceNumber < CHANNEL_MAX_DEVICES; ++DeviceNumber) { - TRACE("Using CHS addressing mode.\n"); - Flags |= ATA_DEVICE_CHS; + PHW_DEVICE_UNIT DeviceUnit; + ATA_DEVICE_CLASS DeviceClass; - if (Id.UnformattedBytesPerSector == 0) - { - SectorSize = 512; - } - else + /* Allocate a new device unit structure */ + DeviceUnit = FrLdrTempAlloc(sizeof(*DeviceUnit), TAG_ATA_DEVICE); + if (!DeviceUnit) { - for (i = 1 << 15; i > 0; i >>= 1) - { - if ((Id.UnformattedBytesPerSector & i) != 0) - { - SectorSize = i; - break; - } - } + ERR("Failed to allocate device unit!\n"); + continue; } - TotalSectors = Id.NumberOfCylinders * Id.NumberOfHeads * Id.SectorsPerTrack; - } - } - TRACE("Sector size %d ; Total sectors %I64d\n", SectorSize, TotalSectors); + RtlZeroMemory(DeviceUnit, sizeof(*DeviceUnit)); - (*DeviceUnit)->Flags = Flags; - (*DeviceUnit)->SectorSize = SectorSize; - (*DeviceUnit)->TotalSectors = TotalSectors; - if (Flags & ATA_DEVICE_ATAPI) - { - (*DeviceUnit)->Cylinders = 0xFFFFFFFF; - (*DeviceUnit)->Heads = 0xFFFFFFFF; - (*DeviceUnit)->Sectors = 0xFFFFFFFF; - } - else - { - (*DeviceUnit)->Cylinders = Id.NumberOfCylinders; - (*DeviceUnit)->Heads = Id.NumberOfHeads; - (*DeviceUnit)->Sectors = Id.SectorsPerTrack; - } + /* Perform a minimal initialization */ + RtlCopyMemory(&DeviceUnit->Registers, &Registers, sizeof(Registers)); + DeviceUnit->DeviceNumber = DeviceNumber; + DeviceUnit->P.SectorSize = 512; + DeviceUnit->DeviceSelect = (DEV_SLAVE(DeviceNumber) << 4) | IDE_DRIVE_SELECT; -#if DBG - DbgDumpBuffer(DPRINT_DISK, &Id, IDENTIFY_DATA_SIZE); -#endif + /* Let's see what kind of device this is */ + DeviceClass = AtapIdentifyDevice(DeviceUnit); + if (DeviceClass == DEV_NONE) + goto NextDevice; - TRACE("IdentifyDevice() done.\n"); - return TRUE; + TRACE("Found %lu device at %X:%u\n", DeviceClass, Registers.Data, DeviceNumber); -Failure: - TRACE("IdentifyDevice() done. No device present at %d:%d\n", Channel, DeviceNumber); - return FALSE; + if (!AtapInitDevice(DeviceUnit, DeviceClass)) + goto NextDevice; + + TRACE("Total sectors %I64u of size %lu, CHS %lu:%lu:%lu, %lx\n", + DeviceUnit->P.TotalSectors, + DeviceUnit->P.SectorSize, + DeviceUnit->P.Cylinders, + DeviceUnit->P.Heads, + DeviceUnit->P.SectorsPerTrack, + DeviceUnit->P.Flags); + + AtapUnits[(*DetectedCount)++] = DeviceUnit; + continue; + +NextDevice: + FrLdrTempFree(DeviceUnit, TAG_ATA_DEVICE); + } + } + + return (*DetectedCount > 0); } diff --git a/boot/freeldr/freeldr/arch/drivers/hwidep.h b/boot/freeldr/freeldr/arch/drivers/hwidep.h new file mode 100644 index 00000000000..748b58b2440 --- /dev/null +++ b/boot/freeldr/freeldr/arch/drivers/hwidep.h @@ -0,0 +1,387 @@ +/* + * PROJECT: FreeLoader + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Private header for ATA/ATAPI programmed I/O driver. + * COPYRIGHT: Copyright 2019-2025 Dmitry Borisov (di.sean(a)protonmail.com) + */ + +#pragma once + +#define TAG_ATA_DEVICE 'dATA' + +#define ATA_STATUS_SUCCESS 0 +#define ATA_STATUS_PENDING 1 +#define ATA_STATUS_ERROR 2 +#define ATA_STATUS_RESET 3 +#define ATA_STATUS_RETRY 4 + +#if defined(SARCH_PC98) +/* Master/Slave devices for Bank 0 and Bank 1 */ +#define CHANNEL_MAX_DEVICES 4 +#define DEV_SLAVE(DeviceNumber) ((DeviceNumber) & 1) +#else +/* Master/Slave devices */ +#define CHANNEL_MAX_DEVICES 2 +#define DEV_SLAVE(DeviceNumber) (DeviceNumber) +#endif + +#if defined(SARCH_XBOX) +/* It's safe to enable the multiple mode */ +#define ATA_ENABLE_MULTIPLE_MODE +#endif + +/* Delay of 400ns */ +#if defined(SARCH_PC98) +#define ATA_IO_WAIT() WRITE_PORT_UCHAR((PUCHAR)0x5F, 0) +#else +#define ATA_IO_WAIT() StallExecutionProcessor(1) +#endif + +#if defined(_M_IX86) || defined(_M_AMD64) +/* x86 I/O address space spans from 0 to 0xFFFF */ +typedef USHORT IDE_REG; +#else +typedef ULONG_PTR IDE_REG; +#endif + +#define ATA_MAX_LBA_28 0x0FFFFFFFULL +#define ATA_MAX_LBA_48 (1ULL << 48) + +#define IDE_FEATURE_PIO 0x00 + +#define IDE_DC_ALWAYS 0x08 + +#define IDE_DRIVE_SELECT 0xA0 + +#define ATAPI_INT_REASON_COD 0x01 +#define ATAPI_INT_REASON_IO 0x02 +#define ATAPI_INT_REASON_MASK (ATAPI_INT_REASON_IO | ATAPI_INT_REASON_COD) + +#define ATAPI_INT_REASON_STATUS_NEC 0x00 +#define ATAPI_INT_REASON_STATUS (ATAPI_INT_REASON_IO | ATAPI_INT_REASON_COD) +#define ATAPI_INT_REASON_AWAIT_CDB (IDE_STATUS_DRQ | ATAPI_INT_REASON_COD) +#define ATAPI_INT_REASON_DATA_IN (ATAPI_INT_REASON_IO | IDE_STATUS_DRQ) + +#define MAXIMUM_CDROM_SIZE 804 // == sizeof(CDROM_TOC) + +#define ATA_TIME_BUSY_SELECT 2000 ///< 20 ms +#define ATA_TIME_BUSY_POLL 500000 ///< 5 s +#define ATA_TIME_BUSY_ENUM 100 ///< 1 ms +#define ATA_TIME_BUSY_RESET 1000000 ///< 10 s +#define ATA_TIME_RESET_SELECT 200000 ///< 2 s +#define ATA_TIME_DRQ_CLEAR 100 ///< 200 us +#define ATA_TIME_PHASE_CHANGE 100 ///< 1 ms + +#define ATA_WRITE(Port, Value) \ + WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)(Port), (Value)) + +#define ATA_WRITE_BLOCK_16(Port, Buffer, Count) \ + WRITE_PORT_BUFFER_USHORT((PUSHORT)(ULONG_PTR)(Port), (PUSHORT)(Buffer), (Count)) + +#define ATA_WRITE_BLOCK_32(Port, Buffer, Count) \ + WRITE_PORT_BUFFER_ULONG((PULONG)(ULONG_PTR)(Port), (PULONG)(Buffer), (Count)) + +#define ATA_READ(Port) \ + READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)(Port)) + +#define ATA_READ_BLOCK_16(Port, Buffer, Count) \ + READ_PORT_BUFFER_USHORT((PUSHORT)(ULONG_PTR)(Port), (PUSHORT)(Buffer), (Count)) + +#define ATA_READ_BLOCK_32(Port, Buffer, Count) \ + READ_PORT_BUFFER_ULONG((PULONG)(ULONG_PTR)(Port), (PULONG)(Buffer), (Count)) + +typedef enum _ATA_DEVICE_CLASS +{ + DEV_ATA, + DEV_ATAPI, + DEV_NONE, +} ATA_DEVICE_CLASS, *PATA_DEVICE_CLASS; + +typedef struct _IDE_REGISTERS +{ + IDE_REG Data; + union + { + IDE_REG Features; + IDE_REG Error; + }; + union + { + IDE_REG SectorCount; + IDE_REG InterruptReason; + }; + IDE_REG LbaLow; ///< LBA bits 0-7, 24-31 + union + { + IDE_REG LbaMid; ///< LBA bits 8-15, 32-39 + IDE_REG ByteCountLow; + IDE_REG SignatureLow; + }; + union + { + IDE_REG LbaHigh; ///< LBA bits 16-23, 40-47 + IDE_REG ByteCountHigh; + IDE_REG SignatureHigh; + }; + IDE_REG Device; + union + { + IDE_REG Command; + IDE_REG Status; + }; + union + { + IDE_REG Control; + IDE_REG AlternateStatus; + }; +} IDE_REGISTERS, *PIDE_REGISTERS; + +typedef struct _ATA_TASKFILE +{ + UCHAR DriveSelect; + UCHAR Command; + struct + { + UCHAR Feature; + UCHAR SectorCount; + UCHAR LowLba; + UCHAR MidLba; + UCHAR HighLba; + } Data[2]; // 0 - low part, 1 - high part +} ATA_TASKFILE, *PATA_TASKFILE; + +typedef struct _ATA_DEVICE_REQUEST +{ + union + { + UCHAR Cdb[16]; + ATA_TASKFILE TaskFile; + }; + PVOID DataBuffer; + ULONG Flags; +#define REQUEST_FLAG_LBA48 0x00000001 +#define REQUEST_FLAG_READ_WRITE_MULTIPLE 0x00000002 +#define REQUEST_FLAG_PACKET_COMMAND 0x00000004 +#define REQUEST_FLAG_SET_DEVICE_REGISTER 0x00000008 +#define REQUEST_FLAG_AWAIT_CDB 0x00000010 +#define REQUEST_FLAG_READ_COMMAND 0x00000020 +#define REQUEST_FLAG_IDENTIFY_COMMAND 0x00000040 + + ULONG DataTransferLength; +} ATA_DEVICE_REQUEST, *PATA_DEVICE_REQUEST; + +typedef struct _HW_DEVICE_UNIT +{ + /* Public data, must be the first member */ + DEVICE_UNIT P; + + IDE_REGISTERS Registers; + ULONG BytesToTransfer; + PUCHAR DataBuffer; + ULONG DrqByteCount; + ULONG MaximumTransferLength; + UCHAR DeviceNumber; + UCHAR DeviceSelect; + UCHAR CdbSize; + UCHAR MultiSectorTransfer; + union + { + IDENTIFY_DEVICE_DATA IdentifyDeviceData; + IDENTIFY_PACKET_DATA IdentifyPacketData; + }; +} HW_DEVICE_UNIT, *PHW_DEVICE_UNIT; + +FORCEINLINE +BOOLEAN +AtaDevIsIdentifyDataValid( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + ULONG i; + UCHAR Crc; + + /* Bits 0:8 of word 255 */ + if (IdentifyData->Signature != 0xA5) + { + /* The integrity word is missing, assume the data provided by the device is valid */ + return TRUE; + } + + /* Verify the checksum */ + Crc = 0; + for (i = 0; i < sizeof(*IdentifyData); ++i) + { + Crc += ((PUCHAR)IdentifyData)[i]; + } + + return (Crc == 0); +} + +FORCEINLINE +UCHAR +AtaDevCdbSizeInWords( + _In_ PIDENTIFY_PACKET_DATA IdentifyPacketData) +{ + /* Bits 0:2 of word 0 */ + return (IdentifyPacketData->GeneralConfiguration.PacketType != 0) ? 8 : 6; +} + +FORCEINLINE +BOOLEAN +AtaDevHasLbaTranslation( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + /* Bit 9 of word 49 */ + return IdentifyData->Capabilities.LbaSupported; +} + +FORCEINLINE +ULONG +AtaDevUserAddressableSectors28Bit( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + /* Words 60-61 */ + return IdentifyData->UserAddressableSectors; +} + +FORCEINLINE +ULONG64 +AtaDevUserAddressableSectors48Bit( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + /* Words 100-103 */ + return ((ULONG64)IdentifyData->Max48BitLBA[1] << 32) | IdentifyData->Max48BitLBA[0]; +} + +FORCEINLINE +BOOLEAN +AtaDevHas48BitAddressFeature( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + /* Word 83: 15 = 0, 14 = 1 */ + if (IdentifyData->CommandSetSupport.WordValid83 == 1) + { + /* Bit 10 of word 83 */ + return IdentifyData->CommandSetSupport.BigLba; + } + + return FALSE; +} + +FORCEINLINE +BOOLEAN +AtaDevIsCurrentGeometryValid( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + return ((IdentifyData->TranslationFieldsValid & 1) && + (IdentifyData->NumberOfCurrentCylinders != 0) && + (IdentifyData->NumberOfCurrentCylinders <= 63) && + (IdentifyData->NumberOfCurrentHeads != 0) && + (IdentifyData->NumberOfCurrentHeads <= 16) && + (IdentifyData->CurrentSectorsPerTrack != 0)); +} + +FORCEINLINE +VOID +AtaDevDefaultChsTranslation( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData, + _Out_ PUSHORT Cylinders, + _Out_ PUSHORT Heads, + _Out_ PUSHORT SectorsPerTrack) +{ + /* Word 1 */ + *Cylinders = IdentifyData->NumCylinders; + + /* Word 3 */ + *Heads = IdentifyData->NumHeads; + + /* Word 6 */ + *SectorsPerTrack = IdentifyData->NumSectorsPerTrack; +} + +FORCEINLINE +VOID +AtaDevCurrentChsTranslation( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData, + _Out_ PUSHORT Cylinders, + _Out_ PUSHORT Heads, + _Out_ PUSHORT SectorsPerTrack) +{ + /* Word 54 */ + *Cylinders = IdentifyData->NumberOfCurrentCylinders; + + /* Word 55 */ + *Heads = IdentifyData->NumberOfCurrentHeads; + + /* Word 55 */ + *SectorsPerTrack = IdentifyData->CurrentSectorsPerTrack; +} + +FORCEINLINE +UCHAR +AtaDevCurrentSectorsPerDrq( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + UCHAR MultiSectorCurrent; + + /* Bit 8 of word 59 */ + if (!(IdentifyData->MultiSectorSettingValid)) + return 0; + + /* The word 59 should be a power of 2 */ + MultiSectorCurrent = IdentifyData->CurrentMultiSectorSetting; + + if ((MultiSectorCurrent > 0) && ((MultiSectorCurrent & (MultiSectorCurrent - 1)) == 0)) + return MultiSectorCurrent; + + return 0; +} + +FORCEINLINE +UCHAR +AtaDevMaximumSectorsPerDrq( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + UCHAR MultiSectorMax; + + /* The word 47 should be a power of 2 */ + MultiSectorMax = IdentifyData->MaximumBlockTransfer; + + if ((MultiSectorMax > 0) && ((MultiSectorMax & (MultiSectorMax - 1)) == 0)) + return MultiSectorMax; + + return 0; +} + +FORCEINLINE +ULONG +AtaDevBytesPerLogicalSector( + _In_ PIDENTIFY_DEVICE_DATA IdentifyData) +{ + ULONG WordCount; + + /* Word 106: 15 = 0, 14 = 1, 12 = 1 */ + if (IdentifyData->PhysicalLogicalSectorSize.Reserved1 == 1 && + IdentifyData->PhysicalLogicalSectorSize.LogicalSectorLongerThan256Words) + { + /* Words 116-117 */ + WordCount = IdentifyData->WordsPerLogicalSector[0]; + WordCount |= (ULONG)IdentifyData->WordsPerLogicalSector[1] << 16; + } + else + { + /* 256 words = 512 bytes */ + WordCount = 256; + } + + return WordCount * sizeof(USHORT); +} + +FORCEINLINE +BOOLEAN +AtaCommandUseLba48( + _In_ ULONG64 SectorNumber, + _In_ ULONG SectorCount) +{ + /* Use the 48-bit command when reasonable */ + return (((SectorNumber + SectorCount) >= ATA_MAX_LBA_28) || (SectorCount > 0x100)); +} diff --git a/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c b/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c index 2ba4707de7a..7fd9e292b55 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c @@ -34,7 +34,6 @@ Pc98HwIdle(VOID) VOID Pc98PrepareForReactOS(VOID) { - Pc98DiskPrepareForReactOS(); Pc98VideoPrepareForReactOS(); DiskStopFloppyMotor(); DebugDisableScreenPort(); diff --git a/boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c b/boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c index e6f98d136f7..0f9fdf1eb27 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/pc98disk.c @@ -132,11 +132,6 @@ BOOLEAN DiskResetController(IN PPC98_DISK_DRIVE DiskDrive) return INT386_SUCCESS(Regs); } -VOID Pc98DiskPrepareForReactOS(VOID) -{ - AtaFree(); -} - PPC98_DISK_DRIVE Pc98DiskDriveNumberToDrive(IN UCHAR DriveNumber) { @@ -187,7 +182,7 @@ Pc98DiskReadLogicalSectorsLBA( if (DiskDrive->Type & DRIVE_IDE && DiskDrive->Type & DRIVE_CDROM) { - return AtaAtapiReadLogicalSectorsLBA(AtaGetDevice(DiskDrive->IdeUnitNumber), SectorNumber, SectorCount, Buffer); + return AtaReadLogicalSectors(AtaGetDevice(DiskDrive->IdeUnitNumber), SectorNumber, SectorCount, Buffer); } else { @@ -503,7 +498,7 @@ InitIdeDrive( { DiskDrive->Geometry.Cylinders = DeviceUnit->Cylinders; DiskDrive->Geometry.Heads = DeviceUnit->Heads; - DiskDrive->Geometry.SectorsPerTrack = DeviceUnit->Sectors; + DiskDrive->Geometry.SectorsPerTrack = DeviceUnit->SectorsPerTrack; DiskDrive->Geometry.BytesPerSector = DeviceUnit->SectorSize; DiskDrive->Geometry.Sectors = DeviceUnit->TotalSectors; diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index 6c0b094f49b..ab3f8020041 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -374,7 +374,6 @@ XboxPrepareForReactOS(VOID) { /* On Xbox, prepare video and disk support */ XboxVideoPrepareForReactOS(); - XboxDiskInit(FALSE); DiskStopFloppyMotor(); /* Turn off debug messages to screen */ diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c index 4afdc99c398..6d6fee8ce40 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Xbox specific disk access routines * COPYRIGHT: Copyright 2004 Gé van Geldorp (gvg(a)reactos.com) - * Copyright 2019 Dmitry Borisov (di.sean(a)protonmail.com) + * Copyright 2019-2025 Dmitry Borisov (di.sean(a)protonmail.com) */ /* INCLUDES *******************************************************************/ @@ -22,39 +22,36 @@ static BOOLEAN AtaInitialized = FALSE; /* FUNCTIONS ******************************************************************/ +static VOID -XboxDiskInit(BOOLEAN Init) +XboxDiskInit(VOID) { UCHAR DetectedCount; UCHAR UnitNumber; PDEVICE_UNIT DeviceUnit = NULL; - if (Init & !AtaInitialized) + ASSERT(!AtaInitialized); + + AtaInitialized = TRUE; + + /* Find first HDD and CD */ + AtaInit(&DetectedCount); + for (UnitNumber = 0; UnitNumber <= DetectedCount; UnitNumber++) { - /* Find first HDD and CD */ - AtaInit(&DetectedCount); - for (UnitNumber = 0; UnitNumber <= DetectedCount; UnitNumber++) + DeviceUnit = AtaGetDevice(UnitNumber); + if (DeviceUnit) { - DeviceUnit = AtaGetDevice(UnitNumber); - if (DeviceUnit) + if (DeviceUnit->Flags & ATA_DEVICE_ATAPI) + { + if (!CdDrive) + CdDrive = DeviceUnit; + } + else { - if (DeviceUnit->Flags & ATA_DEVICE_ATAPI) - { - if (!CdDrive) - CdDrive = DeviceUnit; - } - else - { - if (!HardDrive) - HardDrive = DeviceUnit; - } + if (!HardDrive) + HardDrive = DeviceUnit; } } - AtaInitialized = TRUE; - } - else - { - AtaFree(); } } @@ -67,7 +64,7 @@ XboxDiskDriveNumberToDeviceUnit(UCHAR DriveNumber) return NULL; if (!AtaInitialized) - XboxDiskInit(TRUE); + XboxDiskInit(); /* HDD */ if ((DriveNumber == 0x80) && HardDrive) @@ -96,7 +93,7 @@ XboxDiskReadLogicalSectors( if (!DeviceUnit) return FALSE; - return AtaAtapiReadLogicalSectorsLBA(DeviceUnit, SectorNumber, SectorCount, Buffer); + return AtaReadLogicalSectors(DeviceUnit, SectorNumber, SectorCount, Buffer); } BOOLEAN @@ -112,7 +109,7 @@ XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) Geometry->Cylinders = DeviceUnit->Cylinders; Geometry->Heads = DeviceUnit->Heads; - Geometry->SectorsPerTrack = DeviceUnit->Sectors; + Geometry->SectorsPerTrack = DeviceUnit->SectorsPerTrack; Geometry->BytesPerSector = DeviceUnit->SectorSize; Geometry->Sectors = DeviceUnit->TotalSectors; @@ -135,7 +132,7 @@ XboxDiskGetCacheableBlockCount(UCHAR DriveNumber) if (DeviceUnit->Flags & ATA_DEVICE_LBA) return 64; else - return DeviceUnit->Sectors; + return DeviceUnit->SectorsPerTrack; } /* EOF */ diff --git a/boot/freeldr/freeldr/include/arch/i386/machpc98.h b/boot/freeldr/freeldr/include/arch/i386/machpc98.h index 23e268e9d98..737d5d84ced 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machpc98.h +++ b/boot/freeldr/freeldr/include/arch/i386/machpc98.h @@ -151,7 +151,6 @@ UCHAR Pc98GetFloppyCount(VOID); PPC98_DISK_DRIVE Pc98DiskDriveNumberToDrive(IN UCHAR DriveNumber); ULONG Pc98GetBootSectorLoadAddress(IN UCHAR DriveNumber); -VOID Pc98DiskPrepareForReactOS(VOID); /* hwdisk.c */ BOOLEAN PcInitializeBootDevices(VOID); diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 4d3a4510263..9591729784d 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -51,7 +51,6 @@ VOID XboxPrepareForReactOS(VOID); VOID XboxMemInit(VOID); PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize); -VOID XboxDiskInit(BOOLEAN Init); BOOLEAN XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY DriveGeometry); ULONG XboxDiskGetCacheableBlockCount(UCHAR DriveNumber); diff --git a/boot/freeldr/freeldr/include/hwide.h b/boot/freeldr/freeldr/include/hwide.h index 23f7fd94ad0..60b2cce415c 100644 --- a/boot/freeldr/freeldr/include/hwide.h +++ b/boot/freeldr/freeldr/include/hwide.h @@ -1,331 +1,52 @@ /* * PROJECT: FreeLoader - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: MIT (https://spdx.org/licenses/MIT) * PURPOSE: ATA/ATAPI programmed I/O driver header file. - * COPYRIGHT: Copyright 2019-2020 Dmitry Borisov (di.sean(a)protonmail.com) + * COPYRIGHT: Copyright 2019-2025 Dmitry Borisov (di.sean(a)protonmail.com) */ -/* GLOBALS ********************************************************************/ +#pragma once -/* Some definitions were taken from UniATA driver by Alter */ - -/* - * IDE registers offsets - */ -#if defined(SARCH_PC98) -#define IDX_IO1_i_Data 0x00 -#define IDX_IO1_i_Error 0x02 -#define IDX_IO1_i_BlockCount 0x04 -#define IDX_IO1_i_BlockNumber 0x06 -#define IDX_IO1_i_CylinderLow 0x08 -#define IDX_IO1_i_CylinderHigh 0x0A -#define IDX_IO1_i_DriveSelect 0x0C -#define IDX_IO1_i_Status 0x0E - -#define IDX_IO2_i_AltStatus 0x10C -#define IDX_IO2_i_DriveAddress 0x10E -#define IDE_IO_i_Bank 0x432 - -#define IDX_IO1_o_Data 0x00 -#define IDX_IO1_o_Feature 0x02 -#define IDX_IO1_o_BlockCount 0x04 -#define IDX_IO1_o_BlockNumber 0x06 -#define IDX_IO1_o_CylinderLow 0x08 -#define IDX_IO1_o_CylinderHigh 0x0A -#define IDX_IO1_o_DriveSelect 0x0C -#define IDX_IO1_o_Command 0x0E - -#define IDX_IO2_o_Control 0x10C -#define IDE_IO_o_BankSelect 0x432 -#else /* SARCH_PC98 */ -#define IDX_IO1_i_Data 0x00 -#define IDX_IO1_i_Error 0x01 -#define IDX_IO1_i_BlockCount 0x02 -#define IDX_IO1_i_BlockNumber 0x03 -#define IDX_IO1_i_CylinderLow 0x04 -#define IDX_IO1_i_CylinderHigh 0x05 -#define IDX_IO1_i_DriveSelect 0x06 -#define IDX_IO1_i_Status 0x07 - -#define IDX_IO2_i_AltStatus 0x206 -#define IDX_IO2_i_DriveAddress 0x207 - -#define IDX_IO1_o_Data 0x00 -#define IDX_IO1_o_Feature 0x01 -#define IDX_IO1_o_BlockCount 0x02 -#define IDX_IO1_o_BlockNumber 0x03 -#define IDX_IO1_o_CylinderLow 0x04 -#define IDX_IO1_o_CylinderHigh 0x05 -#define IDX_IO1_o_DriveSelect 0x06 -#define IDX_IO1_o_Command 0x07 - -#define IDX_IO2_o_Control 0x206 -#endif - -/* - * ATAPI registers offsets - */ -#if defined(SARCH_PC98) -#define IDX_ATAPI_IO1_i_Data 0x00 -#define IDX_ATAPI_IO1_i_Error 0x02 -#define IDX_ATAPI_IO1_i_InterruptReason 0x04 -#define IDX_ATAPI_IO1_i_Unused1 0x06 -#define IDX_ATAPI_IO1_i_ByteCountLow 0x08 -#define IDX_ATAPI_IO1_i_ByteCountHigh 0x0A -#define IDX_ATAPI_IO1_i_DriveSelect 0x0C -#define IDX_ATAPI_IO1_i_Status 0x0E - -#define IDX_ATAPI_IO1_o_Data 0x00 -#define IDX_ATAPI_IO1_o_Feature 0x02 -#define IDX_ATAPI_IO1_o_Unused0 0x04 -#define IDX_ATAPI_IO1_o_Unused1 0x06 -#define IDX_ATAPI_IO1_o_ByteCountLow 0x08 -#define IDX_ATAPI_IO1_o_ByteCountHigh 0x0A -#define IDX_ATAPI_IO1_o_DriveSelect 0x0C -#define IDX_ATAPI_IO1_o_Command 0x0E -#else /* SARCH_PC98 */ -#define IDX_ATAPI_IO1_i_Data 0x00 -#define IDX_ATAPI_IO1_i_Error 0x01 -#define IDX_ATAPI_IO1_i_InterruptReason 0x02 -#define IDX_ATAPI_IO1_i_Unused1 0x03 -#define IDX_ATAPI_IO1_i_ByteCountLow 0x04 -#define IDX_ATAPI_IO1_i_ByteCountHigh 0x05 -#define IDX_ATAPI_IO1_i_DriveSelect 0x06 -#define IDX_ATAPI_IO1_i_Status 0x07 - -#define IDX_ATAPI_IO1_o_Data 0x00 -#define IDX_ATAPI_IO1_o_Feature 0x01 -#define IDX_ATAPI_IO1_o_Unused0 0x02 -#define IDX_ATAPI_IO1_o_Unused1 0x03 -#define IDX_ATAPI_IO1_o_ByteCountLow 0x04 -#define IDX_ATAPI_IO1_o_ByteCountHigh 0x05 -#define IDX_ATAPI_IO1_o_DriveSelect 0x06 -#define IDX_ATAPI_IO1_o_Command 0x07 -#endif - -/* - * IDE status definitions - */ -#define IDE_STATUS_SUCCESS 0x00 -#define IDE_STATUS_ERROR 0x01 -#define IDE_STATUS_INDEX 0x02 -#define IDE_STATUS_CORRECTED_ERROR 0x04 -#define IDE_STATUS_DRQ 0x08 -#define IDE_STATUS_DSC 0x10 -#define IDE_STATUS_DMA 0x20 /* DMA ready */ -#define IDE_STATUS_DWF 0x20 /* drive write fault */ -#define IDE_STATUS_DRDY 0x40 -#define IDE_STATUS_IDLE 0x50 -#define IDE_STATUS_BUSY 0x80 - -#define IDE_STATUS_WRONG 0xff -#define IDE_STATUS_MASK 0xff - -/* - * IDE drive select/head definitions - */ -#define IDE_DRIVE_SELECT 0xA0 -#define IDE_DRIVE_1 0x00 -#define IDE_DRIVE_2 0x10 -#define IDE_DRIVE_SELECT_1 (IDE_DRIVE_SELECT | IDE_DRIVE_1) -#define IDE_DRIVE_SELECT_2 (IDE_DRIVE_SELECT | IDE_DRIVE_2) -#define IDE_DRIVE_MASK (IDE_DRIVE_SELECT_1 | IDE_DRIVE_SELECT_2) -#define IDE_USE_LBA 0x40 - -/* - * IDE drive control definitions - */ -#define IDE_DC_DISABLE_INTERRUPTS 0x02 -#define IDE_DC_RESET_CONTROLLER 0x04 -#define IDE_DC_A_4BIT 0x80 -#define IDE_DC_USE_HOB 0x80 // use high-order byte(s) -#define IDE_DC_REENABLE_CONTROLLER 0x00 +/** @brief Data structure for the ATA device. */ +typedef struct _DEVICE_UNIT +{ + /** Number of cylinders on the device */ + ULONG Cylinders; -/* - * IDE error definitions - */ -#define IDE_ERROR_ICRC 0x80 -#define IDE_ERROR_BAD_BLOCK 0x80 -#define IDE_ERROR_DATA_ERROR 0x40 -#define IDE_ERROR_MEDIA_CHANGE 0x20 -#define IDE_ERROR_ID_NOT_FOUND 0x10 -#define IDE_ERROR_MEDIA_CHANGE_REQ 0x08 -#define IDE_ERROR_COMMAND_ABORTED 0x04 -#define IDE_ERROR_END_OF_MEDIA 0x02 -#define IDE_ERROR_NO_MEDIA 0x02 -#define IDE_ERROR_ILLEGAL_LENGTH 0x01 + /** Number of heads on the device */ + ULONG Heads; -/* - * Values for TransferMode - */ -#define ATA_PIO 0x00 + /** Number of sectors per track */ + ULONG SectorsPerTrack; -/* - * IDENTIFY data - */ -#include <pshpack1.h> -typedef struct _IDENTIFY_DATA -{ - UCHAR AtapiCmdSize:2; // 00 00 General configuration - UCHAR Unused1:3; - UCHAR DrqType:2; - UCHAR Removable:1; - UCHAR DeviceType:5; - UCHAR Unused2:1; - UCHAR CmdProtocol:2; - USHORT NumberOfCylinders; // 02 1 - USHORT Reserved1; // 04 2 - USHORT NumberOfHeads; // 06 3 - USHORT UnformattedBytesPerTrack; // 08 4 - USHORT UnformattedBytesPerSector; // 0A 5 - USHORT SectorsPerTrack; // 0C 6 - USHORT VendorUnique1[3]; // 0E 7-9 - USHORT SerialNumber[10]; // 14 10-19 - USHORT BufferType; // 28 20 - USHORT BufferSectorSize; // 2A 21 - USHORT NumberOfEccBytes; // 2C 22 - USHORT FirmwareRevision[4]; // 2E 23-26 - USHORT ModelNumber[20]; // 36 27-46 - UCHAR ReadWriteMultipleSupport; // 5E 47 - UCHAR VendorUnique2; // 5F - USHORT DoubleWordIo; // 60 48 - USHORT Reserved62_0:8; // 62 49 Capabilities - USHORT SupportDma:1; - USHORT SupportLba:1; - USHORT DisableIordy:1; - USHORT SupportIordy:1; - USHORT SoftReset:1; - USHORT StandbyOverlap:1; - USHORT SupportQTag:1; - USHORT SupportIDma:1; - USHORT Reserved2; // 64 50 - UCHAR VendorUnique3; // 66 51 - UCHAR PioCycleTimingMode; // 67 - UCHAR VendorUnique4; // 68 52 - UCHAR DmaCycleTimingMode; // 69 - USHORT TranslationFieldsValid:1; // 6A 53 - USHORT Reserved3:15; - USHORT NumberOfCurrentCylinders; // 6C 54 - USHORT NumberOfCurrentHeads; // 6E 55 - USHORT CurrentSectorsPerTrack; // 70 56 - ULONG CurrentSectorCapacity; // 72 57-58 - USHORT CurrentMultiSectorSetting; // 59 - ULONG UserAddressableSectors; // 60-61 - USHORT SingleWordDMASupport:8; // 62 - USHORT SingleWordDMAActive:8; - USHORT MultiWordDMASupport:8; // 63 - USHORT MultiWordDMAActive:8; - USHORT AdvancedPIOModes:8; // 64 - USHORT Reserved4:8; - USHORT MinimumMWXferCycleTime; // 65 - USHORT RecommendedMWXferCycleTime; // 66 - USHORT MinimumPIOCycleTime; // 67 - USHORT MinimumPIOCycleTimeIORDY; // 68 - USHORT Reserved5[2]; // 69-70 - USHORT ReleaseTimeOverlapped; // 71 - USHORT ReleaseTimeServiceCommand; // 72 - USHORT Reserved73_74[2]; // 73-74 - USHORT QueueLength:5; // 75 - USHORT Reserved75_6:11; - USHORT SataCapabilities; // 76 - USHORT Reserved77; // 77 - USHORT SataSupport; // 78 - USHORT SataEnable; // 79 - USHORT MajorRevision; // 80 - USHORT MinorRevision; // 81 - struct { - USHORT Smart:1; // 82 - USHORT Security:1; - USHORT Removable:1; - USHORT PowerMngt:1; - USHORT Packet:1; - USHORT WriteCache:1; - USHORT LookAhead:1; - USHORT ReleaseDRQ:1; - USHORT ServiceDRQ:1; - USHORT Reset:1; - USHORT Protected:1; - USHORT Reserved_82_11:1; - USHORT WriteBuffer:1; - USHORT ReadBuffer:1; - USHORT Nop:1; - USHORT Reserved_82_15:1; - USHORT Microcode:1; // 83/86 - USHORT Queued:1; - USHORT CFA:1; - USHORT APM:1; - USHORT Notify:1; - USHORT Standby:1; - USHORT Spinup:1; - USHORT Reserver_83_7:1; - USHORT MaxSecurity:1; - USHORT AutoAcoustic:1; - USHORT Address48:1; - USHORT ConfigOverlay:1; - USHORT FlushCache:1; - USHORT FlushCache48:1; - USHORT SupportOne:1; - USHORT SupportZero:1; - USHORT SmartErrorLog:1; // 84/87 - USHORT SmartSelfTest:1; - USHORT MediaSerialNo:1; - USHORT MediaCardPass:1; - USHORT Streaming:1; - USHORT Logging:1; - USHORT Reserver_84_6:8; - USHORT ExtendedOne:1; - USHORT ExtendedZero:1; - } FeaturesSupport, FeaturesEnabled; - USHORT Reserved6[13]; // 88-99 - ULONGLONG UserAddressableSectors48; // 100-103 - USHORT Reserved7[151]; // 104-255 -} IDENTIFY_DATA, *PIDENTIFY_DATA; -#include <poppack.h> -#define IDENTIFY_DATA_SIZE sizeof(IDENTIFY_DATA) + /** Number of bytes per sector */ + ULONG SectorSize; -#define ATAPI_MAGIC_LSB 0x14 -#define ATAPI_MAGIC_MSB 0xEB -#define MAXIMUM_CDROM_SIZE 804 + /** Total number of device sectors/LBA blocks */ + ULONG64 TotalSectors; -typedef struct _DEVICE_UNIT -{ - UCHAR Channel; - UCHAR DeviceNumber; - ULONG Cylinders; - ULONG Heads; - ULONG Sectors; - ULONG SectorSize; - ULONGLONG TotalSectors; /* This number starts from 0 */ - USHORT Flags; - IDENTIFY_DATA IdentifyData; + /** Device-specific flags */ + ULONG Flags; +#define ATA_DEVICE_ATAPI 0x00000001 +#define ATA_DEVICE_LBA 0x00000002 +#define ATA_DEVICE_LBA48 0x00000004 +#define ATA_DEVICE_IS_NEC_CDR260 0x00000008 +#define ATA_DEVICE_FLAG_IO32 0x00000010 } DEVICE_UNIT, *PDEVICE_UNIT; -#define ATA_DEVICE_ATAPI (1 << 0) -#define ATA_DEVICE_NO_MEDIA (1 << 1) -#define ATA_DEVICE_NOT_READY (1 << 2) -#define ATA_DEVICE_LBA48 (1 << 3) -#define ATA_DEVICE_LBA (1 << 4) -#define ATA_DEVICE_CHS (1 << 5) - -/* PROTOTYPES ****************************************************************/ +/* FUNCTIONS ******************************************************************/ BOOLEAN AtaInit( - OUT PUCHAR DetectedCount -); - -VOID -AtaFree(); + _Out_ PUCHAR DetectedCount); PDEVICE_UNIT AtaGetDevice( - IN UCHAR UnitNumber -); + _In_ UCHAR UnitNumber); BOOLEAN -AtaAtapiReadLogicalSectorsLBA( - IN OUT PDEVICE_UNIT DeviceUnit, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - OUT PVOID Buffer -); +AtaReadLogicalSectors( + _In_ PDEVICE_UNIT DeviceUnit, + _In_ ULONG64 SectorNumber, + _In_ ULONG SectorCount, + _Out_writes_bytes_all_(SectorCount * DeviceUnit->SectorSize) PVOID Buffer); diff --git a/sdk/include/ddk/ata.h b/sdk/include/ddk/ata.h index a0c59a69837..d5b749f0c13 100644 --- a/sdk/include/ddk/ata.h +++ b/sdk/include/ddk/ata.h @@ -14,7 +14,7 @@ typedef struct _IDENTIFY_DEVICE_DATA { USHORT DeviceType :1; } GeneralConfiguration; USHORT NumCylinders; - USHORT ReservedWord2; + USHORT SpecificConfiguration; USHORT NumHeads; USHORT Retired1[2]; USHORT NumSectorsPerTrack; @@ -26,9 +26,13 @@ typedef struct _IDENTIFY_DEVICE_DATA { UCHAR ModelNumber[40]; UCHAR MaximumBlockTransfer; UCHAR VendorUnique2; - USHORT ReservedWord48; struct { - UCHAR ReservedByte49; + USHORT FeatureSupported :1; + USHORT Reserved :15; + } TrustedComputing; + struct { + UCHAR CurrentLongPhysicalSectorAlignment :2; + UCHAR ReservedByte49 :6; UCHAR DmaSupported :1; UCHAR LbaSupported :1; UCHAR IordyDisable :1; @@ -40,14 +44,19 @@ typedef struct _IDENTIFY_DEVICE_DATA { } Capabilities; USHORT ObsoleteWords51[2]; USHORT TranslationFieldsValid :3; - USHORT Reserved3 :13; + USHORT Reserved3 :5; + USHORT FreeFallControlSensitivity :8; USHORT NumberOfCurrentCylinders; USHORT NumberOfCurrentHeads; USHORT CurrentSectorsPerTrack; ULONG CurrentSectorCapacity; UCHAR CurrentMultiSectorSetting; UCHAR MultiSectorSettingValid :1; - UCHAR ReservedByte59 :7; + UCHAR ReservedByte59 :3; + UCHAR SanitizeFeatureSupported :1; + UCHAR CryptoScrambleExtCommandSupported :1; + UCHAR OverwriteExtCommandSupported :1; + UCHAR BlockEraseExtCommandSupported :1; ULONG UserAddressableSectors; USHORT ObsoleteWord62; USHORT MultiWordDMASupport :8; @@ -58,10 +67,74 @@ typedef struct _IDENTIFY_DEVICE_DATA { USHORT RecommendedMWXferCycleTime; USHORT MinimumPIOCycleTime; USHORT MinimumPIOCycleTimeIORDY; - USHORT ReservedWords69[6]; + struct { + USHORT ZonedCapabilities :2; + USHORT NonVolatileWriteCache :1; + USHORT ExtendedUserAddressableSectorsSupported :1; + USHORT DeviceEncryptsAllUserData :1; + USHORT ReadZeroAfterTrimSupported :1; + USHORT Optional28BitCommandsSupported :1; + USHORT IEEE1667 :1; + USHORT DownloadMicrocodeDmaSupported :1; + USHORT SetMaxSetPasswordUnlockDmaSupported :1; + USHORT WriteBufferDmaSupported :1; + USHORT ReadBufferDmaSupported :1; + USHORT DeviceConfigIdentifySetDmaSupported :1; + USHORT LPSAERCSupported :1; + USHORT DeterministicReadAfterTrimSupported :1; + USHORT CFastSpecSupported :1; + } AdditionalSupported; + USHORT ReservedWords70[5]; USHORT QueueDepth :5; USHORT ReservedWord75 :11; - USHORT ReservedWords76[4]; + struct { + USHORT Reserved0 :1; + USHORT SataGen1 :1; + USHORT SataGen2 :1; + USHORT SataGen3 :1; + USHORT Reserved1 :4; + USHORT NCQ :1; + USHORT HIPM :1; + USHORT PhyEvents :1; + USHORT NcqUnload :1; + USHORT NcqPriority :1; + USHORT HostAutoPS :1; + USHORT DeviceAutoPS :1; + USHORT ReadLogDMA :1; + USHORT Reserved2 :1; + USHORT CurrentSpeed :3; + USHORT NcqStreaming :1; + USHORT NcqQueueMgmt :1; + USHORT NcqReceiveSend :1; + USHORT DEVSLPtoReducedPwrState :1; + USHORT Reserved3 :8; + } SerialAtaCapabilities; + struct { + USHORT Reserved0 :1; + USHORT NonZeroOffsets :1; + USHORT DmaSetupAutoActivate :1; + USHORT DIPM :1; + USHORT InOrderData :1; + USHORT HardwareFeatureControl :1; + USHORT SoftwareSettingsPreservation :1; + USHORT NCQAutosense :1; + USHORT DEVSLP :1; + USHORT HybridInformation :1; + USHORT Reserved1 :6; + } SerialAtaFeaturesSupported; + struct { + USHORT Reserved0 :1; + USHORT NonZeroOffsets :1; + USHORT DmaSetupAutoActivate :1; + USHORT DIPM :1; + USHORT InOrderData :1; + USHORT HardwareFeatureControl :1; + USHORT SoftwareSettingsPreservation :1; + USHORT DeviceAutoPS :1; + USHORT DEVSLP :1; + USHORT HybridInformation :1; + USHORT Reserved1 :6; + } SerialAtaFeaturesEnabled; USHORT MajorRevision; USHORT MinorRevision; struct { @@ -95,7 +168,7 @@ typedef struct _IDENTIFY_DEVICE_DATA { USHORT DeviceConfigOverlay :1; USHORT FlushCache :1; USHORT FlushCacheExt :1; - USHORT Resrved3 :2; + USHORT WordValid83 :2; USHORT SmartErrorLog :1; USHORT SmartSelfTest :1; USHORT MediaSerialNumber :1; @@ -109,7 +182,7 @@ typedef struct _IDENTIFY_DEVICE_DATA { USHORT URGWriteStream :1; USHORT ReservedForTechReport :2; USHORT IdleWithUnloadFeature :1; - USHORT Reserved4 :2; + USHORT WordValid :2; } CommandSetSupport; struct { USHORT SmartCommands :1; @@ -142,7 +215,8 @@ typedef struct _IDENTIFY_DEVICE_DATA { USHORT DeviceConfigOverlay :1; USHORT FlushCache :1; USHORT FlushCacheExt :1; - USHORT Resrved3 :2; + USHORT Resrved3 :1; + USHORT Words119_120Valid :1; USHORT SmartErrorLog :1; USHORT SmartSelfTest :1; USHORT MediaSerialNumber :1; @@ -160,14 +234,27 @@ typedef struct _IDENTIFY_DEVICE_DATA { } CommandSetActive; USHORT UltraDMASupport :8; USHORT UltraDMAActive :8; - USHORT ReservedWord89[4]; + struct { + USHORT TimeRequired :15; + USHORT ExtendedTimeReported :1; + } NormalSecurityEraseUnit; + struct { + USHORT TimeRequired :15; + USHORT ExtendedTimeReported :1; + } EnhancedSecurityEraseUnit; + USHORT CurrentAPMLevel :8; + USHORT ReservedWord91 :8; + USHORT MasterPasswordID; USHORT HardwareResetResult; USHORT CurrentAcousticValue :8; USHORT RecommendedAcousticValue :8; - USHORT ReservedWord95[5]; + USHORT StreamMinRequestSize; + USHORT StreamingTransferTimeDMA; + USHORT StreamingAccessLatencyDMAPIO; + ULONG StreamingPerfGranularity; ULONG Max48BitLBA[2]; USHORT StreamingTransferTime; - USHORT ReservedWord105; + USHORT DsmCap; struct { USHORT LogicalSectorsPerPhysicalSector :4; USHORT Reserved0 :8; @@ -182,19 +269,31 @@ typedef struct _IDENTIFY_DEVICE_DATA { USHORT WordsPerLogicalSector[2]; struct { USHORT ReservedForDrqTechnicalReport :1; - USHORT WriteReadVerifySupported :1; - USHORT Reserved01 :11; - USHORT Reserved1 :2; + USHORT WriteReadVerify :1; + USHORT WriteUncorrectableExt :1; + USHORT ReadWriteLogDmaExt :1; + USHORT DownloadMicrocodeMode3 :1; + USHORT FreefallControl :1; + USHORT SenseDataReporting :1; + USHORT ExtendedPowerConditions :1; + USHORT Reserved0 :6; + USHORT WordValid :2; } CommandSetSupportExt; struct { USHORT ReservedForDrqTechnicalReport :1; - USHORT WriteReadVerifyEnabled :1; - USHORT Reserved01 :11; + USHORT WriteReadVerify :1; + USHORT WriteUncorrectableExt :1; + USHORT ReadWriteLogDmaExt :1; + USHORT DownloadMicrocodeMode3 :1; + USHORT FreefallControl :1; + USHORT SenseDataReporting :1; + USHORT ExtendedPowerConditions :1; + USHORT Reserved0 :6; USHORT Reserved1 :2; } CommandSetActiveExt; USHORT ReservedForExpandedSupportandActive[6]; USHORT MsnSupport :2; - USHORT ReservedWord1274 :14; + USHORT ReservedWord127 :14; struct { USHORT SecuritySupported :1; USHORT SecurityEnabled :1; @@ -208,20 +307,32 @@ typedef struct _IDENTIFY_DEVICE_DATA { } SecurityStatus; USHORT ReservedWord129[31]; struct { - USHORT MaximumCurrentInMA2 :12; + USHORT MaximumCurrentInMA :12; USHORT CfaPowerMode1Disabled :1; USHORT CfaPowerMode1Required :1; USHORT Reserved0 :1; USHORT Word160Supported :1; - } CfaPowerModel; - USHORT ReservedForCfaWord161[8]; + } CfaPowerMode1; + USHORT ReservedForCfaWord161[7]; + USHORT NominalFormFactor :4; + USHORT ReservedWord168 :12; struct { USHORT SupportsTrim :1; USHORT Reserved0 :15; } DataSetManagementFeature; - USHORT ReservedForCfaWord170[6]; + USHORT AdditionalProductID[4]; + USHORT ReservedForCfaWord174[2]; USHORT CurrentMediaSerialNumber[30]; - USHORT ReservedWord206; + struct { + USHORT Supported :1; + USHORT Reserved0 :1; + USHORT WriteSameSuported :1; + USHORT ErrorRecoveryControlSupported :1; + USHORT FeatureControlSuported :1; + USHORT DataTablesSuported :1; + USHORT Reserved1 :6; + USHORT VendorSpecific :4; + } SCTCommandTransport; USHORT ReservedWord207[2]; struct { USHORT AlignmentOfLogicalWithinPhysical :14; @@ -246,56 +357,367 @@ typedef struct _IDENTIFY_DEVICE_DATA { UCHAR NVCacheEstimatedTimeToSpinUpInSeconds; UCHAR Reserved; } NVCacheOptions; - USHORT ReservedWord220[35]; + USHORT WriteReadVerifySectorCountMode :8; + USHORT ReservedWord220 :8; + USHORT ReservedWord221; + struct { + USHORT MajorVersion :12; + USHORT TransportType :4; + } TransportMajorVersion; + USHORT TransportMinorVersion; + USHORT ReservedWord224[6]; + ULONG ExtendedNumberOfUserAddressableSectors[2]; + USHORT MinBlocksPerDownloadMicrocodeMode03; + USHORT MaxBlocksPerDownloadMicrocodeMode03; + USHORT ReservedWord236[19]; USHORT Signature :8; USHORT CheckSum :8; } IDENTIFY_DEVICE_DATA, *PIDENTIFY_DEVICE_DATA; + +typedef struct _IDENTIFY_PACKET_DATA { + struct { + USHORT PacketType :2; + USHORT IncompleteResponse :1; + USHORT Reserved1 :2; + USHORT DrqDelay :2; + USHORT RemovableMedia :1; + USHORT CommandPacketType :5; + USHORT Reserved2 :1; + USHORT DeviceType :2; + } GeneralConfiguration; + USHORT ResevedWord1; + USHORT UniqueConfiguration; + USHORT ReservedWords3[7]; + UCHAR SerialNumber[20]; + USHORT ReservedWords20[3]; + UCHAR FirmwareRevision[8]; + UCHAR ModelNumber[40]; + USHORT ReservedWords47[2]; + struct { + USHORT VendorSpecific :8; + USHORT DmaSupported :1; + USHORT LbaSupported :1; + USHORT IordyDisabled :1; + USHORT IordySupported :1; + USHORT Obsolete :1; + USHORT OverlapSupported :1; + USHORT QueuedCommandsSupported :1; + USHORT InterleavedDmaSupported :1; + USHORT DeviceSpecificStandbyTimerValueMin :1; + USHORT Obsolete1 :1; + USHORT ReservedWord50 :12; + USHORT WordValid :2; + } Capabilities; + USHORT ObsoleteWords51[2]; + USHORT TranslationFieldsValid :3; + USHORT Reserved3 :13; + USHORT ReservedWords54[8]; + struct { + USHORT UDMA0Supported :1; + USHORT UDMA1Supported :1; + USHORT UDMA2Supported :1; + USHORT UDMA3Supported :1; + USHORT UDMA4Supported :1; + USHORT UDMA5Supported :1; + USHORT UDMA6Supported :1; + USHORT MDMA0Supported :1; + USHORT MDMA1Supported :1; + USHORT MDMA2Supported :1; + USHORT DMASupported :1; + USHORT ReservedWord62 :4; + USHORT DMADIRBitRequired :1; + } DMADIR; + USHORT MultiWordDMASupport :8; + USHORT MultiWordDMAActive :8; + USHORT AdvancedPIOModes :8; + USHORT ReservedByte64 :8; + USHORT MinimumMWXferCycleTime; + USHORT RecommendedMWXferCycleTime; + USHORT MinimumPIOCycleTime; + USHORT MinimumPIOCycleTimeIORDY; + USHORT ReservedWords69[2]; + USHORT BusReleaseDelay; + USHORT ServiceCommandDelay; + USHORT ReservedWords73[2]; + USHORT QueueDepth :5; + USHORT ReservedWord75 :11; + struct { + USHORT Reserved0 :1; + USHORT SataGen1 :1; + USHORT SataGen2 :1; + USHORT SataGen3 :1; + USHORT Reserved1 :5; + USHORT HIPM :1; + USHORT PhyEvents :1; + USHORT Reserved3 :2; + USHORT HostAutoPS :1; + USHORT DeviceAutoPS :1; + USHORT Reserved4 :1; + USHORT Reserved5 :1; + USHORT CurrentSpeed :3; + USHORT SlimlineDeviceAttention :1; + USHORT HostEnvironmentDetect :1; + USHORT Reserved :10; + } SerialAtaCapabilities; + struct { + USHORT Reserved0 :1; + USHORT Reserved1 :2; + USHORT DIPM :1; + USHORT Reserved2 :1; + USHORT AsynchronousNotification :1; + USHORT SoftwareSettingsPreservation :1; + USHORT Reserved3 :9; + } SerialAtaFeaturesSupported; + struct { + USHORT Reserved0 :1; + USHORT Reserved1 :2; + USHORT DIPM :1; + USHORT Reserved2 :1; + USHORT AsynchronousNotification :1; + USHORT SoftwareSettingsPreservation :1; + USHORT DeviceAutoPS :1; + USHORT Reserved3 :8; + } SerialAtaFeaturesEnabled; + USHORT MajorRevision; + USHORT MinorRevision; + struct { + USHORT SmartCommands :1; + USHORT SecurityMode :1; + USHORT RemovableMedia :1; + USHORT PowerManagement :1; + USHORT PacketCommands :1; + USHORT WriteCache :1; + USHORT LookAhead :1; + USHORT ReleaseInterrupt :1; + USHORT ServiceInterrupt :1; + USHORT DeviceReset :1; + USHORT HostProtectedArea :1; + USHORT Obsolete1 :1; + USHORT WriteBuffer :1; + USHORT ReadBuffer :1; + USHORT Nop :1; + USHORT Obsolete2 :1; + USHORT DownloadMicrocode :1; + USHORT Reserved1 :2; + USHORT AdvancedPm :1; + USHORT Msn :1; + USHORT PowerUpInStandby :1; + USHORT ManualPowerUp :1; + USHORT Reserved2 :1; + USHORT SetMax :1; + USHORT Reserved3 :3; + USHORT FlushCache :1; + USHORT Reserved4 :1; + USHORT WordValid :2; + } CommandSetSupport; + struct { + USHORT Reserved0 :5; + USHORT GpLogging :1; + USHORT Reserved1 :2; + USHORT WWN64Bit :1; + USHORT Reserved2 :5; + USHORT WordValid :2; + } CommandSetSupportExt; + struct { + USHORT SmartCommands :1; + USHORT SecurityMode :1; + USHORT RemovableMedia :1; + USHORT PowerManagement :1; + USHORT PacketCommands :1; + USHORT WriteCache :1; + USHORT LookAhead :1; + USHORT ReleaseInterrupt :1; + USHORT ServiceInterrupt :1; + USHORT DeviceReset :1; + USHORT HostProtectedArea :1; + USHORT Obsolete1 :1; + USHORT WriteBuffer :1; + USHORT ReadBuffer :1; + USHORT Nop :1; + USHORT Obsolete2 :1; + USHORT DownloadMicrocode :1; + USHORT Reserved1 :2; + USHORT AdvancedPm :1; + USHORT Msn :1; + USHORT PowerUpInStandby :1; + USHORT ManualPowerUp :1; + USHORT Reserved2 :1; + USHORT SetMax :1; + USHORT Reserved3 :3; + USHORT FlushCache :1; + USHORT Reserved :3; + } CommandSetActive; + struct { + USHORT Reserved0 :5; + USHORT GpLogging :1; + USHORT Reserved1 :2; + USHORT WWN64Bit :1; + USHORT Reserved2 :5; + USHORT WordValid :2; + } CommandSetActiveExt; + USHORT UltraDMASupport :8; + USHORT UltraDMAActive :8; + USHORT TimeRequiredForNormalEraseModeSecurityEraseUnit; + USHORT TimeRequiredForEnhancedEraseModeSecurityEraseUnit; + USHORT CurrentAPMLevel; + USHORT MasterPasswordID; + USHORT HardwareResetResult; + USHORT ReservedWords94[14]; + USHORT WorldWideName[4]; + USHORT ReservedWords112[13]; + USHORT AtapiZeroByteCount; + USHORT ReservedWord126; + USHORT MsnSupport :2; + USHORT ReservedWord127 :14; + USHORT SecurityStatus; + USHORT VendorSpecific[31]; + USHORT ReservedWord160[16]; + USHORT ReservedWord176[46]; + struct { + USHORT MajorVersion :12; + USHORT TransportType :4; + } TransportMajorVersion; + USHORT TransportMinorVersion; + USHORT ReservedWord224[31]; + USHORT Signature :8; + USHORT CheckSum :8; +} IDENTIFY_PACKET_DATA, *PIDENTIFY_PACKET_DATA; + +typedef struct _GP_LOG_NCQ_COMMAND_ERROR { + UCHAR NcqTag : 5; + UCHAR Reserved0 : 1; + UCHAR UNL : 1; + UCHAR NonQueuedCmd : 1; + UCHAR Reserved1; + UCHAR Status; + UCHAR Error; + UCHAR LBA7_0; + UCHAR LBA15_8; + UCHAR LBA23_16; + UCHAR Device; + UCHAR LBA31_24; + UCHAR LBA39_32; + UCHAR LBA47_40; + UCHAR Reserved2; + UCHAR Count7_0; + UCHAR Count15_8; + UCHAR SenseKey; + UCHAR ASC; + UCHAR ASCQ; + UCHAR Reserved3[239]; + UCHAR Vendor[255]; + UCHAR Checksum; +} GP_LOG_NCQ_COMMAND_ERROR, *PGP_LOG_NCQ_COMMAND_ERROR; #include <poppack.h> #define IDE_LBA_MODE (1 << 6) -#define IDE_COMMAND_NOP 0x00 -#define IDE_COMMAND_DATA_SET_MANAGEMENT 0x06 -#define IDE_COMMAND_ATAPI_RESET 0x08 -#define IDE_COMMAND_READ 0x20 -#define IDE_COMMAND_READ_EXT 0x24 -#define IDE_COMMAND_READ_DMA_EXT 0x25 -#define IDE_COMMAND_READ_DMA_QUEUED_EXT 0x26 -#define IDE_COMMAND_READ_MULTIPLE_EXT 0x29 -#define IDE_COMMAND_WRITE 0x30 -#define IDE_COMMAND_WRITE_EXT 0x34 -#define IDE_COMMAND_WRITE_DMA_EXT 0x35 -#define IDE_COMMAND_WRITE_DMA_QUEUED_EXT 0x36 -#define IDE_COMMAND_WRITE_MULTIPLE_EXT 0x39 -#define IDE_COMMAND_WRITE_DMA_FUA_EXT 0x3D -#define IDE_COMMAND_WRITE_DMA_QUEUED_FUA_EXT 0x3E -#define IDE_COMMAND_VERIFY 0x40 -#define IDE_COMMAND_VERIFY_EXT 0x42 -#define IDE_COMMAND_EXECUTE_DEVICE_DIAGNOSTIC 0x90 -#define IDE_COMMAND_SET_DRIVE_PARAMETERS 0x91 -#define IDE_COMMAND_ATAPI_PACKET 0xA0 -#define IDE_COMMAND_ATAPI_IDENTIFY 0xA1 -#define IDE_COMMAND_SMART 0xB0 -#define IDE_COMMAND_READ_MULTIPLE 0xC4 -#define IDE_COMMAND_WRITE_MULTIPLE 0xC5 -#define IDE_COMMAND_SET_MULTIPLE 0xC6 -#define IDE_COMMAND_READ_DMA 0xC8 -#define IDE_COMMAND_WRITE_DMA 0xCA -#define IDE_COMMAND_WRITE_DMA_QUEUED 0xCC -#define IDE_COMMAND_WRITE_MULTIPLE_FUA_EXT 0xCE -#define IDE_COMMAND_GET_MEDIA_STATUS 0xDA -#define IDE_COMMAND_DOOR_LOCK 0xDE -#define IDE_COMMAND_DOOR_UNLOCK 0xDF -#define IDE_COMMAND_STANDBY_IMMEDIATE 0xE0 -#define IDE_COMMAND_IDLE_IMMEDIATE 0xE1 -#define IDE_COMMAND_CHECK_POWER 0xE5 -#define IDE_COMMAND_SLEEP 0xE6 -#define IDE_COMMAND_FLUSH_CACHE 0xE7 -#define IDE_COMMAND_FLUSH_CACHE_EXT 0xEA -#define IDE_COMMAND_IDENTIFY 0xEC -#define IDE_COMMAND_MEDIA_EJECT 0xED -#define IDE_COMMAND_SET_FEATURE 0xEF -#define IDE_COMMAND_SECURITY_FREEZE_LOCK 0xF5 -#define IDE_COMMAND_NOT_VALID 0xFF +#define IDE_DC_DISABLE_INTERRUPTS 0x02 +#define IDE_DC_RESET_CONTROLLER 0x04 +#define IDE_DC_REENABLE_CONTROLLER 0x00 + +#define IDE_STATUS_ERROR 0x01 +#define IDE_STATUS_INDEX 0x02 +#define IDE_STATUS_CORRECTED_ERROR 0x04 +#define IDE_STATUS_DRQ 0x08 +#define IDE_STATUS_DSC 0x10 +#define IDE_STATUS_DEVICE_FAULT 0x20 +#define IDE_STATUS_DRDY 0x40 +#define IDE_STATUS_IDLE 0x50 +#define IDE_STATUS_BUSY 0x80 + +#define IDE_ERROR_ILLEGAL_LENGTH 0x01 +#define IDE_ERROR_ADDRESS_NOT_FOUND IDE_ERROR_ILLEGAL_LENGTH +#define IDE_ERROR_END_OF_MEDIA 0x02 +#define IDE_ERROR_COMMAND_ABORTED 0x04 +#define IDE_ERROR_MEDIA_CHANGE_REQ 0x08 +#define IDE_ERROR_ID_NOT_FOUND 0x10 +#define IDE_ERROR_MEDIA_CHANGE 0x20 +#define IDE_ERROR_DATA_ERROR 0x40 +#define IDE_ERROR_BAD_BLOCK 0x80 +#define IDE_ERROR_CRC_ERROR IDE_ERROR_BAD_BLOCK + +#define IDE_COMMAND_NOP 0x00 +#define IDE_COMMAND_DATA_SET_MANAGEMENT 0x06 +#define IDE_COMMAND_ATAPI_RESET 0x08 +#define IDE_COMMAND_GET_PHYSICAL_ELEMENT_STATUS 0x12 +#define IDE_COMMAND_READ 0x20 +#define IDE_COMMAND_READ_EXT 0x24 +#define IDE_COMMAND_READ_DMA_EXT 0x25 +#define IDE_COMMAND_READ_DMA_QUEUED_EXT 0x26 +#define IDE_COMMAND_READ_MULTIPLE_EXT 0x29 +#define IDE_COMMAND_READ_LOG_EXT 0x2F +#define IDE_COMMAND_WRITE 0x30 +#define IDE_COMMAND_WRITE_EXT 0x34 +#define IDE_COMMAND_WRITE_DMA_EXT 0x35 +#define IDE_COMMAND_WRITE_DMA_QUEUED_EXT 0x36 +#define IDE_COMMAND_WRITE_MULTIPLE_EXT 0x39 +#define IDE_COMMAND_WRITE_DMA_FUA_EXT 0x3D +#define IDE_COMMAND_WRITE_DMA_QUEUED_FUA_EXT 0x3E +#define IDE_COMMAND_WRITE_LOG_EXT 0x3F +#define IDE_COMMAND_VERIFY 0x40 +#define IDE_COMMAND_VERIFY_EXT 0x42 +#define IDE_COMMAND_ZAC_MANAGEMENT_IN 0x4A +#define IDE_COMMAND_WRITE_LOG_DMA_EXT 0x57 +#define IDE_COMMAND_TRUSTED_NON_DATA 0x5B +#define IDE_COMMAND_TRUSTED_RECEIVE 0x5C +#define IDE_COMMAND_TRUSTED_RECEIVE_DMA 0x5D +#define IDE_COMMAND_TRUSTED_SEND 0x5E +#define IDE_COMMAND_TRUSTED_SEND_DMA 0x5F +#define IDE_COMMAND_READ_FPDMA_QUEUED 0x60 +#define IDE_COMMAND_WRITE_FPDMA_QUEUED 0x61 +#define IDE_COMMAND_NCQ_NON_DATA 0x63 +#define IDE_COMMAND_SEND_FPDMA_QUEUED 0x64 +#define IDE_COMMAND_RECEIVE_FPDMA_QUEUED 0x65 +#define IDE_COMMAND_SET_DATE_AND_TIME 0x77 +#define IDE_COMMAND_REMOVE_ELEMENT_AND_TRUNCATE 0x7C +#define IDE_COMMAND_EXECUTE_DEVICE_DIAGNOSTIC 0x90 +#define IDE_COMMAND_SET_DRIVE_PARAMETERS 0x91 +#define IDE_COMMAND_DOWNLOAD_MICROCODE 0x92 +#define IDE_COMMAND_DOWNLOAD_MICROCODE_DMA 0x93 +#define IDE_COMMAND_ZAC_MANAGEMENT_OUT 0x9F +#define IDE_COMMAND_ATAPI_PACKET 0xA0 +#define IDE_COMMAND_ATAPI_IDENTIFY 0xA1 +#define IDE_COMMAND_SMART 0xB0 +#define IDE_COMMAND_READ_LOG_DMA_EXT 0xB1 +#define IDE_COMMAND_SANITIZE_DEVICE 0xB4 +#define IDE_COMMAND_READ_MULTIPLE 0xC4 +#define IDE_COMMAND_WRITE_MULTIPLE 0xC5 +#define IDE_COMMAND_SET_MULTIPLE 0xC6 +#define IDE_COMMAND_READ_DMA 0xC8 +#define IDE_COMMAND_WRITE_DMA 0xCA +#define IDE_COMMAND_WRITE_DMA_QUEUED 0xCC +#define IDE_COMMAND_WRITE_MULTIPLE_FUA_EXT 0xCE +#define IDE_COMMAND_GET_MEDIA_STATUS 0xDA +#define IDE_COMMAND_DOOR_LOCK 0xDE +#define IDE_COMMAND_DOOR_UNLOCK 0xDF +#define IDE_COMMAND_STANDBY_IMMEDIATE 0xE0 +#define IDE_COMMAND_IDLE_IMMEDIATE 0xE1 +#define IDE_COMMAND_CHECK_POWER 0xE5 +#define IDE_COMMAND_SLEEP 0xE6 +#define IDE_COMMAND_FLUSH_CACHE 0xE7 +#define IDE_COMMAND_FLUSH_CACHE_EXT 0xEA +#define IDE_COMMAND_IDENTIFY 0xEC +#define IDE_COMMAND_MEDIA_EJECT 0xED +#define IDE_COMMAND_SET_FEATURE 0xEF +#define IDE_COMMAND_SECURITY_SET_PASSWORD 0xF1 +#define IDE_COMMAND_SECURITY_UNLOCK 0xF2 +#define IDE_COMMAND_SECURITY_ERASE_PREPARE 0xF3 +#define IDE_COMMAND_SECURITY_ERASE_UNIT 0xF4 +#define IDE_COMMAND_SECURITY_FREEZE_LOCK 0xF5 +#define IDE_COMMAND_SECURITY_DISABLE_PASSWORD 0xF6 +#define IDE_COMMAND_NOT_VALID 0xFF + +#define IDE_FEATURE_ENABLE_WRITE_CACHE 0x2 +#define IDE_FEATURE_SET_TRANSFER_MODE 0x3 +#define IDE_FEATURE_ENABLE_PUIS 0x6 +#define IDE_FEATURE_PUIS_SPIN_UP 0x7 +#define IDE_FEATURE_ENABLE_SATA_FEATURE 0x10 +#define IDE_FEATURE_DISABLE_MSN 0x31 +#define IDE_FEATURE_DISABLE_REVERT_TO_POWER_ON 0x66 +#define IDE_FEATURE_DISABLE_WRITE_CACHE 0x82 +#define IDE_FEATURE_DISABLE_PUIS 0x86 +#define IDE_FEATURE_DISABLE_SATA_FEATURE 0x90 +#define IDE_FEATURE_ENABLE_MSN 0x95 #endif

1 0

[reactos] 01/01: [BOOTSECT][FREELDR] Rewrite the Ext bootsector (#7544)
by Daniel Victor 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddf55b3772b4257a4c2de… commit ddf55b3772b4257a4c2decbeccc0d61c47cf42af Author: Daniel Victor <ilauncherdeveloper(a)gmail.com> AuthorDate: Tue Mar 18 17:53:47 2025 -0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 18 21:53:47 2025 +0100 [BOOTSECT][FREELDR] Rewrite the Ext bootsector (#7544) Rewrite the Ext bootsector because the older one was broken and had no compatibility with Ext4 extents. Introduce a 3rd-stage bootsector for complex code. CORE-14235 - Why was the previous bootsector broken? Because of hardcoded inode size, hardcoded freeldr base address, etc. - Why is there a extldr.sys? The extldr.sys was introduced because the limited code space in the bootsector prevents adding new features, such as Ext4 full extents support. - What is extldr.sys and What does it do? It is the helper file for the Ext bootsector and that is necessary for adding Ext4 support. It locates the freeldr.sys file, loads it into memory and runs it. --- boot/freeldr/bootsect/CMakeLists.txt | 6 +- boot/freeldr/bootsect/ext.S | 726 +++++++++++++++++++++++++++++++++++ boot/freeldr/bootsect/ext2.S | 688 --------------------------------- boot/freeldr/bootsect/extldr.S | 583 ++++++++++++++++++++++++++++ 4 files changed, 1313 insertions(+), 690 deletions(-) diff --git a/boot/freeldr/bootsect/CMakeLists.txt b/boot/freeldr/bootsect/CMakeLists.txt index a46c9066c6a..986d399d13e 100644 --- a/boot/freeldr/bootsect/CMakeLists.txt +++ b/boot/freeldr/bootsect/CMakeLists.txt @@ -4,7 +4,8 @@ include_directories(${REACTOS_SOURCE_DIR}/boot/freeldr) if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) - CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) + CreateBootSectorTarget(ext ${CMAKE_CURRENT_SOURCE_DIR}/ext.S ${CMAKE_CURRENT_BINARY_DIR}/ext.bin 7c00) + CreateBootSectorTarget(extldr ${CMAKE_CURRENT_SOURCE_DIR}/extldr.S ${CMAKE_CURRENT_BINARY_DIR}/extldr.sys 8000) CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) @@ -31,7 +32,8 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") CreateBootSectorTarget(isombr ${CMAKE_CURRENT_SOURCE_DIR}/isombr.S ${CMAKE_CURRENT_BINARY_DIR}/isombr.bin 7000) add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR bootcd regtest) - add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR bootcd regtest) + add_cd_file(TARGET ext DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext.bin FOR bootcd regtest) + add_cd_file(TARGET extldr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/extldr.sys FOR bootcd regtest) add_cd_file(TARGET btrfsvbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/btrfs.bin FOR bootcd regtest) add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR bootcd regtest) add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR bootcd regtest) diff --git a/boot/freeldr/bootsect/ext.S b/boot/freeldr/bootsect/ext.S new file mode 100644 index 00000000000..4a449b632d4 --- /dev/null +++ b/boot/freeldr/bootsect/ext.S @@ -0,0 +1,726 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: EXTFS volume boot sector + * COPYRIGHT: Copyright 2002-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright 2024-2025 Daniel Victor <ilauncherdeveloper(a)gmail.com> + */ + +#include <asm.inc> +#include <freeldr/include/arch/pc/x86common.h> + +// Boot sector constants +#define BOOTSECTOR_BASE_ADDRESS HEX(7C00) +#define EXTLDR_BOOTSECTOR_SIZE 1024 +#define EXT_POINTER_SIZE 4 +#define EXT_EXTENT_SIZE 12 + +// Maximum extent values +#define EXT_EXTENT_MAX_LEVEL 5 +#define EXT_EXTENT_MAX_LENGTH 32768 + +// Group descriptor offsets +#define EXT_GROUP_DESC_INODE_TABLE_OFFSET 8 + +// Extent offsets +#define EXT_EXTENT_HEADER_ENTRIES_OFFSET 2 +#define EXT_EXTENT_HEADER_DEPTH_OFFSET 6 +#define EXT_EXTENT_INDEX_LEAF_OFFSET 4 +#define EXT_EXTENT_LENGTH_OFFSET 4 +#define EXT_EXTENT_START_OFFSET 8 + +// Inode offsets +#define EXT_INODE_SIZE_OFFSET 4 +#define EXT_INODE_FLAGS_OFFSET 32 +#define EXT_INODE_BLOCK_POINTER_OFFSET 40 + +// Directory entry offsets +#define EXT_DIRECTORY_ENTRY_SIZE_OFFSET 4 +#define EXT_DIRECTORY_ENTRY_NAME_LENGTH_OFFSET 6 +#define EXT_DIRECTORY_ENTRY_NAME_OFFSET 8 + +// Inode flags +#define EXT_INODE_FLAG_EXTENTS HEX(80000) + +// Inode blocks constants +#define EXT_INODE_BLOCKS 12 +#define EXT_INODE_INDIRECT_BLOCKS 3 + +// Root Inode +#define EXT_ROOT_INODE 2 + +// Inode address +#define EXT_INODE_ADDRESS HEX(9000) + +// Data block addresses +#define EXT_BLOCK_ADDRESS HEX(1000) +#define EXT_BLOCK2_ADDRESS HEX(2000) +#define EXT_BLOCK3_ADDRESS HEX(3000) +#define EXT_BLOCK4_ADDRESS HEX(4000) +#define EXT_BLOCK5_ADDRESS HEX(5000) +#define EXT_BLOCK6_ADDRESS HEX(6000) +#define EXT_BLOCK7_ADDRESS HEX(A000) + +// Inode types +#define EXT_INODE_TYPE_MASK HEX(F000) +#define EXT_INODE_TYPE_REGULAR HEX(8000) + +// File size limit +#define EXT_INODE_DATA_SIZE_LIMIT HEX(F000) + +// Offset of functions addresses that will be used by the extldr.sys 3rd-stage bootsector +#define ExtReadBlockOffset 2 +#define ExtReadInodeOffset 4 +#define DisplayItAndRebootOffset 6 +#define PutCharsOffset 8 + +// Boot sector stack constants +#define BOOTSECTOR_STACK_TEMP_VARIABLES 2 +#define BOOTSECTOR_STACK_TEMP_VARIABLES_SIZE (4 * BOOTSECTOR_STACK_TEMP_VARIABLES) +#define BOOTSECTOR_STACK_OFFSET (8 + BOOTSECTOR_STACK_TEMP_VARIABLES_SIZE) +#define BOOTSECTOR_STACK_BASE (BOOTSECTOR_BASE_ADDRESS - BOOTSECTOR_STACK_OFFSET) +#define BP_REL(x) ss:[bp + (x - BOOTSECTOR_BASE_ADDRESS)] + +// Temporary variables +#define ExtFileSizeState ((BOOTSECTOR_STACK_BASE + BOOTSECTOR_STACK_TEMP_VARIABLES_SIZE) - 4) +#define LBASectorsRead (ExtFileSizeState - 4) + +.code16 + +#ifndef INCLUDED_ASM + +start: + jmp short main + nop + +// Fields that will be changed by the installer +BootDrive: + .byte HEX(FF) +ExtVolumeStartSector: + .long 263088 // Start sector of the ext2 volume +ExtBlockSize: + .long 2 // Block size in sectors +ExtBlockSizeInBytes: + .long 1024 // Block size in bytes +ExtPointersPerBlock: + .long 256 // Number of block pointers that can be contained in one block +ExtGroupDescSize: + .long 32 // Size of Group Descriptor +ExtFirstDataBlock: + .long 2 // First data block (2 for 1024-byte blocks, 1 for bigger sizes) +ExtInodeSize: + .long 128 // Size of Inode +ExtInodesPerGroup: + .long 2048 // Number of inodes per group + +// File variables +ExtFileSize: + .long 0 // File size in bytes +ExtFileAddress: + .long FREELDR_BASE // File address +ExtFileAddressOld: + .long FREELDR_BASE // Old file address + +// Inode variables +ExtReadInodeGroup: + .long 0 +ExtReadInodeIndex: + .long 0 +ExtReadInodeGroupBlock: + .long 0 +ExtReadInodeIndexBlock: + .long 0 +ExtReadInodeGroupOffset: + .word 0 +ExtReadInodeIndexOffset: + .word 0 + +main: + xor ax, ax // Setup segment registers + mov ds, ax // Make DS correct + mov es, ax // Make ES correct + mov ss, ax // Make SS correct + mov bp, BOOTSECTOR_BASE_ADDRESS + mov sp, bp // Setup a stack + sub sp, BOOTSECTOR_STACK_OFFSET + + // Save the function addresses so the helper code knows where to call them + mov word ptr ss:[bp-ExtReadBlockOffset], offset ExtReadBlock + mov word ptr ss:[bp-ExtReadInodeOffset], offset ExtReadInode + mov word ptr ss:[bp-DisplayItAndRebootOffset], offset DisplayItAndReboot + mov word ptr ss:[bp-PutCharsOffset], offset PutChars + + mov si, offset BootDrive + cmp byte ptr [si], HEX(0ff) // If they have specified a boot drive then use it + jne CheckInt13hExtensions + + mov byte ptr [si], dl // Save the boot drive + +// Now check if this computer supports extended reads. This boot sector will not work without it. +CheckInt13hExtensions: + mov ah, HEX(41) // AH = 41h + mov bx, HEX(55aa) // BX = 55AAh + int HEX(13) // IBM/MS INT 13 Extensions - INSTALLATION CHECK + jc PrintDiskError // CF set on error (extensions not supported) + cmp bx, HEX(aa55) // BX = AA55h if installed + jne PrintDiskError + test cl, 1 // si = API subset support bitmap + jz PrintDiskError // Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported + +LoadExtraBootCode: + // First we have to load our extra boot code at + // sector 1 into memory at [0000:7e00h] + xor eax, eax + inc eax + mov cx, 1 + xor bx, bx + mov es, bx // Read sector to [0000:7e00h] + mov bx, HEX(7e00) + call ReadSectors + + jmp LoadRootDirectory + +// Reads logical sectors into ES:[BX] +// EAX has logical sector number to read +// CX has number of sectors to read +ReadSectors: + push es + add eax, dword ptr BP_REL(ExtVolumeStartSector) // Add the start of the volume + // If at all possible we want to use LBA routines because + // they are optimized to read more than 1 sector per read + +ReadSectorsLBA: + pushad // Save logical sector number & sector count + + cmp cx, 64 // Since the LBA calls only support 0x7F sectors at a time we will limit ourselves to 64 + jbe ReadSectorsSetupDiskAddressPacket // If we are reading less than 65 sectors then just do the read + mov cx, 64 // Otherwise read only 64 sectors on this loop iteration + +ReadSectorsSetupDiskAddressPacket: + movzx ecx, cx + mov dword ptr BP_REL(LBASectorsRead), ecx + data32 push 0 + push eax // Put 64-bit logical block address on stack + push es // Put transfer segment on stack + push bx // Put transfer offset on stack + push cx // Set transfer count + push 16 // Set size of packet to 10h + mov si, sp // Setup disk address packet on stack + + mov dl, byte ptr BP_REL(BootDrive) // Drive number + mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read + int HEX(13) // Call BIOS + jc PrintDiskError // If the read failed then abort + + add sp, 16 // Remove disk address packet from stack + + popad // Restore sector count & logical sector number + + push bx + mov ebx, dword ptr BP_REL(LBASectorsRead) + add eax, ebx // Increment sector to read + shl ebx, 5 + mov dx, es + add dx, bx // Setup read buffer for next sector + mov es, dx + pop bx + + sub cx, word ptr BP_REL(LBASectorsRead) + jnz ReadSectorsLBA // Read next sector + + pop es + ret + +// Displays a disk error message +// And reboots +PrintDiskError: + mov si, offset msgDiskError // Bad boot disk message + call PutChars // Display it + +Reboot: + mov si, offset msgAnyKey // Press any key message + call PutChars // Display it + xor ax, ax + int HEX(16) // Wait for a keypress + int HEX(19) // Reboot + +.PutCharsLoop: + mov ah, HEX(0E) + mov bx, 7 + int HEX(10) +PutChars: + lodsb + or al, al + jnz .PutCharsLoop + ret + +SwapESWithDS: + // Swap ES and DS + push es + push ds + pop es + pop ds + ret + +ExtReadGroupDescriptor: + mov eax, dword ptr BP_REL(ExtReadInodeGroupBlock) // Get Inode group block + add eax, dword ptr BP_REL(ExtFirstDataBlock) // Add the Group Descriptor offset + call ExtSetInodeSegment + +ExtReadBlock: + xor edx, edx + mov ecx, dword ptr BP_REL(ExtBlockSize) + mul ecx + jmp ReadSectors + +// EAX +ExtCalculateBlock: + xor edx, edx // Clear EDX before division + div dword ptr BP_REL(ExtBlockSizeInBytes) // Inode /= ExtBlockSizeInBytes + mov dword ptr ds:[bp + si], eax // Store the Inode block + ret + +// SI, DI +ExtCalculateOffset: + add bx, bp // Sum BX with BP for absolute address + xor edx, edx // Clear EDX before multiplication + mov eax, dword ptr ds:[bp + si] // Get the Inode block + mul dword ptr BP_REL(ExtBlockSizeInBytes) // Inode *= ExtBlockSizeInBytes + mov ecx, dword ptr ds:[bx] // Get the Inode + sub ecx, eax // Subtract the original Inode with rounded down Inode + mov word ptr ds:[bp + di], cx // Store the rounded down Inode + ret + +ExtSetOldFileSegment: + mov ebx, dword ptr BP_REL(ExtFileAddressOld) // Get the EXT old file address + jmp .ExtSegSkip +ExtSetFileSegment: + mov ebx, dword ptr BP_REL(ExtFileAddress) // Get the EXT file address +.ExtSegSkip: + shr ebx, 4 // Shift four bits to the right to get segment + jmp .ExtSkip +ExtSetInodeSegment: + mov bx, EXT_INODE_ADDRESS / 16 // Get the EXT inode address +.ExtSkip: + mov es, bx // Set ES + xor bx, bx // Clear BX + ret + +// Read the Inode in EAX register +ExtReadInode: + xor edx, edx // Clear EDX before division + dec eax // Inode-- + div dword ptr BP_REL(ExtInodesPerGroup) // Inode /= ExtInodesPerGroup + mov dword ptr BP_REL(ExtReadInodeGroup), eax // Store the Inode group + mov dword ptr BP_REL(ExtReadInodeIndex), edx // Store the Inode index + + xor edx, edx // Clear EDX before multiplication + mul dword ptr BP_REL(ExtGroupDescSize) // Inode group *= ExtGroupDescSize + mov dword ptr BP_REL(ExtReadInodeGroup), eax // Store the precalculated Inode group + + xor edx, edx // Clear EDX before multiplication + mov eax, dword ptr BP_REL(ExtReadInodeIndex) // Get the read Inode index + mul dword ptr BP_REL(ExtInodeSize) // Inode group *= ExtInodeSize + mov dword ptr BP_REL(ExtReadInodeIndex), eax // Store the Inode index + + // Calculate the Inode index block + mov si, offset ExtReadInodeIndexBlock - start + call ExtCalculateBlock + + // Calculate the Inode group block + mov eax, dword ptr BP_REL(ExtReadInodeGroup) + mov si, offset ExtReadInodeGroupBlock - start + call ExtCalculateBlock + + // Calculate the Inode group offset + mov bx, offset ExtReadInodeGroup - start + mov si, offset ExtReadInodeGroupBlock - start + mov di, offset ExtReadInodeGroupOffset - start + call ExtCalculateOffset + + // Calculate the Inode index offset + mov bx, offset ExtReadInodeIndex - start + mov si, offset ExtReadInodeIndexBlock - start + mov di, offset ExtReadInodeIndexOffset - start + call ExtCalculateOffset + + // Read group descriptor + call ExtReadGroupDescriptor + + // Set the offset address + mov si, word ptr BP_REL(ExtReadInodeGroupOffset) + + // Get InodeTable field from the ExtGroupDescriptor structure + mov eax, dword ptr es:[si + EXT_GROUP_DESC_INODE_TABLE_OFFSET] + + // Sum EAX with Inode index block + add eax, dword ptr BP_REL(ExtReadInodeIndexBlock) + + jmp ExtReadBlock + +msgDiskError: + .ascii "Disk error", CR, LF, NUL +msgAnyKey: + .ascii "Press any key", CR, LF, NUL + +.org 509 + +BootPartition: + .byte 0 + +.word HEX(AA55) // BootSector signature + +// End of bootsector +// +// Now starts the extra boot code that we will store +// at sector 1 on a EXT volume + +LoadRootDirectory: + mov al, EXT_ROOT_INODE // Put the root directory inode number in AL + movzx eax, al // Convert AL to EAX + + call ExtReadInode // Read the inode + call BasicReadFile // Load the directory entries using basic function + call SearchFile // Find the extended loader and run it + + jmp ExtLdrPrintFileNotFound // If the extended loader wasn't found, display an error + +ExtInodeDetectExtentsFlag: + mov eax, es:[si + EXT_INODE_FLAGS_OFFSET] + test eax, EXT_INODE_FLAG_EXTENTS + ret + +ExtUpdateFileSize: + mov eax, dword ptr BP_REL(ExtBlockSizeInBytes) + +ExtAdjustFileSize: + // Update the file size + sub dword ptr BP_REL(ExtFileSizeState), eax + add dword ptr BP_REL(ExtFileAddress), eax + ret + +ExtReadFileDone: + push eax + mov eax, dword ptr BP_REL(ExtFileSizeState) + cmp eax, dword ptr BP_REL(ExtBlockSizeInBytes) + pop eax + ret + +ExtFileReadBlocks: + push es +.FRLoop: + // Check if there is no more blocks to read + call ExtReadFileDone + jb .FRDone + + // If the block count is zero then do nothing + test bx, bx + jz .FRDone + + // Read the block + pushad + call ExtSetFileSegment + call ExtReadBlock + popad + + // Update the file size + call ExtUpdateFileSize + + // Go to the next block and decrement the block count + inc eax + dec bx + + // Loop until all blocks are read + jmp .FRLoop +.FRDone: + pop es + ret + +BasicReadFileExtents: + // Add block pointer offset + add si, EXT_INODE_BLOCK_POINTER_OFFSET + +.DepthExtentsLoop: + // Load extent header depth + mov dx, word ptr es:[si + EXT_EXTENT_HEADER_DEPTH_OFFSET] + + // Check if depth is zero + test dx, dx + jz .DepthExtentsDone + + // Go to next extent + add si, EXT_EXTENT_SIZE + + // Push all registers + pushad + + // Read the extent block + mov eax, dword ptr es:[si + EXT_EXTENT_INDEX_LEAF_OFFSET] + call ExtSetInodeSegment + call ExtReadBlock + + // Pop all registers + popad + + // Reset SI + xor si, si + + jmp .DepthExtentsLoop +.DepthExtentsDone: + // Load extent header entries + mov cx, word ptr es:[si + EXT_EXTENT_HEADER_ENTRIES_OFFSET] + +.FinalExtentsLoop: + // Check if there is no more blocks to read + call ExtReadFileDone + jb .FinalExtentsDone + + // Go to next extent + add si, EXT_EXTENT_SIZE + + // Load extent length + mov bx, word ptr es:[si + EXT_EXTENT_LENGTH_OFFSET] + and ebx, HEX(FFFF) + + // Check if extent is sparse + cmp bx, EXT_EXTENT_MAX_LENGTH + jbe .NotSparse + + // Adjust sparse extent length + sub bx, EXT_EXTENT_MAX_LENGTH + + // Adjust extent length to byte count + // by multiplying extent length to block size + xor edx, edx + mov eax, dword ptr BP_REL(ExtBlockSizeInBytes) + mul ebx + + // Adjust file size for sparse extent + call ExtAdjustFileSize + + jmp .FinalExtentsSkip + +.NotSparse: + // Read blocks from extent start + mov eax, dword ptr es:[si + EXT_EXTENT_START_OFFSET] + call ExtFileReadBlocks + +.FinalExtentsSkip: + // Loop to process next extent + loop .FinalExtentsLoop + +.FinalExtentsDone: + ret + +BasicReadFile: + push es + pushad + call ExtSetInodeSegment + + // Set the correct Inode offset + mov si, word ptr BP_REL(ExtReadInodeIndexOffset) + + // Set the old file address + mov eax, dword ptr BP_REL(ExtFileAddress) + mov dword ptr BP_REL(ExtFileAddressOld), eax + + // Set the file size limit + mov eax, EXT_INODE_DATA_SIZE_LIMIT + + // Load file size from Inode + mov ebx, dword ptr es:[si + EXT_INODE_SIZE_OFFSET] + + // Compare and limit file size + cmp ebx, eax + jbe .BelowOrEqualSize + mov ebx, eax +.BelowOrEqualSize: + // Store the file size in the ExtFileSize variable + mov dword ptr BP_REL(ExtFileSize), ebx + + // Set rounded up file size + add ebx, dword ptr BP_REL(ExtBlockSizeInBytes) + dec ebx + mov dword ptr BP_REL(ExtFileSizeState), ebx + + // Don't use the extents method if theres no extents flag + call ExtInodeDetectExtentsFlag + jz .NoExtents + + // If this Inode use Extents mapping then use the extents method and skip the entire classic method + call BasicReadFileExtents + jmp .LDone + +.NoExtents: + // Set up for reading direct block addresses + xor ecx, ecx + mov cl, EXT_INODE_BLOCKS + add si, EXT_INODE_BLOCK_POINTER_OFFSET +.LLoop: + call ExtSetInodeSegment + + call ExtReadFileDone + jb .LDone + + // Get the block address + mov eax, dword ptr es:[si] + + // If the block address is zero, skip the block + test eax, eax + jz .LSkipBlock + + // Set the file segment + call ExtSetFileSegment + + // Read the block + call ExtReadBlock +.LSkipBlock: + call ExtUpdateFileSize + + // Increment block + add si, EXT_POINTER_SIZE + + // Loop until all blocks are loaded + loop .LLoop +.LDone: + popad + pop es + ret + +SearchFile: + call ExtSetOldFileSegment + call SwapESWithDS + + xor si, si + mov dx, word ptr BP_REL(ExtFileSize) +.FLoop: + mov eax, dword ptr ds:[si] // Load directory Inode + + cmp si, dx // End of buffer reached? + jae .Done // Abort the search if yes + + // Save SI + push si + + test eax, eax // Check if Inode is zero + jz .Skip // Skip this entry if yes + + mov di, offset ExtLdrFileName // Load target filename address + mov cx, offset ExtLdrFileNameEnd - ExtLdrFileName // Length of filename to compare + cmp byte ptr ds:[si + EXT_DIRECTORY_ENTRY_NAME_LENGTH_OFFSET], cl // Compare if both names have the same length + jnz .Skip // Skip this entry if yes + add si, EXT_DIRECTORY_ENTRY_NAME_OFFSET // Move to filename in entry + repe cmpsb // Compare filenames + pop si // Restore SI + jz LoadExtLdr // Found matching file + push si // Save SI + +.Skip: + // Restore SI + pop si + + // Move to next directory entry and continue looping + add si, word ptr ds:[si + EXT_DIRECTORY_ENTRY_SIZE_OFFSET] + jmp .FLoop +.Done: + ret + +LoadExtLdr: + // Swap ES and DS + call SwapESWithDS + + push si // Save SI + mov si, offset msgLoadingExtLdr // Point SI to a loading message + call PutChars // Show the message + pop si // Restore SI + + mov eax, dword ptr es:[si] // Load directory Inode + call ExtReadInode // Read the inode + mov si, word ptr BP_REL(ExtReadInodeIndexOffset) // Set the correct offset + + // Get Inode type + mov ax, word ptr es:[si] + and ax, EXT_INODE_TYPE_MASK + + cmp ax, EXT_INODE_TYPE_REGULAR // Check if regular file + jnz ExtLdrPrintRegFileError // If not, handle error + + call BasicReadFile // Load the file using basic function + call ExtSetOldFileSegment // Set old file segment + call SwapESWithDS // Swap ES with DS before copy + + // Copy the loaded file to 1KB ahead of this bootsector + xor si, si + mov di, offset ExtLdrEntryPoint + mov cx, EXTLDR_BOOTSECTOR_SIZE + rep movsb + + ljmp16 0, ExtLdrEntryPoint + +ExtLdrPrintFileNotFound: + // Make DS correct, display it and reboot + call SwapESWithDS + mov si, offset msgExtLdr + jmp DisplayItAndReboot + +ExtLdrPrintRegFileError: + mov si, offset msgExtLdrNotRegularFile // ExtLdr not found message +DisplayItAndReboot: + call PutChars // Display it + jmp Reboot + +ExtLdrFileName: + .ascii "extldr.sys" +ExtLdrFileNameEnd: + +msgExtLdr: + .ascii "extldr.sys not found", CR, LF, NUL +msgExtLdrNotRegularFile: + .ascii "extldr.sys is not a regular file", CR, LF, NUL +msgLoadingExtLdr: + .ascii "Loading ExtLoader...", CR, LF, NUL + +.org 1022 + +.word HEX(AA55) // BootSector signature + +ExtLdrEntryPoint: +// ExtLdr is loaded here + +.endcode16 + +END + +#else + +#define start BOOTSECTOR_BASE_ADDRESS + +#define BootDrive (start + 3) +#define ExtVolumeStartSector (BootDrive + 1) +#define ExtBlockSize (ExtVolumeStartSector + 4) +#define ExtBlockSizeInBytes (ExtBlockSize + 4) +#define ExtPointersPerBlock (ExtBlockSizeInBytes + 4) +#define ExtGroupDescSize (ExtPointersPerBlock + 4) +#define ExtFirstDataBlock (ExtGroupDescSize + 4) +#define ExtInodeSize (ExtFirstDataBlock + 4) +#define ExtInodesPerGroup (ExtInodeSize + 4) + +#define ExtFileSize (ExtInodesPerGroup + 4) +#define ExtFileAddress (ExtFileSize + 4) +#define ExtFileAddressOld (ExtFileAddress + 4) + +#define ExtReadInodeGroup (ExtFileAddressOld + 4) +#define ExtReadInodeIndex (ExtReadInodeGroup + 4) +#define ExtReadInodeGroupBlock (ExtReadInodeIndex + 4) +#define ExtReadInodeIndexBlock (ExtReadInodeGroupBlock + 4) +#define ExtReadInodeGroupOffset (ExtReadInodeIndexBlock + 4) +#define ExtReadInodeIndexOffset (ExtReadInodeGroupOffset + 2) + +#define BootPartition (BootDrive + 506) + +#define ExtReadBlock word ptr ss:[bp-ExtReadBlockOffset] +#define ExtReadInode word ptr ss:[bp-ExtReadInodeOffset] +#define DisplayItAndReboot word ptr ss:[bp-DisplayItAndRebootOffset] +#define PutChars word ptr ss:[bp-PutCharsOffset] + +#endif diff --git a/boot/freeldr/bootsect/ext2.S b/boot/freeldr/bootsect/ext2.S deleted file mode 100644 index bd3119c635f..00000000000 --- a/boot/freeldr/bootsect/ext2.S +++ /dev/null @@ -1,688 +0,0 @@ -// EXT2.ASM -// EXT2 Boot Sector -// Copyright (c) 2002, 2003 Brian Palmer - -// [bp-0x04] Here we will store the number of sectors per track -// [bp-0x08] Here we will store the number of heads -// [bp-0x0c] Here we will store the size of the disk as the BIOS reports in CHS form -// [bp-0x10] Here we will store the number of LBA sectors read - -#include <asm.inc> -.code16 - -SECTORS_PER_TRACK = HEX(04) -NUMBER_OF_HEADS = HEX(08) -BIOS_CHS_DRIVE_SIZE = HEX(0C) -LBA_SECTORS_READ = HEX(10) - - -EXT2_ROOT_INO = 2 -EXT2_S_IFMT = HEX(0f0) -EXT2_S_IFREG = HEX(080) - - -//org 7c00h - - -start: - jmp short main - nop - -BootDrive: - .byte HEX(80) -//BootPartition db 0 // Moved to end of boot sector to have a standard format across all boot sectors -//SectorsPerTrack db 63 // Moved to [bp-SECTORS_PER_TRACK] -//NumberOfHeads dw 16 // Moved to [bp-NUMBER_OF_HEADS] -//BiosCHSDriveSize dd (1024 * 1024 * 63) // Moved to [bp-BIOS_CHS_DRIVE_SIZE] -//LBASectorsRead dd 0 // Moved to [bp-LBA_SECTORS_READ] - -Ext2VolumeStartSector: - .long 263088 // Start sector of the ext2 volume -Ext2BlockSize: - .long 2 // Block size in sectors -Ext2BlockSizeInBytes: - .long 1024 // Block size in bytes -Ext2PointersPerBlock: - .long 256 // Number of block pointers that can be contained in one block -Ext2GroupDescPerBlock: - .long 32 // Number of group descriptors per block -Ext2FirstDataBlock: - .long 1 // First data block (1 for 1024-byte blocks, 0 for bigger sizes) -Ext2InodesPerGroup: - .long 2048 // Number of inodes per group -Ext2InodesPerBlock: - .long 8 // Number of inodes per block - -Ext2ReadEntireFileLoadSegment: - .word 0 -Ext2InodeIndirectPointer: - .long 0 -Ext2InodeDoubleIndirectPointer: - .long 0 -Ext2BlocksLeftToRead: - .long 0 - -main: - xor ax,ax // Setup segment registers - mov ds,ax // Make DS correct - mov es,ax // Make ES correct - mov ss,ax // Make SS correct - mov bp, HEX(7c00) - mov sp, HEX(7b00) // Setup a stack - - mov si, offset BootDrive - cmp byte ptr [si], HEX(0ff) // If they have specified a boot drive then use it - jne GetDriveParameters - - mov [si],dl // Save the boot drive - - -GetDriveParameters: - mov ah, 8 - mov dl,[si] // Get boot drive in dl - int HEX(13) // Request drive parameters from the bios - jnc CalcDriveSize // If the call succeeded then calculate the drive size - - // If we get here then the call to the BIOS failed - // so just set CHS equal to the maximum addressable - // size - mov cx, HEX(0ffff) - mov dh,cl - -CalcDriveSize: - // Now that we have the drive geometry - // lets calculate the drive size - mov bl,ch // Put the low 8-bits of the cylinder count into BL - mov bh,cl // Put the high 2-bits in BH - shr bh,6 // Shift them into position, now BX contains the cylinder count - and cl, HEX(3f) // Mask off cylinder bits from sector count - // CL now contains sectors per track and DH contains head count - movzx eax,dh // Move the heads into EAX - movzx ebx,bx // Move the cylinders into EBX - movzx ecx,cl // Move the sectors per track into ECX - inc eax // Make it one based because the bios returns it zero based - mov [bp-NUMBER_OF_HEADS],eax // Save number of heads - mov [bp-SECTORS_PER_TRACK],ecx // Save number of sectors per track - inc ebx // Make the cylinder count one based also - mul ecx // Multiply heads with the sectors per track, result in edx:eax - mul ebx // Multiply the cylinders with (heads * sectors) [stored in edx:eax already] - - // We now have the total number of sectors as reported - // by the bios in eax, so store it in our variable - mov [bp-BIOS_CHS_DRIVE_SIZE],eax - - -LoadExtraBootCode: - // First we have to load our extra boot code at - // sector 1 into memory at [0000:7e00h] - //mov eax,01h - xor eax,eax - inc eax // Read logical sector 1, EAX now = 1 - mov cx,1 // Read one sector - mov bx, HEX(7e00) // Read sector to [0000:7e00h] - call ReadSectors - - jmp LoadRootDirectory - - - -// Reads ext2 group descriptor into [7000:8000] -// We read it to this arbitrary location so -// it will not cross a 64k boundary -// EAX has group descriptor number to read -Ext2ReadGroupDesc: - shl eax,5 // Group = (Group * sizeof(GROUP_DESCRIPTOR) /* 32 */) - xor edx,edx - div dword ptr [bp+Ext2GroupDescPerBlock] // Group = (Group / Ext2GroupDescPerBlock) - add eax, dword ptr [bp+Ext2FirstDataBlock] // Group = Group + Ext2FirstDataBlock + 1 - inc eax // EAX now has the group descriptor block number - // EDX now has the group descriptor offset in the block - - // Adjust the read offset so that the - // group descriptor is read to 7000:8000 - mov ebx, HEX(78000) - sub ebx,edx - shr ebx,4 - mov es,bx - xor bx,bx - - - // Everything is now setup to call Ext2ReadBlock - // Instead of using the call instruction we will - // just put Ext2ReadBlock right after this routine - -// Reads ext2 block into ES:[BX] -// EAX has logical block number to read -Ext2ReadBlock: - mov ecx, dword ptr [bp+Ext2BlockSize] - mul ecx - jmp ReadSectors - -// Reads ext2 inode into [6000:8000] -// We read it to this arbitrary location so -// it will not cross a 64k boundary -// EAX has inode number to read -Ext2ReadInode: - dec eax // Inode = Inode - 1 - xor edx,edx - div dword ptr [bp+Ext2InodesPerGroup] // Inode = (Inode / Ext2InodesPerGroup) - mov ebx,eax // EBX now has the inode group number - mov eax,edx - xor edx,edx - div dword ptr [bp+Ext2InodesPerBlock] // Inode = (Inode / Ext2InodesPerBlock) - shl edx,7 // FIXME: InodeOffset *= 128 (make the array index a byte offset) - // EAX now has the inode offset block number from inode table - // EDX now has the inode offset in the block - - // Save the inode values and put the group - // descriptor number in EAX and read it in - push edx - push eax - mov eax,ebx - call Ext2ReadGroupDesc - - // Group descriptor has been read, now - // grab the inode table block number from it - push HEX(7000) - pop es - mov di, HEX(8008) - pop eax // Restore inode offset block number from stack - add eax, es:[di] // Add the inode table start block - - // Adjust the read offset so that the - // inode we want is read to 6000:8000 - pop edx // Restore inode offset in the block from stack - mov ebx, HEX(68000) - sub ebx,edx - shr ebx,4 - mov es,bx - xor bx,bx - - call Ext2ReadBlock - ret - - -// Reads logical sectors into ES:[BX] -// EAX has logical sector number to read -// CX has number of sectors to read -ReadSectors: - add eax, dword ptr [bp+Ext2VolumeStartSector] // Add the start of the volume - cmp eax, [bp-BIOS_CHS_DRIVE_SIZE] // Check if they are reading a sector outside CHS range - jae ReadSectorsLBA // Yes - go to the LBA routine - // If at all possible we want to use LBA routines because - // They are optimized to read more than 1 sector per read - - pushad // Save logical sector number & sector count - -CheckInt13hExtensions: // Now check if this computer supports extended reads - mov ah, HEX(41) // AH = 41h - mov bx, HEX(55aa) // BX = 55AAh - mov dl, byte ptr [bp+BootDrive] // DL = drive (80h-FFh) - int HEX(13) // IBM/MS INT 13 Extensions - INSTALLATION CHECK - jc ReadSectorsCHS // CF set on error (extensions not supported) - cmp bx, HEX(0aa55) // BX = AA55h if installed - jne ReadSectorsCHS - test cl,1 // CX = API subset support bitmap - jz ReadSectorsCHS // Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported - - popad // Restore sector count & logical sector number - -ReadSectorsLBA: - pushad // Save logical sector number & sector count - - cmp cx, 64 // Since the LBA calls only support 0x7F sectors at a time we will limit ourselves to 64 - jbe ReadSectorsSetupDiskAddressPacket // If we are reading less than 65 sectors then just do the read - mov cx,64 // Otherwise read only 64 sectors on this loop iteration - -ReadSectorsSetupDiskAddressPacket: - mov [bp-LBA_SECTORS_READ],cx - mov word ptr [bp-LBA_SECTORS_READ+2],0 - data32 push 0 - push eax // Put 64-bit logical block address on stack - push es // Put transfer segment on stack - push bx // Put transfer offset on stack - push cx // Set transfer count - push 16 // Set size of packet to 10h - mov si,sp // Setup disk address packet on stack - - - mov dl, byte ptr [bp+BootDrive] // Drive number - mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read - int HEX(13) // Call BIOS - jc PrintDiskError // If the read failed then abort - - add sp, 16 // Remove disk address packet from stack - - popad // Restore sector count & logical sector number - - push bx - mov ebx, [bp-LBA_SECTORS_READ] - add eax,ebx // Increment sector to read - shl ebx,5 - mov dx,es - add dx,bx // Setup read buffer for next sector - mov es,dx - pop bx - - sub cx,[bp-LBA_SECTORS_READ] - jnz ReadSectorsLBA // Read next sector - - ret - - -// Reads logical sectors into ES:[BX] -// EAX has logical sector number to read -// CX has number of sectors to read -ReadSectorsCHS: - popad // Get logical sector number & sector count off stack - -ReadSectorsCHSLoop: - pushad - xor edx,edx - mov ecx, [bp-SECTORS_PER_TRACK] - div ecx // Divide logical by SectorsPerTrack - inc dl // Sectors numbering starts at 1 not 0 - mov cl,dl // Sector in CL - mov edx,eax - shr edx,16 - div word ptr [bp-NUMBER_OF_HEADS] // Divide logical by number of heads - mov dh,dl // Head in DH - mov dl, byte ptr [bp+BootDrive] // Drive number in DL - mov ch,al // Cylinder in CX - ror ah,2 // Low 8 bits of cylinder in CH, high 2 bits - // in CL shifted to bits 6 & 7 - or cl,ah // Or with sector number - mov ax, HEX(0201) - int HEX(13) // DISK - READ SECTORS INTO MEMORY - // AL = number of sectors to read, CH = track, CL = sector - // DH = head, DL = drive, ES:BX -> buffer to fill - // Return: CF set on error, AH = status (see AH=01h), AL = number of sectors read - - jc PrintDiskError // If the read failed then abort - - popad - - inc eax // Increment Sector to Read - - mov dx,es - add dx, HEX(20) // Increment read buffer for next sector - mov es,dx - - loop ReadSectorsCHSLoop // Read next sector - - ret - - - - -// Displays a disk error message -// And reboots -PrintDiskError: - mov si,msgDiskError // Bad boot disk message - call PutChars // Display it - -Reboot: - mov si,msgAnyKey // Press any key message - call PutChars // Display it - xor ax,ax - int HEX(16) // Wait for a keypress - int HEX(19) // Reboot - -PutChars: - lodsb - or al,al - jz short Done - call PutCharsCallBios - jmp short PutChars -PutCharsCallBios: - mov ah, HEX(0e) - mov bx, HEX(07) - int HEX(10) - ret -Done: - mov al, HEX(0d) - call PutCharsCallBios - mov al, HEX(0a) - call PutCharsCallBios - ret - - - -msgDiskError: - .ascii "Disk error", NUL -// Sorry, need the space... -//msgAnyKey db 'Press any key to restart',0 -msgAnyKey: - .ascii "Press key", NUL - -// times 509-($-$$) db 0 // Pad to 509 bytes - .org 509 - -BootPartition: - .byte 0 - - .word HEX(0aa55) // BootSector signature - - -// End of bootsector -// -// Now starts the extra boot code that we will store -// at sector 1 on a EXT2 volume - - - -LoadRootDirectory: - - mov eax,EXT2_ROOT_INO // Put the root directory inode number in EAX - call Ext2ReadInode // Read in the inode - - // Point ES:DI to the inode structure at 6000:8000 - push HEX(6000) - pop es - mov di, HEX(8000) - push di - push es // Save these for later - - // Get root directory size from inode structure - mov eax, es:[di+4] - push eax - - // Now that the inode has been read in load - // the root directory file data to 0000:8000 - call Ext2ReadEntireFile - - // Since the root directory was loaded to 0000:8000 - // then add 8000h to the root directory's size - pop eax - mov edx, HEX(8000) // Set EDX to the current offset in the root directory - add eax,edx // Initially add 8000h to the size of the root directory - -SearchRootDirectory: - push edx // Save current offset in root directory - push eax // Save the size of the root directory - - // Now we have to convert the current offset - // in the root directory to a SEGMENT:OFFSET pair - mov eax,edx - xor edx,edx - mov ecx,16 - div ecx // Now AX:DX has segment & offset - mov es,ax - mov di,dx - push di // Save the start of the directory entry - add di, 8 // Add the offset to the filename - mov si,filename - mov cl,11 - repe cmpsb // Compare the file names - pop di - pop eax - pop edx - jz FoundFile - - // Nope, didn't find it in this entry, keep looking - movzx ecx,word ptr es:[di+4] - add edx,ecx - - // Check to see if we have reached the - // end of the root directory - cmp edx,eax - jb SearchRootDirectory - jmp PrintFileNotFound - -FoundFile: - mov eax,es:[di] // Get inode number from directory entry - call Ext2ReadInode // Read in the inode - - // Point ES:DI to the inode structure at 6000:8000 - pop es - pop di // These were saved earlier - - mov cx, es:[di] // Get the file mode so we can make sure it's a regular file - and ch,EXT2_S_IFMT // Mask off everything but the file type - cmp ch,EXT2_S_IFREG // Make sure it's a regular file - je LoadFreeLoader - jmp PrintRegFileError - -LoadFreeLoader: - mov si,msgLoading // "Loading FreeLoader..." message - call PutChars // Display it - - call Ext2ReadEntireFile // Read freeldr.sys to 0000:8000 - - mov dl, byte ptr [bp+BootDrive] - mov dh, byte ptr [bp+BootPartition] - push 0 // push segment (0x0000) - mov eax, [HEX(8000) + HEX(0A8)] // load the RVA of the EntryPoint into eax - add eax, HEX(8000) // RVA -> VA - push ax // push offset - retf // Transfer control to FreeLoader - - - - - -// Reads ext2 file data into [0000:8000] -// This function assumes that the file's -// inode has been read in to 6000:8000 *and* -// ES:DI points to 6000:8000 -// This will load all the blocks up to -// and including the double-indirect pointers. -// This should be sufficient because it -// allows for ~64MB which is much bigger -// than we need for a boot loader. -Ext2ReadEntireFile: - - // Reset the load segment - mov word ptr [bp+Ext2ReadEntireFileLoadSegment], HEX(800) - - // Now we must calculate how - // many blocks to read in - // We will do this by rounding the - // file size up to the next block - // size and then dividing by the block size - mov eax, dword ptr [bp+Ext2BlockSizeInBytes] // Get the block size in bytes - push eax - dec eax // Ext2BlockSizeInBytes -= 1 - add eax, es:[di+4] // Add the file size - xor edx,edx - pop ecx // Divide by the block size in bytes - div ecx // EAX now contains the number of blocks to load - push eax - - // Make sure the file size isn't zero - cmp eax, 0 - jnz Ext2ReadEntireFile2 - jmp PrintFileSizeError - -Ext2ReadEntireFile2: - // Save the indirect & double indirect pointers - mov edx, es:[di+ HEX(58)] // Get indirect pointer - mov dword ptr [bp+Ext2InodeIndirectPointer], edx // Save indirect pointer - mov edx, es:[di+ HEX(5c)] // Get double indirect pointer - mov dword ptr [bp+Ext2InodeDoubleIndirectPointer],edx // Save double indirect pointer - - // Now copy the direct pointers to 7000:0000 - // so that we can call Ext2ReadDirectBlocks - push ds // Save DS - push es - push HEX(7000) - pop es - pop ds - mov si, HEX(8028) - xor di,di // DS:SI = 6000:8028 ES:DI = 7000:0000 - mov cx,24 // Moving 24 words of data - rep movsw - pop ds // Restore DS - - // Now we have all the block pointers in the - // right location so read them in - pop eax // Restore the total number of blocks in this file - xor ecx,ecx // Set the max count of blocks to read to 12 - mov cl,12 // which is the number of direct block pointers in the inode - call Ext2ReadDirectBlockList - - // Check to see if we actually have - // blocks left to read - cmp eax, 0 - jz Ext2ReadEntireFileDone - - // Now we have read all the direct blocks in - // the inode. So now we have to read the indirect - // block and read all it's direct blocks - push eax // Save the total block count - mov eax, dword ptr [bp+Ext2InodeIndirectPointer] // Get the indirect block pointer - push HEX(7000) - pop es - xor bx,bx // Set the load address to 7000:0000 - call Ext2ReadBlock // Read the block - - // Now we have all the block pointers from the - // indirect block in the right location so read them in - pop eax // Restore the total block count - mov ecx, dword ptr [bp+Ext2PointersPerBlock] // Get the number of block pointers that one block contains - call Ext2ReadDirectBlockList - - // Check to see if we actually have - // blocks left to read - cmp eax, 0 - jz Ext2ReadEntireFileDone - - // Now we have read all the direct blocks from - // the inode's indirect block pointer. So now - // we have to read the double indirect block - // and read all it's indirect blocks - // (whew, it's a good thing I don't support triple indirect blocks) - mov dword ptr [bp+Ext2BlocksLeftToRead],eax // Save the total block count - mov eax, dword ptr [bp+Ext2InodeDoubleIndirectPointer] // Get the double indirect block pointer - push HEX(7800) - pop es - push es // Save an extra copy of this value on the stack - xor bx,bx // Set the load address to 7000:8000 - call Ext2ReadBlock // Read the block - - pop es // Put 7800h into ES (saved on the stack already) - xor di,di - -Ext2ReadIndirectBlock: - mov eax, es:[di] // Get indirect block pointer - add di, 4 // Update DI for next array index - push es - push di - - push HEX(7000) - pop es - xor bx,bx // Set the load address to 7000:0000 - call Ext2ReadBlock // Read the indirect block - - // Now we have all the block pointers from the - // indirect block in the right location so read them in - mov eax, dword ptr [bp+Ext2BlocksLeftToRead] // Restore the total block count - mov ecx, dword ptr [bp+Ext2PointersPerBlock] // Get the number of block pointers that one block contains - call Ext2ReadDirectBlockList - mov dword ptr [bp+Ext2BlocksLeftToRead],eax // Save the total block count - pop di - pop es - - // Check to see if we actually have - // blocks left to read - cmp eax, 0 - jnz Ext2ReadIndirectBlock - -Ext2ReadEntireFileDone: - ret - -// Reads a maximum number of blocks -// from an array at 7000:0000 -// and updates the total count -// ECX contains the max number of blocks to read -// EAX contains the number of blocks left to read -// On return: -// EAX contains the new number of blocks left to read -Ext2ReadDirectBlockList: - cmp eax,ecx // Compare it to the maximum number of blocks to read - ja CallExt2ReadDirectBlocks // If it will take more blocks then just read all of the blocks - mov cx,ax // Otherwise adjust the block count accordingly - -CallExt2ReadDirectBlocks: - sub eax,ecx // Subtract the number of blocks being read from the total count - push eax // Save the new total count - call Ext2ReadDirectBlocks - pop eax // Restore the total count - ret - - -// Reads a specified number of blocks -// from an array at 7000:0000 -// CX contains the number of blocks to read -Ext2ReadDirectBlocks: - - push HEX(7000) - pop es - xor di,di // Set ES:DI = 7000:0000 - -Ext2ReadDirectBlocksLoop: - mov eax,es:[di] // Get direct block pointer from array - add di, 4 // Update DI for next array index - - push cx // Save number of direct blocks left - push es // Save array segment - push di // Save array offset - mov es,[bp+Ext2ReadEntireFileLoadSegment] - xor bx,bx // Setup load address for next read - - call Ext2ReadBlock // Read the block (this updates ES for the next read) - - mov [bp+Ext2ReadEntireFileLoadSegment],es // Save updated ES - - pop di // Restore the array offset - pop es // Restore the array segment - pop cx // Restore the number of blocks left - - loop Ext2ReadDirectBlocksLoop - - // At this point all the direct blocks should - // be loaded and ES (Ext2ReadEntireFileLoadSegment) - // should be ready for the next read. - ret - - - -// Displays a file not found error message -// And reboots -PrintFileNotFound: - mov si,msgFreeLdr // FreeLdr not found message - jmp short DisplayItAndReboot - -// Displays a file size is 0 error -// And reboots -PrintFileSizeError: - mov si,msgFileSize // Error message - jmp short DisplayItAndReboot - -// Displays a file is not a regular file error -// And reboots -PrintRegFileError: - mov si,msgRegFile // Error message -DisplayItAndReboot: - call PutChars // Display it - jmp Reboot - -msgFreeLdr: - .ascii "freeldr.sys not found", NUL -msgFileSize: - .ascii "File size 0", NUL -msgRegFile: - .ascii "freeldr.sys isnt a regular file", NUL -filename: - .ascii "freeldr.sys" -msgLoading: - .ascii "Loading...", NUL - -// times 1022-($-$$) db 0 // Pad to 1022 bytes -.org 1022 - - .word HEX(0aa55) // BootSector signature - -.endcode16 - -END diff --git a/boot/freeldr/bootsect/extldr.S b/boot/freeldr/bootsect/extldr.S new file mode 100644 index 00000000000..08074831392 --- /dev/null +++ b/boot/freeldr/bootsect/extldr.S @@ -0,0 +1,583 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: EXTFS second stage loader + * COPYRIGHT: Copyright 2024-2025 Daniel Victor <ilauncherdeveloper(a)gmail.com> + */ + +#define INCLUDED_ASM +#include "ext.S" + +ExtLdrEntryPoint: + // Clear segment registers + xor eax, eax + mov ds, ax + mov es, ax + + // Read root directory Inode + mov al, EXT_ROOT_INODE + call ExtReadInode + + // Set file base address and search for freeldr + mov dword ptr BP_REL(ExtFileAddress), FREELDR_BASE + call ExtSetFileSegment + + // Swap ES with DS segment and clear SI + call SwapESWithDS + xor si, si + + // Set the directory entries size limit + mov eax, EXT_INODE_DATA_SIZE_LIMIT + + // Get directory entries size + mov edx, dword ptr BP_REL(ExtFileSize) + + // Set the buffer size with limit + cmp edx, eax + jbe .FLoop2 + mov edx, eax +.FLoop2: + // Load directory Inode + mov eax, dword ptr ds:[si] + + // If the buffer reached the end then abort the search + cmp si, dx + jae FreeLdrPrintFileNotFound + + // Save SI + push si + + // If the Inode is zero then skip this entry + test eax, eax + jz .FSkip2 + + mov di, offset FreeLdrFileName // Load target filename address + mov cx, offset FreeLdrFileNameEnd - FreeLdrFileName // Length of filename to compare + cmp byte ptr ds:[si + EXT_DIRECTORY_ENTRY_NAME_LENGTH_OFFSET], cl // Compare if both names have the same length + jnz .FSkip2 // Skip this entry if yes + add si, EXT_DIRECTORY_ENTRY_NAME_OFFSET // Move to filename in entry + repe cmpsb // Compare filenames + pop si // Restore SI + jz LoadFreeLdr // Found matching file + push si // Save SI + +.FSkip2: + // Restore SI + pop si + + // Move to next directory entry + add si, word ptr ds:[si + EXT_DIRECTORY_ENTRY_SIZE_OFFSET] + + jmp .FLoop2 + +ExtFileIndirectPointer: + .long 0 +ExtFileIndirectPointerDouble: + .long 0 + +SwapESWithDS: + // Swap ES and DS + push es + push ds + pop es + pop ds + ret + +ExtSetFileSegment: + mov ebx, dword ptr BP_REL(ExtFileAddress) // Get the EXT file address + shr ebx, 4 // Shift four bits to the right to get segment + jmp .ExtSkip +ExtSetInodeSegment: + mov bx, EXT_INODE_ADDRESS / 16 // Get the EXT inode address + jmp .ExtSkip +ExtSetBlockSegment: + mov bx, EXT_BLOCK_ADDRESS / 16 // Get the EXT block address + jmp .ExtSkip +ExtSetBlock2Segment: + mov bx, EXT_BLOCK2_ADDRESS / 16 // Get the EXT second block address + jmp .ExtSkip +ExtSetBlock3Segment: + mov bx, EXT_BLOCK3_ADDRESS / 16 // Get the EXT third block address + jmp .ExtSkip +ExtSetBlock4Segment: + mov bx, EXT_BLOCK4_ADDRESS / 16 // Get the EXT fourth block address + jmp .ExtSkip +ExtSetBlock5Segment: + mov bx, EXT_BLOCK5_ADDRESS / 16 // Get the EXT fifth block address + jmp .ExtSkip +ExtSetBlock6Segment: + mov bx, EXT_BLOCK6_ADDRESS / 16 // Get the EXT sixth block address + jmp .ExtSkip +ExtSetBlock7Segment: + mov bx, EXT_BLOCK7_ADDRESS / 16 // Get the EXT seventh block address +.ExtSkip: + mov es, bx // Set ES + xor bx, bx // Clear BX + ret + +ExtUpdateFileSize: + mov eax, dword ptr BP_REL(ExtBlockSizeInBytes) + +ExtAdjustFileSize: + // Update the file size + sub dword ptr BP_REL(ExtFileSizeState), eax + add dword ptr BP_REL(ExtFileAddress), eax + ret + +ExtInodeDetectExtentsFlag: + push eax + mov eax, es:[si + EXT_INODE_FLAGS_OFFSET] + test eax, EXT_INODE_FLAG_EXTENTS + pop eax + ret + +ExtFileReadBlocks: + // If the block count is zero then do nothing + test bx, bx + jz .FRDone + + // Read the block + call ExtFileReadBlock + + // Go to the next block and decrement the block count + inc eax + dec bx + + // Loop until all blocks are read + jmp ExtFileReadBlocks +.FRDone: + ret + +ExtSafeReadBlock: + pushad + + // If the block is zero then just clear the block + test eax, eax + jz .NullBlk + + // Read the block safely + call ExtReadBlock + jmp .RBDone +.NullBlk: + // If the block is 0 then just clear the block + mov di, bx + xor ax, ax + mov cx, word ptr BP_REL(ExtBlockSizeInBytes) + rep stosb +.RBDone: + popad + ret + +// Reads a block from the EXT file +// EAX has the block to read +// ExtFileAddress has the address to write to +ExtFileReadBlock: + push es + pushad + + // Set the EXT file segment + call ExtSetFileSegment + + // Read the block safely + call ExtSafeReadBlock + + // Update the file size + call ExtUpdateFileSize + + // Exit + popad + pop es + ret + +ExtReadEntireFileDone: + push eax // Save EAX register + mov eax, dword ptr BP_REL(ExtBlockSizeInBytes) // Load block size in bytes into EAX + cmp dword ptr BP_REL(ExtFileSizeState), eax // Compare file size state with block size + pop eax // Restore EAX register + ret // Return from procedure + +// Loops over the block pointers and reads the blocks +// until the file size state is zero +ExtReadEntireFileLoop: + call ExtReadEntireFileDone + jb .RDone + + mov eax, dword ptr es:[si] + + // Read the block safely + call ExtFileReadBlock + + add si, EXT_POINTER_SIZE + loop ExtReadEntireFileLoop +.RDone: + ret + +// Reads the double indirect block data +// This function is used to read the blocks that are not contiguous +// to the blocks that are pointed by the indirect block +ExtReadEntireFileIndirectDouble: + push es + pushad + + // Check if there is no more blocks to read + call ExtReadEntireFileDone + jb .RDone4 + + // Reset block offset + xor si, si + + // Load the double indirect block address + mov eax, dword ptr BP_REL(ExtFileIndirectPointerDouble) + call ExtSetBlock2Segment + call ExtSafeReadBlock + + // Load the number of pointers per block + mov ecx, dword ptr BP_REL(ExtPointersPerBlock) +.RLoop4: + // Check if there is no more blocks to read + call ExtReadEntireFileDone + jb .RDone4 + + // Get the block address + mov eax, dword ptr es:[si] + + // Read the indirect block + call ExtReadEntireFileIndirect + + // Increment block offset + add si, EXT_POINTER_SIZE + + // Loop until all blocks are read + loop .RLoop4 +.RDone4: + popad + pop es + ret + +// Reads the indirect block data +ExtReadEntireFileIndirect: + push es + pushad + + // Check if there is no more blocks to read + call ExtReadEntireFileDone + jb .RDone3 + + // Reset block offset + xor si, si + + // Set the block segment + call ExtSetBlockSegment + + // Read the block safely + call ExtSafeReadBlock + + // Read the blocks + mov ecx, dword ptr BP_REL(ExtPointersPerBlock) + call ExtReadEntireFileLoop + +.RDone3: + popad + pop es + ret + +// Reads the direct block data +ExtReadEntireFileDirect: + push es + pushad + + // If there is no more blocks to read then abort it + call ExtReadEntireFileDone + jb .RDone2 + + // Move to block pointer in Inode + add si, EXT_INODE_BLOCK_POINTER_OFFSET + xor ecx, ecx + mov cl, EXT_INODE_BLOCKS + + // Set the correct segment + call ExtSetInodeSegment + + // Read the blocks + call ExtReadEntireFileLoop + +.RDone2: + popad + pop es + ret + +ExtExtentsLevelSegmentFunctionTable: + .word ExtSetBlockSegment + .word ExtSetBlock2Segment + .word ExtSetBlock3Segment + .word ExtSetBlock4Segment + .word ExtSetBlock5Segment + .word ExtSetBlock6Segment + +ExtExtentsLevelFunctionTable: + .word ExtReadEntireFileExtentsLevel0 + .word ExtReadEntireFileExtentsLevelX + .word ExtReadEntireFileExtentsLevelX + .word ExtReadEntireFileExtentsLevelX + .word ExtReadEntireFileExtentsLevelX + .word ExtReadEntireFileExtentsLevelX + +ExtReadEntireFileExtentsLevelX: + push es + pushad + + // Load extent header entries + mov cx, word ptr es:[si + EXT_EXTENT_HEADER_ENTRIES_OFFSET] +.ExtentsLoopX: + // Check if there is no more blocks to read + call ExtReadEntireFileDone + jb .ExtentsDoneX + + // Go to next extent + add si, EXT_EXTENT_SIZE + + // Save current state + push es + pushad + + // Read the extent block + mov eax, dword ptr es:[si + EXT_EXTENT_INDEX_LEAF_OFFSET] + + // Set block segment and read block safely + call ExtSetBlock7Segment + call ExtSafeReadBlock + + // Reset SI for calculations + xor si, si + + // Calculate function table offset + mov bp, word ptr es:[si + EXT_EXTENT_HEADER_DEPTH_OFFSET] + shl bp, 1 + + // Call the segment and level functions + call word ptr cs:ExtExtentsLevelSegmentFunctionTable[bp] + call ExtSafeReadBlock + call word ptr cs:ExtExtentsLevelFunctionTable[bp] + + // Restore state and continue loop + popad + pop es + + loop .ExtentsLoopX +.ExtentsDoneX: + popad + pop es + ret + +ExtReadEntireFileExtentsLevel0: + push es + pushad + + // Load extent header entries + mov cx, word ptr es:[si + EXT_EXTENT_HEADER_ENTRIES_OFFSET] + +.ExtentsLoop0: + // Check if there is no more blocks to read + call ExtReadEntireFileDone + jb .ExtentsDone0 + + // Go to next extent + add si, EXT_EXTENT_SIZE + + // Load extent length + mov bx, word ptr es:[si + EXT_EXTENT_LENGTH_OFFSET] + and ebx, HEX(FFFF) + + // Check if extent is sparse + cmp bx, EXT_EXTENT_MAX_LENGTH + jbe .NotSparse + + // Adjust sparse extent length + sub bx, EXT_EXTENT_MAX_LENGTH + + push es +.SparseLoop: + // Check if the sparse blocks reached the end + test bx, bx + jz .SparseDone + + xor eax, eax + call ExtFileReadBlock + + // Decrement the block count + dec bx + jmp .SparseLoop +.SparseDone: + pop es + jmp .ExtentsSkip0 + +.NotSparse: + // Read blocks from extent start + mov eax, dword ptr es:[si + EXT_EXTENT_START_OFFSET] + call ExtFileReadBlocks + +.ExtentsSkip0: + loop .ExtentsLoop0 +.ExtentsDone0: + popad + pop es + ret + +ExtReadEntireFileExtents: + push es + pushad + + // Add the extent header offset + add si, EXT_INODE_BLOCK_POINTER_OFFSET + + // Load extent header depth + mov ax, word ptr es:[si + EXT_EXTENT_HEADER_DEPTH_OFFSET] + + // Check if the file has more than the maximum allowed levels + cmp ax, EXT_EXTENT_MAX_LEVEL + ja FreeLdrPrintFileBig + + // If the extent header depth is zero then this is a level 0 extent + test ax, ax + jz .Level0 + + // Call the recursive function +.LevelX: + call ExtReadEntireFileExtentsLevelX + + // Jump to the end of the function + jmp .FEDone + + // Level 0 extent +.Level0: + // Call the level 0 extent function + call ExtReadEntireFileExtentsLevel0 + + // End of the function +.FEDone: + popad + pop es + ret + +// Reads the entire file in EXTFS +ExtReadEntireFile: + // Set the correct Inode offset + mov si, word ptr BP_REL(ExtReadInodeIndexOffset) + + // Set file size + mov ecx, dword ptr es:[si + EXT_INODE_SIZE_OFFSET] + mov dword ptr BP_REL(ExtFileSize), ecx + + // If file size is zero then abort it + test ecx, ecx + jz FreeLdrPrintFileZero + + // Set rounded up file size + add ecx, dword ptr BP_REL(ExtBlockSizeInBytes) + dec ecx + mov dword ptr BP_REL(ExtFileSizeState), ecx + + // Use extents method if necessary + call ExtInodeDetectExtentsFlag + jz .NoExtents + + // Call the extents method + call ExtReadEntireFileExtents + ret + +.NoExtents: + // Set Indirect pointer + mov eax, dword ptr es:[si + (EXT_INODE_BLOCK_POINTER_OFFSET + (EXT_INODE_BLOCKS * EXT_POINTER_SIZE))] + mov dword ptr BP_REL(ExtFileIndirectPointer), eax + + // Set Double indirect pointer + mov eax, dword ptr es:[si + (EXT_INODE_BLOCK_POINTER_OFFSET + (EXT_INODE_BLOCKS * EXT_POINTER_SIZE) + EXT_POINTER_SIZE)] + mov dword ptr BP_REL(ExtFileIndirectPointerDouble), eax + + call ExtReadEntireFileDirect // Read the direct blocks + + mov eax, dword ptr BP_REL(ExtFileIndirectPointer) // Load the simple indirect pointer + call ExtReadEntireFileIndirect // Read the simple indirect blocks + + call ExtReadEntireFileIndirectDouble // Read the double indirect blocks + ret + +LoadFreeLdr: + // Swap ES and DS + call SwapESWithDS + + // Show output loading status + push si + mov si, offset msgLoadingFreeLdr + call PutChars + pop si + + // Load Inode at directory entry + mov eax, dword ptr es:[si] + call ExtReadInode + mov si, word ptr BP_REL(ExtReadInodeIndexOffset) + + // Get Inode type + mov ax, word ptr es:[si] + and ax, EXT_INODE_TYPE_MASK + + // If it's not a regular file then abort it + cmp ax, EXT_INODE_TYPE_REGULAR + jnz FreeLdrPrintRegFileError + + // Load Freeldr at FREELDR_BASE + mov dword ptr BP_REL(ExtFileAddress), FREELDR_BASE + call ExtReadEntireFile + + // Restore the boot drive and partition + mov dl, byte ptr BP_REL(BootDrive) + mov dh, byte ptr BP_REL(BootPartition) + + // Transfer execution to the bootloader + ljmp16 FREELDR_BASE / 16, 0 + +FreeLdrPrintFileBig: + // Make DS correct, display it and reboot + call SwapESWithDS + mov si, offset msgFreeLdrBig + jmp DisplayItAndReboot + +FreeLdrPrintFileZero: + // Make DS correct, display it and reboot + call SwapESWithDS + mov si, offset msgFreeLdrZero + jmp DisplayItAndReboot + +FreeLdrPrintFileNotFound: + // Make DS correct, display it and reboot + call SwapESWithDS + mov si, offset msgFreeLdr + jmp DisplayItAndReboot + +FreeLdrPrintRegFileError: + // Make DS correct, display it and reboot + call SwapESWithDS + mov si, offset msgFreeLdrNotRegularFile // FreeLdr not found message + jmp DisplayItAndReboot + +FreeLdrFileName: + .ascii "freeldr.sys" +FreeLdrFileNameEnd: + +msgFreeLdrZero: + .ascii "freeldr.sys size is zero", CR, LF, NUL +msgFreeLdrBig: + .ascii "freeldr.sys has many extent levels", CR, LF, NUL +msgFreeLdr: + .ascii "freeldr.sys not found", CR, LF, NUL +msgFreeLdrNotRegularFile: + .ascii "freeldr.sys is not a regular file", CR, LF, NUL +msgLoadingFreeLdr: + .ascii "Loading FreeLoader...", CR, LF, NUL + +.org (EXTLDR_BOOTSECTOR_SIZE - 2) +.word HEX(AA55) // BootSector signature + +.endcode16 + +END

1 0

[reactos] 01/01: [CONFIGURE] Display the operating system on which the build config takes place (#7774)
by Hermès Bélusca-Maïto 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c61e5769f2d603935a7a… commit 7c61e5769f2d603935a7a3b1141ae181155450b7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 8 21:24:50 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 18 21:39:19 2025 +0100 [CONFIGURE] Display the operating system on which the build config takes place (#7774) --- configure.cmd | 9 ++++++--- configure.sh | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.cmd b/configure.cmd index c0c318e8756..2049d3dccb1 100755 --- a/configure.cmd +++ b/configure.cmd @@ -70,7 +70,7 @@ if defined ROS_ARCH ( REM Checkpoint if not defined ARCH ( - echo Unknown build architecture + echo Unknown build architecture. goto quit ) @@ -157,6 +157,10 @@ if "!CMAKE_GENERATOR!" == "Ninja" ( echo This script defaults to Ninja. Type "configure help" for alternative options. ) +REM Display information +echo Configuring a new ReactOS build on: +(for /f "delims=" %%x in ('ver') do @echo %%x) & echo. + REM Create directories set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% @@ -188,10 +192,9 @@ if "%VS_SOLUTION%" == "1" ( goto quit ) -echo Preparing reactos... if EXIST CMakeCache.txt ( - del CMakeCache.txt /q + del /q CMakeCache.txt ) if "%BUILD_ENVIRONMENT%" == "MinGW" ( diff --git a/configure.sh b/configure.sh index 7a693949d35..10928fce7de 100755 --- a/configure.sh +++ b/configure.sh @@ -40,13 +40,15 @@ while [ $# -gt 0 ]; do shift done +echo "Configuring a new ReactOS build on:" +echo $(uname -srvpio); echo + if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then echo "Creating directories in $REACTOS_OUTPUT_PATH" mkdir -p "$REACTOS_OUTPUT_PATH" cd "$REACTOS_OUTPUT_PATH" fi -echo "Preparing reactos..." rm -f CMakeCache.txt host-tools/CMakeCache.txt cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"

1 0

[reactos] 01/01: [CONFIGURE] Adjust some echo'ed strings (#7773)
by Hermès Bélusca-Maïto 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9da45923b33fba22a509c… commit 9da45923b33fba22a509c45df7f78f870bd98fb6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 8 21:18:37 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 18 21:20:32 2025 +0100 [CONFIGURE] Adjust some echo'ed strings (#7773) [CONFIGURE.CMD] Use multi-command syntax instead of AND operator for successive echo's And adjust few strings. [CONFIGURE.SH] Quote the echo'ed strings, and adjust some of them. --- configure.cmd | 24 +++++++++++------------- configure.sh | 12 ++++++------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/configure.cmd b/configure.cmd index d94501ab4bc..c0c318e8756 100755 --- a/configure.cmd +++ b/configure.cmd @@ -24,7 +24,7 @@ set REACTOS_SOURCE_DIR=%~dp0 REM Ensure there's no spaces in the source path echo %REACTOS_SOURCE_DIR%| find " " > NUL if %ERRORLEVEL% == 0 ( - echo. && echo Your source path contains at least one space. + echo. & echo Your source path contains at least one space. echo This will cause problems with building. echo Please rename your folders so there are no spaces in the source path, echo or move your source to a different folder. @@ -97,14 +97,14 @@ set REMAINING=%* ) else if /I "!PARAM!" == "Ninja" ( set CMAKE_GENERATOR="Ninja" ) else if /I "!PARAM!" == "VSSolution" ( - echo. && echo Error: Creation of VS Solution files is not supported in a MinGW environment. + echo. & echo Error: Creation of VS Solution files is not supported in a MinGW environment. echo Please run this command in a [Developer] Command Prompt for Visual Studio. goto quit ) else if /I "!PARAM:~0,2!" == "-D" ( REM User is passing a switch to CMake set "CMAKE_PARAMS=%CMAKE_PARAMS% !PARAM!" ) else ( - echo. && echo Warning: Unrecognized switch "!PARAM!" && echo. + echo. & echo Warning: Unrecognized switch "!PARAM!" & echo. ) ) else ( if /I "!PARAM!" == "CodeBlocks" ( @@ -145,7 +145,7 @@ set REMAINING=%* REM User is passing a switch to CMake set "CMAKE_PARAMS=%CMAKE_PARAMS% !PARAM!" ) else ( - echo. && echo Warning: Unrecognized switch "!PARAM!" && echo. + echo. & echo Warning: Unrecognized switch "!PARAM!" & echo. ) ) @@ -175,17 +175,16 @@ if "%REACTOS_SOURCE_DIR%" == "%CD%\" ( ) if "%VS_SOLUTION%" == "1" ( - if exist build.ninja ( - echo. && echo Error: This directory has already been configured for ninja. + echo. & echo Error: This directory has already been configured for ninja. echo An output folder configured for ninja can't be reconfigured for VSSolution. echo Use an empty folder or delete the contents of this folder, then try again. goto quit ) ) else if exist REACTOS.sln ( - echo. && echo Error: This directory has already been configured for Visual Studio. + echo. & echo Error: This directory has already been configured for Visual Studio. echo An output folder configured for VSSolution can't be reconfigured for ninja. - echo Use an empty folder or delete the contents of this folder, then try again. && echo. + echo Use an empty folder or delete the contents of this folder, then try again. & echo. goto quit ) @@ -195,7 +194,6 @@ if EXIST CMakeCache.txt ( del CMakeCache.txt /q ) - if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %CMAKE_PARAMS% "%REACTOS_SOURCE_DIR%" ) else if %USE_CLANG_CL% == 1 ( @@ -213,17 +211,17 @@ if "%CD_SAME_AS_SOURCE%" == "1" ( ) if "%VS_SOLUTION%" == "1" ( - set ENDV= You can now use msbuild or open REACTOS.sln%ENDV%. + set ENDV= You can now use msbuild or open REACTOS.sln%ENDV% ) else ( - set ENDV= Execute appropriate build commands ^(ex: ninja, make, nmake, etc...^)%ENDV% + set ENDV= Execute appropriate build commands ^(e.g. ninja, make, nmake, etc.^)%ENDV% ) -echo. && echo Configure script complete^^!%ENDV% +echo. & echo Configure script complete^^!%ENDV% goto quit :cmake_notfound -echo Unable to find cmake, if it is installed, check your PATH variable. +echo Unable to find cmake. If it is installed, check your PATH variable. :quit endlocal diff --git a/configure.sh b/configure.sh index f9c4679ad13..7a693949d35 100755 --- a/configure.sh +++ b/configure.sh @@ -1,7 +1,7 @@ #!/bin/sh if [ "x$ROS_ARCH" = "x" ]; then - echo Could not detect RosBE. + echo "Could not detect RosBE." exit 1 fi @@ -11,7 +11,7 @@ REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH usage() { - echo Invalid parameter given. + echo "Invalid parameter given." exit 1 } @@ -41,18 +41,18 @@ while [ $# -gt 0 ]; do done if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then - echo Creating directories in $REACTOS_OUTPUT_PATH + echo "Creating directories in $REACTOS_OUTPUT_PATH" mkdir -p "$REACTOS_OUTPUT_PATH" cd "$REACTOS_OUTPUT_PATH" fi -echo Preparing reactos... +echo "Preparing reactos..." rm -f CMakeCache.txt host-tools/CMakeCache.txt cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" if [ $? -ne 0 ]; then - echo "An error occured while configuring ReactOS" + echo "An error occurred while configuring ReactOS" exit 1 fi -echo Configure script complete! Enter directories and execute appropriate build commands $ex: ninja, make, makex, etc...$. +echo "Configure script complete! Execute appropriate build commands (e.g. ninja, make, makex, etc.) from $REACTOS_OUTPUT_PATH"

1 0

[reactos] 01/01: [GIT] Ensure .sh script files use LF (Unix) line endings (#7772)
by Hermès Bélusca-Maïto 18 Mar '25

18 Mar '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57fa5a22defb8711f8efd… commit 57fa5a22defb8711f8efd2441bffdd6ac8015db3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 8 21:01:50 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 18 20:17:40 2025 +0100 [GIT] Ensure .sh script files use LF (Unix) line endings (#7772) For example, this is what's expected by Cygwin (ba)sh on Windows. --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index ee079a75c8d..c2c723297f4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -30,6 +30,9 @@ *.TXT text *.y text +# Files with these extensions must always have LF (Unix) line endings. +*.sh text eol=lf + # Files with these extensions end up in the built ReactOS system, so they # need to have CRLF line endings. *.bat text eol=crlf

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2025