From efffb2f0b1b24951169b693b0b6a3ee20849c460 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 12 Mar 2012 23:00:56 +0000 Subject: [PATCH] [FREELDR] Set proper video mode for VESA graphical Remove one magic value usage svn path=/trunk/; revision=56137 --- reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c | 2 +- reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c b/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c index b481dd4ec0d..098f558bb30 100644 --- a/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c +++ b/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c @@ -798,7 +798,7 @@ PcVideoSetMode(USHORT NewMode) ScreenHeight = VesaVideoModeInformation.HeightInPixels; BytesPerScanLine = VesaVideoModeInformation.BytesPerScanLine; BiosVideoMode = NewMode; - DisplayMode = VideoTextMode; + DisplayMode = VideoGraphicsMode; VesaVideoMode = TRUE; return TRUE; diff --git a/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c b/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c index 0f2663f1306..3fda993e377 100644 --- a/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c +++ b/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c @@ -338,11 +338,11 @@ DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, * harddisks. So, we set the buffer to known contents first, then try to * read. If the BIOS reports success but the buffer contents haven't * changed then we fail anyway */ - memset((PVOID) DISKREADBUFFER, 0xcd, 512); + memset((PVOID) DISKREADBUFFER, 0xcd, DISKREADBUFFER_SIZE); while (MachDiskReadLogicalSectors(0x80 + DiskCount, 0ULL, 1, (PVOID)DISKREADBUFFER)) { Changed = FALSE; - for (i = 0; ! Changed && i < 512; i++) + for (i = 0; ! Changed && i < DISKREADBUFFER_SIZE; i++) { Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; } @@ -353,7 +353,7 @@ DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, break; } DiskCount++; - memset((PVOID) DISKREADBUFFER, 0xcd, 512); + memset((PVOID) DISKREADBUFFER, 0xcd, DISKREADBUFFER_SIZE); } DiskReportError(TRUE); TRACE("BIOS reports %d harddisk%s\n",