contrib/thermald: Be consistent about formatting

contrib/thermald/surface_laptop_1/thermal-conf.xml

@@ -46,4 +46,4 @@
       </CoolingDevice>
     </CoolingDevices>
   </Platform>
-</ThermalConfiguration>
+</ThermalConfiguration>

contrib/thermald/surface_pro_5/40-surface-power.rules

@@ -23,8 +23,6 @@
 # E: POWER_SUPPLY_ONLINE=0
 # E: SUBSYSTEM=power_supply
 
-
-
 # Plugged
 SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/bin/logger -t surface power supply online"
 SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/bin/surface profile set performance"

contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool

@@ -1,85 +1,83 @@
-<?xml version="1.0"?> 
- <!-- BEGIN --> 
- <ThermalConfiguration> 
- <Platform>
-	<Name> Auto generated </Name>
-	<ProductName>Surface Pro</ProductName>
-	<Preference>QUIET</Preference>
-	<PPCC>
-		<PowerLimitIndex>0</PowerLimitIndex>
-		<PowerLimitMinimum>3000</PowerLimitMinimum>
-		<PowerLimitMaximum>25000</PowerLimitMaximum>
-		<TimeWindowMinimum>28000</TimeWindowMinimum>
-		<TimeWindowMaximum>32000</TimeWindowMaximum>
-		<StepSize>500</StepSize>
-	</PPCC>
-	<ThermalZones>
-		<ThermalZone>
-			<Type>auto_zone_0</Type>
-			<TripPoints>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>46000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>20</SamplingPeriod>
-						<TargetState>15000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>49000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>20</SamplingPeriod>
-						<TargetState>13000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>52000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>20</SamplingPeriod>
-						<TargetState>11000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>56000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>20</SamplingPeriod>
-						<TargetState>9000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>59000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>15</SamplingPeriod>
-						<TargetState>7000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>62000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>10</SamplingPeriod>
-						<TargetState>6000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-			</TripPoints>
-		</ThermalZone>
-	</ThermalZones>
-</Platform>
+<?xml version="1.0" encoding="UTF-8"?>
+<ThermalConfiguration>
+  <Platform>
+    <Name> Auto generated </Name>
+    <ProductName>Surface Pro</ProductName>
+    <Preference>QUIET</Preference>
+    <PPCC>
+      <PowerLimitIndex>0</PowerLimitIndex>
+      <PowerLimitMinimum>3000</PowerLimitMinimum>
+      <PowerLimitMaximum>25000</PowerLimitMaximum>
+      <TimeWindowMinimum>28000</TimeWindowMinimum>
+      <TimeWindowMaximum>32000</TimeWindowMaximum>
+      <StepSize>500</StepSize>
+    </PPCC>
+    <ThermalZones>
+      <ThermalZone>
+        <Type>auto_zone_0</Type>
+        <TripPoints>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>46000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>20</SamplingPeriod>
+              <TargetState>15000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>49000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>20</SamplingPeriod>
+              <TargetState>13000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>52000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>20</SamplingPeriod>
+              <TargetState>11000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>56000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>20</SamplingPeriod>
+              <TargetState>9000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>59000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>15</SamplingPeriod>
+              <TargetState>7000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>62000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>10</SamplingPeriod>
+              <TargetState>6000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+        </TripPoints>
+      </ThermalZone>
+    </ThermalZones>
+  </Platform>
 </ThermalConfiguration>
-<!-- END -->

contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile

@@ -1,95 +1,93 @@
-<?xml version="1.0"?> 
- <!-- BEGIN --> 
- <ThermalConfiguration> 
- <Platform>
-	<Name> Auto generated </Name>
-	<ProductName>Surface Pro</ProductName>
-	<Preference>QUIET</Preference>
-	<PPCC>
-		<PowerLimitIndex>0</PowerLimitIndex>
-		<PowerLimitMinimum>3000</PowerLimitMinimum>
-		<PowerLimitMaximum>15000</PowerLimitMaximum>
-		<TimeWindowMinimum>28000</TimeWindowMinimum>
-		<TimeWindowMaximum>32000</TimeWindowMaximum>
-		<StepSize>500</StepSize>
-	</PPCC>
-	<ThermalZones>
-		<ThermalZone>
-			<Type>auto_zone_0</Type>
-			<TripPoints>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>39000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>10</SamplingPeriod>
-						<TargetState>15000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>43000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>10</SamplingPeriod>
-						<TargetState>10000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>47000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>10</SamplingPeriod>
-						<TargetState>8000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>49000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>10</SamplingPeriod>
-						<TargetState>6000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>51000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>5</SamplingPeriod>
-						<TargetState>5000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>53000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>5</SamplingPeriod>
-						<TargetState>4000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>54000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>5</SamplingPeriod>
-						<TargetState>3000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-			</TripPoints>
-		</ThermalZone>
-	</ThermalZones>
-</Platform>
+<?xml version="1.0" encoding="UTF-8"?>
+<ThermalConfiguration>
+  <Platform>
+    <Name> Auto generated </Name>
+    <ProductName>Surface Pro</ProductName>
+    <Preference>QUIET</Preference>
+    <PPCC>
+      <PowerLimitIndex>0</PowerLimitIndex>
+      <PowerLimitMinimum>3000</PowerLimitMinimum>
+      <PowerLimitMaximum>15000</PowerLimitMaximum>
+      <TimeWindowMinimum>28000</TimeWindowMinimum>
+      <TimeWindowMaximum>32000</TimeWindowMaximum>
+      <StepSize>500</StepSize>
+    </PPCC>
+    <ThermalZones>
+      <ThermalZone>
+        <Type>auto_zone_0</Type>
+        <TripPoints>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>39000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>10</SamplingPeriod>
+              <TargetState>15000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>43000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>10</SamplingPeriod>
+              <TargetState>10000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>47000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>10</SamplingPeriod>
+              <TargetState>8000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>49000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>10</SamplingPeriod>
+              <TargetState>6000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>51000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>5</SamplingPeriod>
+              <TargetState>5000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>53000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>5</SamplingPeriod>
+              <TargetState>4000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>54000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>5</SamplingPeriod>
+              <TargetState>3000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+        </TripPoints>
+      </ThermalZone>
+    </ThermalZones>
+  </Platform>
 </ThermalConfiguration>
-<!-- END -->

contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance

@@ -1,75 +1,73 @@
-<?xml version="1.0"?> 
- <!-- BEGIN --> 
- <ThermalConfiguration> 
- <Platform>
-	<Name> Auto generated </Name>
-	<ProductName>Surface Pro</ProductName>
-	<Preference>QUIET</Preference>
-	<PPCC>
-		<PowerLimitIndex>0</PowerLimitIndex>
-		<PowerLimitMinimum>3000</PowerLimitMinimum>
-		<PowerLimitMaximum>15000</PowerLimitMaximum>
-		<TimeWindowMinimum>28000</TimeWindowMinimum>
-		<TimeWindowMaximum>32000</TimeWindowMaximum>
-		<StepSize>500</StepSize>
-	</PPCC>
-	<ThermalZones>
-		<ThermalZone>
-			<Type>auto_zone_0</Type>
-			<TripPoints>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>54000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>10</SamplingPeriod>
-						<TargetState>15000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>58000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>10</SamplingPeriod>
-						<TargetState>13000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>60000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>5</SamplingPeriod>
-						<TargetState>9000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>62000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>5</SamplingPeriod>
-						<TargetState>7000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-				<TripPoint>
-					<SensorType>pch_skylake</SensorType>
-					<Temperature>63000</Temperature>
-					<Type>Passive</Type>
-					<CoolingDevice>
-						<Type>B0D4</Type>
-						<SamplingPeriod>5</SamplingPeriod>
-						<TargetState>6000000</TargetState>
-					</CoolingDevice>
-				</TripPoint>
-			</TripPoints>
-		</ThermalZone>
-	</ThermalZones>
-</Platform>
+<?xml version="1.0" encoding="UTF-8"?>
+<ThermalConfiguration>
+  <Platform>
+    <Name> Auto generated </Name>
+    <ProductName>Surface Pro</ProductName>
+    <Preference>QUIET</Preference>
+    <PPCC>
+      <PowerLimitIndex>0</PowerLimitIndex>
+      <PowerLimitMinimum>3000</PowerLimitMinimum>
+      <PowerLimitMaximum>15000</PowerLimitMaximum>
+      <TimeWindowMinimum>28000</TimeWindowMinimum>
+      <TimeWindowMaximum>32000</TimeWindowMaximum>
+      <StepSize>500</StepSize>
+    </PPCC>
+    <ThermalZones>
+      <ThermalZone>
+        <Type>auto_zone_0</Type>
+        <TripPoints>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>54000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>10</SamplingPeriod>
+              <TargetState>15000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>58000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>10</SamplingPeriod>
+              <TargetState>13000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>60000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>5</SamplingPeriod>
+              <TargetState>9000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>62000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>5</SamplingPeriod>
+              <TargetState>7000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+          <TripPoint>
+            <SensorType>pch_skylake</SensorType>
+            <Temperature>63000</Temperature>
+            <Type>Passive</Type>
+            <CoolingDevice>
+              <Type>B0D4</Type>
+              <SamplingPeriod>5</SamplingPeriod>
+              <TargetState>6000000</TargetState>
+            </CoolingDevice>
+          </TripPoint>
+        </TripPoints>
+      </ThermalZone>
+    </ThermalZones>
+  </Platform>
 </ThermalConfiguration>
-<!-- END -->

contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml

@@ -1,17 +1,8 @@
-
-<!--
-Specifies the order of compensation to cool CPU only.
-There is a default already implemented in the code, but
-this file can be used to change order
-
-The Following cooling device can present
--->
-
 <CoolingDeviceOrder>
-	<!-- Specify Cooling device order -->
-	<CoolingDevice>rapl_controller</CoolingDevice>
-	<CoolingDevice>intel_pstate</CoolingDevice>
-	<CoolingDevice>intel_powerclamp</CoolingDevice>
-	<CoolingDevice>cpufreq</CoolingDevice>
-	<CoolingDevice>Processor</CoolingDevice>
+  <!-- Specify Cooling device order -->
+  <CoolingDevice>rapl_controller</CoolingDevice>
+  <CoolingDevice>intel_pstate</CoolingDevice>
+  <CoolingDevice>intel_powerclamp</CoolingDevice>
+  <CoolingDevice>cpufreq</CoolingDevice>
+  <CoolingDevice>Processor</CoolingDevice>
 </CoolingDeviceOrder>

contrib/thermald/surface_pro_5/thermald.service

@@ -11,4 +11,3 @@ ExecStart=/usr/sbin/thermald --systemd --dbus-enable
 [Install]
 WantedBy=multi-user.target
 Alias=dbus-org.freedesktop.thermald.service
-

contrib/thermald/thermal-conf.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ThermalConfiguration>
-   <Platform>
-      <Name>Intel Powered Laptop</Name>
-      <ProductName>*</ProductName>
-      <Preference>QUIET</Preference>
-      <ThermalZones>
-         <ThermalZone>
-            <Type>cpu</Type>
-            <TripPoints>
-               <TripPoint>
-                  <SensorType>x86_pkg_temp</SensorType>
-                  <Temperature>65000</Temperature>
-                  <type>passive</type>
-                  <ControlType>SEQUENTIAL</ControlType>
-                  <CoolingDevice>
-                     <index>1</index>
-                     <type>rapl_controller</type>
-                     <influence>100</influence>
-                     <SamplingPeriod>5</SamplingPeriod>
-                  </CoolingDevice>
-               </TripPoint>
-            </TripPoints>
-         </ThermalZone>
-      </ThermalZones>
-   </Platform>
+  <Platform>
+    <Name>Intel Powered Laptop</Name>
+    <ProductName>*</ProductName>
+    <Preference>QUIET</Preference>
+    <ThermalZones>
+      <ThermalZone>
+        <Type>cpu</Type>
+        <TripPoints>
+          <TripPoint>
+            <SensorType>x86_pkg_temp</SensorType>
+            <Temperature>65000</Temperature>
+            <type>passive</type>
+            <ControlType>SEQUENTIAL</ControlType>
+            <CoolingDevice>
+              <index>1</index>
+              <type>rapl_controller</type>
+              <influence>100</influence>
+              <SamplingPeriod>5</SamplingPeriod>
+            </CoolingDevice>
+          </TripPoint>
+        </TripPoints>
+      </ThermalZone>
+    </ThermalZones>
+  </Platform>
 </ThermalConfiguration>

contrib/thermald/thermal-cpu-cdev-order.xml

@@ -1,8 +1,8 @@
 <CoolingDeviceOrder>
-    <!-- Specify Cooling device order -->
-    <CoolingDevice>rapl_controller</CoolingDevice>
-    <CoolingDevice>intel_pstate</CoolingDevice>
-    <CoolingDevice>intel_powerclamp</CoolingDevice>
-    <CoolingDevice>cpufreq</CoolingDevice>
-    <CoolingDevice>Processor</CoolingDevice>
+  <!-- Specify Cooling device order -->
+  <CoolingDevice>rapl_controller</CoolingDevice>
+  <CoolingDevice>intel_pstate</CoolingDevice>
+  <CoolingDevice>intel_powerclamp</CoolingDevice>
+  <CoolingDevice>cpufreq</CoolingDevice>
+  <CoolingDevice>Processor</CoolingDevice>
 </CoolingDeviceOrder>