Skip to content

MSC: pair install-path printfs with _LOG for COM1 capture #37

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

Open
netrunner01 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MSC: pair install-path printfs with _LOG for COM1 capture #37

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: 10 additions & 0 deletions USBDDOS/CLASS/msc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,11 +700,13 @@ static BOOL USB_MSC_DOS_InstallDevice(USB_Device* pDevice) //ref: https://gi

if(!result)
{
_LOG("MSC: Error reading boot sector\n"); /* F-AUDIT-3 */
printf("MSC: Error reading boot sector.\n");
return FALSE;
}
if(TSRData.bpb.DOS20.BPS != pDriverData->BlockSize || (memcmp(TSRData.bpb.DOS40.FS, "FAT",3) != 0 && memcmp(TSRData.bpb.DOS70.FS, "FAT",3) != 0))
{
_LOG("MSC: BPB not found (BPS=%u expected %u)\n", TSRData.bpb.DOS20.BPS, pDriverData->BlockSize); /* F-AUDIT-3 */
printf("MSC: BPB not found.\n");
return FALSE;
}
Expand Down Expand Up @@ -954,10 +956,17 @@ static BOOL USB_MSC_DOS_InstallDevice(USB_Device* pDevice) //ref: https://gi
free(cds);
free(buf);

/* F-AUDIT-3: braces required so _LOG and printf both run on the chosen branch */
if(overriden)
{
_LOG("MSC: Disk %s %s BIOS-overridden, drive %c:\n", pDevice->sManufacture, pDevice->sProduct, 'A' + CDSIndex);
printf("USB Disk \'%s %s\': BIOS driver overrided, remounted as drive %c:.\n", pDevice->sManufacture, pDevice->sProduct, 'A' + CDSIndex);
}
else
{
_LOG("MSC: Disk %s %s mounted, drive %c:\n", pDevice->sManufacture, pDevice->sProduct, 'A' + CDSIndex);
printf("USB Disk \'%s %s\' mounted as drive %c:.\n", pDevice->sManufacture, pDevice->sProduct, 'A' + CDSIndex);
}
return TRUE;
}

Expand All @@ -967,6 +976,7 @@ BOOL USB_MSC_DOS_Install()
MSC_DriverINT_RMCB = DPMI_AllocateRMCB_RETF(&USB_MSC_DOS_DriverINT, &MSC_DOSDriverReg);
if(MSC_DriverINT_RMCB == 0)
{
_LOG("MSC: Driver install failed - RMCB allocation\n"); /* F-AUDIT-3 */
printf("MSC Driver Install: Error Allocating RMCB.\n");
return FALSE;
}
Expand Down