SensorsComboDriver: Remove all except ALS and accel

Signed-off-by: Daniel Schaefer <dhs@frame.work>

Author: JohnAZoidberg

SensorsComboDriver/Clients.h

@@ -204,99 +204,6 @@ typedef class _AlsDevice : public _ComboDevice
 
 
 
-//
-// Gyroscope ------------------------------------------------------------------
-//
-typedef class _GyrDevice : public _ComboDevice
-{
-private:
-
-    VEC3D                       m_CachedThresholds;
-    VEC3D                       m_CachedData;
-    VEC3D                       m_LastSample;
-
-public:
-
-    NTSTATUS                    Initialize(_In_ WDFDEVICE Device, _In_ SENSOROBJECT SensorObj);
-    NTSTATUS                    GetData();
-    NTSTATUS                    UpdateCachedThreshold();
-
-} GyrDevice, *PGyrDevice;
-
-
-
-//
-// Magnetometer ---------------------------------------------------------------
-//
-typedef struct _MagData
-{
-    VEC3D Axis;
-    ULONG Accuracy;
-} MagData, *PMagData;
-
-typedef class _MagDevice : public _ComboDevice
-{
-private:
-
-    VEC3D                       m_CachedThresholds;
-    MagData                     m_CachedData;
-    MagData                     m_LastSample;
-
-public:
-
-    NTSTATUS                    Initialize(_In_ WDFDEVICE Device, _In_ SENSOROBJECT SensorObj);
-    NTSTATUS                    GetData();
-    NTSTATUS                    UpdateCachedThreshold();
-
-} MagDevice, *PMagDevice;
-
-
-
-//
-// Proximity ------------------------------------------------------------------
-//
-typedef struct
-{
-    BOOL Detected;
-    ULONG DistanceMillimeters;
-} PrxData, *PPrxData;
-
-typedef class _PrxDevice : public _ComboDevice
-{
-private:
-
-    PrxData                     m_CachedData;
-    PrxData                     m_LastSample;
-
-public:
-
-    NTSTATUS                    Initialize(_In_ WDFDEVICE Device, _In_ SENSOROBJECT SensorObj);
-    NTSTATUS                    GetData();
-    NTSTATUS                    UpdateCachedThreshold();
-
-} PrxDevice, *PPrxDevice;
-
-
-
-//
-// Relative Fusion ------------------------------------------------------------------
-//
-typedef class _RelativeFusionDevice : public _ComboDevice
-{
-private:
-
-    QUATERNION                  m_CachedThresholds;
-    QUATERNION                  m_CachedData;
-    QUATERNION                  m_LastSample;
-
-public:
-
-    NTSTATUS                    Initialize(_In_ WDFDEVICE Device, _In_ SENSOROBJECT SensorObj);
-    NTSTATUS                    GetData();
-    NTSTATUS                    UpdateCachedThreshold();
-
-} RelativeFusionDevice, *PRelativeFusionDevice;
-
 //
 // Linear Accelerometer --------------------------------------------------------------
 //
@@ -321,48 +228,3 @@ typedef class _LinearAccelerometerDevice : public _ComboDevice
     NTSTATUS                    UpdateCachedThreshold();
 
 } LinearAccelerometerDevice, *PLinearAccelerometerDevice;
-
-//
-// Gravity Vector --------------------------------------------------------------
-//
-typedef class _GravityVectorDevice : public _ComboDevice
-{
-private:
-
-    VEC3D                       m_CachedThresholds;
-    VEC3D                       m_CachedData;
-    VEC3D                       m_LastSample;
-
-public:
-
-    NTSTATUS                    Initialize(_In_ WDFDEVICE Device, _In_ SENSOROBJECT SensorObj);
-    NTSTATUS                    GetData();
-    NTSTATUS                    UpdateCachedThreshold();
-
-} GravityVectorDevice, *PGravityVectorDevice;
-
-//
-// Geomagnetic Orientation ------------------------------------------------------------------
-//
-typedef class _GeomagneticOrientationDevice : public _ComboDevice
-{
-private:
-
-    typedef struct _GeomagneticOrientationSample
-    {
-        QUATERNION Quaternion;
-        FLOAT RotationAngle_Degrees;
-        FLOAT DeclinationAngle_Degrees;
-    } GeomagneticOrientationSample, *PGeomagneticOrientationSample;
-
-    GeomagneticOrientationSample                  m_CachedThresholds;
-    GeomagneticOrientationSample                  m_CachedData;
-    GeomagneticOrientationSample                  m_LastSample;
-
-public:
-
-    NTSTATUS                    Initialize(_In_ WDFDEVICE Device, _In_ SENSOROBJECT SensorObj);
-    NTSTATUS                    GetData();
-    NTSTATUS                    UpdateCachedThreshold();
-
-} GeomagneticOrientationDevice, *PGeomagneticOrientationDevice;

SensorsComboDriver/Device.cpp

@@ -22,13 +22,7 @@
 enum Device
 {
     Device_Als = 0,
-    Device_GeomagneticOrientation,
-    Device_GravityVector,
-    Device_Gyr,
     Device_LinearAccelerometer,
-    Device_Mag,
-    Device_Prx,
-    Device_RelativeFusion,
     // Keep this last
     Device_Count
 };
@@ -43,13 +37,7 @@ inline size_t GetDeviceSizeAtIndex(
     switch (static_cast<Device>(Index))
     {
         case Device_Als:                    result = sizeof(AlsDevice); break;
-        case Device_GeomagneticOrientation: result = sizeof(GeomagneticOrientationDevice); break;
-        case Device_GravityVector:          result = sizeof(GravityVectorDevice); break;
-        case Device_Gyr:                    result = sizeof(GyrDevice); break;
         case Device_LinearAccelerometer:    result = sizeof(LinearAccelerometerDevice); break;
-        case Device_Mag:                    result = sizeof(MagDevice); break;
-        case Device_Prx:                    result = sizeof(PrxDevice); break;
-        case Device_RelativeFusion:         result = sizeof(RelativeFusionDevice); break;
         default: break; // invalid
     }
     return result;
@@ -63,13 +51,7 @@ void AllocateDeviceAtIndex(
     switch (static_cast<Device>(Index))
     {
         case Device_Als:                    *ppDevice = new(*ppDevice) AlsDevice; break;
-        case Device_GeomagneticOrientation: *ppDevice = new(*ppDevice) GeomagneticOrientationDevice; break;
-        case Device_GravityVector:          *ppDevice = new(*ppDevice) GravityVectorDevice; break;
-        case Device_Gyr:                    *ppDevice = new(*ppDevice) GyrDevice; break;
         case Device_LinearAccelerometer:    *ppDevice = new(*ppDevice) LinearAccelerometerDevice; break;
-        case Device_Mag:                    *ppDevice = new(*ppDevice) MagDevice; break;
-        case Device_Prx:                    *ppDevice = new(*ppDevice) PrxDevice; break;
-        case Device_RelativeFusion:         *ppDevice = new(*ppDevice) RelativeFusionDevice; break;
 
         default: break; // invalid (let driver fail)
     }