[ros-diffs] [sir_richard] 49741: [ARMLLB]: We made certain assumptions in the "generic" files that are actually board-specific. For example, Versatile does indeed return a strange ULONG as the RTC time (second...

[sir_richard at svn.reactos.org]

Author: sir_richard
Date: Tue Nov 23 16:49:28 2010
New Revision: 49741

URL: http://svn.reactos.org/svn/reactos?rev=49741&view=rev
Log:
[ARMLLB]: We made certain assumptions in the "generic" files that are actually board-specific. For example, Versatile does indeed return a strange ULONG as the RTC time (seconds since 1970, I think), but TWL4030 on the ZOOM2 is normal and returns BCD RTC values just like the PC CMOS. Therefore, most of the "Generic" time.c code should move to versatile later. For now, use an IFDEF.
[ARMLLB]: Likewise, not all platforms have a PS/2 controller like the Versatile. ZOOM2 for example has a keypad, so the generic "input" file shouldn't assume keyboard-only. As such, most of the code there should also be made specific, but for now, use an ifdef.

Modified:
    trunk/reactos/boot/armllb/fw.c
    trunk/reactos/boot/armllb/hw/time.c

Modified: trunk/reactos/boot/armllb/fw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/fw.c?rev=49741&r1=49740&r2=49741&view=diff
==============================================================================
--- trunk/reactos/boot/armllb/fw.c [iso-8859-1] (original)
+++ trunk/reactos/boot/armllb/fw.c [iso-8859-1] Tue Nov 23 16:49:28 2010
@@ -49,7 +49,11 @@
 LlbFwGetCh(VOID)
 {
     /* Return the key pressed */
+#ifdef _ZOOM2_
+    return LlbKeypadGetChar();
+#else
     return LlbKeyboardGetChar();
+#endif
 }
 
 ULONG

Modified: trunk/reactos/boot/armllb/hw/time.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/time.c?rev=49741&r1=49740&r2=49741&view=diff
==============================================================================
--- trunk/reactos/boot/armllb/hw/time.c [iso-8859-1] (original)
+++ trunk/reactos/boot/armllb/hw/time.c [iso-8859-1] Tue Nov 23 16:49:28 2010
@@ -11,7 +11,12 @@
 #define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)
 
 UCHAR LlbDaysInMonth[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+
+#ifndef _ZOOM2_
 TIMEINFO LlbTime;
+#else
+extern TIMEINFO LlbTime;
+#endif
 
 BOOLEAN
 NTAPI
@@ -82,9 +87,10 @@
 
     /* Read RTC time */
     RtcTime = LlbHwRtcRead();
-
+#ifndef _ZOOM2_
     /* Convert it */
     LlbConvertRtcTime(RtcTime, &LlbTime);
+#endif
     return &LlbTime;
 }