WebSVN – HelenOS-historic – Diff – /kernel/trunk/arch/ia32/src/drivers/i8042.c


/*
 * Copyright (C) 2001-2004 Jakub Jermar
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * - Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 * - The name of the author may not be used to endorse or promote products
 *   derived from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
#include <arch/i8042.h>
#include <arch/i8259.h>
#include <arch/interrupt.h>
#include <cpu.h>
#include <arch/asm.h>
#include <arch.h>
#include <print.h>
#include <synch/spinlock.h>
#include <typedefs.h>
#include <console/chardev.h>
#include <console/console.h>
#include <macros.h>
#include <interrupt.h>
 
/**
 * i8042 processor driver.
 * It takes care of low-level keyboard functions.
 */
 
#define i8042_DATA      0x60
#define i8042_STATUS        0x64
 
 
/** Keyboard commands. */
#define KBD_ENABLE  0xf4
#define KBD_DISABLE 0xf5
#define KBD_ACK     0xfa
 
/*
 60   Write 8042 Command Byte: next data byte written to port 60h is
      placed in 8042 command register.Format:
 
     |7|6|5|4|3|2|1|0|8042 Command Byte
      | | | | | | | `---- 1=enable output register full interrupt
      | | | | | | `----- should be 0
      | | | | | `------ 1=set status register system, 0=clear
      | | | | `------- 1=override keyboard inhibit, 0=allow inhibit
      | | | `-------- disable keyboard I/O by driving clock line low
      | | `--------- disable auxiliary device, drives clock line low
      | `---------- IBM scancode translation 0=AT, 1=PC/XT
      `----------- reserved, should be 0
*/
 
#define i8042_SET_COMMAND 0x60
#define i8042_COMMAND 0x49
#define i8042_WAIT_MASK 0x02
 
 
#define SPECIAL     '?'
#define KEY_RELEASE 0x80
 
static void key_released(__u8 sc);
static void key_pressed(__u8 sc);
 
#define PRESSED_SHIFT       (1<<0)
#define PRESSED_CAPSLOCK    (1<<1)
#define LOCKED_CAPSLOCK     (1<<0)
 
SPINLOCK_INITIALIZE(keylock);       /**< keylock protects keyflags and lockflags. */
static volatile int keyflags;       /**< Tracking of multiple keypresses. */
static volatile int lockflags;      /**< Tracking of multiple keys lockings. */
 
static void i8042_suspend(chardev_t *);
static void i8042_resume(chardev_t *);
 
static chardev_t kbrd;
static chardev_operations_t ops = {
    .suspend = i8042_suspend,
    .resume = i8042_resume
};
 
/** Primary meaning of scancodes. */
static char sc_primary_map[] = {
    SPECIAL, /* 0x00 */
    SPECIAL, /* 0x01 - Esc */
    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=',
    '\b', /* 0x0e - Backspace */
    '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',
    SPECIAL, /* 0x1d - LCtrl */
    'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'',
    '`',
    SPECIAL, /* 0x2a - LShift */
    '\\',
    'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/',
    SPECIAL, /* 0x36 - RShift */
    '*',
    SPECIAL, /* 0x38 - LAlt */
    ' ',
    SPECIAL, /* 0x3a - CapsLock */
    SPECIAL, /* 0x3b - F1 */
    SPECIAL, /* 0x3c - F2 */
    SPECIAL, /* 0x3d - F3 */
    SPECIAL, /* 0x3e - F4 */
    SPECIAL, /* 0x3f - F5 */
    SPECIAL, /* 0x40 - F6 */
    SPECIAL, /* 0x41 - F7 */
    SPECIAL, /* 0x42 - F8 */
    SPECIAL, /* 0x43 - F9 */
    SPECIAL, /* 0x44 - F10 */
    SPECIAL, /* 0x45 - NumLock */
    SPECIAL, /* 0x46 - ScrollLock */
    '7', '8', '9', '-',
    '4', '5', '6', '+',
    '1', '2', '3',
    '0', '.',
    SPECIAL, /* 0x54 - Alt-SysRq */
    SPECIAL, /* 0x55 - F11/F12/PF1/FN */
    SPECIAL, /* 0x56 - unlabelled key next to LAlt */
    SPECIAL, /* 0x57 - F11 */
    SPECIAL, /* 0x58 - F12 */
    SPECIAL, /* 0x59 */
    SPECIAL, /* 0x5a */
    SPECIAL, /* 0x5b */
    SPECIAL, /* 0x5c */
    SPECIAL, /* 0x5d */
    SPECIAL, /* 0x5e */
    SPECIAL, /* 0x5f */
    SPECIAL, /* 0x60 */
    SPECIAL, /* 0x61 */
    SPECIAL, /* 0x62 */
    SPECIAL, /* 0x63 */
    SPECIAL, /* 0x64 */
    SPECIAL, /* 0x65 */
    SPECIAL, /* 0x66 */
    SPECIAL, /* 0x67 */
    SPECIAL, /* 0x68 */
    SPECIAL, /* 0x69 */
    SPECIAL, /* 0x6a */
    SPECIAL, /* 0x6b */
    SPECIAL, /* 0x6c */
    SPECIAL, /* 0x6d */
    SPECIAL, /* 0x6e */
    SPECIAL, /* 0x6f */
    SPECIAL, /* 0x70 */
    SPECIAL, /* 0x71 */
    SPECIAL, /* 0x72 */
    SPECIAL, /* 0x73 */
    SPECIAL, /* 0x74 */
    SPECIAL, /* 0x75 */
    SPECIAL, /* 0x76 */
    SPECIAL, /* 0x77 */
    SPECIAL, /* 0x78 */
    SPECIAL, /* 0x79 */
    SPECIAL, /* 0x7a */
    SPECIAL, /* 0x7b */
    SPECIAL, /* 0x7c */
    SPECIAL, /* 0x7d */
    SPECIAL, /* 0x7e */
    SPECIAL, /* 0x7f */
};
 
/** Secondary meaning of scancodes. */
static char sc_secondary_map[] = {
    SPECIAL, /* 0x00 */
    SPECIAL, /* 0x01 - Esc */
    '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+',
    SPECIAL, /* 0x0e - Backspace */
    '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n',
    SPECIAL, /* 0x1d - LCtrl */
    'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"',
    '~',
    SPECIAL, /* 0x2a - LShift */
    '|',
    'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?',
    SPECIAL, /* 0x36 - RShift */
    '*',
    SPECIAL, /* 0x38 - LAlt */
    ' ',
    SPECIAL, /* 0x3a - CapsLock */
    SPECIAL, /* 0x3b - F1 */
    SPECIAL, /* 0x3c - F2 */
    SPECIAL, /* 0x3d - F3 */
    SPECIAL, /* 0x3e - F4 */
    SPECIAL, /* 0x3f - F5 */
    SPECIAL, /* 0x40 - F6 */
    SPECIAL, /* 0x41 - F7 */
    SPECIAL, /* 0x42 - F8 */
    SPECIAL, /* 0x43 - F9 */
    SPECIAL, /* 0x44 - F10 */
    SPECIAL, /* 0x45 - NumLock */
    SPECIAL, /* 0x46 - ScrollLock */
    '7', '8', '9', '-',
    '4', '5', '6', '+',
    '1', '2', '3',
    '0', '.',
    SPECIAL, /* 0x54 - Alt-SysRq */
    SPECIAL, /* 0x55 - F11/F12/PF1/FN */
    SPECIAL, /* 0x56 - unlabelled key next to LAlt */
    SPECIAL, /* 0x57 - F11 */
    SPECIAL, /* 0x58 - F12 */
    SPECIAL, /* 0x59 */
    SPECIAL, /* 0x5a */
    SPECIAL, /* 0x5b */
    SPECIAL, /* 0x5c */
    SPECIAL, /* 0x5d */
    SPECIAL, /* 0x5e */
    SPECIAL, /* 0x5f */
    SPECIAL, /* 0x60 */
    SPECIAL, /* 0x61 */
    SPECIAL, /* 0x62 */
    SPECIAL, /* 0x63 */
    SPECIAL, /* 0x64 */
    SPECIAL, /* 0x65 */
    SPECIAL, /* 0x66 */
    SPECIAL, /* 0x67 */
    SPECIAL, /* 0x68 */
    SPECIAL, /* 0x69 */
    SPECIAL, /* 0x6a */
    SPECIAL, /* 0x6b */
    SPECIAL, /* 0x6c */
    SPECIAL, /* 0x6d */
    SPECIAL, /* 0x6e */
    SPECIAL, /* 0x6f */
    SPECIAL, /* 0x70 */
    SPECIAL, /* 0x71 */
    SPECIAL, /* 0x72 */
    SPECIAL, /* 0x73 */
    SPECIAL, /* 0x74 */
    SPECIAL, /* 0x75 */
    SPECIAL, /* 0x76 */
    SPECIAL, /* 0x77 */
    SPECIAL, /* 0x78 */
    SPECIAL, /* 0x79 */
    SPECIAL, /* 0x7a */
    SPECIAL, /* 0x7b */
    SPECIAL, /* 0x7c */
    SPECIAL, /* 0x7d */
    SPECIAL, /* 0x7e */
    SPECIAL, /* 0x7f */
};
 
static void i8042_interrupt(int n, void *stack);
 
/** Initialize i8042. */
void i8042_init(void)
{
    exc_register(VECTOR_KBD, "i8042_interrupt", i8042_interrupt);
    while (inb(i8042_STATUS)&i8042_WAIT_MASK);     /*Wait*/
    outb(i8042_STATUS,i8042_SET_COMMAND);
    while (inb(i8042_STATUS)&i8042_WAIT_MASK);     /*Wait*/
    outb(i8042_DATA,i8042_COMMAND);
 
    trap_virtual_enable_irqs(1<<IRQ_KBD);
    chardev_initialize("i8042_kbd", &kbrd, &ops);
    stdin = &kbrd;
}
 
/** Process i8042 interrupt.
 *
 * @param n Interrupt vector.
 * @param stack Interrupted stack.
 */
void i8042_interrupt(int n, void *stack)
{
    __u8 x;
 
    trap_virtual_eoi();
    x = inb(i8042_DATA);
    if (x & KEY_RELEASE)
        key_released(x ^ KEY_RELEASE);
    else
        key_pressed(x);
}
 
/** Process release of key.
 *
 * @param sc Scancode of the key being released.
 */
void key_released(__u8 sc)
{
    spinlock_lock(&keylock);
    switch (sc) {
        case SC_LSHIFT:
        case SC_RSHIFT:
        keyflags &= ~PRESSED_SHIFT;
        break;
        case SC_CAPSLOCK:
        keyflags &= ~PRESSED_CAPSLOCK;
        if (lockflags & LOCKED_CAPSLOCK)
            lockflags &= ~LOCKED_CAPSLOCK;
        else
            lockflags |= LOCKED_CAPSLOCK;
        break;
        default:
        break;
    }
    spinlock_unlock(&keylock);
}
 
/** Process keypress.
 *
 * @param sc Scancode of the key being pressed.
 */
void key_pressed(__u8 sc)
{
    char *map = sc_primary_map;
    char ascii = sc_primary_map[sc];
    bool shift, capslock;
    bool letter = false;
 
    spinlock_lock(&keylock);
    switch (sc) {
    case SC_LSHIFT:
    case SC_RSHIFT:
            keyflags |= PRESSED_SHIFT;
        break;
    case SC_CAPSLOCK:
        keyflags |= PRESSED_CAPSLOCK;
        break;
    case SC_SPEC_ESCAPE:
        break;
    case SC_LEFTARR:
        chardev_push_character(&kbrd, 0x1b);
        chardev_push_character(&kbrd, 0x5b);
        chardev_push_character(&kbrd, 0x44);
        break;
    case SC_RIGHTARR:
        chardev_push_character(&kbrd, 0x1b);
        chardev_push_character(&kbrd, 0x5b);
        chardev_push_character(&kbrd, 0x43);
        break;
    case SC_UPARR:
        chardev_push_character(&kbrd, 0x1b);
        chardev_push_character(&kbrd, 0x5b);
        chardev_push_character(&kbrd, 0x41);
        break;
    case SC_DOWNARR:
        chardev_push_character(&kbrd, 0x1b);
        chardev_push_character(&kbrd, 0x5b);
        chardev_push_character(&kbrd, 0x42);
        break;
    case SC_HOME:
        chardev_push_character(&kbrd, 0x1b);
        chardev_push_character(&kbrd, 0x4f);
        chardev_push_character(&kbrd, 0x48);
        break;
    case SC_END:
        chardev_push_character(&kbrd, 0x1b);
        chardev_push_character(&kbrd, 0x4f);
        chardev_push_character(&kbrd, 0x46);
        break;
    case SC_DELETE:
        chardev_push_character(&kbrd, 0x1b);
        chardev_push_character(&kbrd, 0x5b);
        chardev_push_character(&kbrd, 0x33);
        chardev_push_character(&kbrd, 0x7e);
        break;
    default:
            letter = is_lower(ascii);
        capslock = (keyflags & PRESSED_CAPSLOCK) || (lockflags & LOCKED_CAPSLOCK);
        shift = keyflags & PRESSED_SHIFT;
        if (letter && capslock)
            shift = !shift;
        if (shift)
            map = sc_secondary_map;
        chardev_push_character(&kbrd, map[sc]);
        break;
    }
    spinlock_unlock(&keylock);
}
 
/* Called from getc(). */
void i8042_resume(chardev_t *d)
{
}
 
/* Called from getc(). */
void i8042_suspend(chardev_t *d)
{
}
 

Rev 670	Rev 671
1	/*	1	/*
2	* Copyright (C) 2001-2004 Jakub Jermar	2	* Copyright (C) 2001-2004 Jakub Jermar
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions	6	* modification, are permitted provided that the following conditions
7	* are met:	7	* are met:
8	*	8	*
9	* - Redistributions of source code must retain the above copyright	9	* - Redistributions of source code must retain the above copyright
10	* notice, this list of conditions and the following disclaimer.	10	* notice, this list of conditions and the following disclaimer.
11	* - Redistributions in binary form must reproduce the above copyright	11	* - Redistributions in binary form must reproduce the above copyright
12	* notice, this list of conditions and the following disclaimer in the	12	* notice, this list of conditions and the following disclaimer in the
13	* documentation and/or other materials provided with the distribution.	13	* documentation and/or other materials provided with the distribution.
14	* - The name of the author may not be used to endorse or promote products	14	* - The name of the author may not be used to endorse or promote products
15	* derived from this software without specific prior written permission.	15	* derived from this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR	17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
18	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	18	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.	19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,	20	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT	21	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,	22	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY	23	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	24	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	25	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27	*/	27	*/
28		28
29	#include <arch/i8042.h>	29	#include <arch/i8042.h>
30	#include <arch/i8259.h>	30	#include <arch/i8259.h>
31	#include <arch/interrupt.h>	31	#include <arch/interrupt.h>
32	#include <cpu.h>	32	#include <cpu.h>
33	#include <arch/asm.h>	33	#include <arch/asm.h>
34	#include <arch.h>	34	#include <arch.h>
35	#include <print.h>	35	#include <print.h>
36	#include <synch/spinlock.h>	36	#include <synch/spinlock.h>
37	#include <typedefs.h>	37	#include <typedefs.h>
38	#include <console/chardev.h>	38	#include <console/chardev.h>
39	#include <console/console.h>	39	#include <console/console.h>
40	#include <macros.h>	40	#include <macros.h>
41	#include <interrupt.h>	41	#include <interrupt.h>
42		42
43	/**	43	/**
44	* i8042 processor driver.	44	* i8042 processor driver.
45	* It takes care of low-level keyboard functions.	45	* It takes care of low-level keyboard functions.
46	*/	46	*/
47		47
48	#define i8042_DATA 0x60	48	#define i8042_DATA 0x60
49	#define i8042_STATUS 0x64	49	#define i8042_STATUS 0x64
50		50
51		51
52	/** Keyboard commands. */	52	/** Keyboard commands. */
53	#define KBD_ENABLE 0xf4	53	#define KBD_ENABLE 0xf4
54	#define KBD_DISABLE 0xf5	54	#define KBD_DISABLE 0xf5
55	#define KBD_ACK 0xfa	55	#define KBD_ACK 0xfa
56		56
57	/*	57	/*
58	60 Write 8042 Command Byte: next data byte written to port 60h is	58	60 Write 8042 Command Byte: next data byte written to port 60h is
59	placed in 8042 command register.Format:	59	placed in 8042 command register.Format:
60		60
61	\|7\|6\|5\|4\|3\|2\|1\|0\|8042 Command Byte	61	\|7\|6\|5\|4\|3\|2\|1\|0\|8042 Command Byte
62	\| \| \| \| \| \| \| `---- 1=enable output register full interrupt	62	\| \| \| \| \| \| \| `---- 1=enable output register full interrupt
63	\| \| \| \| \| \| `----- should be 0	63	\| \| \| \| \| \| `----- should be 0
64	\| \| \| \| \| `------ 1=set status register system, 0=clear	64	\| \| \| \| \| `------ 1=set status register system, 0=clear
65	\| \| \| \| `------- 1=override keyboard inhibit, 0=allow inhibit	65	\| \| \| \| `------- 1=override keyboard inhibit, 0=allow inhibit
66	\| \| \| `-------- disable keyboard I/O by driving clock line low	66	\| \| \| `-------- disable keyboard I/O by driving clock line low
67	\| \| `--------- disable auxiliary device, drives clock line low	67	\| \| `--------- disable auxiliary device, drives clock line low
68	\| `---------- IBM scancode translation 0=AT, 1=PC/XT	68	\| `---------- IBM scancode translation 0=AT, 1=PC/XT
69	`----------- reserved, should be 0	69	`----------- reserved, should be 0
70	*/	70	*/
71		71
72	#define i8042_SET_COMMAND 0x60	72	#define i8042_SET_COMMAND 0x60
73	#define i8042_COMMAND 0x09	73	#define i8042_COMMAND 0x49
74	#define i8042_WAIT_MASK 0x02	74	#define i8042_WAIT_MASK 0x02
75		75
76		76
77	#define SPECIAL '?'	77	#define SPECIAL '?'
78	#define KEY_RELEASE 0x80	78	#define KEY_RELEASE 0x80
79		79
80	static void key_released(__u8 sc);	80	static void key_released(__u8 sc);
81	static void key_pressed(__u8 sc);	81	static void key_pressed(__u8 sc);
82		82
83	#define PRESSED_SHIFT (1<<0)	83	#define PRESSED_SHIFT (1<<0)
84	#define PRESSED_CAPSLOCK (1<<1)	84	#define PRESSED_CAPSLOCK (1<<1)
85	#define LOCKED_CAPSLOCK (1<<0)	85	#define LOCKED_CAPSLOCK (1<<0)
86		86
87	SPINLOCK_INITIALIZE(keylock); /*< keylock protects keyflags and lockflags. /	87	SPINLOCK_INITIALIZE(keylock); /*< keylock protects keyflags and lockflags. /
88	static volatile int keyflags; /*< Tracking of multiple keypresses. /	88	static volatile int keyflags; /*< Tracking of multiple keypresses. /
89	static volatile int lockflags; /*< Tracking of multiple keys lockings. /	89	static volatile int lockflags; /*< Tracking of multiple keys lockings. /
90		90
91	static void i8042_suspend(chardev_t *);	91	static void i8042_suspend(chardev_t *);
92	static void i8042_resume(chardev_t *);	92	static void i8042_resume(chardev_t *);
93		93
94	static chardev_t kbrd;	94	static chardev_t kbrd;
95	static chardev_operations_t ops = {	95	static chardev_operations_t ops = {
96	.suspend = i8042_suspend,	96	.suspend = i8042_suspend,
97	.resume = i8042_resume	97	.resume = i8042_resume
98	};	98	};
99		99
100	/** Primary meaning of scancodes. */	100	/** Primary meaning of scancodes. */
101	static char sc_primary_map[] = {	101	static char sc_primary_map[] = {
102	SPECIAL, /* 0x00 */	102	SPECIAL, /* 0x00 */
103	SPECIAL, /* 0x01 - Esc */	103	SPECIAL, /* 0x01 - Esc */
104	'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=',	104	'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=',
105	'\b', /* 0x0e - Backspace */	105	'\b', /* 0x0e - Backspace */
106	'\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',	106	'\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',
107	SPECIAL, /* 0x1d - LCtrl */	107	SPECIAL, /* 0x1d - LCtrl */
108	'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'',	108	'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'',
109	'`',	109	'`',
110	SPECIAL, /* 0x2a - LShift */	110	SPECIAL, /* 0x2a - LShift */
111	'\\',	111	'\\',
112	'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/',	112	'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/',
113	SPECIAL, /* 0x36 - RShift */	113	SPECIAL, /* 0x36 - RShift */
114	'*',	114	'*',
115	SPECIAL, /* 0x38 - LAlt */	115	SPECIAL, /* 0x38 - LAlt */
116	' ',	116	' ',
117	SPECIAL, /* 0x3a - CapsLock */	117	SPECIAL, /* 0x3a - CapsLock */
118	SPECIAL, /* 0x3b - F1 */	118	SPECIAL, /* 0x3b - F1 */
119	SPECIAL, /* 0x3c - F2 */	119	SPECIAL, /* 0x3c - F2 */
120	SPECIAL, /* 0x3d - F3 */	120	SPECIAL, /* 0x3d - F3 */
121	SPECIAL, /* 0x3e - F4 */	121	SPECIAL, /* 0x3e - F4 */
122	SPECIAL, /* 0x3f - F5 */	122	SPECIAL, /* 0x3f - F5 */
123	SPECIAL, /* 0x40 - F6 */	123	SPECIAL, /* 0x40 - F6 */
124	SPECIAL, /* 0x41 - F7 */	124	SPECIAL, /* 0x41 - F7 */
125	SPECIAL, /* 0x42 - F8 */	125	SPECIAL, /* 0x42 - F8 */
126	SPECIAL, /* 0x43 - F9 */	126	SPECIAL, /* 0x43 - F9 */
127	SPECIAL, /* 0x44 - F10 */	127	SPECIAL, /* 0x44 - F10 */
128	SPECIAL, /* 0x45 - NumLock */	128	SPECIAL, /* 0x45 - NumLock */
129	SPECIAL, /* 0x46 - ScrollLock */	129	SPECIAL, /* 0x46 - ScrollLock */
130	'7', '8', '9', '-',	130	'7', '8', '9', '-',
131	'4', '5', '6', '+',	131	'4', '5', '6', '+',
132	'1', '2', '3',	132	'1', '2', '3',
133	'0', '.',	133	'0', '.',
134	SPECIAL, /* 0x54 - Alt-SysRq */	134	SPECIAL, /* 0x54 - Alt-SysRq */
135	SPECIAL, /* 0x55 - F11/F12/PF1/FN */	135	SPECIAL, /* 0x55 - F11/F12/PF1/FN */
136	SPECIAL, /* 0x56 - unlabelled key next to LAlt */	136	SPECIAL, /* 0x56 - unlabelled key next to LAlt */
137	SPECIAL, /* 0x57 - F11 */	137	SPECIAL, /* 0x57 - F11 */
138	SPECIAL, /* 0x58 - F12 */	138	SPECIAL, /* 0x58 - F12 */
139	SPECIAL, /* 0x59 */	139	SPECIAL, /* 0x59 */
140	SPECIAL, /* 0x5a */	140	SPECIAL, /* 0x5a */
141	SPECIAL, /* 0x5b */	141	SPECIAL, /* 0x5b */
142	SPECIAL, /* 0x5c */	142	SPECIAL, /* 0x5c */
143	SPECIAL, /* 0x5d */	143	SPECIAL, /* 0x5d */
144	SPECIAL, /* 0x5e */	144	SPECIAL, /* 0x5e */
145	SPECIAL, /* 0x5f */	145	SPECIAL, /* 0x5f */
146	SPECIAL, /* 0x60 */	146	SPECIAL, /* 0x60 */
147	SPECIAL, /* 0x61 */	147	SPECIAL, /* 0x61 */
148	SPECIAL, /* 0x62 */	148	SPECIAL, /* 0x62 */
149	SPECIAL, /* 0x63 */	149	SPECIAL, /* 0x63 */
150	SPECIAL, /* 0x64 */	150	SPECIAL, /* 0x64 */
151	SPECIAL, /* 0x65 */	151	SPECIAL, /* 0x65 */
152	SPECIAL, /* 0x66 */	152	SPECIAL, /* 0x66 */
153	SPECIAL, /* 0x67 */	153	SPECIAL, /* 0x67 */
154	SPECIAL, /* 0x68 */	154	SPECIAL, /* 0x68 */
155	SPECIAL, /* 0x69 */	155	SPECIAL, /* 0x69 */
156	SPECIAL, /* 0x6a */	156	SPECIAL, /* 0x6a */
157	SPECIAL, /* 0x6b */	157	SPECIAL, /* 0x6b */
158	SPECIAL, /* 0x6c */	158	SPECIAL, /* 0x6c */
159	SPECIAL, /* 0x6d */	159	SPECIAL, /* 0x6d */
160	SPECIAL, /* 0x6e */	160	SPECIAL, /* 0x6e */
161	SPECIAL, /* 0x6f */	161	SPECIAL, /* 0x6f */
162	SPECIAL, /* 0x70 */	162	SPECIAL, /* 0x70 */
163	SPECIAL, /* 0x71 */	163	SPECIAL, /* 0x71 */
164	SPECIAL, /* 0x72 */	164	SPECIAL, /* 0x72 */
165	SPECIAL, /* 0x73 */	165	SPECIAL, /* 0x73 */
166	SPECIAL, /* 0x74 */	166	SPECIAL, /* 0x74 */
167	SPECIAL, /* 0x75 */	167	SPECIAL, /* 0x75 */
168	SPECIAL, /* 0x76 */	168	SPECIAL, /* 0x76 */
169	SPECIAL, /* 0x77 */	169	SPECIAL, /* 0x77 */
170	SPECIAL, /* 0x78 */	170	SPECIAL, /* 0x78 */
171	SPECIAL, /* 0x79 */	171	SPECIAL, /* 0x79 */
172	SPECIAL, /* 0x7a */	172	SPECIAL, /* 0x7a */
173	SPECIAL, /* 0x7b */	173	SPECIAL, /* 0x7b */
174	SPECIAL, /* 0x7c */	174	SPECIAL, /* 0x7c */
175	SPECIAL, /* 0x7d */	175	SPECIAL, /* 0x7d */
176	SPECIAL, /* 0x7e */	176	SPECIAL, /* 0x7e */
177	SPECIAL, /* 0x7f */	177	SPECIAL, /* 0x7f */
178	};	178	};
179		179
180	/** Secondary meaning of scancodes. */	180	/** Secondary meaning of scancodes. */
181	static char sc_secondary_map[] = {	181	static char sc_secondary_map[] = {
182	SPECIAL, /* 0x00 */	182	SPECIAL, /* 0x00 */
183	SPECIAL, /* 0x01 - Esc */	183	SPECIAL, /* 0x01 - Esc */
184	'!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+',	184	'!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+',
185	SPECIAL, /* 0x0e - Backspace */	185	SPECIAL, /* 0x0e - Backspace */
186	'\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n',	186	'\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n',
187	SPECIAL, /* 0x1d - LCtrl */	187	SPECIAL, /* 0x1d - LCtrl */
188	'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"',	188	'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"',
189	'~',	189	'~',
190	SPECIAL, /* 0x2a - LShift */	190	SPECIAL, /* 0x2a - LShift */
191	'\|',	191	'\|',
192	'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?',	192	'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?',
193	SPECIAL, /* 0x36 - RShift */	193	SPECIAL, /* 0x36 - RShift */
194	'*',	194	'*',
195	SPECIAL, /* 0x38 - LAlt */	195	SPECIAL, /* 0x38 - LAlt */
196	' ',	196	' ',
197	SPECIAL, /* 0x3a - CapsLock */	197	SPECIAL, /* 0x3a - CapsLock */
198	SPECIAL, /* 0x3b - F1 */	198	SPECIAL, /* 0x3b - F1 */
199	SPECIAL, /* 0x3c - F2 */	199	SPECIAL, /* 0x3c - F2 */
200	SPECIAL, /* 0x3d - F3 */	200	SPECIAL, /* 0x3d - F3 */
201	SPECIAL, /* 0x3e - F4 */	201	SPECIAL, /* 0x3e - F4 */
202	SPECIAL, /* 0x3f - F5 */	202	SPECIAL, /* 0x3f - F5 */
203	SPECIAL, /* 0x40 - F6 */	203	SPECIAL, /* 0x40 - F6 */
204	SPECIAL, /* 0x41 - F7 */	204	SPECIAL, /* 0x41 - F7 */
205	SPECIAL, /* 0x42 - F8 */	205	SPECIAL, /* 0x42 - F8 */
206	SPECIAL, /* 0x43 - F9 */	206	SPECIAL, /* 0x43 - F9 */
207	SPECIAL, /* 0x44 - F10 */	207	SPECIAL, /* 0x44 - F10 */
208	SPECIAL, /* 0x45 - NumLock */	208	SPECIAL, /* 0x45 - NumLock */
209	SPECIAL, /* 0x46 - ScrollLock */	209	SPECIAL, /* 0x46 - ScrollLock */
210	'7', '8', '9', '-',	210	'7', '8', '9', '-',
211	'4', '5', '6', '+',	211	'4', '5', '6', '+',
212	'1', '2', '3',	212	'1', '2', '3',
213	'0', '.',	213	'0', '.',
214	SPECIAL, /* 0x54 - Alt-SysRq */	214	SPECIAL, /* 0x54 - Alt-SysRq */
215	SPECIAL, /* 0x55 - F11/F12/PF1/FN */	215	SPECIAL, /* 0x55 - F11/F12/PF1/FN */
216	SPECIAL, /* 0x56 - unlabelled key next to LAlt */	216	SPECIAL, /* 0x56 - unlabelled key next to LAlt */
217	SPECIAL, /* 0x57 - F11 */	217	SPECIAL, /* 0x57 - F11 */
218	SPECIAL, /* 0x58 - F12 */	218	SPECIAL, /* 0x58 - F12 */
219	SPECIAL, /* 0x59 */	219	SPECIAL, /* 0x59 */
220	SPECIAL, /* 0x5a */	220	SPECIAL, /* 0x5a */
221	SPECIAL, /* 0x5b */	221	SPECIAL, /* 0x5b */
222	SPECIAL, /* 0x5c */	222	SPECIAL, /* 0x5c */
223	SPECIAL, /* 0x5d */	223	SPECIAL, /* 0x5d */
224	SPECIAL, /* 0x5e */	224	SPECIAL, /* 0x5e */
225	SPECIAL, /* 0x5f */	225	SPECIAL, /* 0x5f */
226	SPECIAL, /* 0x60 */	226	SPECIAL, /* 0x60 */
227	SPECIAL, /* 0x61 */	227	SPECIAL, /* 0x61 */
228	SPECIAL, /* 0x62 */	228	SPECIAL, /* 0x62 */
229	SPECIAL, /* 0x63 */	229	SPECIAL, /* 0x63 */
230	SPECIAL, /* 0x64 */	230	SPECIAL, /* 0x64 */
231	SPECIAL, /* 0x65 */	231	SPECIAL, /* 0x65 */
232	SPECIAL, /* 0x66 */	232	SPECIAL, /* 0x66 */
233	SPECIAL, /* 0x67 */	233	SPECIAL, /* 0x67 */
234	SPECIAL, /* 0x68 */	234	SPECIAL, /* 0x68 */
235	SPECIAL, /* 0x69 */	235	SPECIAL, /* 0x69 */
236	SPECIAL, /* 0x6a */	236	SPECIAL, /* 0x6a */
237	SPECIAL, /* 0x6b */	237	SPECIAL, /* 0x6b */
238	SPECIAL, /* 0x6c */	238	SPECIAL, /* 0x6c */
239	SPECIAL, /* 0x6d */	239	SPECIAL, /* 0x6d */
240	SPECIAL, /* 0x6e */	240	SPECIAL, /* 0x6e */
241	SPECIAL, /* 0x6f */	241	SPECIAL, /* 0x6f */
242	SPECIAL, /* 0x70 */	242	SPECIAL, /* 0x70 */
243	SPECIAL, /* 0x71 */	243	SPECIAL, /* 0x71 */
244	SPECIAL, /* 0x72 */	244	SPECIAL, /* 0x72 */
245	SPECIAL, /* 0x73 */	245	SPECIAL, /* 0x73 */
246	SPECIAL, /* 0x74 */	246	SPECIAL, /* 0x74 */
247	SPECIAL, /* 0x75 */	247	SPECIAL, /* 0x75 */
248	SPECIAL, /* 0x76 */	248	SPECIAL, /* 0x76 */
249	SPECIAL, /* 0x77 */	249	SPECIAL, /* 0x77 */
250	SPECIAL, /* 0x78 */	250	SPECIAL, /* 0x78 */
251	SPECIAL, /* 0x79 */	251	SPECIAL, /* 0x79 */
252	SPECIAL, /* 0x7a */	252	SPECIAL, /* 0x7a */
253	SPECIAL, /* 0x7b */	253	SPECIAL, /* 0x7b */
254	SPECIAL, /* 0x7c */	254	SPECIAL, /* 0x7c */
255	SPECIAL, /* 0x7d */	255	SPECIAL, /* 0x7d */
256	SPECIAL, /* 0x7e */	256	SPECIAL, /* 0x7e */
257	SPECIAL, /* 0x7f */	257	SPECIAL, /* 0x7f */
258	};	258	};
259		259
260	static void i8042_interrupt(int n, void *stack);	260	static void i8042_interrupt(int n, void *stack);
261		261
262	/** Initialize i8042. */	262	/** Initialize i8042. */
263	void i8042_init(void)	263	void i8042_init(void)
264	{	264	{
265	exc_register(VECTOR_KBD, "i8042_interrupt", i8042_interrupt);	265	exc_register(VECTOR_KBD, "i8042_interrupt", i8042_interrupt);
266	while (inb(i8042_STATUS)&i8042_WAIT_MASK); /Wait/	266	while (inb(i8042_STATUS)&i8042_WAIT_MASK); /Wait/
267	outb(i8042_STATUS,i8042_SET_COMMAND);	267	outb(i8042_STATUS,i8042_SET_COMMAND);
268	while (inb(i8042_STATUS)&i8042_WAIT_MASK); /Wait/	268	while (inb(i8042_STATUS)&i8042_WAIT_MASK); /Wait/
269	outb(i8042_DATA,i8042_COMMAND);	269	outb(i8042_DATA,i8042_COMMAND);
270		270
271	trap_virtual_enable_irqs(1<<IRQ_KBD);	271	trap_virtual_enable_irqs(1<<IRQ_KBD);
272	chardev_initialize("i8042_kbd", &kbrd, &ops);	272	chardev_initialize("i8042_kbd", &kbrd, &ops);
273	stdin = &kbrd;	273	stdin = &kbrd;
274	}	274	}
275		275
276	/** Process i8042 interrupt.	276	/** Process i8042 interrupt.
277	*	277	*
278	* @param n Interrupt vector.	278	* @param n Interrupt vector.
279	* @param stack Interrupted stack.	279	* @param stack Interrupted stack.
280	*/	280	*/
281	void i8042_interrupt(int n, void *stack)	281	void i8042_interrupt(int n, void *stack)
282	{	282	{
283	__u8 x;	283	__u8 x;
284		284
285	trap_virtual_eoi();	285	trap_virtual_eoi();
286	x = inb(i8042_DATA);	286	x = inb(i8042_DATA);
287	if (x & KEY_RELEASE)	287	if (x & KEY_RELEASE)
288	key_released(x ^ KEY_RELEASE);	288	key_released(x ^ KEY_RELEASE);
289	else	289	else
290	key_pressed(x);	290	key_pressed(x);
291	}	291	}
292		292
293	/** Process release of key.	293	/** Process release of key.
294	*	294	*
295	* @param sc Scancode of the key being released.	295	* @param sc Scancode of the key being released.
296	*/	296	*/
297	void key_released(__u8 sc)	297	void key_released(__u8 sc)
298	{	298	{
299	spinlock_lock(&keylock);	299	spinlock_lock(&keylock);
300	switch (sc) {	300	switch (sc) {
301	case SC_LSHIFT:	301	case SC_LSHIFT:
302	case SC_RSHIFT:	302	case SC_RSHIFT:
303	keyflags &= ~PRESSED_SHIFT;	303	keyflags &= ~PRESSED_SHIFT;
304	break;	304	break;
305	case SC_CAPSLOCK:	305	case SC_CAPSLOCK:
306	keyflags &= ~PRESSED_CAPSLOCK;	306	keyflags &= ~PRESSED_CAPSLOCK;
307	if (lockflags & LOCKED_CAPSLOCK)	307	if (lockflags & LOCKED_CAPSLOCK)
308	lockflags &= ~LOCKED_CAPSLOCK;	308	lockflags &= ~LOCKED_CAPSLOCK;
309	else	309	else
310	lockflags \|= LOCKED_CAPSLOCK;	310	lockflags \|= LOCKED_CAPSLOCK;
311	break;	311	break;
312	default:	312	default:
313	break;	313	break;
314	}	314	}
315	spinlock_unlock(&keylock);	315	spinlock_unlock(&keylock);
316	}	316	}
317		317
318	/** Process keypress.	318	/** Process keypress.
319	*	319	*
320	* @param sc Scancode of the key being pressed.	320	* @param sc Scancode of the key being pressed.
321	*/	321	*/
322	void key_pressed(__u8 sc)	322	void key_pressed(__u8 sc)
323	{	323	{
324	char *map = sc_primary_map;	324	char *map = sc_primary_map;
325	char ascii = sc_primary_map[sc];	325	char ascii = sc_primary_map[sc];
326	bool shift, capslock;	326	bool shift, capslock;
327	bool letter = false;	327	bool letter = false;
328		328
329	spinlock_lock(&keylock);	329	spinlock_lock(&keylock);
330	switch (sc) {	330	switch (sc) {
331	case SC_LSHIFT:	331	case SC_LSHIFT:
332	case SC_RSHIFT:	332	case SC_RSHIFT:
333	keyflags \|= PRESSED_SHIFT;	333	keyflags \|= PRESSED_SHIFT;
334	break;	334	break;
335	case SC_CAPSLOCK:	335	case SC_CAPSLOCK:
336	keyflags \|= PRESSED_CAPSLOCK;	336	keyflags \|= PRESSED_CAPSLOCK;
337	break;	337	break;
338	case SC_SPEC_ESCAPE:	338	case SC_SPEC_ESCAPE:
339	break;	339	break;
340	case SC_LEFTARR:	340	case SC_LEFTARR:
341	chardev_push_character(&kbrd, 0x1b);	341	chardev_push_character(&kbrd, 0x1b);
342	chardev_push_character(&kbrd, 0x5b);	342	chardev_push_character(&kbrd, 0x5b);
343	chardev_push_character(&kbrd, 0x44);	343	chardev_push_character(&kbrd, 0x44);
344	break;	344	break;
345	case SC_RIGHTARR:	345	case SC_RIGHTARR:
346	chardev_push_character(&kbrd, 0x1b);	346	chardev_push_character(&kbrd, 0x1b);
347	chardev_push_character(&kbrd, 0x5b);	347	chardev_push_character(&kbrd, 0x5b);
348	chardev_push_character(&kbrd, 0x43);	348	chardev_push_character(&kbrd, 0x43);
349	break;	349	break;
350	case SC_UPARR:	350	case SC_UPARR:
351	chardev_push_character(&kbrd, 0x1b);	351	chardev_push_character(&kbrd, 0x1b);
352	chardev_push_character(&kbrd, 0x5b);	352	chardev_push_character(&kbrd, 0x5b);
353	chardev_push_character(&kbrd, 0x41);	353	chardev_push_character(&kbrd, 0x41);
354	break;	354	break;
355	case SC_DOWNARR:	355	case SC_DOWNARR:
356	chardev_push_character(&kbrd, 0x1b);	356	chardev_push_character(&kbrd, 0x1b);
357	chardev_push_character(&kbrd, 0x5b);	357	chardev_push_character(&kbrd, 0x5b);
358	chardev_push_character(&kbrd, 0x42);	358	chardev_push_character(&kbrd, 0x42);
359	break;	359	break;
360	case SC_HOME:	360	case SC_HOME:
361	chardev_push_character(&kbrd, 0x1b);	361	chardev_push_character(&kbrd, 0x1b);
362	chardev_push_character(&kbrd, 0x4f);	362	chardev_push_character(&kbrd, 0x4f);
363	chardev_push_character(&kbrd, 0x48);	363	chardev_push_character(&kbrd, 0x48);
364	break;	364	break;
365	case SC_END:	365	case SC_END:
366	chardev_push_character(&kbrd, 0x1b);	366	chardev_push_character(&kbrd, 0x1b);
367	chardev_push_character(&kbrd, 0x4f);	367	chardev_push_character(&kbrd, 0x4f);
368	chardev_push_character(&kbrd, 0x46);	368	chardev_push_character(&kbrd, 0x46);
369	break;	369	break;
370	case SC_DELETE:	370	case SC_DELETE:
371	chardev_push_character(&kbrd, 0x1b);	371	chardev_push_character(&kbrd, 0x1b);
372	chardev_push_character(&kbrd, 0x5b);	372	chardev_push_character(&kbrd, 0x5b);
373	chardev_push_character(&kbrd, 0x33);	373	chardev_push_character(&kbrd, 0x33);
374	chardev_push_character(&kbrd, 0x7e);	374	chardev_push_character(&kbrd, 0x7e);
375	break;	375	break;
376	default:	376	default:
377	letter = is_lower(ascii);	377	letter = is_lower(ascii);
378	capslock = (keyflags & PRESSED_CAPSLOCK) \|\| (lockflags & LOCKED_CAPSLOCK);	378	capslock = (keyflags & PRESSED_CAPSLOCK) \|\| (lockflags & LOCKED_CAPSLOCK);
379	shift = keyflags & PRESSED_SHIFT;	379	shift = keyflags & PRESSED_SHIFT;
380	if (letter && capslock)	380	if (letter && capslock)
381	shift = !shift;	381	shift = !shift;
382	if (shift)	382	if (shift)
383	map = sc_secondary_map;	383	map = sc_secondary_map;
384	chardev_push_character(&kbrd, map[sc]);	384	chardev_push_character(&kbrd, map[sc]);
385	break;	385	break;
386	}	386	}
387	spinlock_unlock(&keylock);	387	spinlock_unlock(&keylock);
388	}	388	}
389		389
390	/* Called from getc(). */	390	/* Called from getc(). */
391	void i8042_resume(chardev_t *d)	391	void i8042_resume(chardev_t *d)
392	{	392	{
393	}	393	}
394		394
395	/* Called from getc(). */	395	/* Called from getc(). */
396	void i8042_suspend(chardev_t *d)	396	void i8042_suspend(chardev_t *d)
397	{	397	{
398	}	398	}
399		399

Subversion Repositories HelenOS-historic

(root)/kernel/trunk/arch/ia32/src/drivers/i8042.c @ 878 – Rev 670 → 671