1 added + 10 modified, total 11 files
freeldr/freeldr
diff -u -r1.58 -r1.59
--- Makefile 14 Nov 2004 22:07:53 -0000 1.58
+++ Makefile 28 Nov 2004 22:42:39 -0000 1.59
@@ -220,6 +220,7 @@
xboxcons.o \
xboxdisk.o \
xboxfont.o \
+ xboxhw.o \
xboxmem.o \
xboxrtc.o \
xboxvideo.o \
freeldr/freeldr
diff -u -r1.6 -r1.7
--- machine.c 23 Nov 2004 11:28:02 -0000 1.6
+++ machine.c 28 Nov 2004 22:42:39 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: machine.c,v 1.6 2004/11/23 11:28:02 gvg Exp $
+/* $Id: machine.c,v 1.7 2004/11/28 22:42:39 gvg Exp $
*
* FreeLoader
*
@@ -42,6 +42,7 @@
#undef MachDiskGetDriveGeometry
#undef MachDiskGetCacheableBlockCount
#undef MachRTCGetCurrentDateTime
+#undef MachHwDetect
MACHVTBL MachVtbl;
@@ -177,4 +178,10 @@
MachVtbl.RTCGetCurrentDateTime(Year, Month, Day, Hour, Minute, Second);
}
+VOID
+MachHwDetect(VOID)
+{
+ MachVtbl.HwDetect();
+}
+
/* EOF */
freeldr/freeldr/arch/i386
diff -N xboxhw.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xboxhw.c 28 Nov 2004 22:42:40 -0000 1.1
@@ -0,0 +1,29 @@
+/* $Id: xboxhw.c,v 1.1 2004/11/28 22:42:40 gvg Exp $
+ *
+ * FreeLoader
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "freeldr.h"
+#include "machine.h"
+#include "machxbox.h"
+
+VOID
+XboxHwDetect(VOID)
+{
+}
+
+/* EOF */
freeldr/freeldr/arch/i386
diff -u -r1.22 -r1.23
--- hardware.c 12 Nov 2004 17:17:07 -0000 1.22
+++ hardware.c 28 Nov 2004 22:42:40 -0000 1.23
@@ -2231,7 +2231,7 @@
VOID
-DetectHardware(VOID)
+PcHwDetect(VOID)
{
HKEY SystemKey;
U32 BusNumber = 0;
freeldr/freeldr/arch/i386
diff -u -r1.6 -r1.7
--- machpc.c 23 Nov 2004 11:28:02 -0000 1.6
+++ machpc.c 28 Nov 2004 22:42:40 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: machpc.c,v 1.6 2004/11/23 11:28:02 gvg Exp $
+/* $Id: machpc.c,v 1.7 2004/11/28 22:42:40 gvg Exp $
*
* FreeLoader
*
@@ -53,6 +53,7 @@
MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry;
MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount;
MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime;
+ MachVtbl.HwDetect = PcHwDetect;
}
/* EOF */
freeldr/freeldr/arch/i386
diff -u -r1.6 -r1.7
--- machpc.h 23 Nov 2004 11:28:02 -0000 1.6
+++ machpc.h 28 Nov 2004 22:42:40 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: machpc.h,v 1.6 2004/11/23 11:28:02 gvg Exp $
+/* $Id: machpc.h,v 1.7 2004/11/28 22:42:40 gvg Exp $
*
* FreeLoader
*
@@ -55,6 +55,8 @@
VOID PcRTCGetCurrentDateTime(PU32 Year, PU32 Month, PU32 Day, PU32 Hour, PU32 Minute, PU32 Second);
+VOID PcHwDetect(VOID);
+
#endif /* __I386_MACHPC_H_ */
/* EOF */
freeldr/freeldr/arch/i386
diff -u -r1.6 -r1.7
--- machxbox.c 23 Nov 2004 11:28:02 -0000 1.6
+++ machxbox.c 28 Nov 2004 22:42:40 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: machxbox.c,v 1.6 2004/11/23 11:28:02 gvg Exp $
+/* $Id: machxbox.c,v 1.7 2004/11/28 22:42:40 gvg Exp $
*
* FreeLoader
*
@@ -51,4 +51,5 @@
MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry;
MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount;
MachVtbl.RTCGetCurrentDateTime = XboxRTCGetCurrentDateTime;
+ MachVtbl.HwDetect = XboxHwDetect;
}
freeldr/freeldr/arch/i386
diff -u -r1.6 -r1.7
--- machxbox.h 23 Nov 2004 11:28:02 -0000 1.6
+++ machxbox.h 28 Nov 2004 22:42:40 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: machxbox.h,v 1.6 2004/11/23 11:28:02 gvg Exp $
+/* $Id: machxbox.h,v 1.7 2004/11/28 22:42:40 gvg Exp $
*
* FreeLoader
*
@@ -57,6 +57,9 @@
U32 XboxDiskGetCacheableBlockCount(U32 DriveNumber);
VOID XboxRTCGetCurrentDateTime(PU32 Year, PU32 Month, PU32 Day, PU32 Hour, PU32 Minute, PU32 Second);
+
+VOID XboxHwDetect(VOID);
+
#endif /* __I386_HWXBOX_H_ */
/* EOF */
freeldr/freeldr/include
diff -u -r1.6 -r1.7
--- machine.h 23 Nov 2004 11:28:02 -0000 1.6
+++ machine.h 28 Nov 2004 22:42:40 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: machine.h,v 1.6 2004/11/23 11:28:02 gvg Exp $
+/* $Id: machine.h,v 1.7 2004/11/28 22:42:40 gvg Exp $
*
* FreeLoader
*
@@ -62,6 +62,8 @@
U32 (*DiskGetCacheableBlockCount)(U32 DriveNumber);
VOID (*RTCGetCurrentDateTime)(PU32 Year, PU32 Month, PU32 Day, PU32 Hour, PU32 Minute, PU32 Second);
+
+ VOID (*HwDetect)(VOID);
} MACHVTBL, *PMACHVTBL;
VOID MachInit(VOID);
@@ -90,6 +92,7 @@
#define MachDiskGetDriveGeometry(Drive, Geom) MachVtbl.DiskGetDriveGeometry((Drive), (Geom))
#define MachDiskGetCacheableBlockCount(Drive) MachVtbl.DiskGetCacheableBlockCount(Drive)
#define MachRTCGetCurrentDateTime(Y, Mo, D, H, Mi, S) MachVtbl.RTCGetCurrentDateTime((Y), (Mo), (D), (H), (Mi), (S));
+#define MachHwDetect() MachVtbl.HwDetect()
#endif /* __MACHINE_H_ */
freeldr/freeldr/reactos
diff -u -r1.40 -r1.41
--- reactos.c 23 Nov 2004 11:28:02 -0000 1.40
+++ reactos.c 28 Nov 2004 22:42:40 -0000 1.41
@@ -739,7 +739,7 @@
/*
* Detect hardware
*/
- DetectHardware();
+ MachHwDetect();
UiDrawStatusText("Loading...");
freeldr/freeldr/reactos
diff -u -r1.17 -r1.18
--- setupldr.c 14 Nov 2004 22:04:39 -0000 1.17
+++ setupldr.c 28 Nov 2004 22:42:40 -0000 1.18
@@ -302,7 +302,7 @@
#else
printf("Detecting hardware...\n\n");
#endif
- DetectHardware();
+ MachHwDetect();
#ifdef USE_UI
UiDrawStatusText("");
#endif
CVSspam 0.2.8