From d494feece238d2d7cdd2f17d376325fe668d65cc Mon Sep 17 00:00:00 2001 From: lvs1974 Date: Thu, 4 Oct 2018 20:01:45 +0200 Subject: [PATCH] Issue with unresolved symbols is solved, checked in Xcode 10.0 and in Xcode 7.2.1 (plugin is loaded in 10.10.5) --- AirportBrcmFixup.xcodeproj/project.pbxproj | 4 ++-- AirportBrcmFixup/kern_brcmfx.cpp | 2 +- AirportBrcmFixup/kern_start.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AirportBrcmFixup.xcodeproj/project.pbxproj b/AirportBrcmFixup.xcodeproj/project.pbxproj index 6520f92..d395aa1 100644 --- a/AirportBrcmFixup.xcodeproj/project.pbxproj +++ b/AirportBrcmFixup.xcodeproj/project.pbxproj @@ -379,7 +379,7 @@ MODULE_NAME = as.lvs1974.AirportBrcmFixup; MODULE_START = "$(PRODUCT_NAME)_kern_start"; MODULE_STOP = "$(PRODUCT_NAME)_kern_stop"; - MODULE_VERSION = 1.1.5; + MODULE_VERSION = 1.1.6; OTHER_CFLAGS = ( "-mmmx", "-msse", @@ -424,7 +424,7 @@ MODULE_NAME = as.lvs1974.AirportBrcmFixup; MODULE_START = "$(PRODUCT_NAME)_kern_start"; MODULE_STOP = "$(PRODUCT_NAME)_kern_stop"; - MODULE_VERSION = 1.1.5; + MODULE_VERSION = 1.1.6; OTHER_CFLAGS = ( "-mmmx", "-msse", diff --git a/AirportBrcmFixup/kern_brcmfx.cpp b/AirportBrcmFixup/kern_brcmfx.cpp index 556c453..e775048 100644 --- a/AirportBrcmFixup/kern_brcmfx.cpp +++ b/AirportBrcmFixup/kern_brcmfx.cpp @@ -133,7 +133,7 @@ bool BRCMFX::start(IOService* service, IOService* provider) if (callbackBRCMFX->wl_msg_level2 && ADDPR(brcmfx_config).wl_msg_level2 != 0) *callbackBRCMFX->wl_msg_level2 = ADDPR(brcmfx_config).wl_msg_level2; - auto data = OSDynamicCast(OSData, provider->getProperty(ADDPR(brcmfx_config).bootargBrcmCountry)); + auto data = OSDynamicCast(OSData, provider->getProperty(Configuration::bootargBrcmCountry)); if (data) { lilu_os_strncpy(callbackBRCMFX->provider_country_code, reinterpret_cast(data->getBytesNoCopy()), data->getLength()); diff --git a/AirportBrcmFixup/kern_start.cpp b/AirportBrcmFixup/kern_start.cpp index 493350b..dd638b5 100644 --- a/AirportBrcmFixup/kern_start.cpp +++ b/AirportBrcmFixup/kern_start.cpp @@ -28,13 +28,13 @@ const char *Configuration::bootargBeta[] { Configuration ADDPR(brcmfx_config); void Configuration::readArguments() { - country_code_overrided = PE_parse_boot_argn(ADDPR(brcmfx_config).bootargBrcmCountry, country_code, sizeof(country_code)); + country_code_overrided = PE_parse_boot_argn(bootargBrcmCountry, country_code, sizeof(country_code)); - PE_parse_boot_argn(ADDPR(brcmfx_config).bootargWlanMsgLevel, &wl_msg_level, sizeof(wl_msg_level)); - PE_parse_boot_argn(ADDPR(brcmfx_config).bootargWlanMsgLevel2, &wl_msg_level2, sizeof(wl_msg_level2)); + PE_parse_boot_argn(bootargWlanMsgLevel, &wl_msg_level, sizeof(wl_msg_level)); + PE_parse_boot_argn(bootargWlanMsgLevel2, &wl_msg_level2, sizeof(wl_msg_level2)); - disabled = checkKernelArgument(ADDPR(brcmfx_config).bootargOff[0]); - enable_wowl = checkKernelArgument(ADDPR(brcmfx_config).bootargBrcmEnableWowl); + disabled = checkKernelArgument(bootargOff[0]); + enable_wowl = checkKernelArgument(bootargBrcmEnableWowl); } PluginConfiguration ADDPR(config) {