Merge pull request #1 from Microsoft/master

Updating Local

5 files changed, 14 insertions, 162 deletions

diff --git a/sensors/SimpleDeviceOrientationSensor/Device.h b/sensors/SimpleDeviceOrientationSensor/Device.h
index b75b5ceb..3d1e677c 100644
--- a/sensors/SimpleDeviceOrientationSensor/Device.h
+++ b/sensors/SimpleDeviceOrientationSensor/Device.h
@@ -15,7 +15,7 @@
 #include <wdf.h>
 #include <math.h>
 
-#include <SensorsTrace.h>
+#include "SensorsTrace.h"
 #include <SensorsCx.h>
 #include <SensorsUtils.h>
 
diff --git a/sensors/SimpleDeviceOrientationSensor/Gallery.xml b/sensors/SimpleDeviceOrientationSensor/Gallery.xml
deleted file mode 100644
index 8fbb8b8c..00000000
--- a/sensors/SimpleDeviceOrientationSensor/Gallery.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="../../buildx/script2/preview.xslt"?>
-<gallery_sample xmlns="http://microsoft.com/wdcml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://microsoft.com/wdcml ../../buildx/schema/xsd/wdcml.xsd">
-  <metadata id="gallery_samples.107a_gallery" type="gallery_sample" msdnID="7cba6311-f0db-4c3d-8f1f-25de8648b353">
-    <title>SimpleDeviceOrientationSensor</title>
-    <!-- Add a devlang for each programming language in all versions of the sample.  -->
-    <devlang value="cpp" />
-    <!-- Do not change tech value -->
-    <tech value="gallery_samples" />
-    <index />
-    <sample_langs>
-      <!-- Describes the languages to which the sample code itself has been localized. -->
-      <sample_lang xml:lang="en-us" />
-    </sample_langs>
-  </metadata>
-  <content>
-    <desc>
-      <p><abstract>The SimpleDeviceOrientationSensor sample shows how to write a UMDF v2 sensor driver to output Simple Device Orientation values.</abstract></p>
-    </desc>
-    <outline />
-    <license_info>
-      <default_license />
-    </license_info>
-    <programming_models>
-      <programming_model value="win32" />
-    </programming_models>
-    <application_frameworks>
-    </application_frameworks>
-    <!-- For Driver Samples Only -->
-    <driver_models>
-      <!-- possible values: kmdf, umdf, wdm, ndis, wddm -->
-      <driver_model value="UMDF" />
-    </driver_models>
-    <driver_techs>
-      <driver_tech value="Windows Driver" />
-    </driver_techs>
-    <related_techs>
-    </related_techs>
-    <os_requirements>
-      <min_os>
-        <client name="winblue"/>
-        <server name="wbluesrv"/>
-      </min_os>
-    </os_requirements>
-    <required_sdks>
-      <min_sdk>
-        <tla rid="windows_driver_kit_8" />
-      </min_sdk>
-    </required_sdks>
-    <supported_ides>
-      <supported_ide>
-        <tla rid="tla_visualstu2012" />
-      </supported_ide>
-    </supported_ides>
-    <build_info>
-      <authored_instructions>
-        <section>
-          <!-- Include any special instructions for compiling your sample -->
-          <sectioncontents>
-          </sectioncontents>
-        </section>
-      </authored_instructions>
-    </build_info>
-    <run_info>
-      <authored_instructions>
-        <section>
-          <sectioncontents>
-            <p>To install the sample driver, follow these steps:</p>
-            <proch>
-              <item>Ensure that the driver builds without errors.</item>
-              <item>Copy the DLL and INF files to a separate folder.</item>
-              <item>Enter the command "<inline_code devlang="cmd">devcon.exe update SimpleDeviceOrientationSensor.inf ACPI\&lt;HWID&gt;</inline_code>" to install the driver on an existing device node. You can find the devcon.exe program in the tools\devcon folder where you installed the WDK.</item>
-            </proch>
-          </sectioncontents>
-        </section>
-        <section>
-          <title>File manifest</title>
-          <sectioncontents>
-            <p>The following source files are in the src\Sensors\SimpleDeviceOrientationSensor folder and are used to build the SimpleDeviceOrientationSensor.dll and SimpleDeviceOrientationSensor.inf files.</p>
-            <table>
-              <tr>
-                <th>File</th>
-                <th>Description</th>
-              </tr>
-              <tr>
-                <td>
-                  <p>device.h, device.cpp</p>
-                </td>
-                <td>
-                  <p>Implements the driver's WDF PnP event callbacks and helper methods</p>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <p>client.cpp</p>
-                </td>
-                <td>
-                  <p>Implements the driver's callback functions from the class extension to simple device orientation sensors.</p>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <p>driver.h, driver.cpp</p>
-                </td>
-                <td>
-                  <p>WDF driver entry event callbacks and helper methods</p>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <p>hardwaresimulator.h, hardwaresimulator.cpp</p>
-                </td>
-                <td>
-                  <p>Hardware simulator implementation</p>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <p>makefile.inc</p>
-                </td>
-                <td>
-                  <p>Defines custom build actions. Includes the conversion of the .INX file into a .INF file.</p>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <p>SensorsTrace.h</p>
-                </td>
-                <td>
-                  <p>Implementation the sensor traces files.</p>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <p>SimpleDeviceOrientationSensor.ctl</p>
-                </td>
-                <td>
-                  <p>Declaration of driver's tracing GUID</p>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <p>SimpleDeviceOrientationSensor.inx</p>
-                </td>
-                <td>
-                  <p>Describes the installation of the driver. The build process converts this into a .INF.</p>
-                </td>
-              </tr>
-            </table>
-          </sectioncontents>
-        </section>
-      </authored_instructions>
-    </run_info>
-  </content>
-  <!-- List the component compcentral path -->
-  <feature_teams>
-    <feature_team_info comp_central_path="CORE-OS Core\SiGMa-Silicon, Graphics and Media\SiPlat - Silicon Platform\Sensors" dev_owner="osamasal" writer_owner="ericdoku" />
-  </feature_teams>
-  <workflow_control_host />
-</gallery_sample>
diff --git a/sensors/SimpleDeviceOrientationSensor/HardwareSimulator.h b/sensors/SimpleDeviceOrientationSensor/HardwareSimulator.h
index 8f96b902..7da0be14 100644
--- a/sensors/SimpleDeviceOrientationSensor/HardwareSimulator.h
+++ b/sensors/SimpleDeviceOrientationSensor/HardwareSimulator.h
@@ -14,7 +14,7 @@
 #include <windows.h>
 #include <wdf.h>
 
-#include <SensorsTrace.h>
+#include "SensorsTrace.h"
 #include <SensorsCx.h>
 #include <windows.devices.sensors.h>
 
diff --git a/sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.inx b/sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.inx
index 7de2e6f0..6dbbf7be 100644
--- a/sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.inx
+++ b/sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.inx
diff --git a/sensors/SimpleDeviceOrientationSensor/readme.md b/sensors/SimpleDeviceOrientationSensor/readme.md
new file mode 100644
index 00000000..7a1e39f7
--- /dev/null
+++ b/sensors/SimpleDeviceOrientationSensor/readme.md
@@ -0,0 +1,12 @@
+<!---
+    name: Simple Device Orientation Sensor Sample
+    platform: UMDF2
+    language: cpp
+    category: Sensors
+    description: Demonstrates how to write a UMDF v2 sensor driver to output Simple Device Orientation values.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617960
+--->
+
+# Simple Device Orientation Sensor Sample
+
+The SimpleDeviceOrientationSensor sample shows how to write a UMDF v2 sensor driver to output Simple Device Orientation values.
\ No newline at end of file