diff --git a/source/lib/sysdep/os/win/wfirmware.cpp b/source/lib/sysdep/os/win/wfirmware.cpp deleted file mode 100644 index 05bac7fc7d..0000000000 --- a/source/lib/sysdep/os/win/wfirmware.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright (C) 2026 Wildfire Games. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "precompiled.h" -#include "lib/sysdep/os/win/wfirmware.h" - -#include "lib/sysdep/os/win/wutil.h" - -namespace wfirmware { - -TableIds GetTableIDs(Provider provider) -{ - const size_t tableIdsSize = EnumSystemFirmwareTables(provider, 0, 0); - ENSURE(tableIdsSize != 0); - ENSURE(tableIdsSize % sizeof(TableId) == 0); - TableIds tableIDs(DivideRoundUp(tableIdsSize, sizeof(TableId)), 0); - - const size_t bytesWritten = EnumSystemFirmwareTables(provider, &tableIDs[0], (DWORD)tableIdsSize); - ENSURE(bytesWritten == tableIdsSize); - - return tableIDs; -} - - -Table GetTable(Provider provider, TableId tableId) -{ - const size_t tableSize = GetSystemFirmwareTable(provider, tableId, 0, 0); - if(tableSize == 0) - { - DEBUG_WARN_ERR(ERR::LOGIC); - return Table(); - } - - Table table(tableSize, 0); - const size_t bytesWritten = GetSystemFirmwareTable(provider, tableId, &table[0], (DWORD)tableSize); - ENSURE(bytesWritten == tableSize); - - return table; -} - -} // namespace wfirmware diff --git a/source/lib/sysdep/os/win/wfirmware.h b/source/lib/sysdep/os/win/wfirmware.h deleted file mode 100644 index b323d5daf4..0000000000 --- a/source/lib/sysdep/os/win/wfirmware.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (C) 2020 Wildfire Games. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef INCLUDED_WFIRMWARE -#define INCLUDED_WFIRMWARE - -#include - -namespace wfirmware { - -typedef std::uint32_t Provider; - -typedef std::uint32_t TableId; -typedef std::vector TableIds; - -extern TableIds GetTableIDs(Provider provider); - -typedef std::vector Table; - -extern Table GetTable(Provider provider, TableId tableId); - -} // namespace wfirmware - -#endif // #ifndef INCLUDED_WFIRMWARE diff --git a/source/tools/lint/cppcheck/suppressions-list.txt b/source/tools/lint/cppcheck/suppressions-list.txt index a5787da60a..9788faac30 100644 --- a/source/tools/lint/cppcheck/suppressions-list.txt +++ b/source/tools/lint/cppcheck/suppressions-list.txt @@ -60,7 +60,6 @@ syntaxError:source/tools/atlas/GameInterface/MessagesSetup.h unknownMacro:source/lib/external_libraries/dbghelp_funcs.h unknownMacro:source/lib/sysdep/os/win/wdbg_sym.cpp -unknownMacro:source/lib/sysdep/os/win/wfirmware.cpp unknownMacro:source/lib/sysdep/os/win/wposix/wutsname.cpp unknownMacro:source/ps/CStr.cpp unknownMacro:source/simulation2/components/tests/test_HierPathfinder.h