From 45426ff16cf5c43680ecf2305d55b8900e51de8a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 18 Apr 2012 16:00:52 -0500 Subject: Fix detection of PS/2 and AC97 devices --- tdecore/tdehardwaredevices.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'tdecore') diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index c4cae020d..f44272b31 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -3007,7 +3007,8 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::OtherVirtual); } if ((devicetypestring == "audio") - || (devicesubsystem == "sound")) { + || (devicesubsystem == "sound") + || (devicesubsystem == "ac97")) { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Sound); } if ((devicesubsystem == "video4linux") @@ -3066,7 +3067,15 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD } } if (devicesubsystem == "serio") { - if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Serial); + if (devicedriver.contains("atkbd")) { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Keyboard); + } + else if (devicedriver.contains("mouse")) { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Mouse); + } + else { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Serial); + } } if (devicesubsystem == "ppdev") { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Parallel); @@ -5168,4 +5177,4 @@ TDEGenericHardwareList TDEHardwareDevices::listAllPhysicalDevices() { return ret; } -#include "tdehardwaredevices.moc" \ No newline at end of file +#include "tdehardwaredevices.moc" -- cgit v1.2.1