From: smolik <smolik>
Date: Wed, 27 Feb 2008 20:13:36 +0000 (+0000)
Subject: makes KBD more platform independent - now can be compiled with/without microwindows
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sysless.git/commitdiff_plain/f3ba615aa3a9f00ce123c2c1de03c6820f07d4d1

makes KBD more platform independent - now can be compiled with/without microwindows
---

diff --git a/board/arm/ul_usb1/defines/system_def-hisc-keypad.h b/board/arm/ul_usb1/defines/system_def-hisc-keypad.h
index ee70f3c..09a90c5 100644
--- a/board/arm/ul_usb1/defines/system_def-hisc-keypad.h
+++ b/board/arm/ul_usb1/defines/system_def-hisc-keypad.h
@@ -241,6 +241,7 @@
 /***************************************************************************/
 /* kbd */
 #define KEY_TIMER sys_timer_ticks
+#define KBDDEVICE void
 
 typedef unsigned short kbd_key_t;
 typedef unsigned int kbd_keymod_t;
diff --git a/libs4c/kbd/kbd.h b/libs4c/kbd/kbd.h
index ba26f9b..6721c8d 100644
--- a/libs4c/kbd/kbd.h
+++ b/libs4c/kbd/kbd.h
@@ -37,6 +37,9 @@ void kbd_scan2mod(int scan_code);
 int kbd_down();
 kbd_key_t kbd_scan2key(int scan);
 
-int kbd_Open(void *pkd);
+int kbd_Open(KBDDEVICE *pkd);
+void kbd_Close(void);
+void kbd_GetModifierInfo(kbd_keymod_t *modifiers, kbd_keymod_t *curmodifiers);
 int kbd_Read(kbd_key_t *buf, kbd_keymod_t *modifiers, kbd_scan_code_t *scancode);
+int kbd_Poll(void);
 
diff --git a/libs4c/kbd/kbd_dev_ops.c b/libs4c/kbd/kbd_dev_ops.c
index 7c2fd41..9de5cf5 100644
--- a/libs4c/kbd/kbd_dev_ops.c
+++ b/libs4c/kbd/kbd_dev_ops.c
@@ -1,8 +1,6 @@
 #include <string.h>
 #include "kbd.h"
 
-#define KBDDEVICE void
-
 /*static int  kbd_Open(KBDDEVICE *pkd);
 static void kbd_Close(void);
 static void kbd_GetModifierInfo(kbd_keymod_t *modifiers, kbd_keymod_t *curmodifiers);
@@ -32,7 +30,7 @@ kbd_Open(KBDDEVICE *pkd)
 	key_use_timer=0;
 	memset(key_down_arr,0,sizeof(key_down_arr));
 	kbd_setio();
-	return 0;
+	return 1;
 }
 
 /**