Input: lkkbd - change formatting style to match the rest of the kernel
- no spaces between function name and opening parenthesis - switch statements were indented too much This makes checkpatch (and me) happy. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov
parent
fb5bbee0dd
commit
7d3fadd148
@ -98,8 +98,8 @@ MODULE_PARM_DESC (ctrlclick_volume, "Ctrlclick volume (in %), default is 100%");
|
||||
|
||||
static int lk201_compose_is_alt;
|
||||
module_param(lk201_compose_is_alt, int, 0);
|
||||
MODULE_PARM_DESC (lk201_compose_is_alt, "If set non-zero, LK201' Compose key "
|
||||
"will act as an Alt key");
|
||||
MODULE_PARM_DESC(lk201_compose_is_alt,
|
||||
"If set non-zero, LK201' Compose key will act as an Alt key");
|
||||
|
||||
|
||||
|
||||
@ -152,11 +152,8 @@ MODULE_PARM_DESC (lk201_compose_is_alt, "If set non-zero, LK201' Compose key "
|
||||
|
||||
#define LK_NUM_KEYCODES 256
|
||||
#define LK_NUM_IGNORE_BYTES 6
|
||||
typedef u_int16_t lk_keycode_t;
|
||||
|
||||
|
||||
|
||||
static lk_keycode_t lkkbd_keycode[LK_NUM_KEYCODES] = {
|
||||
static unsigned short lkkbd_keycode[LK_NUM_KEYCODES] = {
|
||||
[0x56] = KEY_F1,
|
||||
[0x57] = KEY_F2,
|
||||
[0x58] = KEY_F3,
|
||||
@ -278,7 +275,7 @@ static lk_keycode_t lkkbd_keycode[LK_NUM_KEYCODES] = {
|
||||
* Per-keyboard data
|
||||
*/
|
||||
struct lkkbd {
|
||||
lk_keycode_t keycode[LK_NUM_KEYCODES];
|
||||
unsigned short keycode[LK_NUM_KEYCODES];
|
||||
int ignore_bytes;
|
||||
unsigned char id[LK_NUM_IGNORE_BYTES];
|
||||
struct input_dev *dev;
|
||||
@ -315,8 +312,7 @@ static struct {
|
||||
#undef RESPONSE
|
||||
};
|
||||
|
||||
static unsigned char *
|
||||
response_name (unsigned char value)
|
||||
static unsigned char *response_name(unsigned char value)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -331,8 +327,7 @@ response_name (unsigned char value)
|
||||
/*
|
||||
* Calculate volume parameter byte for a given volume.
|
||||
*/
|
||||
static unsigned char
|
||||
volume_to_hw (int volume_percent)
|
||||
static unsigned char volume_to_hw(int volume_percent)
|
||||
{
|
||||
unsigned char ret = 0;
|
||||
|
||||
@ -363,8 +358,7 @@ volume_to_hw (int volume_percent)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void
|
||||
lkkbd_detection_done (struct lkkbd *lk)
|
||||
static void lkkbd_detection_done(struct lkkbd *lk)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -378,30 +372,28 @@ lkkbd_detection_done (struct lkkbd *lk)
|
||||
*/
|
||||
switch (lk->id[4]) {
|
||||
case 1:
|
||||
strlcpy (lk->name, "DEC LK201 keyboard",
|
||||
sizeof (lk->name));
|
||||
strlcpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name));
|
||||
|
||||
if (lk201_compose_is_alt)
|
||||
lk->keycode[0xb1] = KEY_LEFTALT;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
strlcpy (lk->name, "DEC LK401 keyboard",
|
||||
sizeof (lk->name));
|
||||
strlcpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name));
|
||||
break;
|
||||
|
||||
default:
|
||||
strlcpy (lk->name, "Unknown DEC keyboard",
|
||||
sizeof (lk->name));
|
||||
printk (KERN_ERR "lkkbd: keyboard on %s is unknown, "
|
||||
"please report to Jan-Benedict Glaw "
|
||||
"<jbglaw@lug-owl.de>\n", lk->phys);
|
||||
strlcpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name));
|
||||
printk(KERN_ERR
|
||||
"lkkbd: keyboard on %s is unknown, please report to "
|
||||
"Jan-Benedict Glaw <jbglaw@lug-owl.de>\n", lk->phys);
|
||||
printk(KERN_ERR "lkkbd: keyboard ID'ed as:");
|
||||
for (i = 0; i < LK_NUM_IGNORE_BYTES; i++)
|
||||
printk(" 0x%02x", lk->id[i]);
|
||||
printk("\n");
|
||||
break;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "lkkbd: keyboard on %s identified as: %s\n",
|
||||
lk->phys, lk->name);
|
||||
|
||||
@ -414,20 +406,20 @@ lkkbd_detection_done (struct lkkbd *lk)
|
||||
break;
|
||||
|
||||
case LK_STUCK_KEY:
|
||||
printk (KERN_ERR "lkkbd: Stuck key on keyboard at "
|
||||
"%s\n", lk->phys);
|
||||
printk(KERN_ERR "lkkbd: Stuck key on keyboard at %s\n",
|
||||
lk->phys);
|
||||
break;
|
||||
|
||||
case LK_SELFTEST_FAILED:
|
||||
printk (KERN_ERR "lkkbd: Selftest failed on keyboard "
|
||||
"at %s, keyboard may not work "
|
||||
"properly\n", lk->phys);
|
||||
printk(KERN_ERR
|
||||
"lkkbd: Selftest failed on keyboard at %s, "
|
||||
"keyboard may not work properly\n", lk->phys);
|
||||
break;
|
||||
|
||||
default:
|
||||
printk (KERN_ERR "lkkbd: Unknown error %02x on "
|
||||
"keyboard at %s\n", lk->id[2],
|
||||
lk->phys);
|
||||
printk(KERN_ERR
|
||||
"lkkbd: Unknown error %02x on keyboard at %s\n",
|
||||
lk->id[2], lk->phys);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -435,21 +427,21 @@ lkkbd_detection_done (struct lkkbd *lk)
|
||||
* Try to hint user if there's a stuck key.
|
||||
*/
|
||||
if (lk->id[2] == LK_STUCK_KEY && lk->id[3] != 0)
|
||||
printk (KERN_ERR "Scancode of stuck key is 0x%02x, keycode "
|
||||
"is 0x%04x\n", lk->id[3],
|
||||
lk->keycode[lk->id[3]]);
|
||||
|
||||
return;
|
||||
printk(KERN_ERR
|
||||
"Scancode of stuck key is 0x%02x, keycode is 0x%04x\n",
|
||||
lk->id[3], lk->keycode[lk->id[3]]);
|
||||
}
|
||||
|
||||
/*
|
||||
* lkkbd_interrupt() is called by the low level driver when a character
|
||||
* is received.
|
||||
*/
|
||||
static irqreturn_t
|
||||
lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags)
|
||||
static irqreturn_t lkkbd_interrupt(struct serio *serio,
|
||||
unsigned char data, unsigned int flags)
|
||||
{
|
||||
struct lkkbd *lk = serio_get_drvdata(serio);
|
||||
struct input_dev *input_dev = lk->dev;
|
||||
unsigned int keycode;
|
||||
int i;
|
||||
|
||||
DBG(KERN_INFO "Got byte 0x%02x\n", data);
|
||||
@ -467,9 +459,8 @@ lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags)
|
||||
switch (data) {
|
||||
case LK_ALL_KEYS_UP:
|
||||
for (i = 0; i < ARRAY_SIZE(lkkbd_keycode); i++)
|
||||
if (lk->keycode[i] != KEY_RESERVED)
|
||||
input_report_key (lk->dev, lk->keycode[i], 0);
|
||||
input_sync (lk->dev);
|
||||
input_report_key(input_dev, lk->keycode[i], 0);
|
||||
input_sync(input_dev);
|
||||
break;
|
||||
|
||||
case 0x01:
|
||||
@ -492,62 +483,76 @@ lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags)
|
||||
break;
|
||||
|
||||
default:
|
||||
if (lk->keycode[data] != KEY_RESERVED) {
|
||||
if (!test_bit (lk->keycode[data], lk->dev->key))
|
||||
input_report_key (lk->dev, lk->keycode[data], 1);
|
||||
else
|
||||
input_report_key (lk->dev, lk->keycode[data], 0);
|
||||
input_sync (lk->dev);
|
||||
} else
|
||||
printk (KERN_WARNING "%s: Unknown key with "
|
||||
"scancode 0x%02x on %s.\n",
|
||||
keycode = lk->keycode[data];
|
||||
if (keycode != KEY_RESERVED) {
|
||||
input_report_key(input_dev, keycode,
|
||||
!test_bit(keycode, input_dev->key));
|
||||
input_sync(input_dev);
|
||||
} else {
|
||||
printk(KERN_WARNING
|
||||
"%s: Unknown key with scancode 0x%02x on %s.\n",
|
||||
__FILE__, data, lk->name);
|
||||
}
|
||||
}
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
/*
|
||||
* lkkbd_event() handles events from the input module.
|
||||
*/
|
||||
static int
|
||||
lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
|
||||
int value)
|
||||
static void lkkbd_toggle_leds(struct lkkbd *lk)
|
||||
{
|
||||
struct lkkbd *lk = input_get_drvdata (dev);
|
||||
struct serio *serio = lk->serio;
|
||||
unsigned char leds_on = 0;
|
||||
unsigned char leds_off = 0;
|
||||
|
||||
switch (type) {
|
||||
case EV_LED:
|
||||
CHECK_LED(lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK);
|
||||
CHECK_LED(lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE);
|
||||
CHECK_LED(lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
|
||||
CHECK_LED(lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT);
|
||||
if (leds_on != 0) {
|
||||
serio_write (lk->serio, LK_CMD_LED_ON);
|
||||
serio_write (lk->serio, leds_on);
|
||||
serio_write(serio, LK_CMD_LED_ON);
|
||||
serio_write(serio, leds_on);
|
||||
}
|
||||
if (leds_off != 0) {
|
||||
serio_write (lk->serio, LK_CMD_LED_OFF);
|
||||
serio_write (lk->serio, leds_off);
|
||||
serio_write(serio, LK_CMD_LED_OFF);
|
||||
serio_write(serio, leds_off);
|
||||
}
|
||||
}
|
||||
|
||||
static void lkkbd_toggle_keyclick(struct lkkbd *lk, bool on)
|
||||
{
|
||||
struct serio *serio = lk->serio;
|
||||
|
||||
if (on) {
|
||||
DBG("%s: Activating key clicks\n", __func__);
|
||||
serio_write(serio, LK_CMD_ENABLE_KEYCLICK);
|
||||
serio_write(serio, volume_to_hw(lk->keyclick_volume));
|
||||
serio_write(serio, LK_CMD_ENABLE_CTRCLICK);
|
||||
serio_write(serio, volume_to_hw(lk->ctrlclick_volume));
|
||||
} else {
|
||||
DBG("%s: Deactivating key clicks\n", __func__);
|
||||
serio_write(serio, LK_CMD_DISABLE_KEYCLICK);
|
||||
serio_write(serio, LK_CMD_DISABLE_CTRCLICK);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* lkkbd_event() handles events from the input module.
|
||||
*/
|
||||
static int lkkbd_event(struct input_dev *dev,
|
||||
unsigned int type, unsigned int code, int value)
|
||||
{
|
||||
struct lkkbd *lk = input_get_drvdata(dev);
|
||||
|
||||
switch (type) {
|
||||
case EV_LED:
|
||||
lkkbd_toggle_leds(lk);
|
||||
return 0;
|
||||
|
||||
case EV_SND:
|
||||
switch (code) {
|
||||
case SND_CLICK:
|
||||
if (value == 0) {
|
||||
DBG ("%s: Deactivating key clicks\n", __func__);
|
||||
serio_write (lk->serio, LK_CMD_DISABLE_KEYCLICK);
|
||||
serio_write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
|
||||
} else {
|
||||
DBG ("%s: Activating key clicks\n", __func__);
|
||||
serio_write (lk->serio, LK_CMD_ENABLE_KEYCLICK);
|
||||
serio_write (lk->serio, volume_to_hw (lk->keyclick_volume));
|
||||
serio_write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
|
||||
serio_write (lk->serio, volume_to_hw (lk->ctrlclick_volume));
|
||||
}
|
||||
lkkbd_toggle_keyclick(lk, value);
|
||||
return 0;
|
||||
|
||||
case SND_BELL:
|
||||
@ -556,6 +561,7 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -570,13 +576,10 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
|
||||
* lkkbd_reinit() sets leds and beeps to a state the computer remembers they
|
||||
* were in.
|
||||
*/
|
||||
static void
|
||||
lkkbd_reinit (struct work_struct *work)
|
||||
static void lkkbd_reinit(struct work_struct *work)
|
||||
{
|
||||
struct lkkbd *lk = container_of(work, struct lkkbd, tq);
|
||||
int division;
|
||||
unsigned char leds_on = 0;
|
||||
unsigned char leds_off = 0;
|
||||
|
||||
/* Ask for ID */
|
||||
serio_write(lk->serio, LK_CMD_REQUEST_ID);
|
||||
@ -585,18 +588,7 @@ lkkbd_reinit (struct work_struct *work)
|
||||
serio_write(lk->serio, LK_CMD_SET_DEFAULTS);
|
||||
|
||||
/* Set LEDs */
|
||||
CHECK_LED (lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK);
|
||||
CHECK_LED (lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE);
|
||||
CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
|
||||
CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT);
|
||||
if (leds_on != 0) {
|
||||
serio_write (lk->serio, LK_CMD_LED_ON);
|
||||
serio_write (lk->serio, leds_on);
|
||||
}
|
||||
if (leds_off != 0) {
|
||||
serio_write (lk->serio, LK_CMD_LED_OFF);
|
||||
serio_write (lk->serio, leds_off);
|
||||
}
|
||||
lkkbd_toggle_leds(lk);
|
||||
|
||||
/*
|
||||
* Try to activate extended LK401 mode. This command will
|
||||
@ -607,23 +599,15 @@ lkkbd_reinit (struct work_struct *work)
|
||||
|
||||
/* Set all keys to UPDOWN mode */
|
||||
for (division = 1; division <= 14; division++)
|
||||
serio_write (lk->serio, LK_CMD_SET_MODE (LK_MODE_UPDOWN,
|
||||
division));
|
||||
serio_write(lk->serio,
|
||||
LK_CMD_SET_MODE(LK_MODE_UPDOWN, division));
|
||||
|
||||
/* Enable bell and set volume */
|
||||
serio_write(lk->serio, LK_CMD_ENABLE_BELL);
|
||||
serio_write(lk->serio, volume_to_hw(lk->bell_volume));
|
||||
|
||||
/* Enable/disable keyclick (and possibly set volume) */
|
||||
if (test_bit (SND_CLICK, lk->dev->snd)) {
|
||||
serio_write (lk->serio, LK_CMD_ENABLE_KEYCLICK);
|
||||
serio_write (lk->serio, volume_to_hw (lk->keyclick_volume));
|
||||
serio_write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
|
||||
serio_write (lk->serio, volume_to_hw (lk->ctrlclick_volume));
|
||||
} else {
|
||||
serio_write (lk->serio, LK_CMD_DISABLE_KEYCLICK);
|
||||
serio_write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
|
||||
}
|
||||
lkkbd_toggle_keyclick(lk, test_bit(SND_CLICK, lk->dev->snd));
|
||||
|
||||
/* Sound the bell if needed */
|
||||
if (test_bit(SND_BELL, lk->dev->snd))
|
||||
@ -633,8 +617,7 @@ lkkbd_reinit (struct work_struct *work)
|
||||
/*
|
||||
* lkkbd_connect() probes for a LK keyboard and fills the necessary structures.
|
||||
*/
|
||||
static int
|
||||
lkkbd_connect (struct serio *serio, struct serio_driver *drv)
|
||||
static int lkkbd_connect(struct serio *serio, struct serio_driver *drv)
|
||||
{
|
||||
struct lkkbd *lk;
|
||||
struct input_dev *input_dev;
|
||||
@ -654,7 +637,7 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
|
||||
lk->bell_volume = bell_volume;
|
||||
lk->keyclick_volume = keyclick_volume;
|
||||
lk->ctrlclick_volume = ctrlclick_volume;
|
||||
memcpy (lk->keycode, lkkbd_keycode, sizeof (lk_keycode_t) * LK_NUM_KEYCODES);
|
||||
memcpy(lk->keycode, lkkbd_keycode, sizeof(lk->keycode));
|
||||
|
||||
strlcpy(lk->name, "DEC LK keyboard", sizeof(lk->name));
|
||||
snprintf(lk->phys, sizeof(lk->phys), "%s/input0", serio->phys);
|
||||
@ -670,20 +653,20 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
|
||||
|
||||
input_set_drvdata(input_dev, lk);
|
||||
|
||||
set_bit (EV_KEY, input_dev->evbit);
|
||||
set_bit (EV_LED, input_dev->evbit);
|
||||
set_bit (EV_SND, input_dev->evbit);
|
||||
set_bit (EV_REP, input_dev->evbit);
|
||||
set_bit (LED_CAPSL, input_dev->ledbit);
|
||||
set_bit (LED_SLEEP, input_dev->ledbit);
|
||||
set_bit (LED_COMPOSE, input_dev->ledbit);
|
||||
set_bit (LED_SCROLLL, input_dev->ledbit);
|
||||
set_bit (SND_BELL, input_dev->sndbit);
|
||||
set_bit (SND_CLICK, input_dev->sndbit);
|
||||
__set_bit(EV_KEY, input_dev->evbit);
|
||||
__set_bit(EV_LED, input_dev->evbit);
|
||||
__set_bit(EV_SND, input_dev->evbit);
|
||||
__set_bit(EV_REP, input_dev->evbit);
|
||||
__set_bit(LED_CAPSL, input_dev->ledbit);
|
||||
__set_bit(LED_SLEEP, input_dev->ledbit);
|
||||
__set_bit(LED_COMPOSE, input_dev->ledbit);
|
||||
__set_bit(LED_SCROLLL, input_dev->ledbit);
|
||||
__set_bit(SND_BELL, input_dev->sndbit);
|
||||
__set_bit(SND_CLICK, input_dev->sndbit);
|
||||
|
||||
input_dev->keycode = lk->keycode;
|
||||
input_dev->keycodesize = sizeof (lk_keycode_t);
|
||||
input_dev->keycodemax = LK_NUM_KEYCODES;
|
||||
input_dev->keycodesize = sizeof(lk->keycode[0]);
|
||||
input_dev->keycodemax = ARRAY_SIZE(lk->keycode);
|
||||
|
||||
for (i = 0; i < LK_NUM_KEYCODES; i++)
|
||||
__set_bit(lk->keycode[i], input_dev->keybit);
|
||||
@ -713,8 +696,7 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
|
||||
/*
|
||||
* lkkbd_disconnect() unregisters and closes behind us.
|
||||
*/
|
||||
static void
|
||||
lkkbd_disconnect (struct serio *serio)
|
||||
static void lkkbd_disconnect(struct serio *serio)
|
||||
{
|
||||
struct lkkbd *lk = serio_get_drvdata(serio);
|
||||
|
||||
@ -752,14 +734,12 @@ static struct serio_driver lkkbd_drv = {
|
||||
/*
|
||||
* The functions for insering/removing us as a module.
|
||||
*/
|
||||
static int __init
|
||||
lkkbd_init (void)
|
||||
static int __init lkkbd_init(void)
|
||||
{
|
||||
return serio_register_driver(&lkkbd_drv);
|
||||
}
|
||||
|
||||
static void __exit
|
||||
lkkbd_exit (void)
|
||||
static void __exit lkkbd_exit(void)
|
||||
{
|
||||
serio_unregister_driver(&lkkbd_drv);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user