]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - drivers/input/keyboard.c
Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD
[people/ms/u-boot.git] / drivers / input / keyboard.c
index a634d76d6c294e7dfd50929f63e2101da0ebf17e..84ee015cb33e88ffc4656f8a158224f70da31c0e 100644 (file)
  * (C) Copyright 2004
  * DENX Software Engineering
  * Wolfgang Denk, wd@denx.de
- * All rights reserved.
  *
  * Keyboard driver
  *
  ***********************************************************************/
 
 #include <common.h>
+#include <console.h>
+#include <input.h>
 
-#include <devices.h>
+#include <stdio_dev.h>
 #include <keyboard.h>
+#include <stdio_dev.h>
 
-#undef KBG_DEBUG
+static struct input_config config;
 
-#ifdef KBG_DEBUG
-#define        PRINTF(fmt,args...)     printf (fmt ,##args)
-#else
-#define PRINTF(fmt,args...)
-#endif
-
-
-#define        DEVNAME                 "kbd"
-
-#define        LED_SCR                 0x01    /* scroll lock led */
-#define        LED_CAP                 0x04    /* caps lock led */
-#define        LED_NUM                 0x02    /* num lock led */
-
-#define        KBD_BUFFER_LEN          0x20  /* size of the keyboardbuffer */
-
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
-int ps2ser_check(void);
+static int kbd_read_keys(struct input_config *config)
+{
+#if defined(CONFIG_ARCH_MPC8540) || \
+               defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555)
+       /* no ISR is used, so received chars must be polled */
+       ps2ser_check();
 #endif
 
-static volatile char kbd_buffer[KBD_BUFFER_LEN];
-static volatile int in_pointer = 0;
-static volatile int out_pointer = 0;
+       return 1;
+}
 
-static unsigned char leds = 0;
-static unsigned char num_lock = 0;
-static unsigned char caps_lock = 0;
-static unsigned char scroll_lock = 0;
-static unsigned char shift = 0;
-static unsigned char ctrl = 0;
-static unsigned char alt = 0;
-static unsigned char e0 = 0;
+static int check_leds(int ret)
+{
+       int leds;
 
-/******************************************************************
- * Queue handling
- ******************************************************************/
+       leds = input_leds_changed(&config);
+       if (leds >= 0)
+               pckbd_leds(leds);
 
-/* puts character in the queue and sets up the in and out pointer */
-static void kbd_put_queue(char data)
-{
-       if((in_pointer+1)==KBD_BUFFER_LEN) {
-               if(out_pointer==0) {
-                       return; /* buffer full */
-               } else{
-                       in_pointer=0;
-               }
-       } else {
-               if((in_pointer+1)==out_pointer)
-                       return; /* buffer full */
-               in_pointer++;
-       }
-       kbd_buffer[in_pointer]=data;
-       return;
+       return ret;
 }
 
 /* test if a character is in the queue */
-static int kbd_testc(void)
+static int kbd_testc(struct stdio_dev *dev)
 {
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
-       /* no ISR is used, so received chars must be polled */
-       ps2ser_check();
-#endif
-       if(in_pointer==out_pointer)
-               return(0); /* no data */
-       else
-               return(1);
+       return check_leds(input_tstc(&config));
 }
 
 /* gets the character from the queue */
-static int kbd_getc(void)
+static int kbd_getc(struct stdio_dev *dev)
 {
-       char c;
-       while(in_pointer==out_pointer) {
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
-       /* no ISR is used, so received chars must be polled */
-       ps2ser_check();
-#endif
-       ;}
-       if((out_pointer+1)==KBD_BUFFER_LEN)
-               out_pointer=0;
-       else
-               out_pointer++;
-       c=kbd_buffer[out_pointer];
-       return (int)c;
-
+       return check_leds(input_getc(&config));
 }
 
-/* Simple translation table for the keys */
-
-static unsigned char kbd_plain_xlate[] = {
-       0xff,0x1b, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=','\b','\t',        /* 0x00 - 0x0f */
-        'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']','\r',0xff, 'a', 's',        /* 0x10 - 0x1f */
-        'd', 'f', 'g', 'h', 'j', 'k', 'l', ';','\'', '`',0xff,'\\', 'z', 'x', 'c', 'v',        /* 0x20 - 0x2f */
-        'b', 'n', 'm', ',', '.', '/',0xff,0xff,0xff, ' ',0xff,0xff,0xff,0xff,0xff,0xff,        /* 0x30 - 0x3f */
-       0xff,0xff,0xff,0xff,0xff,0xff,0xff, '7', '8', '9', '-', '4', '5', '6', '+', '1',        /* 0x40 - 0x4f */
-        '2', '3', '0', '.',0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,  /* 0x50 - 0x5F */
-       '\r',0xff,0xff
-       };
-
-static unsigned char kbd_shift_xlate[] = {
-       0xff,0x1b, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+','\b','\t',        /* 0x00 - 0x0f */
-        'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}','\r',0xff, 'A', 'S',        /* 0x10 - 0x1f */
-        'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '~',0xff, '|', 'Z', 'X', 'C', 'V',        /* 0x20 - 0x2f */
-        'B', 'N', 'M', '<', '>', '?',0xff,0xff,0xff, ' ',0xff,0xff,0xff,0xff,0xff,0xff,        /* 0x30 - 0x3f */
-       0xff,0xff,0xff,0xff,0xff,0xff,0xff, '7', '8', '9', '-', '4', '5', '6', '+', '1',        /* 0x40 - 0x4f */
-        '2', '3', '0', '.',0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,  /* 0x50 - 0x5F */
-       '\r',0xff,0xff
-       };
-
-static unsigned char kbd_ctrl_xlate[] = {
-       0xff,0x1b, '1',0x00, '3', '4', '5',0x1E, '7', '8', '9', '0',0x1F, '=','\b','\t',        /* 0x00 - 0x0f */
-       0x11,0x17,0x05,0x12,0x14,0x18,0x15,0x09,0x0f,0x10,0x1b,0x1d,'\n',0xff,0x01,0x13,        /* 0x10 - 0x1f */
-       0x04,0x06,0x08,0x09,0x0a,0x0b,0x0c, ';','\'', '~',0x00,0x1c,0x1a,0x18,0x03,0x16,        /* 0x20 - 0x2f */
-       0x02,0x0e,0x0d, '<', '>', '?',0xff,0xff,0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,        /* 0x30 - 0x3f */
-       0xff,0xff,0xff,0xff,0xff,0xff,0xff, '7', '8', '9', '-', '4', '5', '6', '+', '1',        /* 0x40 - 0x4f */
-        '2', '3', '0', '.',0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,  /* 0x50 - 0x5F */
-       '\r',0xff,0xff
-       };
-
-
-void handle_scancode(unsigned char scancode)
+void handle_scancode(unsigned char scan_code)
 {
-       unsigned char keycode;
+       bool release = false;
 
-       /*  Convert scancode to keycode */
-       PRINTF("scancode %x\n",scancode);
-       if(scancode==0xe0) {
-               e0=1; /* special charakters */
-               return;
-       }
-       if(e0==1) {
-               e0=0; /* delete flag */
-               if(!(   ((scancode&0x7F)==0x38)|| /* the right ctrl key */
-                                       ((scancode&0x7F)==0x1D)|| /* the right alt key */
-                                       ((scancode&0x7F)==0x35)||       /* the right '/' key */
-                                       ((scancode&0x7F)==0x1C) ))  /* the right enter key */
-                       /* we swallow unknown e0 codes */
-                       return;
-       }
-       /* special cntrl keys */
-       switch(scancode) {
-       case 0x2A:
-       case 0x36: /* shift pressed */
-               shift=1;
-               return; /* do nothing else */
-       case 0xAA:
-       case 0xB6: /* shift released */
-               shift=0;
-               return; /* do nothing else */
-       case 0x38: /* alt pressed */
-               alt=1;
-               return; /* do nothing else */
-       case 0xB8: /* alt released */
-               alt=0;
-               return; /* do nothing else */
-       case 0x1d: /* ctrl pressed */
-               ctrl=1;
-               return; /* do nothing else */
-       case 0x9d: /* ctrl released */
-               ctrl=0;
-               return; /* do nothing else */
-       case 0x46: /* scrollock pressed */
-               scroll_lock=~scroll_lock;
-               if(scroll_lock==0)
-                       leds&=~LED_SCR; /* switch LED off */
-               else
-                       leds|=LED_SCR; /* switch on LED */
-               pckbd_leds(leds);
-               return; /* do nothing else */
-       case 0x3A: /* capslock pressed */
-               caps_lock=~caps_lock;
-               if(caps_lock==0)
-                       leds&=~LED_CAP; /* switch caps_lock off */
-               else
-                       leds|=LED_CAP; /* switch on LED */
-               pckbd_leds(leds);
-               return;
-       case 0x45: /* numlock pressed */
-               num_lock=~num_lock;
-               if(num_lock==0)
-                       leds&=~LED_NUM; /* switch LED off */
-               else
-                       leds|=LED_NUM;  /* switch on LED */
-               pckbd_leds(leds);
-               return;
-       case 0xC6: /* scroll lock released */
-       case 0xC5: /* num lock released */
-       case 0xBA: /* caps lock released */
-               return; /* just swallow */
-       }
-#if 1
-       if((scancode&0x80)==0x80) /* key released */
-               return;
-#else
-       if((scancode&0x80)==0x00) /* key pressed */
-               return;
-       scancode &= ~0x80;
-#endif
-       /* now, decide which table we need */
-       if(scancode > (sizeof(kbd_plain_xlate)/sizeof(kbd_plain_xlate[0]))) { /* scancode not in list */
-               PRINTF("unkown scancode %X\n",scancode);
-               return; /* swallow it */
-       }
-       /* setup plain code first */
-       keycode=kbd_plain_xlate[scancode];
-       if(caps_lock==1) { /* caps_lock is pressed, overwrite plain code */
-               if(scancode > (sizeof(kbd_shift_xlate)/sizeof(kbd_shift_xlate[0]))) { /* scancode not in list */
-                       PRINTF("unkown caps-locked scancode %X\n",scancode);
-                       return; /* swallow it */
-               }
-               keycode=kbd_shift_xlate[scancode];
-               if(keycode<'A') { /* we only want the alphas capital */
-                       keycode=kbd_plain_xlate[scancode];
-               }
-       }
-       if(shift==1) { /* shift overwrites caps_lock */
-               if(scancode > (sizeof(kbd_shift_xlate)/sizeof(kbd_shift_xlate[0]))) { /* scancode not in list */
-                       PRINTF("unkown shifted scancode %X\n",scancode);
-                       return; /* swallow it */
-               }
-               keycode=kbd_shift_xlate[scancode];
-       }
-       if(ctrl==1) { /* ctrl overwrites caps_lock and shift */
-               if(scancode > (sizeof(kbd_ctrl_xlate)/sizeof(kbd_ctrl_xlate[0]))) { /* scancode not in list */
-                       PRINTF("unkown ctrl scancode %X\n",scancode);
-                       return; /* swallow it */
-               }
-               keycode=kbd_ctrl_xlate[scancode];
-       }
-       /* check if valid keycode */
-       if(keycode==0xff) {
-               PRINTF("unkown scancode %X\n",scancode);
-               return; /* swallow unknown codes */
+       /* Compare with i8042_kbd_check() in i8042.c if some logic is missing */
+       if (scan_code & 0x80) {
+               scan_code &= 0x7f;
+               release = true;
        }
 
-       kbd_put_queue(keycode);
-       PRINTF("%x\n",keycode);
+       input_add_keycode(&config, scan_code, release);
 }
 
-/******************************************************************
- * Init
- ******************************************************************/
-
-#ifdef CFG_CONSOLE_OVERWRITE_ROUTINE
-extern int overwrite_console (void);
-#define OVERWRITE_CONSOLE overwrite_console ()
-#else
-#define OVERWRITE_CONSOLE 0
-#endif /* CFG_CONSOLE_OVERWRITE_ROUTINE */
-
+/* TODO: convert to driver model */
 int kbd_init (void)
 {
-       int error;
-       device_t kbddev ;
-       char *stdinname  = getenv ("stdin");
+       struct stdio_dev kbddev;
+       struct input_config *input = &config;
 
        if(kbd_init_hw()==-1)
                return -1;
        memset (&kbddev, 0, sizeof(kbddev));
-       strcpy(kbddev.name, DEVNAME);
-       kbddev.flags =  DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
-       kbddev.putc = NULL ;
-       kbddev.puts = NULL ;
-       kbddev.getc = kbd_getc ;
-       kbddev.tstc = kbd_testc ;
+       strcpy(kbddev.name, "kbd");
+       kbddev.flags =  DEV_FLAGS_INPUT;
+       kbddev.getc = kbd_getc;
+       kbddev.tstc = kbd_testc;
 
-       error = device_register (&kbddev);
-       if(error==0) {
-               /* check if this is the standard input device */
-               if(strcmp(stdinname,DEVNAME)==0) {
-                       /* reassign the console */
-                       if(OVERWRITE_CONSOLE) {
-                               return 1;
-                       }
-                       error=console_assign(stdin,DEVNAME);
-                       if(error==0)
-                               return 1;
-                       else
-                               return error;
-               }
-               return 1;
-       }
-       return error;
+       input_init(input, 0);
+       input->read_keys = kbd_read_keys;
+       input_add_tables(input, true);
+
+       return input_stdio_register(&kbddev);
 }