Commit 0deb54c0241d38db3c43ebe5e5e442f7aef6bfa5
2014-02-22T00:55:28
Reworked Mac OS X joystick code to use the 10.5+ HID Manager API. Besides being a little more simple to use than the earlier IOKit HID API, and less likely to be deprecated, it also has the added benefit of working with the Sony DualShock 4 controller in Bluetooth mode out of the box, whereas the previous API has a bug that makes it report bad data for the controller. Cleaned up several other things in this code, having gone over every line of it. The remaining deprecated calls are also gone.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index 4be0162..716b3e4 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/src/joystick/darwin/SDL_sysjoystick.c
@@ -22,22 +22,7 @@
#ifdef SDL_JOYSTICK_IOKIT
-/* SDL joystick driver for Darwin / Mac OS X, based on the IOKit HID API */
-/* Written 2001 by Max Horn */
-
-#include <unistd.h>
-#include <ctype.h>
-#include <sysexits.h>
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/IOCFPlugIn.h>
-#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
#include <IOKit/hid/IOHIDLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <Carbon/Carbon.h> /* for NewPtrClear, DisposePtr */
-#include <IOKit/IOMessage.h>
/* For force feedback testing. */
#include <ForceFeedback/ForceFeedback.h>
@@ -53,75 +38,99 @@
#include "../../events/SDL_events_c.h"
#endif
+/* The base object of the HID Manager API */
+static IOHIDManagerRef hidman = NULL;
/* Linked list of all available devices */
static recDevice *gpDeviceList = NULL;
-/* OSX reference to the notification object that tells us about device insertion/removal */
-IONotificationPortRef notificationPort = 0;
-/* if 1 then a device was added since the last update call */
+
+/* if SDL_TRUE then a device was added since the last update call */
static SDL_bool s_bDeviceAdded = SDL_FALSE;
static SDL_bool s_bDeviceRemoved = SDL_FALSE;
/* static incrementing counter for new joystick devices seen on the system. Devices should start with index 0 */
static int s_joystick_instance_id = -1;
+
static void
-HIDReportErrorNum(char *strError, long numError)
+FreeElementList(recElement *pElement)
{
- SDL_SetError(strError);
+ while (pElement) {
+ recElement *pElementNext = pElement->pNext;
+ SDL_free(pElement);
+ pElement = pElementNext;
+ }
}
-static void HIDGetCollectionElements(CFMutableDictionaryRef deviceProperties,
- recDevice * pDevice);
+static recDevice *
+FreeDevice(recDevice *removeDevice)
+{
+ recDevice *pDeviceNext = NULL;
+ if (removeDevice) {
+ /* save next device prior to disposing of this device */
+ pDeviceNext = removeDevice->pNext;
-/* returns current value for element, polling element
- * will return 0 on error conditions which should be accounted for by application
- */
+ if ( gpDeviceList == removeDevice ) {
+ gpDeviceList = pDeviceNext;
+ } else {
+ recDevice *device = gpDeviceList;
+ while (device->pNext != removeDevice) {
+ device = device->pNext;
+ }
+ device->pNext = pDeviceNext;
+ }
+ removeDevice->pNext = NULL;
+
+ /* free element lists */
+ FreeElementList(removeDevice->firstAxis);
+ FreeElementList(removeDevice->firstButton);
+ FreeElementList(removeDevice->firstHat);
+
+ SDL_free(removeDevice);
+ }
+ return pDeviceNext;
+}
static SInt32
-HIDGetElementValue(recDevice * pDevice, recElement * pElement)
+GetHIDElementState(recDevice *pDevice, recElement *pElement)
{
- IOReturn result = kIOReturnSuccess;
- IOHIDEventStruct hidEvent;
- hidEvent.value = 0;
-
- if (NULL != pDevice && NULL != pElement && NULL != pDevice->interface) {
- result =
- (*(pDevice->interface))->getElementValue(pDevice->interface,
- pElement->cookie,
- &hidEvent);
- if (kIOReturnSuccess == result) {
+ SInt32 value = 0;
+
+ if (pDevice && pElement) {
+ IOHIDValueRef valueRef;
+ if (IOHIDDeviceGetValue(pDevice->deviceRef, pElement->elementRef, &valueRef) == kIOReturnSuccess) {
+ value = (SInt32) IOHIDValueGetIntegerValue(valueRef);
+
/* record min and max for auto calibration */
- if (hidEvent.value < pElement->minReport)
- pElement->minReport = hidEvent.value;
- if (hidEvent.value > pElement->maxReport)
- pElement->maxReport = hidEvent.value;
+ if (value < pElement->minReport) {
+ pElement->minReport = value;
+ }
+ if (value > pElement->maxReport) {
+ pElement->maxReport = value;
+ }
}
}
- /* auto user scale */
- return hidEvent.value;
+ return value;
}
static SInt32
-HIDScaledCalibratedValue(recDevice * pDevice, recElement * pElement,
- long min, long max)
+GetHIDScaledCalibratedState(recDevice * pDevice, recElement * pElement, SInt32 min, SInt32 max)
{
- float deviceScale = max - min;
- float readScale = pElement->maxReport - pElement->minReport;
- SInt32 value = HIDGetElementValue(pDevice, pElement);
- if (readScale == 0)
+ const float deviceScale = max - min;
+ const float readScale = pElement->maxReport - pElement->minReport;
+ const SInt32 value = GetHIDElementState(pDevice, pElement);
+ if (readScale == 0) {
return value; /* no scaling at all */
- else
- return ((value - pElement->minReport) * deviceScale / readScale) +
- min;
+ }
+ return ((value - pElement->minReport) * deviceScale / readScale) + min;
}
static void
-HIDRemovalCallback(void *target, IOReturn result, void *refcon, void *sender)
+JoystickDeviceWasRemovedCallback(void *ctx, IOReturn result, void *sender)
{
- recDevice *device = (recDevice *) refcon;
+ recDevice *device = (recDevice *) ctx;
device->removed = 1;
#if SDL_HAPTIC_IOKIT
MacHaptic_MaybeRemoveDevice(device->ffservice);
@@ -130,567 +139,240 @@ HIDRemovalCallback(void *target, IOReturn result, void *refcon, void *sender)
}
-/* Called by the io port notifier on removal of this device
- */
-void JoystickDeviceWasRemovedCallback( void * refcon, io_service_t service, natural_t messageType, void * messageArgument )
-{
- if( messageType == kIOMessageServiceIsTerminated && refcon )
- {
- recDevice *device = (recDevice *) refcon;
- device->removed = 1;
-#if SDL_HAPTIC_IOKIT
- MacHaptic_MaybeRemoveDevice(device->ffservice);
-#endif
- s_bDeviceRemoved = SDL_TRUE;
- }
-}
-
-
-/* Create and open an interface to device, required prior to extracting values or building queues.
- * Note: application now owns the device and must close and release it prior to exiting
- */
-
-static IOReturn
-HIDCreateOpenDeviceInterface(io_object_t hidDevice, recDevice * pDevice)
-{
- IOReturn result = kIOReturnSuccess;
- HRESULT plugInResult = S_OK;
- SInt32 score = 0;
- IOCFPlugInInterface **ppPlugInInterface = NULL;
-
- if (NULL == pDevice->interface) {
- result =
- IOCreatePlugInInterfaceForService(hidDevice,
- kIOHIDDeviceUserClientTypeID,
- kIOCFPlugInInterfaceID,
- &ppPlugInInterface, &score);
- if (kIOReturnSuccess == result) {
- /* Call a method of the intermediate plug-in to create the device interface */
- plugInResult =
- (*ppPlugInInterface)->QueryInterface(ppPlugInInterface,
- CFUUIDGetUUIDBytes
- (kIOHIDDeviceInterfaceID),
- (void *)
- &(pDevice->interface));
- if (S_OK != plugInResult)
- HIDReportErrorNum
- ("Couldn't query HID class device interface from plugInInterface",
- plugInResult);
- (*ppPlugInInterface)->Release(ppPlugInInterface);
- } else
- HIDReportErrorNum
- ("Failed to create **plugInInterface via IOCreatePlugInInterfaceForService.",
- result);
- }
- if (NULL != pDevice->interface) {
- result = (*(pDevice->interface))->open(pDevice->interface, 0);
- if (kIOReturnSuccess != result)
- HIDReportErrorNum
- ("Failed to open pDevice->interface via open.", result);
- else
- {
- pDevice->portIterator = 0;
-
- /* It's okay if this fails, we have another detection method below */
- (*(pDevice->interface))->setRemovalCallback(pDevice->interface,
- HIDRemovalCallback,
- pDevice, pDevice);
-
- /* now connect notification for new devices */
- pDevice->notificationPort = IONotificationPortCreate(kIOMasterPortDefault);
-
- CFRunLoopAddSource(CFRunLoopGetCurrent(),
- IONotificationPortGetRunLoopSource(pDevice->notificationPort),
- kCFRunLoopDefaultMode);
-
- /* Register for notifications when a serial port is added to the system */
- result = IOServiceAddInterestNotification(pDevice->notificationPort,
- hidDevice,
- kIOGeneralInterest,
- JoystickDeviceWasRemovedCallback,
- pDevice,
- &pDevice->portIterator);
- if (kIOReturnSuccess != result) {
- HIDReportErrorNum
- ("Failed to register for removal callback.", result);
- }
- }
-
- }
- return result;
-}
+static void AddHIDElement(const void *value, void *parameter);
-/* Closes and releases interface to device, should be done prior to exiting application
- * Note: will have no affect if device or interface do not exist
- * application will "own" the device if interface is not closed
- * (device may have to be plug and re-plugged in different location to get it working again without a restart)
- */
-
-static IOReturn
-HIDCloseReleaseInterface(recDevice * pDevice)
+/* Call AddHIDElement() on all elements in an array of IOHIDElementRefs */
+static void
+AddHIDElements(CFArrayRef array, recDevice *pDevice)
{
- IOReturn result = kIOReturnSuccess;
-
- if ((NULL != pDevice) && (NULL != pDevice->interface)) {
- /* close the interface */
- result = (*(pDevice->interface))->close(pDevice->interface);
- if (kIOReturnNotOpen == result) {
- /* do nothing as device was not opened, thus can't be closed */
- } else if (kIOReturnSuccess != result)
- HIDReportErrorNum("Failed to close IOHIDDeviceInterface.",
- result);
- /* release the interface */
- result = (*(pDevice->interface))->Release(pDevice->interface);
- if (kIOReturnSuccess != result)
- HIDReportErrorNum("Failed to release IOHIDDeviceInterface.",
- result);
- pDevice->interface = NULL;
-
- if ( pDevice->portIterator )
- {
- IOObjectRelease( pDevice->portIterator );
- pDevice->portIterator = 0;
- }
- }
- return result;
+ const CFRange range = { 0, CFArrayGetCount(array) };
+ CFArrayApplyFunction(array, range, AddHIDElement, pDevice);
}
-/* extracts actual specific element information from each element CF dictionary entry */
-
+/* See if we care about this HID element, and if so, note it in our recDevice. */
static void
-HIDGetElementInfo(CFTypeRef refElement, recElement * pElement)
+AddHIDElement(const void *value, void *parameter)
{
- long number;
- CFTypeRef refType;
-
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementCookieKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->cookie = (IOHIDElementCookie) number;
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementMinKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->minReport = pElement->min = number;
- pElement->maxReport = pElement->min;
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementMaxKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->maxReport = pElement->max = number;
-/*
- TODO: maybe should handle the following stuff somehow?
-
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementScaledMinKey));
- if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
- pElement->scaledMin = number;
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementScaledMaxKey));
- if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
- pElement->scaledMax = number;
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementSizeKey));
- if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
- pElement->size = number;
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsRelativeKey));
- if (refType)
- pElement->relative = CFBooleanGetValue (refType);
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsWrappingKey));
- if (refType)
- pElement->wrapping = CFBooleanGetValue (refType);
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsNonLinearKey));
- if (refType)
- pElement->nonLinear = CFBooleanGetValue (refType);
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementHasPreferedStateKey));
- if (refType)
- pElement->preferredState = CFBooleanGetValue (refType);
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementHasNullStateKey));
- if (refType)
- pElement->nullState = CFBooleanGetValue (refType);
-*/
-}
+ recDevice *pDevice = (recDevice *) parameter;
+ IOHIDElementRef refElement = (IOHIDElementRef) value;
+ const CFTypeID elementTypeID = refElement ? CFGetTypeID(refElement) : 0;
-/* examines CF dictionary value in device element hierarchy to determine if it is element of interest or a collection of more elements
- * if element of interest allocate storage, add to list and retrieve element specific info
- * if collection then pass on to deconstruction collection into additional individual elements
- */
+ if (refElement && (elementTypeID == IOHIDElementGetTypeID())) {
+ const uint32_t usagePage = IOHIDElementGetUsagePage(refElement);
+ const uint32_t usage = IOHIDElementGetUsage(refElement);
+ recElement *element = NULL;
+ recElement **headElement = NULL;
-static void
-HIDAddElement(CFTypeRef refElement, recDevice * pDevice)
-{
- recElement *element = NULL;
- recElement **headElement = NULL;
- long elementType, usagePage, usage;
- CFTypeRef refElementType =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementTypeKey));
- CFTypeRef refUsagePage =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementUsagePageKey));
- CFTypeRef refUsage =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementUsageKey));
-
-
- if ((refElementType)
- &&
- (CFNumberGetValue(refElementType, kCFNumberLongType, &elementType))) {
/* look at types of interest */
- if ((elementType == kIOHIDElementTypeInput_Misc)
- || (elementType == kIOHIDElementTypeInput_Button)
- || (elementType == kIOHIDElementTypeInput_Axis)) {
- if (refUsagePage
- && CFNumberGetValue(refUsagePage, kCFNumberLongType,
- &usagePage) && refUsage
- && CFNumberGetValue(refUsage, kCFNumberLongType, &usage)) {
+ switch (IOHIDElementGetType(refElement)) {
+ case kIOHIDElementTypeInput_Misc:
+ case kIOHIDElementTypeInput_Button:
+ case kIOHIDElementTypeInput_Axis: {
switch (usagePage) { /* only interested in kHIDPage_GenericDesktop and kHIDPage_Button */
- case kHIDPage_GenericDesktop:
- {
- switch (usage) { /* look at usage to determine function */
- case kHIDUsage_GD_X:
- case kHIDUsage_GD_Y:
- case kHIDUsage_GD_Z:
- case kHIDUsage_GD_Rx:
- case kHIDUsage_GD_Ry:
- case kHIDUsage_GD_Rz:
- case kHIDUsage_GD_Slider:
- case kHIDUsage_GD_Dial:
- case kHIDUsage_GD_Wheel:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->axes++;
- headElement = &(pDevice->firstAxis);
- }
- break;
- case kHIDUsage_GD_Hatswitch:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->hats++;
- headElement = &(pDevice->firstHat);
- }
- break;
+ case kHIDPage_GenericDesktop:
+ switch (usage) {
+ case kHIDUsage_GD_X:
+ case kHIDUsage_GD_Y:
+ case kHIDUsage_GD_Z:
+ case kHIDUsage_GD_Rx:
+ case kHIDUsage_GD_Ry:
+ case kHIDUsage_GD_Rz:
+ case kHIDUsage_GD_Slider:
+ case kHIDUsage_GD_Dial:
+ case kHIDUsage_GD_Wheel:
+ element = (recElement *) SDL_calloc(1, sizeof (recElement));
+ if (element) {
+ pDevice->axes++;
+ headElement = &(pDevice->firstAxis);
+ }
+ break;
+
+ case kHIDUsage_GD_Hatswitch:
+ element = (recElement *) SDL_calloc(1, sizeof (recElement));
+ if (element) {
+ pDevice->hats++;
+ headElement = &(pDevice->firstHat);
+ }
+ break;
}
- }
- break;
- case kHIDPage_Simulation:
- switch (usage) {
- case kHIDUsage_Sim_Rudder:
- case kHIDUsage_Sim_Throttle:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->axes++;
- headElement = &(pDevice->firstAxis);
- }
- break;
-
- default:
- break;
- }
- break;
- case kHIDPage_Button:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->buttons++;
- headElement = &(pDevice->firstButton);
- }
- break;
- default:
- break;
+ break;
+
+ case kHIDPage_Simulation:
+ switch (usage) {
+ case kHIDUsage_Sim_Rudder:
+ case kHIDUsage_Sim_Throttle:
+ element = (recElement *) SDL_calloc(1, sizeof (recElement));
+ if (element) {
+ pDevice->axes++;
+ headElement = &(pDevice->firstAxis);
+ }
+ break;
+
+ default:
+ break;
+ }
+ break;
+
+ case kHIDPage_Button:
+ element = (recElement *) SDL_calloc(1, sizeof (recElement));
+ if (element) {
+ pDevice->buttons++;
+ headElement = &(pDevice->firstButton);
+ }
+ break;
+
+ default:
+ break;
}
}
- } else if (kIOHIDElementTypeCollection == elementType)
- HIDGetCollectionElements((CFMutableDictionaryRef) refElement,
- pDevice);
- }
+ break;
- if (element && headElement) { /* add to list */
- recElement *elementPrevious = NULL;
- recElement *elementCurrent = *headElement;
- while (elementCurrent && usage >= elementCurrent->usage) {
- elementPrevious = elementCurrent;
- elementCurrent = elementCurrent->pNext;
- }
- if (elementPrevious) {
- elementPrevious->pNext = element;
- } else {
- *headElement = element;
+ #if 0 /* !!! FIXME: this causes everything to get added twice on a DualShock 4. */
+ case kIOHIDElementTypeCollection: {
+ CFArrayRef array = IOHIDElementGetChildren(refElement);
+ if (array) {
+ AddHIDElements(array, pDevice);
+ }
+ }
+ break;
+ #endif
+
+ default:
+ break;
}
- element->usagePage = usagePage;
- element->usage = usage;
- element->pNext = elementCurrent;
- HIDGetElementInfo(refElement, element);
- pDevice->elements++;
- }
-}
-/* collects information from each array member in device element list (each array member = element) */
+ if (element && headElement) { /* add to list */
+ recElement *elementPrevious = NULL;
+ recElement *elementCurrent = *headElement;
+ while (elementCurrent && usage >= elementCurrent->usage) {
+ elementPrevious = elementCurrent;
+ elementCurrent = elementCurrent->pNext;
+ }
+ if (elementPrevious) {
+ elementPrevious->pNext = element;
+ } else {
+ *headElement = element;
+ }
-static void
-HIDGetElementsCFArrayHandler(const void *value, void *parameter)
-{
- if (CFGetTypeID(value) == CFDictionaryGetTypeID())
- HIDAddElement((CFTypeRef) value, (recDevice *) parameter);
-}
+ element->elementRef = refElement;
+ element->usagePage = usagePage;
+ element->usage = usage;
+ element->pNext = elementCurrent;
-/* handles retrieval of element information from arrays of elements in device IO registry information */
+ element->minReport = element->min = (SInt32) IOHIDElementGetLogicalMin(refElement);
+ element->maxReport = element->max = (SInt32) IOHIDElementGetLogicalMax(refElement);
-static void
-HIDGetElements(CFTypeRef refElementCurrent, recDevice * pDevice)
-{
- CFTypeID type = CFGetTypeID(refElementCurrent);
- if (type == CFArrayGetTypeID()) { /* if element is an array */
- CFRange range = { 0, CFArrayGetCount(refElementCurrent) };
- /* CountElementsCFArrayHandler called for each array member */
- CFArrayApplyFunction(refElementCurrent, range,
- HIDGetElementsCFArrayHandler, pDevice);
+ pDevice->elements++;
+ }
}
}
-/* handles extracting element information from element collection CF types
- * used from top level element decoding and hierarchy deconstruction to flatten device element list
- */
-
-static void
-HIDGetCollectionElements(CFMutableDictionaryRef deviceProperties,
- recDevice * pDevice)
-{
- CFTypeRef refElementTop =
- CFDictionaryGetValue(deviceProperties, CFSTR(kIOHIDElementKey));
- if (refElementTop)
- HIDGetElements(refElementTop, pDevice);
-}
-
-/* use top level element usage page and usage to discern device usage page and usage setting appropriate vlaues in device record */
-
-static void
-HIDTopLevelElementHandler(const void *value, void *parameter)
-{
- CFTypeRef refCF = 0;
- if (CFGetTypeID(value) != CFDictionaryGetTypeID())
- return;
- refCF = CFDictionaryGetValue(value, CFSTR(kIOHIDElementUsagePageKey));
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &((recDevice *) parameter)->usagePage))
- SDL_SetError("CFNumberGetValue error retrieving pDevice->usagePage.");
- refCF = CFDictionaryGetValue(value, CFSTR(kIOHIDElementUsageKey));
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &((recDevice *) parameter)->usage))
- SDL_SetError("CFNumberGetValue error retrieving pDevice->usage.");
-}
-
-/* extracts device info from CF dictionary records in IO registry */
-
-static void
-HIDGetDeviceInfo(io_object_t hidDevice, CFMutableDictionaryRef hidProperties,
- recDevice * pDevice)
+static SDL_bool
+GetDeviceInfo(IOHIDDeviceRef hidDevice, recDevice *pDevice)
{
- CFMutableDictionaryRef usbProperties = 0;
- io_registry_entry_t parent1, parent2;
-
- /* Mac OS X currently is not mirroring all USB properties to HID page so need to look at USB device page also
- * get dictionary for USB properties: step up two levels and get CF dictionary for USB properties
- */
- if ((KERN_SUCCESS == IORegistryEntryGetParentEntry(hidDevice, kIOServicePlane, &parent1))
- && (KERN_SUCCESS == IORegistryEntryGetParentEntry(parent1, kIOServicePlane, &parent2))
- && (KERN_SUCCESS == IORegistryEntryCreateCFProperties(parent2, &usbProperties, kCFAllocatorDefault, kNilOptions))) {
- if (usbProperties) {
- CFTypeRef refCF = 0;
- /* get device info
- * try hid dictionary first, if fail then go to usb dictionary
- */
-
- /* get product name */
- refCF = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDProductKey));
- if (!refCF) {
- refCF = CFDictionaryGetValue(usbProperties, CFSTR("USB Product Name"));
- }
- if (refCF) {
- if (!CFStringGetCString(refCF, pDevice->product, 256, CFStringGetSystemEncoding())) {
- SDL_SetError("CFStringGetCString error retrieving pDevice->product.");
- }
- }
-
- /* get usage page and usage */
- refCF = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDPrimaryUsagePageKey));
- if (refCF) {
- if (!CFNumberGetValue (refCF, kCFNumberLongType, &pDevice->usagePage)) {
- SDL_SetError("CFNumberGetValue error retrieving pDevice->usagePage.");
- }
+ Uint32 *guid32 = NULL;
+ CFTypeRef refCF = NULL;
+ CFArrayRef array = NULL;
- refCF = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDPrimaryUsageKey));
- if (refCF) {
- if (!CFNumberGetValue (refCF, kCFNumberLongType, &pDevice->usage)) {
- SDL_SetError("CFNumberGetValue error retrieving pDevice->usage.");
- }
- }
- }
-
- refCF = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDVendorIDKey));
- if (refCF) {
- if (!CFNumberGetValue(refCF, kCFNumberLongType, &pDevice->guid.data[0])) {
- SDL_SetError("CFNumberGetValue error retrieving pDevice->guid[0]");
- }
- }
+ /* get usage page and usage */
+ refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDPrimaryUsagePageKey));
+ if (refCF) {
+ CFNumberGetValue(refCF, kCFNumberSInt32Type, &pDevice->usagePage);
+ }
+ if (pDevice->usagePage != kHIDPage_GenericDesktop) {
+ return SDL_FALSE; /* Filter device list to non-keyboard/mouse stuff */
+ }
- refCF = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDProductIDKey));
- if (refCF) {
- if (!CFNumberGetValue(refCF, kCFNumberLongType, &pDevice->guid.data[8])) {
- SDL_SetError("CFNumberGetValue error retrieving pDevice->guid[8]");
- }
- }
+ refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDPrimaryUsageKey));
+ if (refCF) {
+ CFNumberGetValue(refCF, kCFNumberSInt32Type, &pDevice->usage);
+ }
- /* Check to make sure we have a vendor and product ID
- If we don't, use the same algorithm as the Linux code for Bluetooth devices */
- {
- Uint32 *guid32 = (Uint32*)pDevice->guid.data;
- if (!guid32[0] && !guid32[1]) {
- const Uint16 BUS_BLUETOOTH = 0x05;
- Uint16 *guid16 = (Uint16 *)guid32;
- *guid16++ = BUS_BLUETOOTH;
- *guid16++ = 0;
- SDL_strlcpy((char*)guid16, pDevice->product, sizeof(pDevice->guid.data) - 4);
- }
- }
+ if ((pDevice->usage != kHIDUsage_GD_Joystick &&
+ pDevice->usage != kHIDUsage_GD_GamePad &&
+ pDevice->usage != kHIDUsage_GD_MultiAxisController)) {
+ return SDL_FALSE; /* Filter device list to non-keyboard/mouse stuff */
+ }
- /* If we don't have a vendor and product ID this is probably a Bluetooth device */
+ pDevice->deviceRef = hidDevice;
- if (NULL == refCF) { /* get top level element HID usage page or usage */
- /* use top level element instead */
- CFTypeRef refCFTopElement = 0;
- refCFTopElement = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDElementKey));
- {
- /* refCFTopElement points to an array of element dictionaries */
- CFRange range = { 0, CFArrayGetCount(refCFTopElement) };
- CFArrayApplyFunction(refCFTopElement, range, HIDTopLevelElementHandler, pDevice);
- }
- }
+ /* get device name */
+ refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDProductKey));
+ if (!refCF) {
+ /* Maybe we can't get "AwesomeJoystick2000", but we can get "Logitech"? */
+ refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDManufacturerKey));
+ }
+ if ((!refCF) || (!CFStringGetCString(refCF, pDevice->product, sizeof (pDevice->product), kCFStringEncodingUTF8))) {
+ SDL_strlcpy(pDevice->product, "Unidentified joystick", sizeof (pDevice->product));
+ }
- CFRelease(usbProperties);
- } else {
- SDL_SetError("IORegistryEntryCreateCFProperties failed to create usbProperties.");
- }
+ refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDVendorIDKey));
+ if (refCF) {
+ CFNumberGetValue(refCF, kCFNumberSInt32Type, &pDevice->guid.data[0]);
+ }
- if (kIOReturnSuccess != IOObjectRelease(parent2)) {
- SDL_SetError("IOObjectRelease error with parent2");
- }
- if (kIOReturnSuccess != IOObjectRelease(parent1)) {
- SDL_SetError("IOObjectRelease error with parent1");
- }
+ refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDProductIDKey));
+ if (refCF) {
+ CFNumberGetValue(refCF, kCFNumberSInt32Type, &pDevice->guid.data[8]);
}
-}
+ /* Check to make sure we have a vendor and product ID
+ If we don't, use the same algorithm as the Linux code for Bluetooth devices */
+ guid32 = (Uint32*)pDevice->guid.data;
+ if (!guid32[0] && !guid32[1]) {
+ /* If we don't have a vendor and product ID this is probably a Bluetooth device */
+ const Uint16 BUS_BLUETOOTH = 0x05;
+ Uint16 *guid16 = (Uint16 *)guid32;
+ *guid16++ = BUS_BLUETOOTH;
+ *guid16++ = 0;
+ SDL_strlcpy((char*)guid16, pDevice->product, sizeof(pDevice->guid.data) - 4);
+ }
-static recDevice *
-HIDBuildDevice(io_object_t hidDevice)
-{
- recDevice *pDevice = (recDevice *) NewPtrClear(sizeof(recDevice));
- if (pDevice) {
- /* get dictionary for HID properties */
- CFMutableDictionaryRef hidProperties = 0;
- kern_return_t result =
- IORegistryEntryCreateCFProperties(hidDevice, &hidProperties,
- kCFAllocatorDefault,
- kNilOptions);
- if ((result == KERN_SUCCESS) && hidProperties) {
- /* create device interface */
- result = HIDCreateOpenDeviceInterface(hidDevice, pDevice);
- if (kIOReturnSuccess == result) {
- HIDGetDeviceInfo(hidDevice, hidProperties, pDevice); /* hidDevice used to find parents in registry tree */
- HIDGetCollectionElements(hidProperties, pDevice);
- } else {
- DisposePtr((Ptr) pDevice);
- pDevice = NULL;
- }
- CFRelease(hidProperties);
- } else {
- DisposePtr((Ptr) pDevice);
- pDevice = NULL;
- }
+ array = IOHIDDeviceCopyMatchingElements(hidDevice, NULL, kIOHIDOptionsTypeNone);
+ if (array) {
+ AddHIDElements(array, pDevice);
+ CFRelease(array);
}
- return pDevice;
+
+ return SDL_TRUE;
}
-/* disposes of the element list associated with a device and the memory associated with the list
- */
static void
-HIDDisposeElementList(recElement ** elementList)
+JoystickDeviceWasAddedCallback(void *ctx, IOReturn res, void *sender, IOHIDDeviceRef ioHIDDeviceObject)
{
- recElement *pElement = *elementList;
- while (pElement) {
- recElement *pElementNext = pElement->pNext;
- DisposePtr((Ptr) pElement);
- pElement = pElementNext;
+ if (res != kIOReturnSuccess) {
+ return;
}
- *elementList = NULL;
-}
-/* disposes of a single device, closing and releaseing interface, freeing memory fro device and elements, setting device pointer to NULL
- * all your device no longer belong to us... (i.e., you do not 'own' the device anymore)
- */
+ recDevice *device = (recDevice *) SDL_calloc(1, sizeof(recDevice));
-static recDevice *
-HIDDisposeDevice(recDevice ** ppDevice)
-{
- kern_return_t result = KERN_SUCCESS;
- recDevice *pDeviceNext = NULL;
- if (*ppDevice) {
- /* save next device prior to disposing of this device */
- pDeviceNext = (*ppDevice)->pNext;
-
- /* free posible io_service_t */
- if ((*ppDevice)->ffservice) {
- IOObjectRelease((*ppDevice)->ffservice);
- (*ppDevice)->ffservice = 0;
- }
-
- /* free element lists */
- HIDDisposeElementList(&(*ppDevice)->firstAxis);
- HIDDisposeElementList(&(*ppDevice)->firstButton);
- HIDDisposeElementList(&(*ppDevice)->firstHat);
-
- result = HIDCloseReleaseInterface(*ppDevice); /* function sanity checks interface value (now application does not own device) */
- if (kIOReturnSuccess != result)
- HIDReportErrorNum
- ("HIDCloseReleaseInterface failed when trying to dipose device.",
- result);
- DisposePtr((Ptr) * ppDevice);
- *ppDevice = NULL;
+ if (!device) {
+ SDL_OutOfMemory();
+ return;
}
- return pDeviceNext;
-}
-
-/* Given an io_object_t from OSX adds a joystick device to our list if appropriate
- */
-int
-AddDeviceHelper( io_object_t ioHIDDeviceObject )
-{
- recDevice *device;
-
- /* build a device record */
- device = HIDBuildDevice(ioHIDDeviceObject);
- if (!device)
- return 0;
-
- /* Filter device list to non-keyboard/mouse stuff */
- if ((device->usagePage != kHIDPage_GenericDesktop) ||
- ((device->usage != kHIDUsage_GD_Joystick &&
- device->usage != kHIDUsage_GD_GamePad &&
- device->usage != kHIDUsage_GD_MultiAxisController))) {
-
- /* release memory for the device */
- HIDDisposeDevice(&device);
- DisposePtr((Ptr) device);
- return 0;
+ if (!GetDeviceInfo(ioHIDDeviceObject, device)) {
+ SDL_free(device);
+ return; /* not a device we care about, probably. */
}
+ /* Get notified when this device is disconnected. */
+ IOHIDDeviceRegisterRemovalCallback(ioHIDDeviceObject, JoystickDeviceWasRemovedCallback, device);
+ IOHIDDeviceScheduleWithRunLoop(ioHIDDeviceObject, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+
/* Allocate an instance ID for this device */
device->instance_id = ++s_joystick_instance_id;
- /* We have to do some storage of the io_service_t for
- * SDL_HapticOpenFromJoystick */
- if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) {
- device->ffservice = ioHIDDeviceObject;
+ /* We have to do some storage of the io_service_t for SDL_HapticOpenFromJoystick */
+ if (IOHIDDeviceGetService != NULL) { /* weak reference: available in 10.6 and later. */
+ const io_service_t ioservice = IOHIDDeviceGetService(ioHIDDeviceObject);
+ if ((ioservice) && (FFIsForceFeedback(ioservice) == FF_OK)) {
+ device->ffservice = ioservice;
#if SDL_HAPTIC_IOKIT
- MacHaptic_MaybeAddDevice(ioHIDDeviceObject);
+ MacHaptic_MaybeAddDevice(ioservice);
#endif
- } else {
- device->ffservice = 0;
+ }
}
device->send_open_event = 1;
@@ -712,25 +394,93 @@ AddDeviceHelper( io_object_t ioHIDDeviceObject )
}
curdevice->pNext = device;
}
+}
+
+static SDL_bool
+ConfigHIDManager(CFArrayRef matchingArray)
+{
+ CFRunLoopRef runloop = CFRunLoopGetCurrent();
+
+ /* Run in a custom RunLoop mode just while initializing,
+ so we can detect sticks without messing with everything else. */
+ CFStringRef tempRunLoopMode = CFSTR("SDLJoystickInit");
+
+ if (IOHIDManagerOpen(hidman, kIOHIDOptionsTypeNone) != kIOReturnSuccess) {
+ return SDL_FALSE;
+ }
+
+ IOHIDManagerRegisterDeviceMatchingCallback(hidman, JoystickDeviceWasAddedCallback, NULL);
+ IOHIDManagerScheduleWithRunLoop(hidman, runloop, tempRunLoopMode);
+ IOHIDManagerSetDeviceMatchingMultiple(hidman, matchingArray);
+
+ while (CFRunLoopRunInMode(tempRunLoopMode,0,TRUE)==kCFRunLoopRunHandledSource) {
+ /* no-op. Callback fires once per existing device. */
+ }
- return 1;
+ /* Put this in the normal RunLoop mode now, for future hotplug events. */
+ IOHIDManagerUnscheduleFromRunLoop(hidman, runloop, tempRunLoopMode);
+ IOHIDManagerScheduleWithRunLoop(hidman, runloop, kCFRunLoopDefaultMode);
+
+ return SDL_TRUE; /* good to go. */
}
-/* Called by our IO port notifier on the master port when a HID device is inserted, we iterate
- * and check for new joysticks
- */
-void JoystickDeviceWasAddedCallback( void *refcon, io_iterator_t iterator )
+static CFDictionaryRef
+CreateHIDDeviceMatchDictionary(const UInt32 page, const UInt32 usage, int *okay)
{
- io_object_t ioHIDDeviceObject = 0;
+ CFDictionaryRef retval = NULL;
+ CFNumberRef pageNumRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
+ CFNumberRef usageNumRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage);
+ const void *keys[2] = { (void *) CFSTR(kIOHIDDeviceUsagePageKey), (void *) CFSTR(kIOHIDDeviceUsageKey) };
+ const void *vals[2] = { (void *) pageNumRef, (void *) usageNumRef };
- while ( ( ioHIDDeviceObject = IOIteratorNext(iterator) ) )
- {
- if ( ioHIDDeviceObject )
- {
- AddDeviceHelper( ioHIDDeviceObject );
+ if (pageNumRef && usageNumRef) {
+ retval = CFDictionaryCreate(kCFAllocatorDefault, keys, vals, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+ }
+
+ if (pageNumRef) {
+ CFRelease(pageNumRef);
+ }
+ if (usageNumRef) {
+ CFRelease(pageNumRef);
+ }
+
+ if (!retval) {
+ *okay = 0;
+ }
+
+ return retval;
+}
+
+static SDL_bool
+CreateHIDManager(void)
+{
+ SDL_bool retval = SDL_FALSE;
+ int okay = 1;
+ const void *vals[] = {
+ (void *) CreateHIDDeviceMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick, &okay),
+ (void *) CreateHIDDeviceMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad, &okay),
+ (void *) CreateHIDDeviceMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController, &okay),
+ };
+ const size_t numElements = SDL_arraysize(vals);
+ CFArrayRef array = okay ? CFArrayCreate(kCFAllocatorDefault, vals, numElements, &kCFTypeArrayCallBacks) : NULL;
+ size_t i;
+
+ for (i = 0; i < numElements; i++) {
+ if (vals[i]) {
+ CFRelease((CFTypeRef) vals[i]);
}
}
+
+ if (array) {
+ hidman = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
+ if (hidman != NULL) {
+ retval = ConfigHIDManager(array);
+ }
+ CFRelease(array);
+ }
+
+ return retval;
}
@@ -742,81 +492,13 @@ void JoystickDeviceWasAddedCallback( void *refcon, io_iterator_t iterator )
int
SDL_SYS_JoystickInit(void)
{
- IOReturn result = kIOReturnSuccess;
- mach_port_t masterPort = 0;
- io_iterator_t hidObjectIterator = 0;
- CFMutableDictionaryRef hidMatchDictionary = NULL;
- io_object_t ioHIDDeviceObject = 0;
- io_iterator_t portIterator = 0;
-
if (gpDeviceList) {
return SDL_SetError("Joystick: Device list already inited.");
}
- result = IOMasterPort(bootstrap_port, &masterPort);
- if (kIOReturnSuccess != result) {
- return SDL_SetError("Joystick: IOMasterPort error with bootstrap_port.");
- }
-
- /* Set up a matching dictionary to search I/O Registry by class name for all HID class devices. */
- hidMatchDictionary = IOServiceMatching(kIOHIDDeviceKey);
- if (hidMatchDictionary) {
- /* Add key for device type (joystick, in this case) to refine the matching dictionary. */
-
- /* NOTE: we now perform this filtering later
- UInt32 usagePage = kHIDPage_GenericDesktop;
- UInt32 usage = kHIDUsage_GD_Joystick;
- CFNumberRef refUsage = NULL, refUsagePage = NULL;
-
- refUsage = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &usage);
- CFDictionarySetValue (hidMatchDictionary, CFSTR (kIOHIDPrimaryUsageKey), refUsage);
- refUsagePage = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &usagePage);
- CFDictionarySetValue (hidMatchDictionary, CFSTR (kIOHIDPrimaryUsagePageKey), refUsagePage);
- */
- } else {
- return SDL_SetError
- ("Joystick: Failed to get HID CFMutableDictionaryRef via IOServiceMatching.");
- }
-
- /* Now search I/O Registry for matching devices. */
- result =
- IOServiceGetMatchingServices(masterPort, hidMatchDictionary,
- &hidObjectIterator);
- /* Check for errors */
- if (kIOReturnSuccess != result) {
- return SDL_SetError("Joystick: Couldn't create a HID object iterator.");
- }
- if (!hidObjectIterator) { /* there are no joysticks */
- gpDeviceList = NULL;
- return 0;
- }
- /* IOServiceGetMatchingServices consumes a reference to the dictionary, so we don't need to release the dictionary ref. */
-
- /* build flat linked list of devices from device iterator */
-
- gpDeviceList = NULL;
-
- while ((ioHIDDeviceObject = IOIteratorNext(hidObjectIterator))) {
- AddDeviceHelper( ioHIDDeviceObject );
+ if (!CreateHIDManager()) {
+ return SDL_SetError("Joystick: Couldn't initialize HID Manager");
}
- result = IOObjectRelease(hidObjectIterator); /* release the iterator */
-
- /* now connect notification for new devices */
- notificationPort = IONotificationPortCreate(masterPort);
- hidMatchDictionary = IOServiceMatching(kIOHIDDeviceKey);
-
- CFRunLoopAddSource(CFRunLoopGetCurrent(),
- IONotificationPortGetRunLoopSource(notificationPort),
- kCFRunLoopDefaultMode);
-
- /* Register for notifications when a serial port is added to the system */
- result = IOServiceAddMatchingNotification(notificationPort,
- kIOFirstMatchNotification,
- hidMatchDictionary,
- JoystickDeviceWasAddedCallback,
- NULL,
- &portIterator);
- while (IOIteratorNext(portIterator)) {}; /* Run out the iterator or notifications won't start (you can also use it to iterate the available devices). */
return SDL_SYS_NumJoysticks();
}
@@ -828,10 +510,10 @@ SDL_SYS_NumJoysticks()
recDevice *device = gpDeviceList;
int nJoySticks = 0;
- while ( device )
- {
- if ( !device->removed )
+ while (device) {
+ if (!device->removed) {
nJoySticks++;
+ }
device = device->pNext;
}
@@ -843,18 +525,16 @@ SDL_SYS_NumJoysticks()
void
SDL_SYS_JoystickDetect()
{
- if ( s_bDeviceAdded || s_bDeviceRemoved )
- {
+ if (s_bDeviceAdded || s_bDeviceRemoved) {
recDevice *device = gpDeviceList;
s_bDeviceAdded = SDL_FALSE;
s_bDeviceRemoved = SDL_FALSE;
int device_index = 0;
/* send notifications */
- while ( device )
- {
- if ( device->send_open_event )
- {
+ while (device) {
+ if (device->send_open_event) {
device->send_open_event = 0;
+/* !!! FIXME: why isn't there an SDL_PrivateJoyDeviceAdded()? */
#if !SDL_EVENTS_DISABLED
SDL_Event event;
event.type = SDL_JOYDEVICEADDED;
@@ -870,43 +550,25 @@ SDL_SYS_JoystickDetect()
}
- if ( device->removed )
- {
- recDevice *removeDevice = device;
- if ( gpDeviceList == removeDevice )
- {
- device = device->pNext;
- gpDeviceList = device;
- }
- else
- {
- device = gpDeviceList;
- while ( device->pNext != removeDevice )
- {
- device = device->pNext;
- }
-
- device->pNext = removeDevice->pNext;
- }
+ if (device->removed) {
+ const int instance_id = device->instance_id;
+ device = FreeDevice(device);
+/* !!! FIXME: why isn't there an SDL_PrivateJoyDeviceRemoved()? */
#if !SDL_EVENTS_DISABLED
SDL_Event event;
event.type = SDL_JOYDEVICEREMOVED;
if (SDL_GetEventState(event.type) == SDL_ENABLE) {
- event.jdevice.which = removeDevice->instance_id;
+ event.jdevice.which = instance_id;
if ((SDL_EventOK == NULL)
|| (*SDL_EventOK) (SDL_EventOKParam, &event)) {
SDL_PushEvent(&event);
}
}
-
- DisposePtr((Ptr) removeDevice);
#endif /* !SDL_EVENTS_DISABLED */
- }
- else
- {
+ } else {
device = device->pNext;
device_index++;
}
@@ -926,8 +588,9 @@ SDL_SYS_JoystickNameForDeviceIndex(int device_index)
{
recDevice *device = gpDeviceList;
- for (; device_index > 0; device_index--)
+ while (device_index-- > 0) {
device = device->pNext;
+ }
return device->product;
}
@@ -940,8 +603,9 @@ SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
recDevice *device = gpDeviceList;
int index;
- for (index = device_index; index > 0; index--)
+ for (index = device_index; index > 0; index--) {
device = device->pNext;
+ }
return device->instance_id;
}
@@ -957,8 +621,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
recDevice *device = gpDeviceList;
int index;
- for (index = device_index; index > 0; index--)
+ for (index = device_index; index > 0; index--) {
device = device->pNext;
+ }
joystick->instance_id = device->instance_id;
joystick->hwdata = device;
@@ -979,11 +644,10 @@ SDL_SYS_JoystickAttached(SDL_Joystick * joystick)
{
recDevice *device = gpDeviceList;
- while ( device )
- {
- if ( joystick->instance_id == device->instance_id )
+ while (device) {
+ if (joystick->instance_id == device->instance_id) {
return SDL_TRUE;
-
+ }
device = device->pNext;
}
@@ -1003,53 +667,24 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
SInt32 value, range;
int i;
- if ( !device )
+ if (!device) {
return;
+ }
if (device->removed) { /* device was unplugged; ignore it. */
- recDevice *devicelist = gpDeviceList;
joystick->closed = 1;
joystick->uncentered = 1;
-
- if ( devicelist == device )
- {
- gpDeviceList = device->pNext;
- }
- else
- {
- while ( devicelist->pNext != device )
- {
- devicelist = devicelist->pNext;
- }
-
- devicelist->pNext = device->pNext;
- }
-
- DisposePtr((Ptr) device);
joystick->hwdata = NULL;
-
-#if !SDL_EVENTS_DISABLED
- SDL_Event event;
- event.type = SDL_JOYDEVICEREMOVED;
-
- if (SDL_GetEventState(event.type) == SDL_ENABLE) {
- event.jdevice.which = joystick->instance_id;
- if ((SDL_EventOK == NULL)
- || (*SDL_EventOK) (SDL_EventOKParam, &event)) {
- SDL_PushEvent(&event);
- }
- }
-#endif /* !SDL_EVENTS_DISABLED */
-
return;
}
element = device->firstAxis;
i = 0;
while (element) {
- value = HIDScaledCalibratedValue(device, element, -32768, 32767);
- if (value != joystick->axes[i])
+ value = GetHIDScaledCalibratedState(device, element, -32768, 32767);
+ if (value != joystick->axes[i]) {
SDL_PrivateJoystickAxis(joystick, i, value);
+ }
element = element->pNext;
++i;
}
@@ -1057,11 +692,13 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
element = device->firstButton;
i = 0;
while (element) {
- value = HIDGetElementValue(device, element);
- if (value > 1) /* handle pressure-sensitive buttons */
+ value = GetHIDElementState(device, element);
+ if (value > 1) { /* handle pressure-sensitive buttons */
value = 1;
- if (value != joystick->buttons[i])
+ }
+ if (value != joystick->buttons[i]) {
SDL_PrivateJoystickButton(joystick, i, value);
+ }
element = element->pNext;
++i;
}
@@ -1072,11 +709,12 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
Uint8 pos = 0;
range = (element->max - element->min + 1);
- value = HIDGetElementValue(device, element) - element->min;
- if (range == 4) /* 4 position hatswitch - scale up value */
+ value = GetHIDElementState(device, element) - element->min;
+ if (range == 4) { /* 4 position hatswitch - scale up value */
value *= 2;
- else if (range != 8) /* Neither a 4 nor 8 positions - fall back to default position (centered) */
+ } else if (range != 8) { /* Neither a 4 nor 8 positions - fall back to default position (centered) */
value = -1;
+ }
switch (value) {
case 0:
pos = SDL_HAT_UP;
@@ -1110,13 +748,14 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
pos = SDL_HAT_CENTERED;
break;
}
- if (pos != joystick->hats[i])
+
+ if (pos != joystick->hats[i]) {
SDL_PrivateJoystickHat(joystick, i, pos);
+ }
+
element = element->pNext;
++i;
}
-
- return;
}
/* Function to close a joystick after use */
@@ -1130,14 +769,17 @@ SDL_SYS_JoystickClose(SDL_Joystick * joystick)
void
SDL_SYS_JoystickQuit(void)
{
- while (NULL != gpDeviceList)
- gpDeviceList = HIDDisposeDevice(&gpDeviceList);
+ while (FreeDevice(gpDeviceList)) {
+ /* spin */
+ }
- if ( notificationPort )
- {
- IONotificationPortDestroy( notificationPort );
- notificationPort = 0;
+ if (hidman) {
+ IOHIDManagerClose(hidman, kIOHIDOptionsTypeNone);
+ CFRelease(hidman);
+ hidman = NULL;
}
+
+ s_bDeviceAdded = s_bDeviceRemoved = SDL_FALSE;
}
@@ -1146,8 +788,9 @@ SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
recDevice *device = gpDeviceList;
int index;
- for (index = device_index; index > 0; index--)
+ for (index = device_index; index > 0; index--) {
device = device->pNext;
+ }
return device->guid;
}
diff --git a/src/joystick/darwin/SDL_sysjoystick_c.h b/src/joystick/darwin/SDL_sysjoystick_c.h
index 6f3372f..e1c6f71 100644
--- a/src/joystick/darwin/SDL_sysjoystick_c.h
+++ b/src/joystick/darwin/SDL_sysjoystick_c.h
@@ -22,34 +22,18 @@
#ifndef SDL_JOYSTICK_IOKIT_H
-
#include <IOKit/hid/IOHIDLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <IOKit/IOKitLib.h>
-
struct recElement
{
- IOHIDElementCookie cookie; /* unique value which identifies element, will NOT change */
- long usagePage, usage; /* HID usage */
- long min; /* reported min value possible */
- long max; /* reported max value possible */
-#if 0
- /* TODO: maybe should handle the following stuff somehow? */
-
- long scaledMin; /* reported scaled min value possible */
- long scaledMax; /* reported scaled max value possible */
- long size; /* size in bits of data return from element */
- Boolean relative; /* are reports relative to last report (deltas) */
- Boolean wrapping; /* does element wrap around (one value higher than max is min) */
- Boolean nonLinear; /* are the values reported non-linear relative to element movement */
- Boolean preferredState; /* does element have a preferred state (such as a button) */
- Boolean nullState; /* does element have null state */
-#endif /* 0 */
+ IOHIDElementRef elementRef;
+ uint32_t usagePage, usage; /* HID usage */
+ SInt32 min; /* reported min value possible */
+ SInt32 max; /* reported max value possible */
/* runtime variables used for auto-calibration */
- long minReport; /* min returned value */
- long maxReport; /* max returned value */
+ SInt32 minReport; /* min returned value */
+ SInt32 maxReport; /* max returned value */
struct recElement *pNext; /* next element in list */
};
@@ -57,19 +41,17 @@ typedef struct recElement recElement;
struct joystick_hwdata
{
+ IOHIDDeviceRef deviceRef; /* HIDManager device handle */
io_service_t ffservice; /* Interface for force feedback, 0 = no ff */
- IOHIDDeviceInterface **interface; /* interface to device, NULL = no interface */
- IONotificationPortRef notificationPort; /* port to be notified on joystick removal */
- io_iterator_t portIterator; /* iterator for removal callback */
char product[256]; /* name of product */
- long usage; /* usage page from IOUSBHID Parser.h which defines general usage */
- long usagePage; /* usage within above page from IOUSBHID Parser.h which defines specific usage */
+ uint32_t usage; /* usage page from IOUSBHID Parser.h which defines general usage */
+ uint32_t usagePage; /* usage within above page from IOUSBHID Parser.h which defines specific usage */
- long axes; /* number of axis (calculated, not reported by device) */
- long buttons; /* number of buttons (calculated, not reported by device) */
- long hats; /* number of hat switches (calculated, not reported by device) */
- long elements; /* number of total elements (should be total of above) (calculated, not reported by device) */
+ int axes; /* number of axis (calculated, not reported by device) */
+ int buttons; /* number of buttons (calculated, not reported by device) */
+ int hats; /* number of hat switches (calculated, not reported by device) */
+ int elements; /* number of total elements (should be total of above) (calculated, not reported by device) */
recElement *firstAxis;
recElement *firstButton;