Branch: master

6b07d53d 2014-09-20 14:50:24 Timothy Pearson
Update hardware device classification map
Fix potential infinite loop in TDEStyle
M tdecore/tdehw/tdehardwaredevices.cpp
M tdefx/tdestyle.cpp
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 15fda05..a2934df 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -1971,6 +1971,18 @@
 		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 @@
 			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 73bf983..8e9fe40 100644
--- a/tdefx/tdestyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -2139,7 +2139,7 @@
 			}
 		}
 
-		strip_data = shadow_strip[++line];
+		strip_data = shadow_strip[line++];
 	}
 }