Skip to content

Tahoe support #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dhinakg wants to merge 4 commits into
base: main
Choose a base branch
from
+94 −13
Draft

Tahoe support #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f86ca42
Bump to 1.2.0
dhinakg Jun 10, 2025
f397910
Switch some logs to non-debug
dhinakg Jun 10, 2025
36466ec
First iteration of port fixing code
dhinakg Jun 10, 2025
a22ea1e
Move kernel major declaration to headers
dhinakg Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions USBToolBox.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,14 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1.1.1;
CURRENT_PROJECT_VERSION = 1.2.0;
INFOPLIST_FILE = USBToolBox/Info.plist;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
);
MODULE_NAME = com.dhinakg.USBToolBox.kext;
MODULE_VERSION = 1.1.1;
MODULE_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.dhinakg.USBToolBox.kext;
PRODUCT_NAME = "$(TARGET_NAME)";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand All @@ -334,14 +334,14 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.1.1;
CURRENT_PROJECT_VERSION = 1.2.0;
INFOPLIST_FILE = USBToolBox/Info.plist;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/MacKernelSDK/Library/x86_64",
);
MODULE_NAME = com.dhinakg.USBToolBox.kext;
MODULE_VERSION = 1.1.1;
MODULE_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.dhinakg.USBToolBox.kext;
PRODUCT_NAME = "$(TARGET_NAME)";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down
95 changes: 86 additions & 9 deletions USBToolBox/USBToolBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ IORegistryEntry* USBToolBox::getControllerViaMatching() {
if (controller) {
DEBUGLOGPROV("waitForMatchingService successful");
} else {
SYSTEMLOGPROV("waitForMatchingService failed or timed out");
SYSTEMLOGPROV("waitForMatchingService failed or timed out, will try different method");
}
return controller;
}
Expand Down Expand Up @@ -212,7 +212,70 @@ void USBToolBox::deleteProperty(IORegistryEntry* entry, const char* property) {
}
}

OSObject* USBToolBox::fixMapForTahoe(OSObject* object) {
OSDictionary* ports = OSDynamicCast(OSDictionary, object);
if (!ports) {
SYSTEMLOGPROV("Ports is not a dictionary, skipping");
return object;
}

OSDictionary* portsCopy = OSDynamicCast(OSDictionary, ports->copyCollection());
if (!portsCopy) {
SYSTEMLOGPROV("Failed to copy ports dictionary, skipping");
return object;
}
OSSafeReleaseNULL(ports);

const OSSymbol* portSymbol = OSSymbol::withCString("port");
const OSSymbol* usbConnectorSymbol = OSSymbol::withCString("UsbConnector");
const OSSymbol* portNumberSymbol = OSSymbol::withCString("usb-port-number");
const OSSymbol* portTypeSymbol = OSSymbol::withCString("usb-port-type");

if (OSCollectionIterator* propertyIterator = OSCollectionIterator::withCollection(portsCopy)) {
DEBUGLOGPROV("Starting iteration over ports");
while (OSSymbol* key = OSDynamicCast(OSSymbol, propertyIterator->getNextObject())) {
OSObject* value = portsCopy->getObject(key);
OSDictionary* portDict = OSDynamicCast(OSDictionary, value);
if (!portDict) {
DEBUGLOGPROV("Port %s is not a dictionary, skipping", key->getCStringNoCopy());
continue;
}

if (portDict->getObject(portNumberSymbol)) {
DEBUGLOGPROV("Port %s already has usb-port-number, skipping", key->getCStringNoCopy());
} else if (!portDict->getObject(portSymbol)) {
DEBUGLOGPROV("Port %s does not have port, skipping", key->getCStringNoCopy());
} else {
DEBUGLOGPROV("Port %s does not have usb-port-number, copying port to usb-port-number", key->getCStringNoCopy());
portDict->setObject(portNumberSymbol, portDict->getObject(portSymbol));
}

if (portDict->getObject(portTypeSymbol)) {
DEBUGLOGPROV("Port %s already has usb-port-type, skipping", key->getCStringNoCopy());
} else if (!portDict->getObject(usbConnectorSymbol)) {
DEBUGLOGPROV("Port %s does not have UsbConnector, skipping", key->getCStringNoCopy());
} else {
DEBUGLOGPROV("Port %s does not have usb-port-type, copying UsbConnector to usb-port-type", key->getCStringNoCopy());
portDict->setObject(portTypeSymbol, portDict->getObject(usbConnectorSymbol));
}
}
DEBUGLOGPROV("Successfully fixed ports");
OSSafeReleaseNULL(propertyIterator);
} else {
SYSTEMLOGPROV("Failed to create ports iterator!");
}

OSSafeReleaseNULL(portTypeSymbol);
OSSafeReleaseNULL(usbConnectorSymbol);
OSSafeReleaseNULL(portNumberSymbol);
OSSafeReleaseNULL(portSymbol);

return portsCopy;
}

void USBToolBox::mergeProperties(IORegistryEntry* instance) {
const OSSymbol* portsSymbol = OSSymbol::withCString("ports");

if (instance) {
this->controllerInstance = instance;
}
Expand All @@ -238,10 +301,23 @@ void USBToolBox::mergeProperties(IORegistryEntry* instance) {
if (OSCollectionIterator* propertyIterator = OSCollectionIterator::withCollection(properties)) {
DEBUGLOGPROV("Starting iteration over properties");
while (OSSymbol* key = OSDynamicCast(OSSymbol, propertyIterator->getNextObject())) {
OSObject* value = properties->getObject(key);
if (!value) {
DEBUGLOGPROV("Property %s is null, skipping", key->getCStringNoCopy());
continue;
}
value->retain(); // Needed for proper handling in fixMapForTahoe

if (key == portsSymbol && version_major >= 25) {
DEBUGLOGPROV("Fixing map");
value = fixMapForTahoe(value);
}

//DEBUGLOGPROV("Applied property %s", key->getCStringNoCopy());
this->controllerInstance->setProperty(key, properties->getObject(key));
this->controllerInstance->setProperty(key, value);
OSSafeReleaseNULL(value);
}
DEBUGLOGPROV("Successfully applied map");
SYSTEMLOGPROV("Successfully applied map");
OSSafeReleaseNULL(propertyIterator);
} else {
SYSTEMLOGPROV("Failed to create property iterator!");
Expand All @@ -254,6 +330,7 @@ void USBToolBox::mergeProperties(IORegistryEntry* instance) {
SYSTEMLOGPROV("Map disabled, continuing");
}
this->controllerInstance->release();
OSSafeReleaseNULL(portsSymbol);
}

void USBToolBox::removeACPIPorts() {
Expand Down Expand Up @@ -321,7 +398,7 @@ IOService* USBToolBox::probe(IOService* provider, SInt32* score) {
this->controllerInstance = getControllerViaMatching();
}
if (!(this->controllerInstance)) {
DEBUGLOGPROV("Failed to obtain via matching in probe");
SYSTEMLOGPROV("Failed to obtain via matching in probe, will try during start");
} else {
mergeProperties();
DEBUGLOGPROV("Probe early finish");
Expand All @@ -341,7 +418,7 @@ bool USBToolBox::matchingCallback(OSDictionary* matchingDict, IOService* newServ
// Should never be null, but better safe than sorry.
OSSafeReleaseNULL(matchingDict);

DEBUGLOGPROV("controller callback end");
SYSTEMLOGPROV("Controller notifier callback finished, goodbye!");
terminate();
return true;
}
Expand All @@ -357,12 +434,12 @@ bool USBToolBox::start(IOService *provider) {
this->controllerInstance = getControllerViaMatching();

if (!(this->controllerInstance)) {
DEBUGLOGPROV("Failed to obtain via matching, falling back to iteration");
SYSTEMLOGPROV("Failed to obtain via matching, falling back to iteration");
this->controllerInstance = getControllerViaIteration();
}

if (!(this->controllerInstance)) {
DEBUGLOGPROV("Failed to obtain via iteration, falling back to notification");
SYSTEMLOGPROV("Failed to obtain via iteration, falling back to notification");
OSDictionary* matchingDict = createMatchingDictionary();

if (!matchingDict) {
Expand All @@ -376,10 +453,10 @@ bool USBToolBox::start(IOService *provider) {
}
// static IONotifier* addMatchingNotification(const OSSymbol* type, OSDictionary* matching, IOServiceMatchingNotificationHandler handler, void* target, void* ref = NULL, SInt32 priority = 0)
IONotifier* notifierStatus = addMatchingNotification(gIOMatchedNotification, matchingDict, _matchingCallback, this, matchingDict);
DEBUGLOGPROV("Installed controller notifier status: %s", notifierStatus ? "successful" : "failed");
SYSTEMLOGPROV("Installed controller notifier status: %s", notifierStatus ? "successful" : "failed");
} else {
mergeProperties();
DEBUGLOGPROV("Successfully applied properties, exiting");
SYSTEMLOGPROV("Successfully applied properties, exiting");
return false;
}
DEBUGLOGPROV("start exit");
Expand Down
4 changes: 4 additions & 0 deletions USBToolBox/USBToolBox.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
#define DEBUGLOGPROV(format, args...)
#endif

// Kernel major
extern const int version_major;


class USBToolBox : public IOService {
OSDeclareDefaultStructors(USBToolBox)
Expand Down Expand Up @@ -82,6 +85,7 @@ class USBToolBox : public IOService {
static bool _matchingCallback(void* matchingDict, void* refCon, IOService* newService, IONotifier* notifier);
IORegistryEntry* getControllerViaMatching();
IORegistryEntry* getControllerViaIteration();
OSObject* fixMapForTahoe(OSObject* object);
void mergeProperties(IORegistryEntry* instance = NULL);
void removeACPIPorts();

Expand Down