Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 517 → Rev 518

/shark/trunk/drivers/input/keyboard/atkbd.c
418,6 → 418,22
atkbd_command(atkbd, param, ATKBD_CMD_SETREP);
 
return 0;
case EV_PWR:
if (code) {
/* Enable the keyboard to receive keystrokes. */
if (atkbd_command(atkbd, NULL, ATKBD_CMD_ENABLE)) {
printk(KERN_ERR "atkbd.c: Failed to enable keyboard on %s\n", atkbd->serio->phys);
return -1;
}
} else {
/* Disable the keyboard to receive keystrokes. */
if (atkbd_command(atkbd, NULL, ATKBD_CMD_RESET_DIS)) {
printk(KERN_ERR "atkbd.c: Failed to disable keyboard on %s\n", atkbd->serio->phys);
return -1;
}
}
return 0;
}
 
return -1;
553,11 → 569,11
* Enable the keyboard to receive keystrokes.
*/
 
if (atkbd_command(atkbd, NULL, ATKBD_CMD_ENABLE)) {
/*if (atkbd_command(atkbd, NULL, ATKBD_CMD_ENABLE)) {
printk(KERN_ERR "atkbd.c: Failed to enable keyboard on %s\n",
atkbd->serio->phys);
return -1;
}
}*/
 
return 0;
}
618,7 → 634,7
}
if (atkbd->write) {
atkbd->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
atkbd->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP) | BIT(EV_PWR);
atkbd->dev.ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL);
} else atkbd->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
 
/shark/trunk/drivers/input/mouse/psmouse-base.c
279,7 → 279,7
* Try Synaptics TouchPad magic ID
*/
 
param[0] = 0;
/*param[0] = 0;
psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
289,11 → 289,11
if (param[1] == 0x47) {
psmouse->vendor = "Synaptics";
psmouse->name = "TouchPad";
/*if (!synaptics_init(psmouse))
if (!synaptics_init(psmouse))
return PSMOUSE_SYNAPTICS;
else*/
else
return PSMOUSE_PS2;
}
}*/
 
/*
* Try Genius NetMouse magic init.
/shark/trunk/drivers/input/makefile
10,12 → 10,15
 
OBJS_PATH = $(BASE)/drivers/input
 
OBJS = input.o evbug.o\
serio/serio.o serio/i8042.o\
OBJS = input.o serio/serio.o serio/i8042.o\
mouse/psmouse-base.o mouse/logips2pp.o\
keyboard/atkbd.o\
misc/pcspkr.o\
shark_input.o
handler/evbug.o handler/keyboard.o\
handler/mouse.o handler/speaker.o\
shark/shark_input.o shark/shark_mouse.o\
shark/shark_keymap.o shark/shark_keyb.o\
shark/shark_spk.o
 
OTHERINCL += -I$(BASE)/drivers/linuxc26/include
 
/shark/trunk/drivers/input/makefile.full
10,14 → 10,14
 
OBJS_PATH = $(BASE)/drivers/input
 
OBJS = input.o cmdline.o evbug.o evdev.o mousedev.o joydev.o\
serio/serio.o serio/i8042.o serio/serport.o\
mouse/psmouse-base.o mouse/logips2pp.o mouse/sermouse.o\
OBJS = input.o serio/serio.o serio/i8042.o\
mouse/psmouse-base.o mouse/logips2pp.o\
keyboard/atkbd.o\
misc/pcspkr.o\
gameport/gameport.o gameport/ns558.o\
joystick/analog.o joystick/joydump.o\
shark_input.o
handler/evbug.o handler/keyboard.o\
shark/shark_input.o shark/shark_keymap.o shark/shark_keyb.o
 
OTHERINCL += -I$(BASE)/drivers/linuxc26/include