Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 19:55:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR] Abstract floppy drive detection code (#1735)

Browse source 
Make floppy detection code machine-specific, because Xbox CMOS cannot be used to detect floppies. Based on a patch by Matt Borgerson.

CORE-16204 CORE-16207

Co-authored-by: Matt Borgerson <contact@mborgerson.com>
This commit is contained in:
Stanislav Motylkov 2019-07-18 23:50:48 +03:00 • committed by Hermès BÉLUSCA - MAÏTO
parent bca8093b89
commit 7547f85b7e
4 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
boot/freeldr/freeldr/arch/i386/hardware.c
View file

@ -165,18 +165,6 @@ HalpCalibrateStallExecution(VOID)
} }
static
UCHAR
GetFloppyCount(VOID)
{
UCHAR Data;
WRITE_PORT_UCHAR((PUCHAR)0x70, 0x10);
Data = READ_PORT_UCHAR((PUCHAR)0x71);
return ((Data & 0xF0) ? 1 : 0) + ((Data & 0x0F) ? 1 : 0);
}
static static
UCHAR UCHAR
GetFloppyType(UCHAR DriveNumber) GetFloppyType(UCHAR DriveNumber)
@ -285,7 +273,7 @@ DetectBiosFloppyController(PCONFIGURATION_COMPONENT_DATA BusKey)
ULONG Size; ULONG Size;
ULONG FloppyCount; ULONG FloppyCount;
FloppyCount = GetFloppyCount(); FloppyCount = MachGetFloppyCount();
TRACE("Floppy count: %u\n", FloppyCount); TRACE("Floppy count: %u\n", FloppyCount);
/* Always create a BIOS disk controller, no matter if we have floppy drives or not */ /* Always create a BIOS disk controller, no matter if we have floppy drives or not */

13
boot/freeldr/freeldr/arch/i386/machpc.c
View file

@ -1301,6 +1301,18 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
/* FIXME: Detect more ISA devices */ /* FIXME: Detect more ISA devices */
} }
static
UCHAR
PcGetFloppyCount(VOID)
{
UCHAR Data;
WRITE_PORT_UCHAR((PUCHAR)0x70, 0x10);
Data = READ_PORT_UCHAR((PUCHAR)0x71);
return ((Data & 0xF0) ? 1 : 0) + ((Data & 0x0F) ? 1 : 0);
}
PCONFIGURATION_COMPONENT_DATA PCONFIGURATION_COMPONENT_DATA
PcHwDetect(VOID) PcHwDetect(VOID)
{ {
@ -1378,6 +1390,7 @@ PcMachInit(const char *CmdLine)
MachVtbl.Beep = PcBeep; MachVtbl.Beep = PcBeep;
MachVtbl.PrepareForReactOS = PcPrepareForReactOS; MachVtbl.PrepareForReactOS = PcPrepareForReactOS;
MachVtbl.GetMemoryMap = PcMemGetMemoryMap; MachVtbl.GetMemoryMap = PcMemGetMemoryMap;
MachVtbl.GetFloppyCount = PcGetFloppyCount;
MachVtbl.DiskGetBootPath = PcDiskGetBootPath; MachVtbl.DiskGetBootPath = PcDiskGetBootPath;
MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors;
MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry;

17
boot/freeldr/freeldr/arch/i386/machxbox.c
View file

@ -139,6 +139,22 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
/* FIXME: Detect more ISA devices */ /* FIXME: Detect more ISA devices */
} }
static
UCHAR
XboxGetFloppyCount(VOID)
{
/* On a PC we use CMOS/RTC I/O ports 0x70 and 0x71 to detect floppies.
* However an Xbox CMOS memory range [0x10, 0x70) and [0x80, 0x100)
* is filled with 0x55 0xAA 0x55 0xAA ... byte pattern which is used
* to validate the date/time settings by Xbox OS.
*
* Technically it's possible to connect a floppy drive to Xbox, but
* CMOS detection method should not be used here. */
WARN("XboxGetFloppyCount() is UNIMPLEMENTED, returning 0\n");
return 0;
}
PCONFIGURATION_COMPONENT_DATA PCONFIGURATION_COMPONENT_DATA
XboxHwDetect(VOID) XboxHwDetect(VOID)
{ {
@ -195,6 +211,7 @@ XboxMachInit(const char *CmdLine)
MachVtbl.Beep = PcBeep; MachVtbl.Beep = PcBeep;
MachVtbl.PrepareForReactOS = XboxPrepareForReactOS; MachVtbl.PrepareForReactOS = XboxPrepareForReactOS;
MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap;
MachVtbl.GetFloppyCount = XboxGetFloppyCount;
MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootPath = DiskGetBootPath;
MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors;
MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry;

3
boot/freeldr/freeldr/include/machine.h
View file

@ -61,6 +61,7 @@ typedef struct tagMACHVTBL
FREELDR_MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(FREELDR_MEMORY_DESCRIPTOR* Current); FREELDR_MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(FREELDR_MEMORY_DESCRIPTOR* Current);
PFREELDR_MEMORY_DESCRIPTOR (*GetMemoryMap)(PULONG MaxMemoryMapSize); PFREELDR_MEMORY_DESCRIPTOR (*GetMemoryMap)(PULONG MaxMemoryMapSize);
UCHAR (*GetFloppyCount)(VOID);
BOOLEAN (*DiskGetBootPath)(PCHAR BootPath, ULONG Size); BOOLEAN (*DiskGetBootPath)(PCHAR BootPath, ULONG Size);
BOOLEAN (*DiskReadLogicalSectors)(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN (*DiskReadLogicalSectors)(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer);
BOOLEAN (*DiskGetDriveGeometry)(UCHAR DriveNumber, PGEOMETRY DriveGeometry); BOOLEAN (*DiskGetDriveGeometry)(UCHAR DriveNumber, PGEOMETRY DriveGeometry);
@ -115,6 +116,8 @@ VOID MachInit(const char *CmdLine);
MachVtbl.Beep() MachVtbl.Beep()
#define MachPrepareForReactOS() \ #define MachPrepareForReactOS() \
MachVtbl.PrepareForReactOS() MachVtbl.PrepareForReactOS()
#define MachGetFloppyCount() \
MachVtbl.GetFloppyCount()
#define MachDiskGetBootPath(Path, Size) \ #define MachDiskGetBootPath(Path, Size) \
MachVtbl.DiskGetBootPath((Path), (Size)) MachVtbl.DiskGetBootPath((Path), (Size))
#define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) \ #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) \