Author: hbelusca Date: Sat Jan 10 22:02:11 2015 New Revision: 66024
URL: http://svn.reactos.org/svn/reactos?rev=66024&view=rev Log: [FREELDR]: Revert r66022. This wasn't our fault but VBox. See CORE-9046 for more details and proposed solution. CORE-9046 #resolve #comment r66022 reverted.
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/i... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] Sat Jan 10 22:02:11 2015 @@ -20,50 +20,10 @@
#define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f))
-#ifndef INT386_WITH_INT_1A_AH_02_04__IS__FIXED - -/* CMOS Registers and Ports */ -#define CMOS_CONTROL_PORT (PUCHAR)0x70 -#define CMOS_DATA_PORT (PUCHAR)0x71 - -#define RTC_REGISTER_A 0x0A -#define RTC_REG_A_UIP 0x80 - -static UCHAR -HalpReadCmos(IN UCHAR Reg) -{ - /* Select the register */ - WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg); - - /* Query the value */ - return READ_PORT_UCHAR(CMOS_DATA_PORT); -} - -#endif - TIMEINFO* PcGetTime(VOID) { static TIMEINFO TimeInfo; - -#ifndef INT386_WITH_INT_1A_AH_02_04__IS__FIXED - - /* Loop while update is in progress */ - while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP); - - /* Set the time data */ - TimeInfo.Second = BCD_INT(HalpReadCmos(0)); - TimeInfo.Minute = BCD_INT(HalpReadCmos(2)); - TimeInfo.Hour = BCD_INT(HalpReadCmos(4)); - TimeInfo.Day = BCD_INT(HalpReadCmos(7)); - TimeInfo.Month = BCD_INT(HalpReadCmos(8)); - TimeInfo.Year = BCD_INT(HalpReadCmos(9)); - - /* Compensate for the century field */ - TimeInfo.Year += (TimeInfo.Year > 80) ? 1900: 2000; - -#else - REGS Regs;
for (;;) @@ -126,9 +86,6 @@
break; } - -#endif - return &TimeInfo; }