x86: keyboad input bug fix

most of the code copy from tinix, just make it run, code quality is not good.

Signed-off-by: parai <parai@foxmail.com>

bsp/x86/Makefile

@@ -8,6 +8,7 @@ all:floppy.img
 
 clean:
 	scons -c clean
+	rm -fr build rtthread*
 
 floppy.img:
 	wget https://github.com/bajdcc/tinix/raw/master/floppy.img

bsp/x86/drivers/console.c

@@ -17,16 +17,13 @@
 
 #include <bsp.h>
 
-
-//#include "serial.h"
-
 static unsigned addr_6845;
 static rt_uint16_t *crt_buf;
 static rt_int16_t  crt_pos;
 
-//extern void rt_serial_init(void);
-extern char rt_keyboard_getc(void);
-//extern char rt_serial_getc(void);
+extern void init_keyboard();
+extern void rt_keyboard_isr(void);
+extern rt_bool_t rt_keyboard_getc(char* c);
 
 static void rt_console_putc(int c);
 
@@ -217,39 +214,38 @@ static rt_size_t rt_console_read(rt_device_t dev, rt_off_t pos, void* buffer, rt
 static void rt_console_isr(int vector, void* param)
 {
     char c;
+	rt_bool_t ret;
     rt_base_t level;
 
-    while(1)
-    {
-        c = rt_keyboard_getc();
+	rt_keyboard_isr();
 
-        if(c == 0)
-        {
-            break;
-        }
-        else if(c > 0)
-        {
-            /* disable interrupt */
-            level = rt_hw_interrupt_disable();
+	ret = rt_keyboard_getc(&c);
+	if(ret == RT_FALSE)
+	{
+		/* do nothing */
+	}
+	else
+	{
+		/* disable interrupt */
+		level = rt_hw_interrupt_disable();
 
-            /* save character */
-            rx_buffer[save_index] = c;
-            save_index ++;
-            if (save_index >= CONSOLE_RX_BUFFER_SIZE)
-                save_index = 0;
+		/* save character */
+		rx_buffer[save_index] = c;
+		save_index ++;
+		if (save_index >= CONSOLE_RX_BUFFER_SIZE)
+			save_index = 0;
 
-            /* if the next position is read index, discard this 'read char' */
-            if (save_index == read_index)
-            {
-                read_index ++;
-                if (read_index >= CONSOLE_RX_BUFFER_SIZE)
-                    read_index = 0;
-            }
+		/* if the next position is read index, discard this 'read char' */
+		if (save_index == read_index)
+		{
+			read_index ++;
+			if (read_index >= CONSOLE_RX_BUFFER_SIZE)
+				read_index = 0;
+		}
 
-            /* enable interrupt */
-            rt_hw_interrupt_enable(level);
-        }
-    }
+		/* enable interrupt */
+		rt_hw_interrupt_enable(level);
+	}
 
     /* invoke callback */
     if (console_device.rx_indicate != RT_NULL)
@@ -258,10 +254,9 @@ static void rt_console_isr(int vector, void* param)
 
         /* get rx length */
         rx_length = read_index > save_index ?
-                    CONSOLE_RX_BUFFER_SIZE - read_index + save_index :
-                    save_index - read_index;
+			CONSOLE_RX_BUFFER_SIZE - read_index + save_index :
+			save_index - read_index;
 
-//        rt_kprintf("\r\nrx_length %d\r\n", rx_length);
         if(rx_length > 0)
         {
             console_device.rx_indicate(&console_device, rx_length);
@@ -269,7 +264,7 @@ static void rt_console_isr(int vector, void* param)
     }
     else
     {
-//        rt_kprintf("\r\nconsole_device.rx_indicate == RT_NULL\r\n");
+
     }
 }
 
@@ -280,6 +275,7 @@ static void rt_console_isr(int vector, void* param)
 void rt_hw_console_init(void)
 {
     rt_cga_init();
+	init_keyboard();
 
     /* install  keyboard isr */
     rt_hw_interrupt_install(INTKEYBOARD, rt_console_isr, RT_NULL, "kbd");

bsp/x86/drivers/include/bsp.h

@@ -101,6 +101,16 @@ extern "C" {
 #define	KBSTATP				0x64	/* kbd controller status port(I) */
 #define	KBS_DIB				0x01	/* kbd data in buffer */
 #define	KBDATAP				0x60	/* kbd data port(I) */
+/* AT keyboard */
+/* 8042 ports */
+#define	KB_DATA		0x60	/* I/O port for keyboard data
+					Read : Read Output Buffer 
+					Write: Write Input Buffer(8042 Data&8048 Command) */
+#define	KB_CMD		0x64	/* I/O port for keyboard command
+					Read : Read Status Register
+					Write: Write Input Buffer(8042 Command) */
+#define	LED_CODE	0xED
+#define	KB_ACK		0xFA
 
 /*******************************************************************/
 /* Serial Register */

bsp/x86/drivers/keyboard.h

@@ -0,0 +1,132 @@
+
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                              keyboard.h
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                                                    Forrest Yu, 2005
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+
+#ifndef	_TINIX_KEYBOARD_H_
+#define	_TINIX_KEYBOARD_H_
+
+
+/************************************************************************/
+/*                          Macros Declaration                          */
+/************************************************************************/
+#define	KB_IN_BYTES	32	/* size of keyboard input buffer */
+#define MAP_COLS	3	/* Number of columns in keymap */
+#define NR_SCAN_CODES	0x80	/* Number of scan codes (rows in keymap) */
+
+#define FLAG_BREAK	0x0080		/* Break Code			*/
+#define FLAG_EXT	0x0100		/* Normal function keys		*/
+#define FLAG_SHIFT_L	0x0200		/* Shift key			*/
+#define FLAG_SHIFT_R	0x0400		/* Shift key			*/
+#define FLAG_CTRL_L	0x0800		/* Control key			*/
+#define FLAG_CTRL_R	0x1000		/* Control key			*/
+#define FLAG_ALT_L	0x2000		/* Alternate key		*/
+#define FLAG_ALT_R	0x4000		/* Alternate key		*/
+#define FLAG_PAD	0x8000		/* keys in num pad		*/
+
+#define MASK_RAW	0x01FF		/* raw key value = code passed to tty & MASK_RAW
+					   the value can be found either in the keymap column 0
+					   or in the list below */
+
+/* Special keys */
+#define ESC		(0x01 + FLAG_EXT)	/* Esc		*/
+#define TAB		(0x02 + FLAG_EXT)	/* Tab		*/
+#define ENTER		(0x03 + FLAG_EXT)	/* Enter	*/
+#define BACKSPACE	(0x04 + FLAG_EXT)	/* BackSpace	*/
+
+#define GUI_L		(0x05 + FLAG_EXT)	/* L GUI	*/
+#define GUI_R		(0x06 + FLAG_EXT)	/* R GUI	*/
+#define APPS		(0x07 + FLAG_EXT)	/* APPS	*/
+
+/* Shift, Ctrl, Alt */
+#define SHIFT_L		(0x08 + FLAG_EXT)	/* L Shift	*/
+#define SHIFT_R		(0x09 + FLAG_EXT)	/* R Shift	*/
+#define CTRL_L		(0x0A + FLAG_EXT)	/* L Ctrl	*/
+#define CTRL_R		(0x0B + FLAG_EXT)	/* R Ctrl	*/
+#define ALT_L		(0x0C + FLAG_EXT)	/* L Alt	*/
+#define ALT_R		(0x0D + FLAG_EXT)	/* R Alt	*/
+
+/* Lock keys */
+#define CAPS_LOCK	(0x0E + FLAG_EXT)	/* Caps Lock	*/
+#define	NUM_LOCK	(0x0F + FLAG_EXT)	/* Number Lock	*/
+#define SCROLL_LOCK	(0x10 + FLAG_EXT)	/* Scroll Lock	*/
+
+/* Function keys */
+#define F1		(0x11 + FLAG_EXT)	/* F1		*/
+#define F2		(0x12 + FLAG_EXT)	/* F2		*/
+#define F3		(0x13 + FLAG_EXT)	/* F3		*/
+#define F4		(0x14 + FLAG_EXT)	/* F4		*/
+#define F5		(0x15 + FLAG_EXT)	/* F5		*/
+#define F6		(0x16 + FLAG_EXT)	/* F6		*/
+#define F7		(0x17 + FLAG_EXT)	/* F7		*/
+#define F8		(0x18 + FLAG_EXT)	/* F8		*/
+#define F9		(0x19 + FLAG_EXT)	/* F9		*/
+#define F10		(0x1A + FLAG_EXT)	/* F10		*/
+#define F11		(0x1B + FLAG_EXT)	/* F11		*/
+#define F12		(0x1C + FLAG_EXT)	/* F12		*/
+
+/* Control Pad */
+#define PRINTSCREEN	(0x1D + FLAG_EXT)	/* Print Screen	*/
+#define PAUSEBREAK	(0x1E + FLAG_EXT)	/* Pause/Break	*/
+#define INSERT		(0x1F + FLAG_EXT)	/* Insert	*/
+#define DELETE		(0x20 + FLAG_EXT)	/* Delete	*/
+#define HOME		(0x21 + FLAG_EXT)	/* Home		*/
+#define END		(0x22 + FLAG_EXT)	/* End		*/
+#define PAGEUP		(0x23 + FLAG_EXT)	/* Page Up	*/
+#define PAGEDOWN	(0x24 + FLAG_EXT)	/* Page Down	*/
+#define UP		(0x25 + FLAG_EXT)	/* Up		*/
+#define DOWN		(0x26 + FLAG_EXT)	/* Down		*/
+#define LEFT		(0x27 + FLAG_EXT)	/* Left		*/
+#define RIGHT		(0x28 + FLAG_EXT)	/* Right	*/
+
+/* ACPI keys */
+#define POWER		(0x29 + FLAG_EXT)	/* Power	*/
+#define SLEEP		(0x2A + FLAG_EXT)	/* Sleep	*/
+#define WAKE		(0x2B + FLAG_EXT)	/* Wake Up	*/
+
+/* Num Pad */
+#define PAD_SLASH	(0x2C + FLAG_EXT)	/* /		*/
+#define PAD_STAR	(0x2D + FLAG_EXT)	/* *		*/
+#define PAD_MINUS	(0x2E + FLAG_EXT)	/* -		*/
+#define PAD_PLUS	(0x2F + FLAG_EXT)	/* +		*/
+#define PAD_ENTER	(0x30 + FLAG_EXT)	/* Enter	*/
+#define PAD_DOT		(0x31 + FLAG_EXT)	/* .		*/
+#define PAD_0		(0x32 + FLAG_EXT)	/* 0		*/
+#define PAD_1		(0x33 + FLAG_EXT)	/* 1		*/
+#define PAD_2		(0x34 + FLAG_EXT)	/* 2		*/
+#define PAD_3		(0x35 + FLAG_EXT)	/* 3		*/
+#define PAD_4		(0x36 + FLAG_EXT)	/* 4		*/
+#define PAD_5		(0x37 + FLAG_EXT)	/* 5		*/
+#define PAD_6		(0x38 + FLAG_EXT)	/* 6		*/
+#define PAD_7		(0x39 + FLAG_EXT)	/* 7		*/
+#define PAD_8		(0x3A + FLAG_EXT)	/* 8		*/
+#define PAD_9		(0x3B + FLAG_EXT)	/* 9		*/
+#define PAD_UP		PAD_8			/* Up		*/
+#define PAD_DOWN	PAD_2			/* Down		*/
+#define PAD_LEFT	PAD_4			/* Left		*/
+#define PAD_RIGHT	PAD_6			/* Right	*/
+#define PAD_HOME	PAD_7			/* Home		*/
+#define PAD_END		PAD_1			/* End		*/
+#define PAD_PAGEUP	PAD_9			/* Page Up	*/
+#define PAD_PAGEDOWN	PAD_3			/* Page Down	*/
+#define PAD_INS		PAD_0			/* Ins		*/
+#define PAD_MID		PAD_5			/* Middle key	*/
+#define PAD_DEL		PAD_DOT			/* Del		*/
+
+
+/************************************************************************/
+/*                         Stucture Definition                          */
+/************************************************************************/
+/* Keyboard structure, 1 per console. */
+typedef struct s_kb {
+	char*	p_head;			/* input cache pointer */
+	char*	p_tail;			/* read cache pointer */
+	int	count;
+	char	buf[KB_IN_BYTES];
+}KB_INPUT;
+
+
+
+#endif /* _TINIX_KEYBOARD_H_ */