Merge 37ec854ff1 into 88fe9771f0

resources: update MAME files

.github/workflows/win32.yml

@@ -98,7 +98,6 @@ jobs:
           -DSDL2_LIBRARY=%SDL2_LIBRARY%
           -DVLC_LIBRARIES=%VLC_LIBRARIES%
           -DVLC_VERSION=%VLC_VERSION%
-          -DCMAKE_EXE_LINKER_FLAGS=/SAFESEH:NO
 
       # Use CMake to build project
       - name: Build EmulationStation

README.md

@@ -158,8 +158,7 @@ C:\src\EmulationStation>cmake . -B build -A Win32 ^
 -DCURL_LIBRARY=%CURL_LIBRARY% ^
 -DSDL2_LIBRARY=%SDL2_LIBRARY% ^
 -DVLC_LIBRARIES=%VLC_LIBRARIES% ^
--DVLC_VERSION=%VLC_VERSION% ^
--DCMAKE_EXE_LINKER_FLAGS=/SAFESEH:NO
+-DVLC_VERSION=%VLC_VERSION%
 ```
 
 * Use CMake to build the Visual Studio project.

es-app/src/FileData.cpp

@@ -280,10 +280,10 @@ void FileData::launchGame(Window* window)
 {
 	LOG(LogInfo) << "Attempting to launch game...";
 
-#ifndef _WIN32
 	AudioManager::getInstance()->deinit();
 	VolumeControl::getInstance()->deinit();
 	InputManager::getInstance()->deinit();
+#ifndef _WIN32
 	window->deinit();
 #endif
 
@@ -312,9 +312,9 @@ void FileData::launchGame(Window* window)
 
 #ifndef _WIN32
 	window->init();
+#endif
 	InputManager::getInstance()->init();
 	VolumeControl::getInstance()->init();
-#endif
 	window->normalizeNextUpdate();
 
 	//update number of times the game has been launched

es-app/src/PlatformId.cpp

@@ -92,6 +92,7 @@ namespace PlatformIds
 		"ti99",
 		"dragon32",
 		"zmachine",
+		"fmtowns",
 
 		"ignore", // do not allow scraping for this system
 		"invalid"

es-app/src/PlatformId.h

@@ -93,6 +93,7 @@ namespace PlatformIds
 		TI_99,
 		DRAGON32,
 		ZMACHINE,
+		FMTOWNS,
 
 		PLATFORM_IGNORE, // do not allow scraping for this system
 		PLATFORM_COUNT

es-app/src/main.cpp

@@ -52,7 +52,18 @@ bool parseArgs(int argc, char* argv[])
 
 	for(int i = 1; i < argc; i++)
 	{
-		if(strcmp(argv[i], "--resolution") == 0)
+		if(strcmp(argv[i], "--monitor") == 0)
+		{
+			if (i >= argc - 1)
+			{
+				std::cerr << "Invalid monitor supplied.";
+				return false;
+			}
+
+			int monitor = atoi(argv[i + 1]);
+			i++; // skip the argument value
+			Settings::getInstance()->setInt("MonitorID", monitor);
+		}else if(strcmp(argv[i], "--resolution") == 0)
 		{
 			if(i >= argc - 2)
 			{
@@ -180,7 +191,9 @@ bool parseArgs(int argc, char* argv[])
 				"--screensize WIDTH HEIGHT      for a canvas smaller than the full resolution,\n"
 				"                               or if rotating into portrait mode\n"
 				"--screenoffset X Y             move the canvas by x,y pixels\n"
+				"--fullscreen-borderless        borderless fullscreen window\n"
 				"--windowed                     not fullscreen, should be used with --resolution\n"
+				"--monitor N                    monitor index (0-)\n"
 				"\nGame and settings visibility in ES and behaviour of ES:\n"
 				"--force-disable-filters        force the UI to ignore applied filters on\n"
 				"                               gamelist (p)\n"

es-app/src/scrapers/GamesDBJSONScraper.cpp

@@ -109,6 +109,7 @@ const std::map<PlatformId, std::string> gamesdb_new_platformid_map{
 	{ TRS80_COLOR_COMPUTER, "4941" },
 	{ TI_99, "4953" },
 	{ TANDY, "4941" },
+	{ FMTOWNS, "4932" },
 };
 
 void thegamesdb_generate_json_scraper_requests(const ScraperSearchParams& params,

es-app/src/scrapers/ScreenScraper.cpp

@@ -100,7 +100,8 @@ const std::map<PlatformId, unsigned short> screenscraper_platformid_map{
 	{ TANDY, 144 },
 	{ TI_99, 205 },
 	{ DRAGON32, 91 },
-	{ ZMACHINE, 21 }
+	{ ZMACHINE, 21 },
+	{ FMTOWNS, 253 }
 };
 
 

es-core/src/Settings.cpp

@@ -13,27 +13,28 @@ Settings* Settings::sInstance = NULL;
 // these values are NOT saved to es_settings.xml
 // since they're set through command-line arguments, and not the in-program settings menu
 std::vector<const char*> settings_dont_save {
-	 "Debug" ,
-	 "DebugGrid" ,
-	 "DebugText" ,
-	 "DebugImage" ,
-	 "ForceKid" ,
-	 "ForceKiosk" ,
-	 "IgnoreGamelist" ,
-	 "HideConsole" ,
-	 "ShowExit" ,
-	 "ConfirmQuit" ,
-	 "SplashScreen" ,
-	 "VSync" ,
-	 "FullscreenBorderless" ,
-	 "Windowed" ,
-	 "WindowWidth" ,
-	 "WindowHeight" ,
-	 "ScreenWidth" ,
-	 "ScreenHeight" ,
-	 "ScreenOffsetX" ,
-	 "ScreenOffsetY" ,
-	 "ScreenRotate"
+	"Debug",
+	"DebugGrid",
+	"DebugText",
+	"DebugImage",
+	"ForceKid",
+	"ForceKiosk",
+	"IgnoreGamelist",
+	"HideConsole",
+	"ShowExit",
+	"ConfirmQuit",
+	"SplashScreen",
+	"VSync",
+	"FullscreenBorderless",
+	"Windowed",
+	"WindowWidth",
+	"WindowHeight",
+	"ScreenWidth",
+	"ScreenHeight",
+	"ScreenOffsetX",
+	"ScreenOffsetY",
+	"ScreenRotate",
+	"MonitorID"
 };
 
 Settings::Settings()
@@ -178,6 +179,7 @@ void Settings::setDefaults()
 	mIntMap["ScreenOffsetX"] = 0;
 	mIntMap["ScreenOffsetY"] = 0;
 	mIntMap["ScreenRotate"]  = 0;
+	mIntMap["MonitorID"] = 0;
 
 	mBoolMap["UseFullscreenPaging"] = false;
 

es-core/src/components/VideoVlcComponent.cpp

@@ -7,7 +7,6 @@
 #include "Settings.h"
 #ifdef WIN32
 #include <basetsd.h>
-#include <codecvt>
 typedef SSIZE_T ssize_t;
 #else
 #include <unistd.h>

es-core/src/guis/GuiInputConfig.cpp

@@ -342,27 +342,39 @@ bool GuiInputConfig::filterTrigger(Input input, InputConfig* config, int inputId
 #if defined(__linux__)
 	// on Linux, some gamepads return both an analog axis and a digital button for the trigger;
 	// we want the analog axis only, so this function removes the button press event
+	bool isPlaystation = (
+		// match PlayStation joystick with 6 axes only
+		strstr(config->getDeviceName().c_str(), "PLAYSTATION") != NULL
+		|| strstr(config->getDeviceName().c_str(), "Sony Interactive") != NULL // Official dualshock 4
+		|| strstr(config->getDeviceName().c_str(), "PS3 Ga") != NULL
+		|| strstr(config->getDeviceName().c_str(), "PS(R) Ga") != NULL
+		// BigBen kid's PS3 gamepad 146b:0902, matched on SDL GUID because its name "Bigben Interactive Bigben Game Pad" may be too generic
+		|| strcmp(config->getDeviceGUIDString().c_str(), "030000006b1400000209000011010000") == 0
+	);
+	bool isAnbernic = (
+		strcmp(config->getDeviceGUIDString().c_str(), "03004ab1020500000913000010010000") == 0 // Anbernic RG P01 has same issue
+	);
 
-	if((
-	  // match PlayStation joystick with 6 axes only
-	  strstr(config->getDeviceName().c_str(), "PLAYSTATION") != NULL
-	  || strstr(config->getDeviceName().c_str(), "PS3 Ga") != NULL
-	  || strstr(config->getDeviceName().c_str(), "PS(R) Ga") != NULL
-	  // BigBen kid's PS3 gamepad 146b:0902, matched on SDL GUID because its name "Bigben Interactive Bigben Game Pad" may be too generic
-	  || strcmp(config->getDeviceGUIDString().c_str(), "030000006b1400000209000011010000") == 0
-	  ) && InputManager::getInstance()->getAxisCountByDevice(config->getDeviceId()) == 6)
+	if((isPlaystation || isAnbernic) 
+		&& InputManager::getInstance()->getAxisCountByDevice(config->getDeviceId()) == 6)
 	{
 		// digital triggers are unwanted
-		if(input.type == TYPE_BUTTON && (input.id == 6 || input.id == 7))
+		if((
+			(isPlaystation && (input.id == 6 || input.id == 7))
+			|| (isAnbernic && (input.id == 8 || input.id == 9))
+			) && input.type == TYPE_BUTTON)
 		{
 			mHoldingInput = false;
 			return true;
 		}
 	}
 
-	// ignore negative pole for axes 2/5 only when triggers are being configured
-	if(input.type == TYPE_AXIS && (input.id == 2 || input.id == 5))
+	bool genericTrigger = !isAnbernic && (input.id == 2 || input.id == 5);
+	bool anbernicTrigger = isAnbernic && (input.id == 4 || input.id == 5);
+	// ignore negative pole for axes only when triggers are being configured
+	if(input.type == TYPE_AXIS && (genericTrigger || anbernicTrigger))
 	{
+		
 		if(strstr(GUI_INPUT_CONFIG_LIST[inputId].name, "Trigger") != NULL)
 		{
 			if(input.value == 1)

es-core/src/platform.cpp

@@ -2,9 +2,7 @@
 
 #include <SDL_events.h>
 #ifdef WIN32
-#include <codecvt>
 #include <SDL.h>
-#include <SDL_opengl.h>
 #include <Windows.h>
 #include "renderers/Renderer.h"
 #else
@@ -55,7 +53,6 @@ int launchGameCommand(const std::string& cmd_utf8)
 	SDL_SetWindowFullscreen(Renderer::getSDLWindow(), 0);
 	SDL_SetWindowBordered(Renderer::getSDLWindow(), SDL_TRUE);
 
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	Renderer::swapBuffers();
 
 	memset(&si, 0, sizeof si);
@@ -65,12 +62,9 @@ int launchGameCommand(const std::string& cmd_utf8)
 	if(!CreateProcess(NULL, (LPSTR)cmd_utf8.c_str(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
 		return 9009;
 
-	while(true){
-		if(WaitForSingleObject(pi.hProcess, 200) == 0)
-			break;
+	while(WaitForSingleObject(pi.hProcess, 200) == WAIT_TIMEOUT)
 		while(SDL_PollEvent(&event))
 			; // NOP
-	}
 
 	GetExitCodeProcess(pi.hProcess, &rcode);
 	CloseHandle(pi.hProcess);

es-core/src/renderers/Renderer.cpp

@@ -75,8 +75,14 @@ namespace Renderer
 
 		initialCursorState = (SDL_ShowCursor(0) != 0);
 
+		int displayIndex = Settings::getInstance()->getInt("MonitorID");
+
+		if(displayIndex < 0 || displayIndex >= SDL_GetNumVideoDisplays()){
+			displayIndex = 0;
+		}
+
 		SDL_DisplayMode dispMode;
-		SDL_GetDesktopDisplayMode(0, &dispMode);
+		SDL_GetDesktopDisplayMode(displayIndex, &dispMode);
 		windowWidth   = Settings::getInstance()->getInt("WindowWidth")   ? Settings::getInstance()->getInt("WindowWidth")   : dispMode.w;
 		windowHeight  = Settings::getInstance()->getInt("WindowHeight")  ? Settings::getInstance()->getInt("WindowHeight")  : dispMode.h;
 		screenWidth   = Settings::getInstance()->getInt("ScreenWidth")   ? Settings::getInstance()->getInt("ScreenWidth")   : windowWidth;
@@ -89,7 +95,7 @@ namespace Renderer
 
 		const unsigned int windowFlags = (Settings::getInstance()->getBool("Windowed") ? 0 : (Settings::getInstance()->getBool("FullscreenBorderless") ? SDL_WINDOW_BORDERLESS : SDL_WINDOW_FULLSCREEN)) | getWindowFlags();
 
-		if((sdlWindow = SDL_CreateWindow("EmulationStation", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, windowWidth, windowHeight, windowFlags)) == nullptr)
+		if((sdlWindow = SDL_CreateWindow("EmulationStation", SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), SDL_WINDOWPOS_UNDEFINED_DISPLAY(displayIndex), windowWidth, windowHeight, windowFlags)) == nullptr)
 		{
 			LOG(LogError) << "Error creating SDL window!\n\t" << SDL_GetError();
 			return false;

es-core/src/utils/FileSystemUtil.cpp

@@ -69,8 +69,10 @@ namespace Utils
 							if(_recursive && isDirectory(fullName))
 								contentList.merge(getDirContent(fullName, true));
 						}
+
+						FindNextFile(hFind, &findData);
 					}
-					while(FindNextFile(hFind, &findData));
+					while(GetLastError() != ERROR_NO_MORE_FILES);
 
 					FindClose(hFind);
 				}

resources/mamebioses.xml

@@ -1,4 +1,4 @@
-<!-- Generated on 2024-02-22, from MAME 0.262 (arcade).dat, fbneo.dat, mame2003-plus.xml -->
+<!-- Generated on 2025-03-10, from MAME 0.275 (arcade).dat, fbneo.dat, mame2003-plus.xml -->
 <bios>3dobios</bios>
 <bios>acpsx</bios>
 <bios>airlbios</bios>
@@ -24,6 +24,7 @@
 <bios>coh1001l</bios>
 <bios>coh1002e</bios>
 <bios>coh1002m</bios>
+<bios>coh1002t</bios>
 <bios>coh1002v</bios>
 <bios>coh3002c</bios>
 <bios>coh3002t</bios>

resources/mamedevices.xml

@@ -1,4 +1,4 @@
-<!-- Generated on 2024-02-22, from MAME 0.262.dat -->
+<!-- Generated on 2025-03-10, from MAME 0.275.dat -->
 <device>22vp931</device>
 <device>3c505</device>
 <device>3xtwin</device>
@@ -143,9 +143,17 @@
 <device>aha1740</device>
 <device>aha1742a</device>
 <device>aha2940au</device>
-<device>alice_mcx128</device>
 <device>alto2_cpu</device>
 <device>altos2_kbd</device>
+<device>amiga_a2091</device>
+<device>amiga_a570</device>
+<device>amiga_a590</device>
+<device>amiga_ar1</device>
+<device>amiga_ar2</device>
+<device>amiga_ar3</device>
+<device>amiga_buddha</device>
+<device>amiga_oktagon2008</device>
+<device>amiga_ripple</device>
 <device>ampex230_kbd</device>
 <device>ap2000</device>
 <device>aplcd150</device>
@@ -182,6 +190,7 @@
 <device>arc_midimax2</device>
 <device>arc_nexus_a500</device>
 <device>arc_rom_aka05</device>
+<device>arc_rom_r225</device>
 <device>arc_rs423</device>
 <device>arc_scan256</device>
 <device>arc_scanjunior</device>
@@ -268,10 +277,12 @@
 <device>bbc_tube_80186</device>
 <device>bbc_tube_80286</device>
 <device>bbc_tube_a500</device>
+<device>bbc_tube_a500d</device>
 <device>bbc_tube_arm</device>
 <device>bbc_tube_arm7</device>
 <device>bbc_tube_casper</device>
 <device>bbc_tube_cms6809</device>
+<device>bbc_tube_matchbox</device>
 <device>bbc_tube_pcplus</device>
 <device>bbc_tube_rc6502</device>
 <device>bbc_tube_rc65816</device>
@@ -289,6 +300,7 @@
 <device>bbc_weddb3</device>
 <device>betadisk</device>
 <device>bingoct</device>
+<device>bk_kmd</device>
 <device>bluechip</device>
 <device>bml3kanji</device>
 <device>bml3mp1802</device>
@@ -370,6 +382,7 @@
 <device>cit101e_kbd</device>
 <device>cit220p_kbd</device>
 <device>clgd542x</device>
+<device>clgd5446_pci</device>
 <device>clgd5465_laguna</device>
 <device>cmdhd</device>
 <device>cmdrc2</device>
@@ -396,6 +409,7 @@
 <device>comx_pl80</device>
 <device>comx_prn</device>
 <device>comx_thm</device>
+<device>concept_kbd</device>
 <device>cp2024</device>
 <device>cp31</device>
 <device>cp450_fdc</device>
@@ -439,9 +453,10 @@
 <device>dio98550</device>
 <device>dio98603a</device>
 <device>dio98603b</device>
+<device>dio98628</device>
+<device>dio98629</device>
 <device>diskii13</device>
 <device>dm_clgd5430</device>
-<device>dms3d2kp</device>
 <device>dmv_k220</device>
 <device>dmv_k230</device>
 <device>dmv_k231</device>
@@ -486,14 +501,17 @@
 <device>ep64_exdos</device>
 <device>epson_pf10</device>
 <device>epson_qx_option_multifont</device>
+<device>epson_rx80</device>
 <device>epson_tf20</device>
 <device>ergoline_kbd</device>
 <device>et4000</device>
 <device>et4000_kasan16</device>
+<device>et4kw32i</device>
 <device>europc_kbd</device>
 <device>ev346</device>
 <device>ex1280</device>
 <device>ex800</device>
+<device>executive10_102_kbd</device>
 <device>exorterm155_device</device>
 <device>f4431_kbd</device>
 <device>fc_disksys</device>
@@ -513,6 +531,7 @@
 <device>gfxultrap</device>
 <device>gic</device>
 <device>gunsense</device>
+<device>h89bus</device>
 <device>hardbox</device>
 <device>hcpu30</device>
 <device>hd44780</device>
@@ -521,6 +540,10 @@
 <device>hd63484</device>
 <device>he191_3425</device>
 <device>heath_gp19_tlb</device>
+<device>heath_igc_super19_tlb_device</device>
+<device>heath_igc_tlb_device</device>
+<device>heath_igc_ultra_tlb_device</device>
+<device>heath_igc_watz_tlb_device</device>
 <device>heath_imaginator_tlb</device>
 <device>heath_super19_tlb</device>
 <device>heath_superset_tlb</device>
@@ -532,6 +555,7 @@
 <device>hp82937</device>
 <device>hp82939</device>
 <device>hp9122c</device>
+<device>hp9133</device>
 <device>hp98034</device>
 <device>hp98035</device>
 <device>hp98046</device>
@@ -543,6 +567,7 @@
 <device>i8245</device>
 <device>ibm_mfc</device>
 <device>ibm_vga</device>
+<device>idpart_video</device>
 <device>ie15_device</device>
 <device>ie15kbd</device>
 <device>imds2ioc</device>
@@ -566,6 +591,7 @@
 <device>isa_ibm_pgc</device>
 <device>isa_ibm_speech</device>
 <device>isa_pcmidi</device>
+<device>isa_prose4001</device>
 <device>isbc202</device>
 <device>isbc8024</device>
 <device>isbc_215g</device>
@@ -620,6 +646,7 @@
 <device>m68705p5</device>
 <device>m68705r3</device>
 <device>m68705u3</device>
+<device>m68hc05pge</device>
 <device>m68hc705c4a</device>
 <device>m68hc705c8a</device>
 <device>mach64isa</device>
@@ -629,13 +656,14 @@
 <device>mackbd_m0110a_j</device>
 <device>mackbd_m0110b</device>
 <device>mackbd_m0110f</device>
+<device>mackbd_m0110j</device>
 <device>mackbd_m0110t</device>
 <device>mackbd_m0120</device>
 <device>mackbd_m0120p</device>
 <device>mb90082</device>
 <device>mbc55x_kbd</device>
-<device>mc10_mcx128</device>
 <device>mc1502_rom</device>
+<device>mcx128</device>
 <device>md_kbd</device>
 <device>md_rom_svp</device>
 <device>mg1_kbd_device</device>
@@ -647,6 +675,7 @@
 <device>mie</device>
 <device>mindset_sound_module</device>
 <device>minichif</device>
+<device>mks3</device>
 <device>mm1kb</device>
 <device>mm5740</device>
 <device>mockingboardd</device>
@@ -661,6 +690,15 @@
 <device>mpcba79</device>
 <device>mpcbb68</device>
 <device>mpcbb92</device>
+<device>mpf1_epb</device>
+<device>mpf1_epb_ibp</device>
+<device>mpf1_iom_ip</device>
+<device>mpf1_prt</device>
+<device>mpf1_prt_ip</device>
+<device>mpf1_sgb</device>
+<device>mpf1_ssb</device>
+<device>mpf1_tva_ip</device>
+<device>mpf1_vid</device>
 <device>mps1200</device>
 <device>mps1250</device>
 <device>mpu401</device>
@@ -678,10 +716,12 @@
 <device>msx_cart_sfg01</device>
 <device>msx_cart_sfg05</device>
 <device>msx_cart_skw01</device>
+<device>msx_cart_sunrise_ataide</device>
 <device>msx_moonsound</device>
 <device>mtx_cfx</device>
 <device>mtx_sdxbas</device>
 <device>mtx_sdxcpm</device>
+<device>mu5lcd</device>
 <device>mulcd</device>
 <device>mvme120</device>
 <device>mvme121</device>
@@ -692,6 +732,7 @@
 <device>mvme181</device>
 <device>mvme187</device>
 <device>mvme327a</device>
+<device>mvme328</device>
 <device>mvme350</device>
 <device>mzr8105</device>
 <device>nabupc_keyboard</device>
@@ -704,11 +745,27 @@
 <device>namco58</device>
 <device>namco59</device>
 <device>namco62</device>
+<device>namco_amc</device>
+<device>namco_asca1</device>
+<device>namco_asca3</device>
+<device>namco_asca3a</device>
+<device>namco_asca5</device>
+<device>namco_csz1</device>
+<device>namco_cyberlead</device>
+<device>namco_cyberlead_led</device>
+<device>namco_cyberleada</device>
+<device>namco_emio102</device>
+<device>namco_fca10</device>
+<device>namco_fca11</device>
+<device>namco_fcb</device>
+<device>namco_tssio</device>
+<device>namco_xmiu1</device>
 <device>namcoc65</device>
 <device>namcoc67</device>
 <device>namcoc68</device>
 <device>namcoc69</device>
 <device>namcoc70</device>
+<device>namcoc71</device>
 <device>namcoc74</device>
 <device>namcoc75</device>
 <device>namcoc76</device>
@@ -731,6 +788,8 @@
 <device>nb_thungx</device>
 <device>nb_vikbw</device>
 <device>nb_wspt</device>
+<device>ncr53c825_pci</device>
+<device>neon250</device>
 <device>nes_rob</device>
 <device>newbrain_eim</device>
 <device>newbrain_fdc</device>
@@ -738,6 +797,7 @@
 <device>nmk004</device>
 <device>novell_dcb</device>
 <device>np600a3</device>
+<device>nss_tvinterface</device>
 <device>omniwave</device>
 <device>omti8621isa</device>
 <device>oric_jasmin</device>
@@ -746,11 +806,13 @@
 <device>osa_maestro</device>
 <device>osa_maestroa</device>
 <device>osa_sparc</device>
+<device>oti64111_pci</device>
 <device>p1_fdc</device>
 <device>p1_hdc</device>
 <device>p1_rom</device>
 <device>p72</device>
 <device>pa7246</device>
+<device>partner_gdp</device>
 <device>pc1512kb</device>
 <device>pc1640_iga</device>
 <device>pc80s31</device>
@@ -771,6 +833,7 @@
 <device>pd3_lviw</device>
 <device>pd3_mclr</device>
 <device>pd3_pc16</device>
+<device>pdc20262</device>
 <device>pds30_emac</device>
 <device>pds_hyper</device>
 <device>pds_sefp</device>
@@ -778,6 +841,8 @@
 <device>pet_softbox</device>
 <device>pet_superpet</device>
 <device>pg200</device>
+<device>plg100_vl</device>
+<device>plg150_ap</device>
 <device>plus4_sid</device>
 <device>polyvti</device>
 <device>pr8210</device>
@@ -790,11 +855,13 @@
 <device>ps2_keybc</device>
 <device>psion_3fax</device>
 <device>psion_3link_ser</device>
+<device>psion_parallel</device>
 <device>psx_cd</device>
 <device>psxgboost</device>
 <device>pvga1a</device>
 <device>pvga1a_jk</device>
 <device>px320a</device>
+<device>qg640</device>
 <device>ql_cumanafdi</device>
 <device>ql_gold</device>
 <device>ql_kdi</device>
@@ -833,7 +900,9 @@
 <device>rivatnt2</device>
 <device>rivatnt2_m64</device>
 <device>rivatnt2_ultra</device>
+<device>rm_mq2</device>
 <device>robotron_k7070</device>
+<device>robotron_k7071</device>
 <device>rolm_pdc</device>
 <device>rolm_smioc</device>
 <device>rtpc_kbd</device>
@@ -846,8 +915,6 @@
 <device>s100_sj2db</device>
 <device>s1410</device>
 <device>s3_764</device>
-<device>s3virge</device>
-<device>s3virgedx</device>
 <device>s97269pb</device>
 <device>s_smp</device>
 <device>sa1403d</device>
@@ -869,6 +936,7 @@
 <device>sbus_hme</device>
 <device>sbus_sunpc</device>
 <device>sc119</device>
+<device>scorpion_ic</device>
 <device>sdtandy_fdc</device>
 <device>sed1200da</device>
 <device>sed1200db</device>
@@ -884,11 +952,13 @@
 <device>sente6vb</device>
 <device>serad</device>
 <device>sfd1001</device>
+<device>sgi_gm1</device>
 <device>sgi_ip4</device>
 <device>sgi_kbd</device>
 <device>side116</device>
 <device>simutrek</device>
 <device>sis630_gui</device>
+<device>sis6326_agp</device>
 <device>sis900_eth</device>
 <device>smoc501</device>
 <device>sms_diypaddle</device>
@@ -947,10 +1017,12 @@
 <device>spectrum_swiftdisc2</device>
 <device>spectrum_usource</device>
 <device>spectrum_uspeech</device>
+<device>spectrum_vtx5000</device>
 <device>spectrum_wafa</device>
 <device>st_kbd</device>
 <device>stereo_fx</device>
 <device>stic</device>
+<device>sun1cpu</device>
 <device>sv603</device>
 <device>sv806</device>
 <device>sw1000xg</device>
@@ -981,8 +1053,11 @@
 <device>tandberg_tdv2100_disp_logic</device>
 <device>tandberg_tdv2100_keyboard</device>
 <device>tandy2kb</device>
+<device>tdl12</device>
 <device>technica</device>
 <device>tek410x_kbd</device>
+<device>tek_msu_fdc</device>
+<device>teletex800</device>
 <device>tetriskr_cga</device>
 <device>tgui9680</device>
 <device>ti99_bwg</device>
@@ -1001,11 +1076,16 @@
 <device>ti99_whtscsi</device>
 <device>ti_hx5102</device>
 <device>tiki100_8088</device>
+<device>tim011_kbd</device>
 <device>tk02</device>
 <device>tms32030</device>
 <device>tms32031</device>
 <device>tms32032</device>
 <device>tms32033</device>
+<device>to8_kbd</device>
+<device>to9_kbd</device>
+<device>to9p_kbd</device>
+<device>tp880v</device>
 <device>tp881v</device>
 <device>trs80m2kb</device>
 <device>turbogx</device>
@@ -1018,11 +1098,14 @@
 <device>ultra12f32</device>
 <device>ultra14f</device>
 <device>ultra24f</device>
+<device>umc6650</device>
 <device>upd7220</device>
+<device>upd7220a</device>
 <device>uts_400kbd</device>
 <device>uts_extw</device>
 <device>v102_kbd</device>
 <device>v1050kb</device>
+<device>v50_kbd</device>
 <device>v550_kbd</device>
 <device>vanta</device>
 <device>vector4_kbd</device>
@@ -1034,6 +1117,9 @@
 <device>victor9k_kb</device>
 <device>virge_pci</device>
 <device>virgedx_pci</device>
+<device>vision864</device>
+<device>vision964</device>
+<device>vision968</device>
 <device>voicebox</device>
 <device>votrsc01</device>
 <device>votrsc01a</device>
@@ -1058,6 +1144,7 @@
 <device>wd90c31a_zs</device>
 <device>wd90c33_zz</device>
 <device>wd90c90_jk</device>
+<device>wd9710_pci</device>
 <device>wdxt_gen</device>
 <device>wg130</device>
 <device>wyse700</device>
@@ -1073,10 +1160,4 @@
 <device>z8682</device>
 <device>zip100_ide</device>
 <device>zorba_kbd</device>
-<device>zorro_a2091</device>
-<device>zorro_a590</device>
-<device>zorro_ar1</device>
-<device>zorro_ar2</device>
-<device>zorro_ar3</device>
-<device>zorro_buddha</device>
 <device>zxbus_neogs</device>