Skip to content

less logs on macos #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

Merged
Bloomca merged 1 commit into from
Aug 31, 2025
Merged

less logs on macos #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions src/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ pub fn read_toc() -> std::io::Result<Toc> {
return Err(std::io::Error::other("TOC read failed"));
}
let data = unsafe { slice::from_raw_parts(buf, len as usize) };
println!(
"TOC len={}, first 16 bytes: {:02X?}",
len,
&data[..16.min(data.len())]
);

// `.to_vec()` will copy the data, so we can free it safely after
let result = parse_toc(data.to_vec());
Expand All @@ -67,11 +62,6 @@ pub fn read_track(toc: &Toc, track_no: u8) -> std::io::Result<Vec<u8>> {
}

let data = unsafe { slice::from_raw_parts(buf, len as usize) };
println!(
"TOC len={}, first 16 bytes: {:02X?}",
len,
&data[..16.min(data.len())]
);

// `.to_vec()` will copy the data, so we can free it safely after
let result = data.to_vec();
Expand Down
24 changes: 0 additions & 24 deletions src/macos_cd_shim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ static io_service_t find_media(const char *bsdName) {
io_iterator_t it = IO_OBJECT_NULL;
io_service_t svc = IO_OBJECT_NULL;

printf("[DEBUG] Looking for BSD name: %s\n", bsdName);

CFMutableDictionaryRef match = IOBSDNameMatching(kIOMainPortDefault, 0, bsdName);
if (!match) {
printf("[ERROR] Failed at IOBSDNameMatching for %s\n", bsdName);
Expand All @@ -117,18 +115,14 @@ static io_service_t find_media(const char *bsdName) {
printf("[ERROR] Failed at IOServiceGetMatchingServices for %s (error: 0x%x)\n", bsdName, kr);
return IO_OBJECT_NULL;
}

printf("[DEBUG] Got service iterator, looking for services...\n");

io_service_t cur;
int service_count = 0;
while ((cur = IOIteratorNext(it))) {
service_count++;
printf("[DEBUG] Found service #%d, checking for CD media...\n", service_count);

// Check if this service directly conforms to IOCDMedia
if (IOObjectConformsTo(cur, kIOCDMediaClass)) {
printf("[DEBUG] Service directly conforms to IOCDMedia!\n");
svc = cur;
IOObjectRetain(svc); // Retain since we're keeping it
IOObjectRelease(cur); // Release our iterator reference
Expand All @@ -144,10 +138,8 @@ static io_service_t find_media(const char *bsdName) {
while (node && parent_depth < 10) { // Limit depth to prevent infinite loops
char className[256];
IOObjectGetClass(node, className);
printf("[DEBUG] Checking parent at depth %d: %s\n", parent_depth, className);

if (IOObjectConformsTo(node, kIOCDMediaClass)) {
printf("[DEBUG] Found IOCDMedia at parent depth %d!\n", parent_depth);
svc = node;
IOObjectRetain(svc); // Retain since we're keeping it
found_cd_media = true;
Expand All @@ -157,7 +149,6 @@ static io_service_t find_media(const char *bsdName) {
// Get parent
io_iterator_t pit = IO_OBJECT_NULL;
if (IORegistryEntryGetParentIterator(node, kIOServicePlane, &pit) != KERN_SUCCESS) {
printf("[DEBUG] No more parents at depth %d\n", parent_depth);
break;
}

Expand All @@ -180,12 +171,6 @@ static io_service_t find_media(const char *bsdName) {

IOObjectRelease(it);

if (svc) {
printf("[SUCCESS] Found CD media service for %s\n", bsdName);
} else {
printf("[ERROR] Could not find CD media service for %s (checked %d services)\n", bsdName, service_count);
}

return svc;
}

Expand Down Expand Up @@ -230,7 +215,6 @@ Boolean get_dev_svc(const char *bsdName) {
return false;
} else {
globalDevSvc = devSvc;
fprintf(stderr, "[TOC] Found device successfully\n");
return true;
}
}
Expand All @@ -249,12 +233,9 @@ static Boolean read_toc(uint8_t **outBuf, uint32_t *outLen) {
SCSITaskInterface **task = NULL;

io_service_t devSvc = globalDevSvc;
fprintf(stderr, "[TOC] After finding device\n");

if (!devSvc) {
fprintf(stderr, "[TOC] Could not find mmc device for bsd\n"); goto fail;
} else {
fprintf(stderr, "[TOC] Found device successfully\n");
}

kern_return_t kret = IOCreatePlugInInterfaceForService(
Expand All @@ -269,15 +250,11 @@ static Boolean read_toc(uint8_t **outBuf, uint32_t *outLen) {
fprintf(stderr, "[TOC] IOCreatePlugInInterfaceForService failed: 0x%x\n", kret);
goto fail;
}
fprintf(stderr, "[TOC] After calling IOCreatePlugInInterfaceForService\n");
HRESULT hr = (*plugin)->QueryInterface(plugin, CFUUIDGetUUIDBytes(kIOMMCDeviceInterfaceID), (LPVOID)&mmc);
fprintf(stderr, "[TOC] After calling QueryInterface\n");

dev = (*mmc)->GetSCSITaskDeviceInterface(mmc);
if (!dev) { fprintf(stderr, "GetSCSITaskDeviceInterface failed\n"); goto fail; }

fprintf(stderr, "[TOC] Got non-null GetSCSITaskDeviceInterface\n");

// We need to get exclusive access, otherwise `CreateSCSITask` will fail
// in order to do so, we need to unmount the disk, claim it and make sure
// we ignore register callbacks from other applications.
Expand Down Expand Up @@ -359,7 +336,6 @@ bool read_cd_audio(uint32_t lba, uint32_t sectors, uint8_t **outBuf, uint32_t *o
SCSITaskDeviceInterface **dev = NULL;

io_service_t devSvc = globalDevSvc;
fprintf(stderr, "[READ] After finding device\n");

if (!devSvc) {
fprintf(stderr, "[READ] Could not find mmc device for bsd\n");
Expand Down