Fix Apple depreciation of kIOMasterPortDefault

JayToltTech · JayToltTech · commit 5b6cc64e6cd7 · 2023-10-03T09:18:42.000-07:00
diff --git a/src/mac/iokit_mac.c b/src/mac/iokit_mac.c
@@ -19,7 +19,7 @@ libusbp_error * service_get_from_id(uint64_t id, io_service_t * service)
         return error_create("Failed to create a dictionary matching the ID.");
     }
 
-    *service = IOServiceGetMatchingService(kIOMasterPortDefault, dict);
+    *service = IOServiceGetMatchingService(kIOMainPortDefault, dict);
     if (*service == MACH_PORT_NULL)
     {
         return error_create("Failed to find service with ID 0x%" PRIx64 ".", id);
diff --git a/src/mac/list_mac.c b/src/mac/list_mac.c
@@ -53,7 +53,7 @@ libusbp_error * libusbp_list_connected_devices(
         // IOServiceGetMatchingServices consumes one reference to dict,
         // so we don't have to CFRelease it.
         kern_return_t result = IOServiceGetMatchingServices(
-            kIOMasterPortDefault, dict, &iterator);
+            kIOMainPortDefault, dict, &iterator);
         dict = NULL;
         if (result != KERN_SUCCESS)
         {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ libusbp_error * service_get_from_id(uint64_t id, io_service_t * service)`
`19`	`19`	`return error_create("Failed to create a dictionary matching the ID.");`
`20`	`20`	`}`
`21`	`21`
`22`		`- *service = IOServiceGetMatchingService(kIOMasterPortDefault, dict);`
	`22`	`+ *service = IOServiceGetMatchingService(kIOMainPortDefault, dict);`
`23`	`23`	`if (*service == MACH_PORT_NULL)`
`24`	`24`	`{`
`25`	`25`	`return error_create("Failed to find service with ID 0x%" PRIx64 ".", id);`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ libusbp_error * libusbp_list_connected_devices(`
`53`	`53`	`// IOServiceGetMatchingServices consumes one reference to dict,`
`54`	`54`	`// so we don't have to CFRelease it.`
`55`	`55`	`kern_return_t result = IOServiceGetMatchingServices(`
`56`		`- kIOMasterPortDefault, dict, &iterator);`
	`56`	`+ kIOMainPortDefault, dict, &iterator);`
`57`	`57`	`dict = NULL;`
`58`	`58`	`if (result != KERN_SUCCESS)`
`59`	`59`	`{`