diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-09-20 14:50:24 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-09-20 14:50:24 -0500 |
| commit | 6b07d53d94da20837b2993180a02f7b474051e0c (patch) | |
| tree | bf7af6c9e1a2d1618b4e9d8d2640115ba058db20 | |
| parent | 36a7df39b0f89c467fc6d9c957a7a30f20d96994 (diff) | |
| download | tdelibs-6b07d53d94da20837b2993180a02f7b474051e0c.tar.gz tdelibs-6b07d53d94da20837b2993180a02f7b474051e0c.zip | |
Update hardware device classification map
Fix potential infinite loop in TDEStyle
| -rw-r--r-- | tdecore/tdehw/tdehardwaredevices.cpp | 15 | ||||
| -rw-r--r-- | tdefx/tdestyle.cpp | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 15fda056a..a2934df02 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -1971,6 +1971,18 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD else if (devicesubsystem == "spi") { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform); } + else if (devicesubsystem == "watchdog") { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform); + } + else if (devicesubsystem == "node") { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform); + } + else if (devicesubsystem == "memory") { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform); + } + else if (devicesubsystem == "clockevents") { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform); + } else if (devicesubsystem == "thermal") { // FIXME // Figure out a way to differentiate between ThermalControl (fans and coolers) and ThermalSensor types @@ -2062,6 +2074,9 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD if (devicedriver.startsWith("tpm_")) { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Cryptography); } + else { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform); + } } if (devicesubsystem == "leds") { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::OtherACPI); diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp index 73bf983a0..8e9fe40f0 100644 --- a/tdefx/tdestyle.cpp +++ b/tdefx/tdestyle.cpp @@ -2139,7 +2139,7 @@ void TransparencyHandler::bottomShadow(TQImage& dst) } } - strip_data = shadow_strip[++line]; + strip_data = shadow_strip[line++]; } } |