Merge pull request #1333 from kyz/remove-iomainport

Replace IOMainPort/IOMasterPort() and kIOMainPortDefault/kIOMasterPortDefault with NULL
shirou · Jul 30, 2022 · 360136f · 360136f
2 parents 190dfee + e0400cc
commit 360136f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 14 deletions.
diff --git a/disk/iostat_darwin.c b/disk/iostat_darwin.c
@@ -18,17 +18,15 @@ static int fillstat(io_registry_entry_t d, DriveStats *stat);
 int
 gopsutil_v3_readdrivestat(DriveStats a[], int n)
 {
-	mach_port_t port;
 	CFMutableDictionaryRef match;
 	io_iterator_t drives;
 	io_registry_entry_t d;
 	kern_return_t status;
 	int na, rv;
 
-	IOMainPort(bootstrap_port, &port);
 	match = IOServiceMatching("IOMedia");
 	CFDictionaryAddValue(match, CFSTR(kIOMediaWholeKey), kCFBooleanTrue);
-	status = IOServiceGetMatchingServices(port, match, &drives);
+	status = IOServiceGetMatchingServices(0, match, &drives);
 	if(status != KERN_SUCCESS)
 		return -1;
 

diff --git a/disk/iostat_darwin.h b/disk/iostat_darwin.h
@@ -30,7 +30,3 @@ struct CPUStats {
 };
 
 extern int gopsutil_v3_readdrivestat(DriveStats a[], int n);
-
-#if (MAC_OS_X_VERSION_MIN_REQUIRED < 120000) // Before macOS 12 Monterey
-       #define IOMainPort IOMasterPort
-#endif
diff --git a/host/smc_darwin.c b/host/smc_darwin.c
@@ -72,8 +72,7 @@ kern_return_t gopsutil_v3_open_smc(void) {
   kern_return_t result;
   io_service_t service;
 
-  service = IOServiceGetMatchingService(kIOMainPortDefault,
-                                        IOServiceMatching(IOSERVICE_SMC));
+  service = IOServiceGetMatchingService(0, IOServiceMatching(IOSERVICE_SMC));
   if (service == 0) {
     // Note: IOServiceMatching documents 0 on failure
     printf("ERROR: %s NOT FOUND\n", IOSERVICE_SMC);

diff --git a/host/smc_darwin.h b/host/smc_darwin.h
@@ -29,9 +29,4 @@ kern_return_t gopsutil_v3_open_smc(void);
 kern_return_t gopsutil_v3_close_smc(void);
 double gopsutil_v3_get_temperature(char *);
 
-#if (MAC_OS_X_VERSION_MIN_REQUIRED < 120000) // Before macOS 12 Monterey
-	#define kIOMainPortDefault kIOMasterPortDefault
-#endif
-
-
 #endif // __SMC_H__