v2.3.3

1、固件版本显示对应版本驱动 2、同步openbsd代码 3、同步iwx代码，支持0x51f1无线网卡
a565109863 · Jun 29, 2023 · 0dab8ef · 0dab8ef
1 parent cae50ff
commit 0dab8ef
Show file tree

Hide file tree

Showing 14 changed files with 247 additions and 111 deletions.
diff --git a/AirPortOpenBSD.xcodeproj/project.pbxproj b/AirPortOpenBSD.xcodeproj/project.pbxproj
@@ -3598,7 +3598,10 @@
 				GCC_INPUT_FILETYPE = sourcecode.cpp.cpp;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = AirPortOpenBSD/PrivateSPI.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = __PRIVATE_SPI__;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					__PRIVATE_SPI__,
+					"$(inherited)",
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -3633,7 +3636,7 @@
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3651,14 +3654,17 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)";
 				CURRENT_PROJECT_VERSION = 1.0.0d1;
-				GCC_PREPROCESSOR_DEFINITIONS = "MAC_VERSION_MAJOR=20";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"MAC_VERSION_MAJOR=20",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = AirPortOpenBSD/Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3686,7 +3692,7 @@
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3704,14 +3710,17 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)";
 				CURRENT_PROJECT_VERSION = 1.0.0d1;
-				GCC_PREPROCESSOR_DEFINITIONS = "MAC_VERSION_MAJOR=19";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"MAC_VERSION_MAJOR=19",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = AirPortOpenBSD/Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3739,7 +3748,7 @@
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3757,14 +3766,17 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)";
 				CURRENT_PROJECT_VERSION = 1.0.0d1;
-				GCC_PREPROCESSOR_DEFINITIONS = "MAC_VERSION_MAJOR=18";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"MAC_VERSION_MAJOR=18",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = AirPortOpenBSD/Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3792,7 +3804,7 @@
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3810,14 +3822,17 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)";
 				CURRENT_PROJECT_VERSION = 1.0.0d1;
-				GCC_PREPROCESSOR_DEFINITIONS = "MAC_VERSION_MAJOR=17";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"MAC_VERSION_MAJOR=17",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = AirPortOpenBSD/Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3871,7 +3886,7 @@
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3890,14 +3905,17 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)";
 				CURRENT_PROJECT_VERSION = 1.0.0d1;
-				GCC_PREPROCESSOR_DEFINITIONS = "MAC_VERSION_MAJOR=21";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"MAC_VERSION_MAJOR=21",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = AirPortOpenBSD/InfoLegacy.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3927,7 +3945,7 @@
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";
@@ -3946,14 +3964,17 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)/$(CONFIGURATION)";
 				CURRENT_PROJECT_VERSION = 1.0.0d1;
-				GCC_PREPROCESSOR_DEFINITIONS = "MAC_VERSION_MAJOR=22";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"MAC_VERSION_MAJOR=22",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = AirPortOpenBSD/InfoLegacy.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13;
-				MARKETING_VERSION = v2.3.2;
+				MARKETING_VERSION = v2.3.3;
 				MODULE_NAME = com.zhong.AirPortOpenBSD;
 				MODULE_VERSION = 1.0.0d1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.zhong.$(PRODUCT_NAME:c99extidentifier)";

diff --git a/...codeproj/project.xcworkspace/xcuserdata/mac-pc.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/mac-pc.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...D.xcodeproj/project.xcworkspace/xcuserdata/tal.xcuserdatad/UserInterfaceState.xcuserstate b/...D.xcodeproj/project.xcworkspace/xcuserdata/tal.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/test.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/test.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AirPortOpenBSD.xcodeproj/xcuserdata/mac-pc.xcuserdatad/xcschemes/xcschememanagement.plist b/AirPortOpenBSD.xcodeproj/xcuserdata/mac-pc.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -17,17 +17,17 @@
 		<key>AirPortOpenBSD_HighSierra.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>5</integer>
 		</dict>
 		<key>AirPortOpenBSD_Mojave.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 		<key>AirPortOpenBSD_Monterey.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>4</integer>
 		</dict>
 		<key>AirPortOpenBSD_Ventura.xcscheme_^#shared#^_</key>
 		<dict>

diff --git a/AirPortOpenBSD.xcodeproj/xcuserdata/tal.xcuserdatad/xcschemes/xcschememanagement.plist b/AirPortOpenBSD.xcodeproj/xcuserdata/tal.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>AirPortOpenBSD_BigSur.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>4</integer>
 		</dict>
 		<key>AirPortOpenBSD_Catalina.xcscheme_^#shared#^_</key>
 		<dict>
@@ -22,12 +22,12 @@
 		<key>AirPortOpenBSD_HighSierra.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>5</integer>
 		</dict>
 		<key>AirPortOpenBSD_Mojave.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>3</integer>
 		</dict>
 		<key>AirPortOpenBSD_Monterey.xcscheme_^#shared#^_</key>
 		<dict>

diff --git a/AirPortOpenBSD.xcodeproj/xcuserdata/test.xcuserdatad/xcschemes/xcschememanagement.plist b/AirPortOpenBSD.xcodeproj/xcuserdata/test.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/AirPortOpenBSD/AirPort_OpenBSD_IOCTL.cpp b/AirPortOpenBSD/AirPort_OpenBSD_IOCTL.cpp
@@ -1347,7 +1347,7 @@ IOReturn AirPort_OpenBSD_Class::getDRIVER_VERSION(OSObject *object, struct apple
     hv->version = APPLE80211_VERSION;
 
     char fwname[256];
-    snprintf(fwname, sizeof(fwname), "AirPortOpenBSD %s", ifp->fwver);
+    snprintf(fwname, sizeof(fwname), "%s %s", PRODUCT_NAME, ifp->fwver);
 
     strncpy(hv->string, fwname, sizeof(hv->string));
     hv->string_len = strlen(fwname);

diff --git a/AirPortOpenBSD/apple80211.h b/AirPortOpenBSD/apple80211.h
@@ -17,41 +17,47 @@
 #define MAC_VERSION_MAJOR_Ventura       22
 
 #if MAC_VERSION_MAJOR == MAC_VERSION_MAJOR_Ventura
+#define PRODUCT_NAME                    "AirPortOpenBSD_Ventura"
 #define AirPort_OpenBSD_Class           AirPortOpenBSD_Ventura
 #define AirPort_OpenBSD_Class_Interface AirPortOpenBSD_Ventura_Interface
 #define IOTimeout_Class                 IOTimeout_Ventura
 #define pci_intr_handle_class           pci_intr_handle_Ventura
 #endif
 
 #if MAC_VERSION_MAJOR == MAC_VERSION_MAJOR_Monterey
+#define PRODUCT_NAME                    "AirPortOpenBSD_Monterey"
 #define AirPort_OpenBSD_Class           AirPortOpenBSD_Monterey
 #define AirPort_OpenBSD_Class_Interface AirPortOpenBSD_Monterey_Interface
 #define IOTimeout_Class                 IOTimeout_Monterey
 #define pci_intr_handle_class           pci_intr_handle_Monterey
 #endif
 
 #if MAC_VERSION_MAJOR == MAC_VERSION_MAJOR_BigSur
+#define PRODUCT_NAME                    "AirPortOpenBSD_BigSur"
 #define AirPort_OpenBSD_Class           AirPortOpenBSD_BigSur
 #define AirPort_OpenBSD_Class_Interface AirPortOpenBSD_BigSur_Interface
 #define IOTimeout_Class                 IOTimeout_BigSur
 #define pci_intr_handle_class           pci_intr_handle_BigSur
 #endif
 
 #if MAC_VERSION_MAJOR == MAC_VERSION_MAJOR_Catalina
+#define PRODUCT_NAME                    "AirPortOpenBSD_Catalina"
 #define AirPort_OpenBSD_Class           AirPortOpenBSD_Catalina
 #define AirPort_OpenBSD_Class_Interface AirPortOpenBSD_Catalina_Interface
 #define IOTimeout_Class                 IOTimeout_Catalina
 #define pci_intr_handle_class           pci_intr_handle_Catalina
 #endif
 
 #if MAC_VERSION_MAJOR == MAC_VERSION_MAJOR_Mojave
+#define PRODUCT_NAME                    "AirPortOpenBSD_Mojave"
 #define AirPort_OpenBSD_Class           AirPortOpenBSD_Mojave
 #define AirPort_OpenBSD_Class_Interface AirPortOpenBSD_Mojave_Interface
 #define IOTimeout_Class                 IOTimeout_Mojave
 #define pci_intr_handle_class           pci_intr_handle_Mojave
 #endif
 
 #if MAC_VERSION_MAJOR == MAC_VERSION_MAJOR_HighSierra
+#define PRODUCT_NAME                    "AirPortOpenBSD_HighSierra"
 #define AirPort_OpenBSD_Class           AirPortOpenBSD_HighSierra
 #define AirPort_OpenBSD_Class_Interface AirPortOpenBSD_HighSierra_Interface
 #define IOTimeout_Class                 IOTimeout_HighSierra

diff --git a/AirPortOpenBSD/openbsd/crypto/sha2.c b/AirPortOpenBSD/openbsd/crypto/sha2.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: sha2.c,v 1.20 2022/08/29 06:08:03 jsg Exp $    */
+/*    $OpenBSD: sha2.c,v 1.21 2022/12/27 20:13:03 patrick Exp $    */
 
 /*
  * FILE:    sha2.c
@@ -472,7 +472,7 @@ SHA256Update(SHA2_CTX *context, const void *dataptr, size_t len)
 }
 
 void
-SHA256Final(u_int8_t digest[], SHA2_CTX *context)
+SHA256Final(u_int8_t *digest, SHA2_CTX *context)
 {
     unsigned int    usedspace;
 
@@ -797,7 +797,7 @@ SHA512Last(SHA2_CTX *context)
 }
 
 void
-SHA512Final(u_int8_t digest[], SHA2_CTX *context)
+SHA512Final(u_int8_t *digest, SHA2_CTX *context)
 {
 
     SHA512Last(context);
@@ -836,7 +836,7 @@ SHA384Update(SHA2_CTX *context, const void *data, size_t len)
 }
 
 void
-SHA384Final(u_int8_t digest[], SHA2_CTX *context)
+SHA384Final(u_int8_t *digest, SHA2_CTX *context)
 {
 
     SHA512Last(context);

diff --git a/AirPortOpenBSD/openbsd/dev/pci/if_iwm.c b/AirPortOpenBSD/openbsd/dev/pci/if_iwm.c
@@ -10926,14 +10926,14 @@ iwm_dump_driver_status(struct iwm_softc *sc)
 do {                                    \
     bus_dmamap_sync(sc->sc_dmat, data->map, sizeof(*(_pkt_)),    \
         sizeof(*(_var_)), BUS_DMASYNC_POSTREAD);            \
-    _var_ = (typeof (_var_))((_pkt_)+1);                    \
+    _var_ = (typeof _var_)((_pkt_)+1);                    \
 } while (/*CONSTCOND*/0)
 
 #define SYNC_RESP_PTR(_ptr_, _len_, _pkt_)                \
 do {                                    \
     bus_dmamap_sync(sc->sc_dmat, data->map, sizeof(*(_pkt_)),    \
         sizeof(len), BUS_DMASYNC_POSTREAD);                \
-    _ptr_ = (typeof (_ptr_))((_pkt_)+1);                    \
+    _ptr_ = (typeof _ptr_)((_pkt_)+1);                    \
 } while (/*CONSTCOND*/0)
 
 #define ADVANCE_RXQ(sc) (sc->rxq.cur = (sc->rxq.cur + 1) % count);