From 8a5ac3eb85a4c6946997ce68218897e668304dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Sun, 23 Aug 2009 08:34:20 +0000
Subject: [PATCH] [freeldr] When creating a component, provide at the same time
 its configuration data

svn path=/trunk/; revision=42875
---
 .../freeldr/freeldr/include/arch/amd64/hardware.h     | 11 ++---------
 .../boot/freeldr/freeldr/include/arch/arm/hardware.h  | 10 ++--------
 .../boot/freeldr/freeldr/include/arch/i386/hardware.h | 11 ++---------
 .../freeldr/freeldr/include/arch/powerpc/hardware.h   | 11 ++---------
 4 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h b/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h
index 7814eff8e10..9c6c41c101a 100644
--- a/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h
+++ b/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h
@@ -54,18 +54,11 @@ FldrCreateComponentKey(
     IN ULONG Key,
     IN ULONG Affinity,
     IN PCHAR IdentifierString,
+    IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
+    IN ULONG Size,
     OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
 );
 
-VOID
-NTAPI
-FldrSetConfigurationData(
-    IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
-    IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
-    IN ULONG Size
-);
-
-
 /* PROTOTYPES ***************************************************************/
 
 /* hardware.c */
diff --git a/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h b/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h
index 2f3c9bbe7b7..549eefeaf71 100644
--- a/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h
+++ b/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h
@@ -74,15 +74,9 @@ FldrCreateComponentKey(
     IN ULONG Key,
     IN ULONG Affinity,
     IN PCHAR IdentifierString,
-    OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
-);
-
-VOID
-NTAPI
-FldrSetConfigurationData(
-    IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
     IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
-    IN ULONG Size
+    IN ULONG Size,
+    OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
 );
 
 VOID
diff --git a/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h b/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h
index d0b8e187092..314cd63ae6f 100644
--- a/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h
+++ b/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h
@@ -54,18 +54,11 @@ FldrCreateComponentKey(
     IN ULONG Key,
     IN ULONG Affinity,
     IN PCHAR IdentifierString,
+    IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
+    IN ULONG Size,
     OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
 );
 
-VOID
-NTAPI
-FldrSetConfigurationData(
-    IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
-    IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
-    IN ULONG Size
-);
-
-
 /* PROTOTYPES ***************************************************************/
 
 /* hardware.c */
diff --git a/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h b/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h
index 7fa5d060085..9d9c229ad56 100644
--- a/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h
+++ b/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h
@@ -53,18 +53,11 @@ FldrCreateComponentKey(
     IN ULONG Key,
     IN ULONG Affinity,
     IN PCHAR IdentifierString,
+    IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
+    IN ULONG Size,
     OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey
 );
 
-VOID
-NTAPI
-FldrSetConfigurationData(
-    IN PCONFIGURATION_COMPONENT_DATA ComponentKey,
-    IN PCM_PARTIAL_RESOURCE_LIST ResourceList,
-    IN ULONG Size
-);
-
-
 /* PROTOTYPES ***************************************************************/
 
 /* hardware.c */