[ARMLLB]: We made certain assumptions in the "generic" files that are actually board...

[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.

svn path=/trunk/; revision=49741

diff --git a/reactos/boot/armllb/fw.c b/reactos/boot/armllb/fw.c
index 4286b4a..8831d95 100644 (file)
--- a/reactos/boot/armllb/fw.c
+++ b/reactos/boot/armllb/fw.c
@@ -49,7 +49,11 @@ INT
 LlbFwGetCh(VOID)
 {
     /* Return the key pressed */
+#ifdef _ZOOM2_
+    return LlbKeypadGetChar();
+#else
     return LlbKeyboardGetChar();
+#endif
 }
 
 ULONG

diff --git a/reactos/boot/armllb/hw/time.c b/reactos/boot/armllb/hw/time.c
index f37be24..ed78ea4 100755 (executable)
--- a/reactos/boot/armllb/hw/time.c
+++ b/reactos/boot/armllb/hw/time.c
@@ -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 @@ LlbGetTime(VOID)
 
     /* Read RTC time */
     RtcTime = LlbHwRtcRead();
-
+#ifndef _ZOOM2_
     /* Convert it */
     LlbConvertRtcTime(RtcTime, &LlbTime);
+#endif
     return &LlbTime;
 }