}
-VOID
+PCONFIGURATION_COMPONENT_DATA
PcHwDetect(VOID)
{
PCONFIGURATION_COMPONENT_DATA SystemKey;
DetectAcpiBios(SystemKey, &BusNumber);
DbgPrint((DPRINT_HWDETECT, "DetectHardware() Done\n"));
+
+ return SystemKey;
}
/* EOF */
/* FIXME: Detect more ISA devices */
}
-VOID
+PCONFIGURATION_COMPONENT_DATA
XboxHwDetect(VOID)
{
PCONFIGURATION_COMPONENT_DATA SystemKey;
DetectIsaBios(SystemKey, &BusNumber);
DbgPrint((DPRINT_HWDETECT, "DetectHardware() Done\n"));
+ return SystemKey;
}
/* EOF */
}
}
-VOID PpcHwDetect() {
+PCONFIGURATION_COMPONENT_DATA PpcHwDetect() {
PCONFIGURATION_COMPONENT_DATA RootKey;
ULONG BusNumber = 0, DiskController = 0, DiskNumber = 0;
int node = ofw_finddevice("/");
FldrSetComponentInformation(RootKey, 0, 0, (ULONG)-1);
OfwCopyDeviceTree(RootKey,"/",node,&BusNumber,&DiskController,&DiskNumber);
+ return RootKey;
}
BOOLEAN PpcDiskNormalizeSystemPath(char *SystemPath, unsigned Size) {
/* Most PReP hardware is in standard locations, based on the corresponding
* hardware on PCs. */
-VOID PpcPrepHwDetect() {
+PCONFIGURATION_COMPONENT_DATA PpcPrepHwDetect() {
PCONFIGURATION_COMPONENT_DATA SystemKey;
/* Create the 'System' key */
0xFFFFFFFF);
printf("DetectHardware() Done\n");
+ return SystemKey;
}
void PpcPrepInit()
VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second);
-VOID PcHwDetect(VOID);
+PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID);
#endif /* __I386_MACHPC_H_ */
VOID XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second);
-VOID XboxHwDetect(VOID);
+PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID);
VOID XboxSetLED(PCSTR Pattern);
VOID (*RTCGetCurrentDateTime)(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second);
- VOID (*HwDetect)(VOID);
+ PCONFIGURATION_COMPONENT_DATA (*HwDetect)(VOID);
} MACHVTBL, *PMACHVTBL;
VOID MachInit(const char *CmdLine);
LoaderBlock.ModsCount = 0;
LoaderBlock.ModsAddr = reactos_modules;
LoaderBlock.DrivesAddr = reactos_arc_disk_info;
- LoaderBlock.ArchExtra = (ULONG)reactos_arc_hardware_data;
LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t);
if (LoaderBlock.MmapLength)
{
/*
* Detect hardware
*/
- MachHwDetect();
+ LoaderBlock.ArchExtra = (ULONG)MachHwDetect();
UiDrawProgressBarCenter(5, 100, szLoadingMsg);
if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE;
LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd;
LoaderBlock.ModsCount = 0;
LoaderBlock.ModsAddr = reactos_modules;
- LoaderBlock.ArchExtra = (ULONG)reactos_arc_hardware_data;
LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t);
if (LoaderBlock.MmapLength)
{
/* Detect hardware */
UiDrawStatusText("Detecting hardware...");
- MachHwDetect();
+ LoaderBlock.ArchExtra = (ULONG)MachHwDetect();
UiDrawStatusText("");
/* set boot device */