Add support for ALCUserClient and alc-verb under 10.5

acidanthera · Aug 8, 2021 · 1001ce2 · 1001ce2
1 parent 7ff9cef
commit 1001ce2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/AppleALC.xcodeproj/project.pbxproj b/AppleALC.xcodeproj/project.pbxproj
@@ -691,7 +691,7 @@
 				DEVELOPMENT_TEAM = "";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -716,7 +716,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -741,7 +741,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/AppleALC/ALCUserClient/ALCUserClient.cpp b/AppleALC/ALCUserClient/ALCUserClient.cpp
@@ -12,6 +12,7 @@
 
 OSDefineMetaClassAndStructors(ALCUserClient, IOUserClient);
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_4
 const IOExternalMethodDispatch ALCUserClient::sMethods[kNumberOfMethods] = {
 	{ //kMethodExecuteVerb
 		reinterpret_cast<IOExternalMethodAction>(&ALCUserClient::methodExecuteVerb),	// Method pointer
@@ -22,7 +23,6 @@ const IOExternalMethodDispatch ALCUserClient::sMethods[kNumberOfMethods] = {
 	}
 };
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_4
 IOReturn ALCUserClient::externalMethod(uint32_t selector, IOExternalMethodArguments* arguments, IOExternalMethodDispatch* dispatch, OSObject* target, void* reference) {
 	if (selector >= kNumberOfMethods)
 		return kIOReturnUnsupported;
@@ -34,6 +34,36 @@ IOReturn ALCUserClient::externalMethod(uint32_t selector, IOExternalMethodArgume
 
 	return super::externalMethod(selector, arguments, dispatch, target, reference);
 }
+
+#else
+IOExternalMethodACID ALCUserClient::sMethodsLegacy[kNumberOfMethods] = {
+	{ //kMethodExecuteVerb
+		NULL,
+#if defined(__i386__)
+		kIOExternalMethodACIDPadding,
+#endif
+		(IOMethodACID) sendHdaCommandInternal,
+#if defined(__x86_64__)
+		kIOExternalMethodACIDPadding,
+#endif
+		kIOUCScalarIScalarO,
+		3,
+		1
+	}
+};
+
+IOExternalMethod* ALCUserClient::getTargetAndMethodForIndex(IOService **targetP, UInt32 index) {
+	if (index >= kNumberOfMethods)
+		return NULL;
+
+	*targetP = this;
+	return reinterpret_cast<IOExternalMethod*>(&sMethodsLegacy[index]);
+}
+
+IOReturn ALCUserClient::sendHdaCommandInternal(ALCUserClient *that, uint16_t nid, uint16_t verb, uint16_t param, uint64_t *outVal) {
+	*outVal = that->mProvider->sendHdaCommand(nid, verb, param);
+	return kIOReturnSuccess;
+}
 #endif
 
 bool ALCUserClient::initWithTask(task_t owningTask, void* securityToken, UInt32 type, OSDictionary* properties) {

diff --git a/AppleALC/ALCUserClient/ALCUserClient.hpp b/AppleALC/ALCUserClient/ALCUserClient.hpp
@@ -21,7 +21,13 @@ class EXPORT ALCUserClient : public IOUserClient {
 
 	ALCUserClientProvider* mProvider { nullptr };
 	task_t mTask {nullptr};
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_4
 	static const IOExternalMethodDispatch sMethods[kNumberOfMethods];
+#else
+	static IOExternalMethodACID sMethodsLegacy[kNumberOfMethods];
+	static IOReturn sendHdaCommandInternal(ALCUserClient *that, uint16_t nid, uint16_t verb, uint16_t param, uint64_t *outVal);
+#endif
 
 public:
 	virtual bool start(IOService* provider) APPLE_KEXT_OVERRIDE;
@@ -34,6 +40,8 @@ class EXPORT ALCUserClient : public IOUserClient {
 	virtual IOReturn externalMethod(uint32_t selector, IOExternalMethodArguments* arguments,
 									IOExternalMethodDispatch* dispatch, OSObject* target,
 									void* reference) APPLE_KEXT_OVERRIDE;
+#else
+	virtual IOExternalMethod *getTargetAndMethodForIndex(IOService **targetP, UInt32 index) APPLE_KEXT_OVERRIDE;
 #endif
 
 protected: