33f0f88f1c
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
157 lines
4.1 KiB
C
157 lines
4.1 KiB
C
#ifndef _KBD_KERN_H
|
|
#define _KBD_KERN_H
|
|
|
|
#include <linux/tty.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/keyboard.h>
|
|
|
|
extern struct tasklet_struct keyboard_tasklet;
|
|
|
|
extern int shift_state;
|
|
|
|
extern char *func_table[MAX_NR_FUNC];
|
|
extern char func_buf[];
|
|
extern char *funcbufptr;
|
|
extern int funcbufsize, funcbufleft;
|
|
|
|
/*
|
|
* kbd->xxx contains the VC-local things (flag settings etc..)
|
|
*
|
|
* Note: externally visible are LED_SCR, LED_NUM, LED_CAP defined in kd.h
|
|
* The code in KDGETLED / KDSETLED depends on the internal and
|
|
* external order being the same.
|
|
*
|
|
* Note: lockstate is used as index in the array key_map.
|
|
*/
|
|
struct kbd_struct {
|
|
|
|
unsigned char lockstate;
|
|
/* 8 modifiers - the names do not have any meaning at all;
|
|
they can be associated to arbitrarily chosen keys */
|
|
#define VC_SHIFTLOCK KG_SHIFT /* shift lock mode */
|
|
#define VC_ALTGRLOCK KG_ALTGR /* altgr lock mode */
|
|
#define VC_CTRLLOCK KG_CTRL /* control lock mode */
|
|
#define VC_ALTLOCK KG_ALT /* alt lock mode */
|
|
#define VC_SHIFTLLOCK KG_SHIFTL /* shiftl lock mode */
|
|
#define VC_SHIFTRLOCK KG_SHIFTR /* shiftr lock mode */
|
|
#define VC_CTRLLLOCK KG_CTRLL /* ctrll lock mode */
|
|
#define VC_CTRLRLOCK KG_CTRLR /* ctrlr lock mode */
|
|
unsigned char slockstate; /* for `sticky' Shift, Ctrl, etc. */
|
|
|
|
unsigned char ledmode:2; /* one 2-bit value */
|
|
#define LED_SHOW_FLAGS 0 /* traditional state */
|
|
#define LED_SHOW_IOCTL 1 /* only change leds upon ioctl */
|
|
#define LED_SHOW_MEM 2 /* `heartbeat': peek into memory */
|
|
|
|
unsigned char ledflagstate:4; /* flags, not lights */
|
|
unsigned char default_ledflagstate:4;
|
|
#define VC_SCROLLOCK 0 /* scroll-lock mode */
|
|
#define VC_NUMLOCK 1 /* numeric lock mode */
|
|
#define VC_CAPSLOCK 2 /* capslock mode */
|
|
#define VC_KANALOCK 3 /* kanalock mode */
|
|
|
|
unsigned char kbdmode:2; /* one 2-bit value */
|
|
#define VC_XLATE 0 /* translate keycodes using keymap */
|
|
#define VC_MEDIUMRAW 1 /* medium raw (keycode) mode */
|
|
#define VC_RAW 2 /* raw (scancode) mode */
|
|
#define VC_UNICODE 3 /* Unicode mode */
|
|
|
|
unsigned char modeflags:5;
|
|
#define VC_APPLIC 0 /* application key mode */
|
|
#define VC_CKMODE 1 /* cursor key mode */
|
|
#define VC_REPEAT 2 /* keyboard repeat */
|
|
#define VC_CRLF 3 /* 0 - enter sends CR, 1 - enter sends CRLF */
|
|
#define VC_META 4 /* 0 - meta, 1 - meta=prefix with ESC */
|
|
};
|
|
|
|
extern struct kbd_struct kbd_table[];
|
|
|
|
extern int kbd_init(void);
|
|
|
|
extern unsigned char getledstate(void);
|
|
extern void setledstate(struct kbd_struct *kbd, unsigned int led);
|
|
|
|
extern int do_poke_blanked_console;
|
|
|
|
extern void (*kbd_ledfunc)(unsigned int led);
|
|
|
|
extern void set_console(int nr);
|
|
extern void schedule_console_callback(void);
|
|
|
|
static inline void set_leds(void)
|
|
{
|
|
tasklet_schedule(&keyboard_tasklet);
|
|
}
|
|
|
|
static inline int vc_kbd_mode(struct kbd_struct * kbd, int flag)
|
|
{
|
|
return ((kbd->modeflags >> flag) & 1);
|
|
}
|
|
|
|
static inline int vc_kbd_led(struct kbd_struct * kbd, int flag)
|
|
{
|
|
return ((kbd->ledflagstate >> flag) & 1);
|
|
}
|
|
|
|
static inline void set_vc_kbd_mode(struct kbd_struct * kbd, int flag)
|
|
{
|
|
kbd->modeflags |= 1 << flag;
|
|
}
|
|
|
|
static inline void set_vc_kbd_led(struct kbd_struct * kbd, int flag)
|
|
{
|
|
kbd->ledflagstate |= 1 << flag;
|
|
}
|
|
|
|
static inline void clr_vc_kbd_mode(struct kbd_struct * kbd, int flag)
|
|
{
|
|
kbd->modeflags &= ~(1 << flag);
|
|
}
|
|
|
|
static inline void clr_vc_kbd_led(struct kbd_struct * kbd, int flag)
|
|
{
|
|
kbd->ledflagstate &= ~(1 << flag);
|
|
}
|
|
|
|
static inline void chg_vc_kbd_lock(struct kbd_struct * kbd, int flag)
|
|
{
|
|
kbd->lockstate ^= 1 << flag;
|
|
}
|
|
|
|
static inline void chg_vc_kbd_slock(struct kbd_struct * kbd, int flag)
|
|
{
|
|
kbd->slockstate ^= 1 << flag;
|
|
}
|
|
|
|
static inline void chg_vc_kbd_mode(struct kbd_struct * kbd, int flag)
|
|
{
|
|
kbd->modeflags ^= 1 << flag;
|
|
}
|
|
|
|
static inline void chg_vc_kbd_led(struct kbd_struct * kbd, int flag)
|
|
{
|
|
kbd->ledflagstate ^= 1 << flag;
|
|
}
|
|
|
|
#define U(x) ((x) ^ 0xf000)
|
|
|
|
/* keyboard.c */
|
|
|
|
struct console;
|
|
|
|
int getkeycode(unsigned int scancode);
|
|
int setkeycode(unsigned int scancode, unsigned int keycode);
|
|
void compute_shiftstate(void);
|
|
|
|
/* defkeymap.c */
|
|
|
|
extern unsigned int keymap_count;
|
|
|
|
/* console.c */
|
|
|
|
static inline void con_schedule_flip(struct tty_struct *t)
|
|
{
|
|
schedule_work(&t->buf.work);
|
|
}
|
|
|
|
#endif
|