Merge branch 'vanilla_0.4.4' and resolve conflicts

TODO: Validate for removed patches due to relocation

Resolved Conflicts:
	LibOVR/Src/Kernel/OVR_ThreadsWinAPI.cpp
	LibOVR/Src/OVR_Linux_HMDDevice.cpp
	LibOVR/Src/OVR_OSX_HMDDevice.cpp
	LibOVR/Src/OVR_Profile.cpp
	LibOVR/Src/OVR_Sensor2Impl.cpp
	LibOVR/Src/OVR_SensorFusion.cpp
	LibOVR/Src/OVR_SensorImpl.cpp
	LibOVR/Src/OVR_Win32_DeviceStatus.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.h
	LibOVR/Src/OVR_Win32_HMDDevice.cpp

1 files changed, 0 insertions, 160 deletions

diff --git a/LibOVR/Src/OVR_OSX_HIDDevice.h b/LibOVR/Src/OVR_OSX_HIDDevice.h
deleted file mode 100644
index c6140cb..0000000
--- a/LibOVR/Src/OVR_OSX_HIDDevice.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/************************************************************************************
-Filename    :   OVR_OSX_HIDDevice.h
-Content     :   OSX HID device implementation.
-Created     :   February 26, 2013
-Authors     :   Lee Cooper
-
-Copyright   :   Copyright 2014 Oculus VR, Inc. All Rights reserved.
-
-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); 
-you may not use the Oculus VR Rift SDK except in compliance with the License, 
-which is provided at the time of installation or download, or which 
-otherwise accompanies this software in either electronic or hard copy form.
-
-You may obtain a copy of the License at
-
-http://www.oculusvr.com/licenses/LICENSE-3.1 
-
-Unless required by applicable law or agreed to in writing, the Oculus VR SDK 
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*************************************************************************************/
-
-#ifndef OVR_OSX_HIDDevice_h
-#define OVR_OSX_HIDDevice_h
-
-#include "OVR_HIDDevice.h"
-
-#include "OVR_OSX_DeviceManager.h"
-
-#include <IOKit/IOKitLib.h>
-
-namespace OVR { namespace OSX {
-
-class HIDDeviceManager;
-
-//-------------------------------------------------------------------------------------
-// ***** OSX HIDDevice
-
-class HIDDevice : public OVR::HIDDevice, public DeviceManagerThread::Notifier
-{
-private:
-    friend class HIDDeviceManager;
-
-public:
-    HIDDevice(HIDDeviceManager* manager);
-
-    // This is a minimal constructor used during enumeration for us to pass
-    // a HIDDevice to the visit function (so that it can query feature reports).
-    HIDDevice(HIDDeviceManager* manager, IOHIDDeviceRef device);
-    
-    virtual ~HIDDevice();
-
-    bool HIDInitialize(const String& path);
-    void HIDShutdown();
-    
-    virtual bool SetFeatureReport(UByte* data, UInt32 length);
-	virtual bool GetFeatureReport(UByte* data, UInt32 length);
-
-    bool Write(UByte* data, UInt32 length);
-
-    bool Read(UByte* pData, UInt32 length, UInt32 timeoutMilliS);
-    bool ReadBlocking(UByte* pData, UInt32 length);
-
-
-    // DeviceManagerThread::Notifier
-    double OnTicks(double tickSeconds);
-    
-private:
-    bool initInfo();
-    bool openDevice();
-    void closeDevice(bool wasUnplugged);
-    bool setupDevicePluggedInNotification();
-    CFStringRef generateRunLoopModeString(IOHIDDeviceRef device);
-    
-    static void staticHIDReportCallback(void* pContext,
-                                        IOReturn result,
-                                        void* pSender,
-                                        IOHIDReportType reportType,
-                                        uint32_t reportId,
-                                        uint8_t* pReport,
-                                        CFIndex reportLength);
-    void hidReportCallback(UByte* pData, UInt32 length);
-
-    static void staticDeviceRemovedCallback(void* pContext,
-                                            IOReturn result,
-                                            void* pSender);
-    void deviceRemovedCallback();
-    
-    static void staticDeviceAddedCallback(void* pContext,
-                                          io_iterator_t iterator);
-    void deviceAddedCallback(io_iterator_t iterator);
-    
-    bool                    InMinimalMode;
-    HIDDeviceManager*       HIDManager;
-    IOHIDDeviceRef          Device;
-    HIDDeviceDesc           DevDesc;
-    
-    enum { ReadBufferSize = 96 };
-    UByte                   ReadBuffer[ReadBufferSize];
-
-    UInt16                  InputReportBufferLength;
-    UInt16                  OutputReportBufferLength;
-    UInt16                  FeatureReportBufferLength;
-    
-    IONotificationPortRef   RepluggedNotificationPort;
-    io_iterator_t           RepluggedNotification;
-};
-
-
-//-------------------------------------------------------------------------------------
-// ***** OSX HIDDeviceManager
-
-class HIDDeviceManager : public OVR::HIDDeviceManager
-{
-	friend class HIDDevice;
-
-public:
-    HIDDeviceManager(OSX::DeviceManager* Manager);
-    virtual ~HIDDeviceManager();
-
-    virtual bool Initialize();
-    virtual void Shutdown();
-
-    virtual bool Enumerate(HIDEnumerateVisitor* enumVisitor);
-    virtual OVR::HIDDevice* Open(const String& path);
-
-    static HIDDeviceManager* CreateInternal(DeviceManager* manager);
-    
-private:
-    CFRunLoopRef getRunLoop();
-    bool initializeManager();
-    bool initVendorProductVersion(IOHIDDeviceRef device, HIDDeviceDesc* pDevDesc);
-    bool initUsage(IOHIDDeviceRef device, HIDDeviceDesc* pDevDesc);
-    bool initStrings(IOHIDDeviceRef device, HIDDeviceDesc* pDevDesc);
-    bool initSerialNumber(IOHIDDeviceRef device, HIDDeviceDesc* pDevDesc);
-    bool getVendorId(IOHIDDeviceRef device, UInt16* pResult);
-    bool getProductId(IOHIDDeviceRef device, UInt16* pResult);
-    bool getLocationId(IOHIDDeviceRef device, SInt32* pResult);
-    bool getSerialNumberString(IOHIDDeviceRef device, String* pResult);
-    bool getPath(IOHIDDeviceRef device, String* pPath);
-    bool getIntProperty(IOHIDDeviceRef device, CFStringRef key, int32_t* pResult);
-    bool getStringProperty(IOHIDDeviceRef device, CFStringRef propertyName, String* pResult);
-    bool getFullDesc(IOHIDDeviceRef device, HIDDeviceDesc* desc);
-    
-    static void staticDeviceMatchingCallback(void *inContext,
-                                             IOReturn inResult,
-                                             void *inSender,
-                                             IOHIDDeviceRef inIOHIDDeviceRef);
-    
-    DeviceManager* DevManager;
-
-    IOHIDManagerRef HIDManager;
-};
-
-}} // namespace OVR::OSX
-
-#endif // OVR_OSX_HIDDevice_h