Revert r18628, as we don't have any RTL8139 driver in ReactOS repository

svn path=/trunk/; revision=18636

diff --git a/reactos/media/inf/inf.xml b/reactos/media/inf/inf.xml
index 803bb26..1d2b927 100644 (file)
--- a/reactos/media/inf/inf.xml
+++ b/reactos/media/inf/inf.xml
@@ -1,12 +1,13 @@
 <group>
 <installfile base="inf">acpi.inf</installfile>
 <installfile base="inf">cdrom.inf</installfile>
+<installfile base="inf">hdc.inf</installfile>
 <installfile base="inf">layout.inf</installfile>
 <installfile base="inf">machine.inf</installfile>
 <installfile base="inf">mouse.inf</installfile>
 <installfile base="inf">NET_NIC.inf</installfile>
+<installfile base="inf">netamd.inf</installfile>
 <installfile base="inf">netisa.inf</installfile>
-<installfile base="inf">netrtsnt.inf</installfile>
 <installfile base="inf">ports.inf</installfile>
 <installfile base="inf">scsi.inf</installfile>
 <installfile base="inf">syssetup.inf</installfile>

diff --git a/reactos/media/inf/netamd.inf b/reactos/media/inf/netamd.inf
new file mode 100644 (file)
index 0000000..f586ce8
--- /dev/null
+++ b/reactos/media/inf/netamd.inf
@@ -0,0 +1,61 @@
+; NETAMD.INF\r
+\r
+; Installation file for PCI network cards with VendorID=1022 (AMD)\r
+\r
+[Version]\r
+Signature  = "$Windows NT$"\r
+;Signature  = "$ReactOS$"\r
+LayoutFile = layout.inf\r
+Class      = Net\r
+ClassGUID  = {4D36E972-E325-11CE-BFC1-08002BE10318}\r
+Provider   = %ReactOS%\r
+DriverVer  = 10/08/2005,1.01.0.0\r
+\r
+[DestinationDirs]\r
+DefaultDestDir = 12\r
+\r
+[Manufacturer]\r
+%AMDMfg% = AMDMfg\r
+\r
+[AMDMfg]\r
+%PCNET.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000\r
+\r
+;----------------------------- PCNET DRIVER -----------------------------\r
+\r
+[PCNet_Inst.NT]\r
+AddReg = PCNet_AddReg.NT\r
+CopyFiles = PCNet_CopyFiles.NT\r
+\r
+[PCNet_AddReg.NT]\r
+HKR,,BUS_TO_SCAN,,"ALL"\r
+HKR,,BUSTIMER,,"0"\r
+HKR,,BUSTYPE,,"5"\r
+HKR,,EXTPHY,,"0"\r
+HKR,,FDUP,,"0"\r
+HKR,,LED0,,"10000"\r
+HKR,,LED1,,"10000"\r
+HKR,,LED2,,"10000"\r
+HKR,,LED3,,"10000"\r
+HKR,,MPMODE,,"0"\r
+HKR,,TP,,"1"\r
+\r
+[PCNet_CopyFiles.NT]\r
+pcnet.sys\r
+\r
+[PCNet_Inst.NT.Services]\r
+AddService = PCNet, 0x00000002, PCNet_Service_Inst\r
+\r
+[PCNet_Service_Inst]\r
+ServiceType   = 1\r
+StartType     = 3\r
+ErrorControl  = 0\r
+ServiceBinary = %12%\pcnet.sys\r
+LoadOrderGroup = NDIS\r
+\r
+;-------------------------------- STRINGS -------------------------------\r
+\r
+[Strings]\r
+ReactOS = "ReactOS Team"\r
+\r
+AMDMfg = "Advanced Micro Devices (AMD)"\r
+PCNET.DeviceDesc = "AMD 79c970 [PCnet32 LANCE]"\r

diff --git a/reactos/media/inf/netrtsnt.inf b/reactos/media/inf/netrtsnt.inf
deleted file mode 100644 (file)
index 7853b77..0000000
--- a/reactos/media/inf/netrtsnt.inf
+++ /dev/null
@@ -1,105 +0,0 @@
-; NETRTSNT.INF\r
-\r
-; Installation file for PCI network cards RTL8139 compatibles\r
-\r
-[Version]\r
-Signature  = "$Windows NT$"\r
-;Signature  = "$ReactOS$"\r
-LayoutFile = layout.inf\r
-Class      = Net\r
-ClassGUID  = {4D36E972-E325-11CE-BFC1-08002BE10318}\r
-Provider   = %ReactOS%\r
-DriverVer  = 10/08/2005,1.00\r
-\r
-[DestinationDirs]\r
-DefaultDestDir = 12\r
-\r
-[Manufacturer]\r
-%AbocomMfg% = AbocomMfg\r
-%AddtronMfg% = AddtronMfg\r
-%AMDMfg% = AMDMfg\r
-%CompaqMfg% = CompaqMfg\r
-%DLinkMfg% = DLinkMfg\r
-%PepperconMfg% = PepperconMfg\r
-%RealtekMfg% = RealtekMfg\r
-\r
-[AbocomMfg]\r
-%PCI\VEN_13D1&DEV_AB06.DeviceDesc% = PCNet_Inst,PCI\VEN_13D1&DEV_AB06\r
-\r
-[AddtronMfg]\r
-%PCI\VEN_4033&DEV_1360.DeviceDesc% = PCNet_Inst,PCI\VEN_4033&DEV_1360\r
-\r
-[AMDMfg]\r
-%PCI\VEN_1022&DEV_2000.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000\r
-\r
-[CompaqMfg]\r
-%PCI\VEN_021B&DEV_8139.DeviceDesc% = PCNet_Inst,PCI\VEN_021B&DEV_8139\r
-\r
-[DLinkMfg]\r
-%PCI\VEN_1186&DEV_1300.DeviceDesc% = PCNet_Inst,PCI\VEN_1186&DEV_1300\r
-\r
-[PepperconMfg]\r
-%PCI\VEN_1743&DEV_8139.DeviceDesc% = PCNet_Inst,PCI\VEN_1743&DEV_8139\r
-\r
-[RealtekMfg]\r
-%PCI\VEN_10EC&DEV_8138.DeviceDesc% = PCNet_Inst,PCI\VEN_10EC&DEV_8138\r
-%PCI\VEN_10EC&DEV_8139.DeviceDesc% = PCNet_Inst,PCI\VEN_10EC&DEV_8139\r
-\r
-;----------------------------- PCNET DRIVER -----------------------------\r
-\r
-[PCNet_Inst.NT]\r
-AddReg = PCNet_AddReg.NT\r
-CopyFiles = PCNet_CopyFiles.NT\r
-\r
-[PCNet_AddReg.NT]\r
-HKR,,BUS_TO_SCAN,,"ALL"\r
-HKR,,BUSTIMER,,"0"\r
-HKR,,BUSTYPE,,"5"\r
-HKR,,EXTPHY,,"0"\r
-HKR,,FDUP,,"0"\r
-HKR,,LED0,,"10000"\r
-HKR,,LED1,,"10000"\r
-HKR,,LED2,,"10000"\r
-HKR,,LED3,,"10000"\r
-HKR,,MPMODE,,"0"\r
-HKR,,TP,,"1"\r
-\r
-[PCNet_CopyFiles.NT]\r
-pcnet.sys\r
-\r
-[PCNet_Inst.NT.Services]\r
-AddService = PCNet, 0x00000002, PCNet_Service_Inst\r
-\r
-[PCNet_Service_Inst]\r
-ServiceType   = 1\r
-StartType     = 3\r
-ErrorControl  = 0\r
-ServiceBinary = %12%\pcnet.sys\r
-LoadOrderGroup = NDIS\r
-\r
-;-------------------------------- STRINGS -------------------------------\r
-\r
-[Strings]\r
-ReactOS = "ReactOS Team"\r
-\r
-AbocomMfg = "Abocom Systems Inc"\r
-PCI\VEN_13D1&DEV_AB06.DeviceDesc = "RTL8139 [FE2000VX] CardBus Fast Ethernet Attached Port Adapter"\r
-\r
-AddtronMfg = "Addtron Technology Co, Inc."\r
-PCI\VEN_4033&DEV_1360.DeviceDesc = "RTL8139 Ethernet"\r
-\r
-AMDMfg = "Advanced Micro Devices (AMD)"\r
-PCI\VEN_1022&DEV_2000.DeviceDesc = "AMD 79c970 [PCnet32 LANCE]"\r
-\r
-CompaqMfg = "Compaq Computer Corporation"\r
-PCI\VEN_021B&DEV_8139.DeviceDesc = "HNE-300 (RealTek RTL8139c) [iPaq Networking]"\r
-\r
-DLinkMfg = "D-Link System Inc"\r
-PCI\VEN_1186&DEV_1300.DeviceDesc = "RTL8139 Ethernet"\r
-\r
-PepperconMfg = "Peppercon AG"\r
-PCI\VEN_1743&DEV_8139.DeviceDesc = "ROL/F-100 Fast Ethernet Adapter with ROL"\r
-\r
-RealtekMfg = "Realtek Semiconductor Co., Ltd."\r
-PCI\VEN_10EC&DEV_8138.DeviceDesc = "RT8139 (B/C) Cardbus Fast Ethernet Adapter"\r
-PCI\VEN_10EC&DEV_8139.DeviceDesc = "RTL-8139/8139C/8139C+"\r