Skip to content

Commit 021d038

Browse files
committed
fdc fix
1 parent ac3b20e commit 021d038

1 file changed

Lines changed: 42 additions & 35 deletions

File tree

media/inf/fdc.inf

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
; FDC.INF
1+
; floppy.INF
22

33
; Installation file for floppy disk controllers
44

55
[Version]
66
Signature = "$Windows NT$"
77
;Signature = "$ReactOS$"
88
LayoutFile = layout.inf
9-
Class = FDC
9+
Class = floppy
1010
ClassGUID = {4D36E969-E325-11CE-BFC1-08002BE10318}
1111
Provider = %ReactOS%
1212
DriverVer = 08/15/2005,1.01.0.0
@@ -15,37 +15,44 @@ DriverVer = 08/15/2005,1.01.0.0
1515
DefaultDestDir = 12
1616

1717
[ClassInstall32.NT]
18-
AddReg = FDC.NT.AddReg
18+
AddReg = floppy.NT.AddReg
1919

20-
[FDC.NT.AddReg]
21-
HKR, , , 0, %FDCClassName%
20+
[floppy.NT.AddReg]
21+
HKR, , , 0, %floppyClassName%
2222
HKR, , Icon, 0, "-9"
2323
HKR,,NoInstallClass,,1
2424

2525
[Manufacturer]
2626
%GenericMfg% = GenericMfg
2727

2828
[GenericMfg]
29-
;FIXME: We do not have a driver yet
30-
%*PNP0700.DeviceDesc% = fdc_Inst,*PNP0700
31-
;%*PNP0700.DeviceDesc% = NO_DRV,*PNP0700
29+
; The legacy floppy.sys is a non-PnP, System-start driver that claims the FDC
30+
; directly from the firmware/BIOS hardware tree; it has no AddDevice and cannot
31+
; act as the PnP function driver for the PNP0700 controller node (doing so makes
32+
; the node fail with Code 39 "driver missing or damaged"). The PnP fdc.sys
33+
; controller driver is not built (see drivers/storage/floppy/CMakeLists.txt), so
34+
; install PNP0700 as needing no function driver - same pattern flpydisk.inf uses
35+
; for the floppy drive node. Actual floppy I/O stays with the System-start
36+
; floppy.sys service.
37+
;%*PNP0700.DeviceDesc% = floppy_Inst,*PNP0700
38+
%*PNP0700.DeviceDesc% = NO_DRV,*PNP0700
3239

33-
;----------------------------- FDC DRIVER -----------------------------
40+
;----------------------------- floppy DRIVER -----------------------------
3441

35-
[fdc_Inst.NT]
36-
CopyFiles = fdc_CopyFiles.NT
42+
[floppy_Inst.NT]
43+
CopyFiles = floppy_CopyFiles.NT
3744

38-
[fdc_CopyFiles.NT]
39-
fdc.sys
45+
[floppy_CopyFiles.NT]
46+
floppy.sys
4047

41-
[fdc_Inst.NT.Services]
42-
AddService = fdc, 0x00000002, fdc_Service_Inst
48+
[floppy_Inst.NT.Services]
49+
AddService = floppy, 0x00000002, floppy_Service_Inst
4350

44-
[fdc_Service_Inst]
51+
[floppy_Service_Inst]
4552
ServiceType = 1
4653
StartType = 3
4754
ErrorControl = 1
48-
ServiceBinary = %12%\fdc.sys
55+
ServiceBinary = %12%\floppy.sys
4956
LoadOrderGroup = System Bus Extender
5057

5158
;----------------------------- NO DRIVER REQ ----------------------------
@@ -62,97 +69,97 @@ AddService = , 0x00000002
6269
ReactOS = "ReactOS Project"
6370

6471
; Localizable
65-
FDCClassName = "Floppy disk controllers"
72+
floppyClassName = "Floppy disk controllers"
6673

6774
GenericMfg = "(Generic floppy disk controllers)"
6875
*PNP0700.DeviceDesc = "Generic floppy disk controller"
6976

7077
[Strings.0404]
71-
FDCClassName = "軟碟控制器"
78+
floppyClassName = "軟碟控制器"
7279

7380
GenericMfg = "(標準軟碟控制器)"
7481
*PNP0700.DeviceDesc = "標準軟碟控制器"
7582

7683
[Strings.0405]
77-
FDCClassName = "Řadiče disketových jednotek"
84+
floppyClassName = "Řadiče disketových jednotek"
7885

7986
GenericMfg = "(Generické řadiče disketových jednotek)"
8087
*PNP0700.DeviceDesc = "Generický řadič disketové jednotky"
8188

8289
[Strings.0407]
83-
FDCClassName = "Disketten-Controller"
90+
floppyClassName = "Disketten-Controller"
8491

8592
GenericMfg = "(Generische Disketten-Controller)"
8693
*PNP0700.DeviceDesc = "Generischer Disketten-Controller"
8794

8895
[Strings.0408]
89-
FDCClassName = "Ελεγκτής Δισκέτας"
96+
floppyClassName = "Ελεγκτής Δισκέτας"
9097

9198
GenericMfg = "(Γενικοί ελεγκτές δισκέτας)"
9299
*PNP0700.DeviceDesc = "Γενικός ελεγκτής δισκέτας"
93100

94101
[Strings.0a]
95-
FDCClassName = "Controladores de disquete"
102+
floppyClassName = "Controladores de disquete"
96103

97104
GenericMfg = "(Controlador estándar de disquetes)"
98105
*PNP0700.DeviceDesc = "Controlador estándar de disquetes"
99106

100107
[Strings.040C]
101-
FDCClassName = "Contrôleurs de lecteur de disquettes"
108+
floppyClassName = "Contrôleurs de lecteur de disquettes"
102109

103110
GenericMfg = "(Contrôleurs de lecteur de disquettes génériques)"
104111
*PNP0700.DeviceDesc = "Contrôleur de lecteur de disquettes générique"
105112

106113
[Strings.0411]
107-
FDCClassName = "フロッピー ディスク コントローラ"
114+
floppyClassName = "フロッピー ディスク コントローラ"
108115

109116
GenericMfg = "(標準フロッピー ディスク コントローラ)"
110117
*PNP0700.DeviceDesc = "標準フロッピー ディスク コントローラ"
111118

112119
[Strings.0415]
113-
FDCClassName = "Kontrolery stacji dyskietek"
120+
floppyClassName = "Kontrolery stacji dyskietek"
114121

115122
GenericMfg = "(Standardowowe kontrolery stacji dyskietek)"
116123
*PNP0700.DeviceDesc = "Standardowy kontroler stacji dyskietek"
117124

118125
[Strings.0416]
119-
FDCClassName = "Unidades de disquete"
126+
floppyClassName = "Unidades de disquete"
120127

121128
GenericMfg = "(Unidades de disquete padrão)"
122129
*PNP0700.DeviceDesc = "Controlador padrão de disquete"
123130

124131
[Strings.0418]
125-
FDCClassName = "Dispozitive de control disc flexibil"
132+
floppyClassName = "Dispozitive de control disc flexibil"
126133

127134
GenericMfg = "(dispozitiv generic de control disc flexibil)"
128135
*PNP0700.DeviceDesc = "Dispozitiv generic de control disc flexibil"
129136

130137
[Strings.0419]
131-
FDCClassName = "Контроллеры гибких дисков"
138+
floppyClassName = "Контроллеры гибких дисков"
132139

133140
GenericMfg = "(Стандартные контроллеры гибких дисков)"
134141
*PNP0700.DeviceDesc = "Стандартный контроллер гибких дисков"
135142

136143
[Strings.041B]
137-
FDCClassName = "Radiče disketových mechaník"
144+
floppyClassName = "Radiče disketových mechaník"
138145

139146
GenericMfg = "(Generické radiče disketových mechaník)"
140147
*PNP0700.DeviceDesc = "Generický radič disketovej mechaniky"
141148

142149
[Strings.041f]
143-
FDCClassName = "Disket Denetleyicileri"
150+
floppyClassName = "Disket Denetleyicileri"
144151

145152
GenericMfg = "(Genel Disket Denetleyicileri)"
146153
*PNP0700.DeviceDesc = "Genel Disket Denetleyicisi"
147154

148155
[Strings.0422]
149-
FDCClassName = "Контроллери гнучких дисків"
156+
floppyClassName = "Контроллери гнучких дисків"
150157

151158
GenericMfg = "(Стандартні контроллери гнучких дисків)"
152159
*PNP0700.DeviceDesc = "Стандартний контроллер гнучких дисків"
153160

154161
[Strings.0427]
155-
FDCClassName = "Diskelių įrenginių valdikliai"
162+
floppyClassName = "Diskelių įrenginių valdikliai"
156163

157164
GenericMfg = "(Standartiniai diskelių įrenginių valdikliai)"
158165
*PNP0700.DeviceDesc = "Standartinis diskelių įrenginio valdiklis"
@@ -162,13 +169,13 @@ GenericMfg = "(通用软盘控制器)"
162169
*PNP0700.DeviceDesc = "通用软盘控制器"
163170

164171
[Strings.0816]
165-
FDCClassName = "Unidades de disquete"
172+
floppyClassName = "Unidades de disquete"
166173

167174
GenericMfg = "(Unidades de disquete padrão)"
168175
*PNP0700.DeviceDesc = "Controlador de disquete padrão"
169176

170177
[Strings.0C04]
171-
FDCClassName = "軟碟控制器"
178+
floppyClassName = "軟碟控制器"
172179

173180
GenericMfg = "(標準軟碟控制器)"
174181
*PNP0700.DeviceDesc = "標準軟碟控制器"

0 commit comments

Comments
 (0)