9 Aug
2009
9 Aug
'09
7:45 a.m.
Author: hpoussin
Date: Sun Aug 9 09:45:41 2009
New Revision: 42543
URL: http://svn.reactos.org/svn/reactos?rev=42543&view=rev
Log:
Merge FldrCreateComponentKey and FldrSetComponentInformation
Remove unneeded parameters in FldrCreateComponentKey
Modified:
trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c
trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c
trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h
trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h
trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h
trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h
trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sun Aug 9 09:45:41
2009
@@ -103,14 +103,6 @@
FldrCreateSystemKey(&RootNode);
//
- // Write null component information
- //
- FldrSetComponentInformation(RootNode,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
-
- //
// TODO:
// There's no such thing as "PnP" on embedded hardware.
// The boot loader will send us a device tree, similar to ACPI
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Aug 9
09:45:41 2009
@@ -238,18 +238,13 @@
/* Create component key */
FldrCreateComponentKey(SystemKey,
- L"MultifunctionAdapter",
- *BusNumber,
AdapterClass,
MultiFunctionAdapter,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&BusKey);
(*BusNumber)++;
-
- /* Set the component information */
- FldrSetComponentInformation(BusKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Set the identifier */
FldrSetIdentifier(BusKey, "PNP BIOS");
@@ -649,17 +644,12 @@
Ptr = GetInt1eTable();
FldrCreateComponentKey(ControllerKey,
- L"FloppyDiskPeripheral",
- FloppyNumber,
PeripheralClass,
FloppyDiskPeripheral,
+ Input | Output,
+ FloppyNumber,
+ 0xFFFFFFFF,
&PeripheralKey);
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(PeripheralKey,
- Input | Output,
- FloppyNumber,
- 0xFFFFFFFF);
Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
sizeof(CM_FLOPPY_DEVICE_DATA);
@@ -811,18 +801,13 @@
(int)DiskCount, (DiskCount == 1) ? "": "s");
FldrCreateComponentKey(BusKey,
- L"DiskController",
- 0,
ControllerClass,
DiskController,
+ Output | Input | Removable,
+ 0x0,
+ 0xFFFFFFFF,
&ControllerKey);
DPRINTM(DPRINT_HWDETECT, "Created key: DiskController\\0\n");
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(ControllerKey,
- Output | Input | Removable,
- 0,
- 0xFFFFFFFF);
DetectBiosFloppyController(BusKey, ControllerKey);
@@ -882,17 +867,12 @@
{
/* Create disk key */
FldrCreateComponentKey(ControllerKey,
- L"DiskPeripheral",
- i,
PeripheralClass,
DiskPeripheral,
+ Output | Input,
+ 0x0,
+ 0xFFFFFFFF,
&DiskKey);
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(DiskKey,
- Output | Input,
- 0,
- 0xFFFFFFFF);
/* Set disk values */
SetHarddiskConfigurationData(DiskKey, 0x80 + i);
@@ -1224,19 +1204,14 @@
/* Create 'PointerPeripheral' key */
FldrCreateComponentKey(ControllerKey,
- L"PointerPeripheral",
- 0,
PeripheralClass,
PointerPeripheral,
+ Input,
+ 0x0,
+ 0xFFFFFFFF,
&PeripheralKey);
DPRINTM(DPRINT_HWDETECT,
"Created key: PointerPeripheral\\0\n");
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(PeripheralKey,
- Input,
- 0,
- 0xFFFFFFFF);
/* Set 'Configuration Data' value */
memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST));
@@ -1287,17 +1262,12 @@
/* Create controller key */
FldrCreateComponentKey(BusKey,
- L"SerialController",
- ControllerNumber,
ControllerClass,
SerialController,
+ Output | Input | ConsoleIn | ConsoleOut,
+ ControllerNumber,
+ 0xFFFFFFFF,
&ControllerKey);
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(ControllerKey,
- Output | Input | ConsoleIn | ConsoleOut,
- ControllerNumber,
- 0xFFFFFFFF);
/* Build full device descriptor */
Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
@@ -1399,17 +1369,12 @@
/* Create controller key */
FldrCreateComponentKey(BusKey,
- L"ParallelController",
- ControllerNumber,
ControllerClass,
ParallelController,
+ Output,
+ ControllerNumber,
+ 0xFFFFFFFF,
&ControllerKey);
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(ControllerKey,
- Output,
- ControllerNumber,
- 0xFFFFFFFF);
/* Build full device descriptor */
Size = sizeof(CM_PARTIAL_RESOURCE_LIST);
@@ -1554,18 +1519,13 @@
{
/* Create controller key */
FldrCreateComponentKey(ControllerKey,
- L"KeyboardPeripheral",
- 0,
PeripheralClass,
KeyboardPeripheral,
+ Input | ConsoleIn,
+ 0x0,
+ 0xFFFFFFFF,
&PeripheralKey);
DPRINTM(DPRINT_HWDETECT, "Created key: KeyboardPeripheral\\0\n");
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(PeripheralKey,
- Input | ConsoleIn,
- 0,
- 0xFFFFFFFF);
/* Set 'Configuration Data' value */
Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
@@ -1616,18 +1576,13 @@
/* Create controller key */
FldrCreateComponentKey(BusKey,
- L"KeyboardController",
- 0,
ControllerClass,
KeyboardController,
+ Input | ConsoleIn,
+ 0x0,
+ 0xFFFFFFFF,
&ControllerKey);
DPRINTM(DPRINT_HWDETECT, "Created key: KeyboardController\\0\n");
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(ControllerKey,
- Input | ConsoleIn,
- 0,
- 0xFFFFFFFF);
/* Set 'Configuration Data' value */
Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
@@ -1803,18 +1758,13 @@
/* Create controller key */
FldrCreateComponentKey(BusKey,
- L"PointerController",
- 0,
ControllerClass,
PointerController,
+ Input,
+ 0x0,
+ 0xFFFFFFFF,
&ControllerKey);
DPRINTM(DPRINT_HWDETECT, "Created key: PointerController\\0\n");
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(ControllerKey,
- Input,
- 0,
- 0xFFFFFFFF);
memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST));
@@ -1842,18 +1792,13 @@
/* Create peripheral key */
FldrCreateComponentKey(ControllerKey,
- L"PointerPeripheral",
- 0,
ControllerClass,
PointerPeripheral,
+ Input,
+ 0x0,
+ 0xFFFFFFFF,
&PeripheralKey);
DPRINTM(DPRINT_HWDETECT, "Created key: PointerPeripheral\\0\n");
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(PeripheralKey,
- Input,
- 0,
- 0xFFFFFFFF);
/* Initialize resource descriptor */
memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST));
@@ -1882,18 +1827,13 @@
USHORT VesaVersion;
FldrCreateComponentKey(BusKey,
- L"DisplayController",
- 0,
ControllerClass,
DisplayController,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&ControllerKey);
DPRINTM(DPRINT_HWDETECT, "Created key: DisplayController\\0\n");
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(ControllerKey,
- 0x00,
- 0,
- 0xFFFFFFFF);
/* FIXME: Set 'ComponentInformation' value */
@@ -1938,17 +1878,12 @@
/* Create new bus key */
FldrCreateComponentKey(SystemKey,
- L"MultifunctionAdapter",
- *BusNumber,
AdapterClass,
MultiFunctionAdapter,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&BusKey);
-
- /* Set 'Component Information' value similar to my NT4 box */
- FldrSetComponentInformation(BusKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Increment bus number */
(*BusNumber)++;
@@ -2004,12 +1939,6 @@
/* Create the 'System' key */
FldrCreateSystemKey(&SystemKey);
-
- /* Set empty component information */
- FldrSetComponentInformation(SystemKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Detect buses */
DetectPciBios(SystemKey, &BusNumber);
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Sun Aug 9 09:45:41
2009
@@ -69,17 +69,12 @@
/* Create new bus key */
FldrCreateComponentKey(SystemKey,
- L"MultifunctionAdapter",
- *BusNumber,
AdapterClass,
MultiFunctionAdapter,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&BiosKey);
-
- /* Set 'Component Information' */
- FldrSetComponentInformation(BiosKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Get BIOS memory map */
RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32);
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c [iso-8859-1] Sun Aug 9 09:45:41
2009
@@ -63,17 +63,12 @@
{
/* Create new bus key */
FldrCreateComponentKey(SystemKey,
- L"MultifunctionAdapter",
- *BusNumber,
AdapterClass,
MultiFunctionAdapter,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&BiosKey);
-
- /* Set 'Component Information' */
- FldrSetComponentInformation(BiosKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Set 'Configuration Data' value */
memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST));
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Sun Aug 9 09:45:41
2009
@@ -155,17 +155,12 @@
DPRINTM(DPRINT_HWDETECT, "Table size: %u\n", Table->Size);
FldrCreateComponentKey(BusKey,
- L"RealModeIrqRoutingTable",
- 0,
PeripheralClass,
RealModeIrqRoutingTable,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&TableKey);
-
- /* Set 'Component Information' */
- FldrSetComponentInformation(TableKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Set 'Identifier' value */
FldrSetIdentifier(TableKey, "PCI Real-mode IRQ Routing Table");
@@ -225,17 +220,12 @@
{
/* Create new bus key */
FldrCreateComponentKey(SystemKey,
- L"MultifunctionAdapter",
- *BusNumber,
AdapterClass,
MultiFunctionAdapter,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&BiosKey);
-
- /* Set 'Component Information' */
- FldrSetComponentInformation(BiosKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Increment bus number */
(*BusNumber)++;
@@ -268,17 +258,12 @@
{
/* Create the bus key */
FldrCreateComponentKey(SystemKey,
- L"MultifunctionAdapter",
- *BusNumber,
AdapterClass,
MultiFunctionAdapter,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&BusKey);
-
- /* Set 'Component Information' */
- FldrSetComponentInformation(BusKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Check if this is the first bus */
if (i == 0)
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Sun Aug 9 09:45:41
2009
@@ -207,18 +207,13 @@
(int)DiskCount, (DiskCount == 1) ? "": "s");
FldrCreateComponentKey(BusKey,
- L"DiskController",
- 0,
ControllerClass,
DiskController,
+ Output | Input | Removable,
+ 0,
+ 0xFFFFFFFF,
&ControllerKey);
DPRINTM(DPRINT_HWDETECT, "Created key: DiskController\\0\n");
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(ControllerKey,
- Output | Input | Removable,
- 0,
- 0xFFFFFFFF);
//DetectBiosFloppyController(BusKey, ControllerKey);
@@ -275,17 +270,12 @@
{
/* Create disk key */
FldrCreateComponentKey(ControllerKey,
- L"DiskPeripheral",
- i,
PeripheralClass,
DiskPeripheral,
+ Output | Input,
+ 0,
+ 0xFFFFFFFF,
&DiskKey);
-
- /* Set 'ComponentInformation' value */
- FldrSetComponentInformation(DiskKey,
- Output | Input,
- 0,
- 0xFFFFFFFF);
/* Set disk values */
SetHarddiskConfigurationData(DiskKey, 0x80 + i);
@@ -302,17 +292,12 @@
/* Create new bus key */
FldrCreateComponentKey(SystemKey,
- L"MultifunctionAdapter",
- *BusNumber,
AdapterClass,
MultiFunctionAdapter,
+ 0x0,
+ 0x0,
+ 0xFFFFFFFF,
&BusKey);
-
- /* Set 'Component Information' value similar to my NT4 box */
- FldrSetComponentInformation(BusKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
/* Increment bus number */
(*BusNumber)++;
@@ -360,12 +345,6 @@
/* Create the 'System' key */
FldrCreateSystemKey(&SystemKey);
- /* Set empty component information */
- FldrSetComponentInformation(SystemKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
-
/* TODO: Build actual xbox's hardware configuration tree */
DetectIsaBios(SystemKey, &BusNumber);
Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Sun Aug 9
09:45:41 2009
@@ -388,13 +388,12 @@
/* Create a key for this device */
FldrCreateComponentKey
(ParentKey,
- wide_name,
- 0,
AdapterClass,
MultiFunctionAdapter,
+ 0,
+ 0,
+ (ULONG)-1,
&NewKey);
-
- FldrSetComponentInformation(NewKey, 0, 0, (ULONG)-1);
/* Add properties */
for (prev_name = ""; ofw_nextprop(node, prev_name, cur_name) == 1; )
@@ -451,8 +450,6 @@
int node = ofw_finddevice("/");
FldrCreateSystemKey(&RootKey);
-
- FldrSetComponentInformation(RootKey, 0, 0, (ULONG)-1);
OfwCopyDeviceTree(RootKey,"/",node,&BusNumber,&DiskController,&DiskNumber);
return RootKey;
Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c [iso-8859-1] Sun Aug 9
09:45:41 2009
@@ -114,12 +114,6 @@
/* Create the 'System' key */
FldrCreateSystemKey(&SystemKey);
- /* Set empty component information */
- FldrSetComponentInformation(SystemKey,
- 0x0,
- 0x0,
- 0xFFFFFFFF);
-
printf("DetectHardware() Done\n");
return SystemKey;
}
Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Sun Aug 9
09:45:41 2009
@@ -11,6 +11,10 @@
<compilerflag>-fno-inline</compilerflag>
<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
</group>
+ <directory name="arcemul">
+ <file>component.c</file>
+ <file>time.c</file>
+ </directory>
<directory name="cache">
<file>blocklist.c</file>
<file>cache.c</file>
Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h [iso-8859-1] Sun Aug
9 09:45:41 2009
@@ -40,15 +40,6 @@
//
VOID
NTAPI
-FldrSetComponentInformation(
- IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
- IN IDENTIFIER_FLAG Flags,
- IN ULONG Key,
- IN ULONG Affinity
-);
-
-VOID
-NTAPI
FldrSetIdentifier(
IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
IN PCHAR Identifier
@@ -64,10 +55,11 @@
NTAPI
FldrCreateComponentKey(
IN PCONFIGURATION_COMPONENT_DATA SystemKey,
- IN PWCHAR BusName,
- IN ULONG BusNumber,
IN CONFIGURATION_CLASS Class,
IN CONFIGURATION_TYPE Type,
+ IN IDENTIFIER_FLAG Flags,
+ IN ULONG Key,
+ IN ULONG Affinity,
OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
);
Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Sun Aug 9
09:45:41 2009
@@ -60,15 +60,6 @@
//
VOID
NTAPI
-FldrSetComponentInformation(
- IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
- IN IDENTIFIER_FLAG Flags,
- IN ULONG Key,
- IN ULONG Affinity
-);
-
-VOID
-NTAPI
FldrSetIdentifier(
IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
IN PCHAR Identifier
@@ -83,11 +74,12 @@
VOID
NTAPI
FldrCreateComponentKey(
- IN PCONFIGURATION_COMPONENT_DATA SystemKey,
- IN PWCHAR BusName,
- IN ULONG BusNumber,
+ IN PCONFIGURATION_COMPONENT_DATA SystemKey,,
IN CONFIGURATION_CLASS Class,
IN CONFIGURATION_TYPE Type,
+ IN IDENTIFIER_FLAG Flags,
+ IN ULONG Key,
+ IN ULONG Affinity,
OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
);
Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h [iso-8859-1] Sun Aug
9 09:45:41 2009
@@ -40,15 +40,6 @@
//
VOID
NTAPI
-FldrSetComponentInformation(
- IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
- IN IDENTIFIER_FLAG Flags,
- IN ULONG Key,
- IN ULONG Affinity
-);
-
-VOID
-NTAPI
FldrSetIdentifier(
IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
IN PCHAR Identifier
@@ -64,10 +55,11 @@
NTAPI
FldrCreateComponentKey(
IN PCONFIGURATION_COMPONENT_DATA SystemKey,
- IN PWCHAR BusName,
- IN ULONG BusNumber,
IN CONFIGURATION_CLASS Class,
IN CONFIGURATION_TYPE Type,
+ IN IDENTIFIER_FLAG Flags,
+ IN ULONG Key,
+ IN ULONG Affinity,
OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
);
Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h [iso-8859-1] Sun
Aug 9 09:45:41 2009
@@ -39,15 +39,6 @@
//
VOID
NTAPI
-FldrSetComponentInformation(
- IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
- IN IDENTIFIER_FLAG Flags,
- IN ULONG Key,
- IN ULONG Affinity
-);
-
-VOID
-NTAPI
FldrSetIdentifier(
IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
IN PCHAR Identifier
@@ -63,10 +54,11 @@
NTAPI
FldrCreateComponentKey(
IN PCONFIGURATION_COMPONENT_DATA SystemKey,
- IN PWCHAR BusName,
- IN ULONG BusNumber,
IN CONFIGURATION_CLASS Class,
IN CONFIGURATION_TYPE Type,
+ IN IDENTIFIER_FLAG Flags,
+ IN ULONG Key,
+ IN ULONG Affinity,
OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
);
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c [iso-8859-1] Sun Aug 9 09:45:41
2009
@@ -53,23 +53,6 @@
VOID
NTAPI
-FldrSetComponentInformation(IN PCONFIGURATION_COMPONENT_DATA ComponentData,
- IN IDENTIFIER_FLAG Flags,
- IN ULONG Key,
- IN ULONG Affinity)
-{
- PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry;
-
- /* Set component information */
- Component->Flags = Flags;
- Component->Version = 0;
- Component->Revision = 0;
- Component->Key = Key;
- Component->AffinityMask = Affinity;
-}
-
-VOID
-NTAPI
FldrSetIdentifier(IN PCONFIGURATION_COMPONENT_DATA ComponentData,
IN PCHAR IdentifierString)
{
@@ -107,6 +90,11 @@
Component->ConfigurationDataLength = 0;
Component->Identifier = 0;
Component->IdentifierLength = 0;
+ Component->Flags = 0;
+ Component->Version = 0;
+ Component->Revision = 0;
+ Component->Key = 0;
+ Component->AffinityMask = 0xFFFFFFFF;
/* Return the node */
*SystemNode = FldrArcHwTreeRoot;
@@ -145,10 +133,11 @@
VOID
NTAPI
FldrCreateComponentKey(IN PCONFIGURATION_COMPONENT_DATA SystemNode,
- IN PWCHAR BusName,
- IN ULONG BusNumber,
IN CONFIGURATION_CLASS Class,
IN CONFIGURATION_TYPE Type,
+ IN IDENTIFIER_FLAG Flags,
+ IN ULONG Key,
+ IN ULONG Affinity,
OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey)
{
PCONFIGURATION_COMPONENT_DATA ComponentData;