Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 287019 | Differences between
and this patch

Collapse All | Expand All

(-)linux-2.6.31-gentoo/drivers/input/mouse/synaptics.c (-2 / +10 lines)
Lines 116-122 static int synaptics_model_id(struct psm Link Here
116
{
116
{
117
	struct synaptics_data *priv = psmouse->private;
117
	struct synaptics_data *priv = psmouse->private;
118
	unsigned char mi[3];
118
	unsigned char mi[3];
119
119
	printk(KERN_INFO "synaptics: Right before synaptics_send_cmd() in synaptics_model_id()");
120
	if (synaptics_send_cmd(psmouse, SYN_QUE_MODEL, mi))
120
	if (synaptics_send_cmd(psmouse, SYN_QUE_MODEL, mi))
121
		return -1;
121
		return -1;
122
	priv->model_id = (mi[0]<<16) | (mi[1]<<8) | mi[2];
122
	priv->model_id = (mi[0]<<16) | (mi[1]<<8) | mi[2];
Lines 132-137 static int synaptics_capability(struct p Link Here
132
	struct synaptics_data *priv = psmouse->private;
132
	struct synaptics_data *priv = psmouse->private;
133
	unsigned char cap[3];
133
	unsigned char cap[3];
134
134
135
	printk(KERN_INFO "synaptics: Right before synaptics_send_cmd() (1) in synaptics_capability()");
135
	if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap))
136
	if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap))
136
		return -1;
137
		return -1;
137
	priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];
138
	priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];
Lines 146-151 static int synaptics_capability(struct p Link Here
146
		priv->capabilities = 0;
147
		priv->capabilities = 0;
147
148
148
	if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 1) {
149
	if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 1) {
150
	    printk(KERN_INFO "synaptics: Right before synaptics_send_cmd() (2) in synaptics_capability()");
149
		if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB, cap)) {
151
		if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB, cap)) {
150
			printk(KERN_ERR "Synaptics claims to have extended capabilities,"
152
			printk(KERN_ERR "Synaptics claims to have extended capabilities,"
151
			       " but I'm not able to read them.");
153
			       " but I'm not able to read them.");
Lines 171-177 static int synaptics_identify(struct psm Link Here
171
{
173
{
172
	struct synaptics_data *priv = psmouse->private;
174
	struct synaptics_data *priv = psmouse->private;
173
	unsigned char id[3];
175
	unsigned char id[3];
174
176
	
177
	printk(KERN_INFO "synaptics: Right before synaptics_send_cmd() in synaptics_identify()");
175
	if (synaptics_send_cmd(psmouse, SYN_QUE_IDENTIFY, id))
178
	if (synaptics_send_cmd(psmouse, SYN_QUE_IDENTIFY, id))
176
		return -1;
179
		return -1;
177
	priv->identity = (id[0]<<16) | (id[1]<<8) | id[2];
180
	priv->identity = (id[0]<<16) | (id[1]<<8) | id[2];
Lines 189-197 static int synaptics_resolution(struct p Link Here
189
	struct synaptics_data *priv = psmouse->private;
192
	struct synaptics_data *priv = psmouse->private;
190
	unsigned char res[3];
193
	unsigned char res[3];
191
194
195
	printk(KERN_INFO "synaptics: Right before SYN_ID_MAJOR in synaptics_resolution()!");
192
	if (SYN_ID_MAJOR(priv->identity) < 4)
196
	if (SYN_ID_MAJOR(priv->identity) < 4)
193
		return 0;
197
		return 0;
194
198
199
	printk(KERN_INFO "synaptics: Right before synaptics_send_cmd() in synaptics_resolution()!")
195
	if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res))
200
	if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res))
196
		return 0;
201
		return 0;
197
202
Lines 222-227 static int synaptics_set_absolute_mode(s Link Here
222
	struct synaptics_data *priv = psmouse->private;
227
	struct synaptics_data *priv = psmouse->private;
223
228
224
	priv->mode = SYN_BIT_ABSOLUTE_MODE;
229
	priv->mode = SYN_BIT_ABSOLUTE_MODE;
230
	
231
	printk(KERN_INFO "synaptics: Right before SYN_ID_MAJOR() (2) in synaptics_set_absolute_mode()");
225
	if (SYN_ID_MAJOR(priv->identity) >= 4)
232
	if (SYN_ID_MAJOR(priv->identity) >= 4)
226
		priv->mode |= SYN_BIT_DISABLE_GESTURE;
233
		priv->mode |= SYN_BIT_DISABLE_GESTURE;
227
	if (SYN_CAP_EXTENDED(priv->capabilities))
234
	if (SYN_CAP_EXTENDED(priv->capabilities))
Lines 679-684 int synaptics_init(struct psmouse *psmou Link Here
679
686
680
	priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
687
	priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
681
688
689
	printk(KERN_INFO "synaptics: Right before SYN_ID_MAJOR in synaptics_init()!");
682
	printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n",
690
	printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n",
683
		SYN_ID_MODEL(priv->identity),
691
		SYN_ID_MODEL(priv->identity),
684
		SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),
692
		SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),

Return to bug 287019