Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recursive scanning of already existing touchpad devices in the devfs never

Browse Source 
worked, because the root scanning directory was declared without "/dev/".
This makes restarting the input_server work with the touchpad driver.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28464 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2008-11-02 13:15:47 +00:00
parent 855012f2bd
commit bff51d943a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp
View File

@ -45,8 +45,7 @@
const static uint32 kMouseThreadPriority = B_FIRST_REAL_TIME_PRIORITY + 4; const static uint32 kMouseThreadPriority = B_FIRST_REAL_TIME_PRIORITY + 4;
// "/dev/" is automatically prepended by StartMonitoringDevice() const static char* kTouchpadDevicesDirectoryPS2 = "/dev/input/touchpad/ps2";
const static char *kTouchpadDevicesDirectoryPS2 = "input/touchpad/ps2";
class TouchpadDevice { class TouchpadDevice {
@ -586,7 +585,7 @@ TouchpadInputDevice::_HandleMonitor(BMessage* message)
void void
TouchpadInputDevice::_RecursiveScan(const char* directory) TouchpadInputDevice::_RecursiveScan(const char* directory)
{ {
CALLED(); LOG("TouchpadInputDevice::_RecursiveScan(%s)\n", directory);
BEntry entry; BEntry entry;
BDirectory dir(directory); BDirectory dir(directory);
@ -633,6 +632,8 @@ TouchpadInputDevice::_AddDevice(const char *path)
return B_NO_MEMORY; return B_NO_MEMORY;
} }
LOG_ERR("TouchpadInputDevice::_AddDevice(%s)\n", path);
input_device_ref* devices[2]; input_device_ref* devices[2];
devices[0] = device->DeviceRef(); devices[0] = device->DeviceRef();
devices[1] = NULL; devices[1] = NULL;
@ -650,6 +651,8 @@ TouchpadInputDevice::_RemoveDevice(const char *path)
if (device == NULL) if (device == NULL)
return B_ENTRY_NOT_FOUND; return B_ENTRY_NOT_FOUND;
LOG_ERR("TouchpadInputDevice::_RemoveDevice(%s)\n", path);
input_device_ref* devices[2]; input_device_ref* devices[2];
devices[0] = device->DeviceRef(); devices[0] = device->DeviceRef();
devices[1] = NULL; devices[1] = NULL;