From bff51d943abd3b33d8d2e49bceb008325d118778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sun, 2 Nov 2008 13:15:47 +0000 Subject: [PATCH] Recursive scanning of already existing touchpad devices in the devfs never 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 --- .../devices/touchpad/TouchpadInputDevice.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp b/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp index 59f1038cc4..04cc38aa15 100644 --- a/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp +++ b/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp @@ -45,8 +45,7 @@ const static uint32 kMouseThreadPriority = B_FIRST_REAL_TIME_PRIORITY + 4; -// "/dev/" is automatically prepended by StartMonitoringDevice() -const static char *kTouchpadDevicesDirectoryPS2 = "input/touchpad/ps2"; +const static char* kTouchpadDevicesDirectoryPS2 = "/dev/input/touchpad/ps2"; class TouchpadDevice { @@ -586,7 +585,7 @@ TouchpadInputDevice::_HandleMonitor(BMessage* message) void TouchpadInputDevice::_RecursiveScan(const char* directory) { - CALLED(); + LOG("TouchpadInputDevice::_RecursiveScan(%s)\n", directory); BEntry entry; BDirectory dir(directory); @@ -633,6 +632,8 @@ TouchpadInputDevice::_AddDevice(const char *path) return B_NO_MEMORY; } + LOG_ERR("TouchpadInputDevice::_AddDevice(%s)\n", path); + input_device_ref* devices[2]; devices[0] = device->DeviceRef(); devices[1] = NULL; @@ -650,6 +651,8 @@ TouchpadInputDevice::_RemoveDevice(const char *path) if (device == NULL) return B_ENTRY_NOT_FOUND; + LOG_ERR("TouchpadInputDevice::_RemoveDevice(%s)\n", path); + input_device_ref* devices[2]; devices[0] = device->DeviceRef(); devices[1] = NULL;