From 84fabd819dcc7130f26d6e7bccee84f72e191d78 Mon Sep 17 00:00:00 2001
From: Dmitry Borisov <di.sean@protonmail.com>
Date: Tue, 9 Nov 2021 23:01:14 +0600
Subject: [PATCH] [ISAPNP] Add support for NEC PC-98 series

---
 boot/bootdata/hivesys.inf     |  9 +++++++++
 drivers/bus/isapnp/isapnphw.h |  5 +++++
 media/inf/machine.inf         | 15 +++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf
index 74d6df755ef..fa6c21b9261 100644
--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@@ -23,6 +23,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604","Clas
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0601","Service",0x00000000,"isapnp"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0601","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}"
 
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_0001","Service",0x00000000,"isapnp"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_0001","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}"
+
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_002D","Service",0x00000000,"isapnp"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_002D","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}"
+
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_003B","Service",0x00000000,"isapnp"
+HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_003B","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}"
+
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}"
 
diff --git a/drivers/bus/isapnp/isapnphw.h b/drivers/bus/isapnp/isapnphw.h
index 0023aac4fdf..3c5a2590729 100644
--- a/drivers/bus/isapnp/isapnphw.h
+++ b/drivers/bus/isapnp/isapnphw.h
@@ -13,8 +13,13 @@
 extern "C" {
 #endif
 
+#if defined(SARCH_PC98)
+#define ISAPNP_ADDRESS 0x259
+#define ISAPNP_WRITE_DATA 0xA59
+#else
 #define ISAPNP_ADDRESS 0x279
 #define ISAPNP_WRITE_DATA 0xA79
+#endif
 
 #define ISAPNP_READPORT 0x00
 #define ISAPNP_SERIALISOLATION 0x01
diff --git a/media/inf/machine.inf b/media/inf/machine.inf
index 7f11fa803a2..5013ceca5eb 100644
--- a/media/inf/machine.inf
+++ b/media/inf/machine.inf
@@ -24,6 +24,7 @@ HKR, , Icon,           0, "-27"
 [Manufacturer]
 %GenericMfg% = GenericMfg
 %IntelMfg% = IntelMfg
+%NecMfg% = NecMfg
 %nVidiaMfg% = nVidiaMfg
 
 [GenericMfg]
@@ -70,6 +71,13 @@ HKR, , Icon,           0, "-27"
 %PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7190
 %PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7192
 
+[NecMfg]
+%NecCb.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_1033&DEV_0001
+%NecVl.DeviceDesc% = NO_DRV,PCI\VEN_1033&DEV_0002
+%NecVl.DeviceDesc% = NO_DRV,PCI\VEN_1033&DEV_0016
+%NecCb.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_1033&DEV_002D
+%NecCb.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_1033&DEV_003B
+
 [nVidiaMfg]
 %PCI\VEN_10DE&DEV_01B2.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_10DE&DEV_01B2
 %PCI\VEN_10DE&DEV_01B4.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01B4
@@ -201,6 +209,10 @@ PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI Br
 PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI Bridge"
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI Bridge"
 
+NecMfg = "NEC"
+NecCb.DeviceDesc = "NEC PCI to C-bus Bridge"
+NecVl.DeviceDesc = "NEC PCI to VL bus Bridge"
+
 nVidiaMfg = "nVidia"
 PCI\VEN_10DE&DEV_01B2.DeviceDesc = "nVidia nForce PCI to ISA Bridge"
 PCI\VEN_10DE&DEV_01B4.DeviceDesc = "nVidia nForce SMBus Controller"
@@ -662,6 +674,9 @@ PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II мост CPU
 PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II мост CPU - PCI"
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II мост CPU - PCI"
 
+NecCb.DeviceDesc = "NEC мост PCI - C-bus"
+NecVl.DeviceDesc = "NEC мост PCI - VL"
+
 PCI\VEN_10DE&DEV_01B2.DeviceDesc = "nVidia nForce мост PCI - ISA"
 PCI\VEN_10DE&DEV_01B4.DeviceDesc = "nVidia nForce контроллер SMBus"
 PCI\VEN_10DE&DEV_01B7.DeviceDesc = "nVidia nForce мост AGP - PCI"