Merge pull request #20 from mac-can/development

Release Candidate RC2 for Version 0.2.2
mac-can · Dec 23, 2021 · d93fbfe · d93fbfe
2 parents d6227d4 + a28afb8
commit d93fbfe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Sources/MacCAN/MacCAN_IOUsbKit.c b/Sources/MacCAN/MacCAN_IOUsbKit.c
@@ -77,7 +77,7 @@
 
 #define VERSION_MAJOR     0
 #define VERSION_MINOR     2
-#define VERSION_PATCH     1
+#define VERSION_PATCH     2
 
 /*#define OPTION_MACCAN_MULTICHANNEL  0  !* set globally: 0 = only one channel on multi-channel devices */
 /*#define OPTION_MACCAN_PIPE_TIMEOUT  0  !* set globally: 0 = do not use xxxPipeTO variant (e.g. macOS < 10.15) */
@@ -1430,7 +1430,12 @@ static int SetupDirectory(SInt32 vendorID, SInt32 productID)
     kern_return_t           kr;
 
     /* Create a master port for communication with the I/O Kit */
+#if defined(__MAC_12_0) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_12_0)
+    kr = IOMainPort(MACH_PORT_NULL, &masterPort);
+#else
+    /*  'IOMasterPort' is deprecated: first deprecated in macOS 12.0 */
     kr = IOMasterPort(MACH_PORT_NULL, &masterPort);
+#endif
     if (kr || !masterPort)
     {
         MACCAN_DEBUG_ERROR("+++ Couldn't create a master I/O Kit port (%08x)\n", kr);
@@ -1857,5 +1862,5 @@ static void* WorkerThread(void* arg)
     return NULL;
 }
 
-/* * $Id: MacCAN_IOUsbKit.c 1001 2021-05-25 17:57:49Z eris $ *** (c) UV Software, Berlin ***
+/* * $Id: MacCAN_IOUsbKit.c 1045 2021-12-23 15:49:37Z neptune $ *** (c) UV Software, Berlin ***
  */
diff --git a/Sources/MacCAN/README.md b/Sources/MacCAN/README.md
@@ -1,8 +1,8 @@
 ### Creation of USB User-Space Drivers for CAN Interfaces under macOS&reg;
 
-_Copyright &copy; 2012-2021   Uwe Vogt, UV Software, Berlin (info@mac-can.com)_
+_Copyright &copy; 2012-2021 Uwe Vogt, UV Software, Berlin (info@mac-can.com)_
 
-Version $Rev: 1003 $
+Version $Rev: 1045 $
 
 # Running CAN and CAN FD on a Mac&reg;
 
@@ -330,6 +330,4 @@ All other company, product and service names mentioned herein are trademarks, re
 ### Contact
 
 E-Mail: mailto://info@mac.can.com \
-Internet: https://www.mac-can.com
-
-##### *Have a lot of fun!*
+Internet: https://www.mac-can.net