Repair arrow keys for console.asm + fixes for Turbo C

git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@605 6ac86273-5f31-0410-b378-82cca8765d1b

hdr/version.h

@@ -47,8 +47,8 @@ static BYTE *date_hRcsId =
 
 #define REVISION_MAJOR  1
 #define REVISION_MINOR  1
-#define REVISION_SEQ    29
+#define REVISION_SEQ    30
-#define BUILD           "2029"
+#define BUILD           "2030"
 #define SUB_BUILD	""
-#define KERNEL_VERSION_STRING "1.1.29" /*#REVISION_MAJOR "." #REVISION_MINOR "." #REVISION_SEQ */
+#define KERNEL_VERSION_STRING "1.1.30" /*#REVISION_MAJOR "." #REVISION_MINOR "." #REVISION_SEQ */
-#define KERNEL_BUILD_STRING "2029"     /*#BUILD SUB_BUILD */
+#define KERNEL_BUILD_STRING "2030"     /*#BUILD SUB_BUILD */

kernel/console.asm

@@ -106,6 +106,26 @@ ConRead2:
                 jmp     _IOExit
 
 
+checkkey:
+                mov     ah,1
+		add     ah,[cs:kbdType]
+                int     16h                     ; Get status, if zf=0  al=char
+                jz      keydone                 ; Jump if no char available
+checke0:        cmp	al,0xe0                 ; must check for 0xe0 scan code
+        	jne	.ret
+		cmp	ax,0x00e0 		; check for Greek alpha
+		je	.ret
+		mov	al,0
+.ret:		retn
+        
+readkey:        
+       		mov     ah,[cs:kbdType]
+                int     16h
+        	jmp     short checke0
+
+keydone:	pop	cx
+		jmp	_IODone
+
 ;
 ; Name:
 ;       KbdRdChar
@@ -129,8 +149,7 @@ KbdRdChar:
 		; and previous is erased in any case
                 or      al,al                   ; Test to see if it was set
                 jnz     KbdRdRtn                ; Exit if it was, returning it
-		mov	ah, [cs:kbdType]
+		call	readkey     		; get keybd char in al, ah=scan
-                int     16h                     ; get keybd char in al, ah=scan
                 or      ax,ax                   ; Zero ?
                 jz      KbdRdChar               ; Loop if it is
                 cmp     ax,CTL_PRT_SCREEN       ; Ctrl-Print screen?
@@ -143,22 +162,16 @@ KbdRd1:
 KbdRdRtn:
                 retn
 
-
-
                 global  CommonNdRdExit
 CommonNdRdExit:		; *** tell if key waiting and return its ASCII if yes
                 mov     al,[cs:uScanCode]       ; Test for last scan code
 			; now AL is set if previous key was extended,
                 or      al,al                   ; Was it zero ?
                 jnz     ConNdRd2                ; Jump if there's a char waiting
-                mov     ah,1
+		call    checkkey
-		add     ah,[cs:kbdType]
-                int     16h                     ; Get status, if zf=0  al=char
-                jz      ConNdRd4                ; Jump if no char available
                 or      ax,ax                   ; Zero ?
                 jnz     ConNdRd1                ; Jump if not zero
-		mov     ah,[cs:kbdType]
+		call	readkey
-                int     16h                     ; get status, if zf=0  al=char
                 jmp     short CommonNdRdExit
 		; if char was there but 0, fetch and retry...
 		; (why do we check uScanCode here?)
@@ -196,8 +209,7 @@ KbdInpCh1:
                 int     16h                     ; get status, if zf=0  al=char
                 jz      KbdInpRtnZero           ; Jump if zero
 		; returns 0 or the last key that was waiting in AL
-		mov     ah,[cs:kbdType]
+		call	readkey
-                int     16h                     ; get keybd char in al, ah=scan
                 jmp     short KbdInpCh1
                 ; just read any key that is waiting, then check if
                 ; more keys are waiting. if not, return AL of this
@@ -270,17 +282,11 @@ ConInStat:
                 or      al,al                   ; Was it zero ?
                 jnz     ConCharReady            ; Jump if there's a char waiting
 		; return previously cached ext char if any
-		mov     ah,1
+        	call	checkkey
-		add     ah,[cs:kbdType]
-		int     16h                     ; get status, if zf=0  al=char
-                jz      ConNoChar               ; Jump if zero
-		; if no key waiting, return AL=0 / "none waiting"
-
                 or      ax,ax                   ; Zero ?
                 jnz     ConIS1                  ; Jump if not zero
                 ; if non-zero key waiting, take it
-		mov     ah,[cs:kbdType]
+        	call	readkey
-                int     16h                     ; get status, if zf=0  al=char
                 jmp     short ConInStat
 		; if zero key was waiting, fetch 2nd part etc. (???)
 

kernel/initclk.c

@@ -29,6 +29,7 @@
 #include "portab.h"
 #include "init-mod.h"
 #include "init-dat.h"
+#include "lol.h"
 
 #ifdef VERSION_STRINGS
 static char *RcsId =

kernel/initdisk.c

@@ -28,6 +28,7 @@
 #include "init-mod.h"
 #include "init-dat.h"
 #include "dyndata.h"
+#include "lol.h"
 #ifdef VERSION_STRINGS
 static BYTE *dskRcsId =
     "$Id$";

kernel/initoem.c

@@ -29,6 +29,7 @@
 
 #include "portab.h"
 #include "init-mod.h"
+#include "lol.h"
 
 #ifdef VERSION_STRINGS
 static BYTE *RcsId =

kernel/main.c

@@ -682,7 +682,7 @@ void CheckContinueBootFromHarddisk(void)
          bootedFrom
     );
 
-  if (GetBiosKey(InitKernelConfig.BootHarddiskSeconds) != -1)
+  if (GetBiosKey(InitKernelConfig.BootHarddiskSeconds) != (UWORD)-1)
   {
     /* user has hit a key, continue to boot from floppy/CD */
     printf("\n");
@@ -703,7 +703,7 @@ void CheckContinueBootFromHarddisk(void)
   init_call_intr(0x13, &r);
 
   {
-    void (far *reboot)() = (void (far*)()) MK_FP(0x0,0x7c00);
+    void (far *reboot)(void) = (void (far*)(void)) MK_FP(0x0,0x7c00);
 
     (*reboot)();
   }