korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 16:54:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Input: lifebook - various cleanups:

Browse Source 
- do not try to set rate and resolution in init method, let
         psmouse core do it for us. This also removes special quirks
         from the core;
       - do not disable mouse before doing full reset - meaningless;
       - some formatting and whitespace cleanups.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2005-05-29 02:30:28 -05:00
parent 02d7f58950
commit 14e9414396
3 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/input/mouse/lifebook.c
View File

@ -20,12 +20,9 @@
#include "psmouse.h" #include "psmouse.h"
#include "lifebook.h" #include "lifebook.h"
static int max_y = 1024;
static struct dmi_system_id lifebook_dmi_table[] = { static struct dmi_system_id lifebook_dmi_table[] = {
{ {
.ident = "Fujitsu Siemens Lifebook B-Sereis", .ident = "Lifebook B",
.matches = { .matches = {
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"), DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),
}, },
@ -39,7 +36,7 @@ static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_re
unsigned char *packet = psmouse->packet; unsigned char *packet = psmouse->packet;
struct input_dev *dev = &psmouse->dev; struct input_dev *dev = &psmouse->dev;
if ( psmouse->pktcnt != 3 ) if (psmouse->pktcnt != 3)
return PSMOUSE_GOOD_DATA; return PSMOUSE_GOOD_DATA;
input_regs(dev, regs); input_regs(dev, regs);
@ -49,12 +46,12 @@ static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_re
input_report_abs(dev, ABS_X, input_report_abs(dev, ABS_X,
(packet[1] | ((packet[0] & 0x30) << 4))); (packet[1] | ((packet[0] & 0x30) << 4)));
input_report_abs(dev, ABS_Y, input_report_abs(dev, ABS_Y,
max_y - (packet[2] | ((packet[0] & 0xC0) << 2))); 1024 - (packet[2] | ((packet[0] & 0xC0) << 2)));
} else { } else {
input_report_rel(dev, REL_X, input_report_rel(dev, REL_X,
((packet[0] & 0x10) ? packet[1]-256 : packet[1])); ((packet[0] & 0x10) ? packet[1] - 256 : packet[1]));
input_report_rel(dev, REL_Y, input_report_rel(dev, REL_Y,
(- (int)((packet[0] & 0x20) ? packet[2]-256 : packet[2]))); -(int)((packet[0] & 0x20) ? packet[2] - 256 : packet[2]));
} }
input_report_key(dev, BTN_LEFT, packet[0] & 0x01); input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
@ -71,26 +68,17 @@ static int lifebook_initialize(struct psmouse *psmouse)
struct ps2dev *ps2dev = &psmouse->ps2dev; struct ps2dev *ps2dev = &psmouse->ps2dev;
unsigned char param; unsigned char param;
if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE)) if (psmouse_reset(psmouse))
return -1; return -1;
if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_BAT)) /*
return -1;
/*
Enable absolute output -- ps2_command fails always but if Enable absolute output -- ps2_command fails always but if
you leave this call out the touchsreen will never send you leave this call out the touchsreen will never send
absolute coordinates absolute coordinates
*/ */
param = 0x07; param = 0x07;
ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES); ps2_command(ps2dev, &param, PSMOUSE_CMD_SETRES);
psmouse->set_rate(psmouse, psmouse->rate);
psmouse->set_resolution(psmouse, psmouse->resolution);
if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE))
return -1;
return 0; return 0;
} }
@ -99,11 +87,10 @@ static void lifebook_disconnect(struct psmouse *psmouse)
psmouse_reset(psmouse); psmouse_reset(psmouse);
} }
int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto, int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto,
int set_properties) int set_properties)
{ {
if (!dmi_check_system(lifebook_dmi_table) && if (!dmi_check_system(lifebook_dmi_table) && max_proto != PSMOUSE_LIFEBOOK)
(max_proto != PSMOUSE_LIFEBOOK) )
return -1; return -1;
if (set_properties) { if (set_properties) {

2
drivers/input/mouse/lifebook.h
View File

@ -11,7 +11,7 @@
#ifndef _LIFEBOOK_H #ifndef _LIFEBOOK_H
#define _LIFEBOOK_H #define _LIFEBOOK_H
int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto, int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto,
int set_properties); int set_properties);
#endif #endif

2
drivers/input/mouse/psmouse-base.c
View File

@ -579,8 +579,6 @@ static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate)
static void psmouse_initialize(struct psmouse *psmouse) static void psmouse_initialize(struct psmouse *psmouse)
{ {
if (psmouse->type==PSMOUSE_LIFEBOOK)
return;
/* /*
* We set the mouse into streaming mode. * We set the mouse into streaming mode.
*/ */