Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 518 → Rev 523

/shark/trunk/drivers/input/mouse/psmouse-base.c
21,7 → 21,7
#include <linux/init.h>
#include <linux/pm.h>
#include "psmouse.h"
//#include "synaptics.h"
#include "synaptics.h"
#include "logips2pp.h"
 
MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
175,7 → 175,7
* The synaptics driver has its own resync logic,
* so it needs to receive all bytes one at a time.
*/
//!!!synaptics_process_byte(psmouse, regs);
synaptics_process_byte(psmouse, regs);
goto out;
}
 
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);
293,7 → 293,7
return PSMOUSE_SYNAPTICS;
else
return PSMOUSE_PS2;
}*/
}
 
/*
* Try Genius NetMouse magic init.
514,8 → 514,11
{
struct psmouse *psmouse = serio->private;
 
/* Added by Nino - Clean de mouse before closing */
psmouse_cleanup(serio);
psmouse->state = PSMOUSE_IGNORE;
//!!!synaptics_disconnect(psmouse);
synaptics_disconnect(psmouse);
input_unregister_device(&psmouse->dev);
serio_close(serio);
kfree(psmouse);
530,7 → 533,7
struct psmouse *psmouse = dev->data;
struct serio_dev *ser_dev = psmouse->serio->dev;
 
//!!!synaptics_disconnect(psmouse);
synaptics_disconnect(psmouse);
 
/* We need to reopen the serio port to reinitialize the i8042 controller */
serio_close(psmouse->serio);
539,7 → 542,7
/* Probe and re-initialize the mouse */
psmouse_probe(psmouse);
psmouse_initialize(psmouse);
//!!!synaptics_pt_init(psmouse);
synaptics_pt_init(psmouse);
psmouse_activate(psmouse);
 
return 0;
610,7 → 613,7
 
psmouse_initialize(psmouse);
 
//!!!synaptics_pt_init(psmouse);
synaptics_pt_init(psmouse);
 
psmouse_activate(psmouse);
}