Patch by Clemens Zeidler:
* Enable the Synaptics driver again. * After performing the checks for the Synaptics device, issue a reset to avoid the device being left in a weird state. This fixes at least the weird mouse in VMWare with enabled Synaptics driver. Please report if there are any other problems! :-) Thanks a lot! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29944 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -6,6 +6,7 @@
|
|||||||
*
|
*
|
||||||
* Authors (in chronological order):
|
* Authors (in chronological order):
|
||||||
* Marcus Overhagen ([email protected])
|
* Marcus Overhagen ([email protected])
|
||||||
|
* Clemens Zeidler ([email protected])
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@@ -102,7 +103,6 @@ ps2_dev_detect_pointing(ps2_dev *dev, device_hooks **hooks)
|
|||||||
// probe devices
|
// probe devices
|
||||||
// the probe function has to set the dev name and the dev packet size
|
// the probe function has to set the dev name and the dev packet size
|
||||||
|
|
||||||
#if 0
|
|
||||||
status = probe_trackpoint(dev);
|
status = probe_trackpoint(dev);
|
||||||
if (status == B_OK) {
|
if (status == B_OK) {
|
||||||
*hooks = &gStandardMouseDeviceHooks;
|
*hooks = &gStandardMouseDeviceHooks;
|
||||||
@@ -114,7 +114,14 @@ ps2_dev_detect_pointing(ps2_dev *dev, device_hooks **hooks)
|
|||||||
*hooks = &gSynapticsDeviceHooks;
|
*hooks = &gSynapticsDeviceHooks;
|
||||||
goto dev_found;
|
goto dev_found;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
// reset the mouse for the case that the previous probes leaf the mouse in
|
||||||
|
// a undefined state
|
||||||
|
status = ps2_reset_mouse(dev);
|
||||||
|
if (status != B_OK) {
|
||||||
|
INFO("ps2: reset after probe failed\n");
|
||||||
|
return B_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
status = probe_standard_mouse(dev);
|
status = probe_standard_mouse(dev);
|
||||||
if (status == B_OK) {
|
if (status == B_OK) {
|
||||||
@@ -180,8 +187,6 @@ ps2_dev_publish(ps2_dev *dev)
|
|||||||
if (status == B_OK) {
|
if (status == B_OK) {
|
||||||
status = devfs_publish_device(dev->name, hooks);
|
status = devfs_publish_device(dev->name, hooks);
|
||||||
}
|
}
|
||||||
|
|
||||||
//status = devfs_publish_device(dev->name, &gPointingDeviceHooks);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dev->active = true;
|
dev->active = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user