use radix literals

[factor.git] / basis / iokit / hid / hid.factor

diff --git a/basis/iokit/hid/hid.factor b/basis/iokit/hid/hid.factor
index bd3fc1e96829098f4535fc88aa88d6f78a083d1c..a9a7ceea7c3b20ec7250feed5f3402bd60e90c9e 100644 (file)
--- a/basis/iokit/hid/hid.factor
+++ b/basis/iokit/hid/hid.factor
@@ -79,34 +79,34 @@ CONSTANT: kIOHIDElementTypeOutput            129
 CONSTANT: kIOHIDElementTypeFeature           257
 CONSTANT: kIOHIDElementTypeCollection        513
 
-CONSTANT: kIOHIDElementCollectionTypePhysical     HEX: 00
-CONSTANT: kIOHIDElementCollectionTypeApplication    HEX: 01
-CONSTANT: kIOHIDElementCollectionTypeLogical        HEX: 02
-CONSTANT: kIOHIDElementCollectionTypeReport         HEX: 03
-CONSTANT: kIOHIDElementCollectionTypeNamedArray     HEX: 04
-CONSTANT: kIOHIDElementCollectionTypeUsageSwitch    HEX: 05
-CONSTANT: kIOHIDElementCollectionTypeUsageModifier  HEX: 06
+CONSTANT: kIOHIDElementCollectionTypePhysical     0x00
+CONSTANT: kIOHIDElementCollectionTypeApplication    0x01
+CONSTANT: kIOHIDElementCollectionTypeLogical        0x02
+CONSTANT: kIOHIDElementCollectionTypeReport         0x03
+CONSTANT: kIOHIDElementCollectionTypeNamedArray     0x04
+CONSTANT: kIOHIDElementCollectionTypeUsageSwitch    0x05
+CONSTANT: kIOHIDElementCollectionTypeUsageModifier  0x06
 
 CONSTANT: kIOHIDReportTypeInput    0
 CONSTANT: kIOHIDReportTypeOutput   1
 CONSTANT: kIOHIDReportTypeFeature  2
 CONSTANT: kIOHIDReportTypeCount    3
 
-CONSTANT: kIOHIDOptionsTypeNone        HEX: 00
-CONSTANT: kIOHIDOptionsTypeSeizeDevice HEX: 01
+CONSTANT: kIOHIDOptionsTypeNone        0x00
+CONSTANT: kIOHIDOptionsTypeSeizeDevice 0x01
 
-CONSTANT: kIOHIDQueueOptionsTypeNone    HEX: 00
-CONSTANT: kIOHIDQueueOptionsTypeEnqueueAll HEX: 01
+CONSTANT: kIOHIDQueueOptionsTypeNone    0x00
+CONSTANT: kIOHIDQueueOptionsTypeEnqueueAll 0x01
 
-CONSTANT: kIOHIDElementFlagsConstantMask        HEX: 0001
-CONSTANT: kIOHIDElementFlagsVariableMask        HEX: 0002
-CONSTANT: kIOHIDElementFlagsRelativeMask        HEX: 0004
-CONSTANT: kIOHIDElementFlagsWrapMask            HEX: 0008
-CONSTANT: kIOHIDElementFlagsNonLinearMask       HEX: 0010
-CONSTANT: kIOHIDElementFlagsNoPreferredMask     HEX: 0020
-CONSTANT: kIOHIDElementFlagsNullStateMask       HEX: 0040
-CONSTANT: kIOHIDElementFlagsVolativeMask        HEX: 0080
-CONSTANT: kIOHIDElementFlagsBufferedByteMask    HEX: 0100
+CONSTANT: kIOHIDElementFlagsConstantMask        0x0001
+CONSTANT: kIOHIDElementFlagsVariableMask        0x0002
+CONSTANT: kIOHIDElementFlagsRelativeMask        0x0004
+CONSTANT: kIOHIDElementFlagsWrapMask            0x0008
+CONSTANT: kIOHIDElementFlagsNonLinearMask       0x0010
+CONSTANT: kIOHIDElementFlagsNoPreferredMask     0x0020
+CONSTANT: kIOHIDElementFlagsNullStateMask       0x0040
+CONSTANT: kIOHIDElementFlagsVolativeMask        0x0080
+CONSTANT: kIOHIDElementFlagsBufferedByteMask    0x0100
 
 CONSTANT: kIOHIDValueScaleTypeCalibrated 0
 CONSTANT: kIOHIDValueScaleTypePhysical   1
@@ -125,6 +125,7 @@ TYPEDEF: uint IOHIDQueueOptionsType
 TYPEDEF: uint IOHIDElementFlags
 TYPEDEF: void* IOHIDDeviceRef
 TYPEDEF: void* IOHIDElementRef
+TYPEDEF: void* IOHIDQueueRef
 TYPEDEF: void* IOHIDValueRef
 TYPEDEF: void* IOHIDManagerRef
 TYPEDEF: void* IOHIDTransactionRef
@@ -132,7 +133,7 @@ TYPEDEF: UInt32 IOHIDValueScaleType
 TYPEDEF: UInt32 IOHIDTransactionDirectionType
 
 CALLBACK: void IOHIDCallback ( void* context, IOReturn result, void* sender ) ;
-CALLBACK: void IOHIDReportCallback ( void* context, IOReturn result, void* sender, IOHIDReportType type, UInt32 reportID, c-string report, CFIndex reportLength ) ;
+CALLBACK: void IOHIDReportCallback ( void* context, IOReturn result, void* sender, IOHIDReportType type, UInt32 reportID, uchar* report, CFIndex reportLength ) ;
 CALLBACK: void IOHIDValueCallback ( void* context, IOReturn result, void* sender, IOHIDValueRef value ) ;
 CALLBACK: void IOHIDValueMultipleCallback ( void* context, IOReturn result, void* sender, CFDictionaryRef multiple ) ;
 CALLBACK: void IOHIDDeviceCallback ( void* context, IOReturn result, void* sender, IOHIDDeviceRef device ) ;
@@ -151,7 +152,7 @@ FUNCTION: void IOHIDDeviceScheduleWithRunLoop ( IOHIDDeviceRef device, CFRunLoop
 FUNCTION: void IOHIDDeviceUnscheduleFromRunLoop ( IOHIDDeviceRef device, CFRunLoopRef runLoop, CFStringRef runLoopMode ) ;
 FUNCTION: void IOHIDDeviceRegisterRemovalCallback ( IOHIDDeviceRef device, IOHIDCallback callback, void* context ) ;
 FUNCTION: void IOHIDDeviceRegisterInputValueCallback ( IOHIDDeviceRef device, IOHIDValueCallback callback, void* context ) ;
-FUNCTION: void IOHIDDeviceRegisterInputReportCallback ( IOHIDDeviceRef device, c-string report, CFIndex reportLength, IOHIDReportCallback callback, void* context ) ;
+FUNCTION: void IOHIDDeviceRegisterInputReportCallback ( IOHIDDeviceRef device, uchar* report, CFIndex reportLength, IOHIDReportCallback callback, void* context ) ;
 FUNCTION: void IOHIDDeviceSetInputValueMatching ( IOHIDDeviceRef device, CFDictionaryRef matching ) ;
 FUNCTION: void IOHIDDeviceSetInputValueMatchingMultiple ( IOHIDDeviceRef device, CFArrayRef multiple ) ;
 FUNCTION: IOReturn IOHIDDeviceSetValue ( IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef value ) ;
@@ -162,10 +163,10 @@ FUNCTION: IOReturn IOHIDDeviceGetValue ( IOHIDDeviceRef device, IOHIDElementRef
 FUNCTION: IOReturn IOHIDDeviceCopyValueMultiple ( IOHIDDeviceRef device, CFArrayRef elements, CFDictionaryRef* pMultiple ) ;
 FUNCTION: IOReturn IOHIDDeviceGetValueWithCallback ( IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef* pValue, CFTimeInterval timeout, IOHIDValueCallback callback, void* context ) ;
 FUNCTION: IOReturn IOHIDDeviceCopyValueMultipleWithCallback ( IOHIDDeviceRef device, CFArrayRef elements, CFDictionaryRef* pMultiple, CFTimeInterval timeout, IOHIDValueMultipleCallback callback, void* context ) ;
-FUNCTION: IOReturn IOHIDDeviceSetReport ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, c-string report, CFIndex reportLength ) ;
-FUNCTION: IOReturn IOHIDDeviceSetReportWithCallback ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, c-string report, CFIndex reportLength, CFTimeInterval timeout, IOHIDReportCallback callback, void* context ) ;
-FUNCTION: IOReturn IOHIDDeviceGetReport ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, c-string report, CFIndex* pReportLength ) ;
-FUNCTION: IOReturn IOHIDDeviceGetReportWithCallback ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, c-string report, CFIndex* pReportLength, CFTimeInterval timeout, IOHIDReportCallback callback, void* context ) ;
+FUNCTION: IOReturn IOHIDDeviceSetReport ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, char* report, CFIndex reportLength ) ;
+FUNCTION: IOReturn IOHIDDeviceSetReportWithCallback ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, char* report, CFIndex reportLength, CFTimeInterval timeout, IOHIDReportCallback callback, void* context ) ;
+FUNCTION: IOReturn IOHIDDeviceGetReport ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, char* report, CFIndex* pReportLength ) ;
+FUNCTION: IOReturn IOHIDDeviceGetReportWithCallback ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, char* report, CFIndex* pReportLength, CFTimeInterval timeout, IOHIDReportCallback callback, void* context ) ;
 
 ! IOHIDManager
 
@@ -231,7 +232,7 @@ FUNCTION: IOHIDValueRef IOHIDValueCreateWithBytesNoCopy ( CFAllocatorRef allocat
 FUNCTION: IOHIDElementRef IOHIDValueGetElement ( IOHIDValueRef value ) ;
 FUNCTION: ulonglong IOHIDValueGetTimeStamp ( IOHIDValueRef value ) ;
 FUNCTION: CFIndex IOHIDValueGetLength ( IOHIDValueRef value ) ;
-FUNCTION: c-string IOHIDValueGetBytePtr ( IOHIDValueRef value ) ;
+FUNCTION: uchar* IOHIDValueGetBytePtr ( IOHIDValueRef value ) ;
 FUNCTION: CFIndex IOHIDValueGetIntegerValue ( IOHIDValueRef value ) ;
 FUNCTION: double IOHIDValueGetScaledValue ( IOHIDValueRef value, IOHIDValueScaleType type ) ;
 
@@ -253,3 +254,7 @@ FUNCTION: IOReturn IOHIDTransactionCommit ( IOHIDTransactionRef transaction ) ;
 FUNCTION: IOReturn IOHIDTransactionCommitWithCallback ( IOHIDTransactionRef transaction, CFTimeInterval timeout, IOHIDCallback callback, void* context ) ;
 FUNCTION: void IOHIDTransactionClear ( IOHIDTransactionRef transaction ) ;
 
+! IOHIDQueue
+
+FUNCTION: CFTypeID IOHIDQueueGetTypeID ( ) ;
+FUNCTION: IOHIDDeviceRef IOHIDQueueGetDevice ( IOHIDQueueRef queue ) ;