From 72f7db13916e0f12ae48cf52f0f06b99c1ea3cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 4 Jan 2015 13:01:14 +0000 Subject: [PATCH] [FREELDR]: Do the same thing as how we fill out the ARC disk block elsewhere. svn path=/trunk/; revision=65968 --- reactos/boot/freeldr/freeldr/arch/arm/macharm.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/arch/arm/macharm.c b/reactos/boot/freeldr/freeldr/arch/arm/macharm.c index b59f58e1969..93a8258be8a 100644 --- a/reactos/boot/freeldr/freeldr/arch/arm/macharm.c +++ b/reactos/boot/freeldr/freeldr/arch/arm/macharm.c @@ -29,8 +29,9 @@ ULONG SecondLevelDcacheFillSize; ULONG SecondLevelIcacheSize; ULONG SecondLevelIcacheFillSize; -ARC_DISK_SIGNATURE reactos_arc_disk_info; -ULONG reactos_disk_count; +extern ULONG reactos_disk_count; +extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; +extern CHAR reactos_arc_strings[32][256]; ULONG SizeBits[] = { @@ -146,10 +147,13 @@ ArmHwDetect(VOID) RamDiskInitialize(); /* Fill out the ARC disk block */ - reactos_arc_disk_info.Signature = 0xBADAB00F; - reactos_arc_disk_info.CheckSum = 0xDEADBABE; - reactos_arc_disk_info.ArcName = "ramdisk(0)"; - reactos_disk_count = 1; + reactos_arc_disk_info[reactos_disk_count].Signature = 0xBADAB00F; + reactos_arc_disk_info[reactos_disk_count].CheckSum = 0xDEADBABE; + strcpy(reactos_arc_strings[reactos_disk_count], "ramdisk(0)"); + reactos_arc_disk_info[reactos_disk_count].ArcName = + reactos_arc_strings[reactos_disk_count]; + reactos_disk_count++; + ASSERT(reactos_disk_count == 1); /* Return the root node */ return RootNode;