Add logging.
This commit is contained in:
@@ -185,17 +185,20 @@ void InputHandler_MacOSX_HID::AddDevices( int usagePage, int usage, InputDevice
|
|||||||
// Iterate over the devices and add them
|
// Iterate over the devices and add them
|
||||||
while( (device = IOIteratorNext(iter)) )
|
while( (device = IOIteratorNext(iter)) )
|
||||||
{
|
{
|
||||||
|
LOG->Trace( "\tFound device %d", id );
|
||||||
HIDDevice *dev = MakeDevice( id );
|
HIDDevice *dev = MakeDevice( id );
|
||||||
int num;
|
int num;
|
||||||
|
|
||||||
if( !dev )
|
if( !dev )
|
||||||
{
|
{
|
||||||
|
LOG->Trace( "\t\tInvalid id, deleting device" );
|
||||||
IOObjectRelease( device );
|
IOObjectRelease( device );
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !dev->Open(device) || (num = dev->AssignIDs(id)) == -1 )
|
if( !dev->Open(device) || (num = dev->AssignIDs(id)) == -1 )
|
||||||
{
|
{
|
||||||
|
LOG->Trace( "\tFailed top open or assign id, deleting device" );
|
||||||
delete dev;
|
delete dev;
|
||||||
IOObjectRelease( device );
|
IOObjectRelease( device );
|
||||||
continue;
|
continue;
|
||||||
@@ -210,6 +213,8 @@ void InputHandler_MacOSX_HID::AddDevices( int usagePage, int usage, InputDevice
|
|||||||
|
|
||||||
if( ret == KERN_SUCCESS )
|
if( ret == KERN_SUCCESS )
|
||||||
m_vIters.push_back( i );
|
m_vIters.push_back( i );
|
||||||
|
else
|
||||||
|
LOG->Trace( "\t\tFailed to add device changed notification, deleting device" );
|
||||||
IOObjectRelease( device );
|
IOObjectRelease( device );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -222,10 +227,13 @@ InputHandler_MacOSX_HID::InputHandler_MacOSX_HID() : m_Sem( "Input thread starte
|
|||||||
m_NotifyPort = IONotificationPortCreate( kIOMasterPortDefault );
|
m_NotifyPort = IONotificationPortCreate( kIOMasterPortDefault );
|
||||||
|
|
||||||
// Add devices.
|
// Add devices.
|
||||||
|
LOG->Trace( "Finding keyboards" );
|
||||||
AddDevices( kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard, id );
|
AddDevices( kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard, id );
|
||||||
|
LOG->Trace( "Finding joysticks" );
|
||||||
id = DEVICE_JOY1;
|
id = DEVICE_JOY1;
|
||||||
AddDevices( kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick, id );
|
AddDevices( kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick, id );
|
||||||
AddDevices( kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad, id );
|
AddDevices( kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad, id );
|
||||||
|
LOG->Trace( "Finding pump" );
|
||||||
id = DEVICE_PUMP1;
|
id = DEVICE_PUMP1;
|
||||||
AddDevices( kHIDPage_VendorDefinedStart, 0x0001, id ); // Pump pads use the first vendor specific usage page.
|
AddDevices( kHIDPage_VendorDefinedStart, 0x0001, id ); // Pump pads use the first vendor specific usage page.
|
||||||
m_bChanged = false;
|
m_bChanged = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user