From edd15150f34b040d5ab68a1b418705c0de895a1e Mon Sep 17 00:00:00 2001 From: Harley Travis Date: Sat, 20 Jun 2026 20:00:32 -0500 Subject: Re-arrange patch files Some of the patches are applied to files in subdirectories of ::/Kernel and ::/Adam. The directory tree has been re-arranged in such a way as to allow them to be #included without having the compiler backtrack to their parent directory. --- Kernel/BlkDev/Patches/BlkDevAddFDC.HC | 28 ++++++++++++++++++++++++++++ Kernel/BlkDev/Patches/BlkDevInitFDC.HC | 8 ++++++++ Kernel/BlkDev/Patches/Let2BlkDevTypeFDC.HC | 22 ++++++++++++++++++++++ Kernel/Patches/BlkDevAddFDC.HC | 28 ---------------------------- Kernel/Patches/BlkDevInitFDC.HC | 8 -------- Kernel/Patches/Let2BlkDevTypeFDC.HC | 22 ---------------------- 6 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 Kernel/BlkDev/Patches/BlkDevAddFDC.HC create mode 100644 Kernel/BlkDev/Patches/BlkDevInitFDC.HC create mode 100644 Kernel/BlkDev/Patches/Let2BlkDevTypeFDC.HC delete mode 100644 Kernel/Patches/BlkDevAddFDC.HC delete mode 100644 Kernel/Patches/BlkDevInitFDC.HC delete mode 100644 Kernel/Patches/Let2BlkDevTypeFDC.HC (limited to 'Kernel') diff --git a/Kernel/BlkDev/Patches/BlkDevAddFDC.HC b/Kernel/BlkDev/Patches/BlkDevAddFDC.HC new file mode 100644 index 0000000..1f9e75a --- /dev/null +++ b/Kernel/BlkDev/Patches/BlkDevAddFDC.HC @@ -0,0 +1,28 @@ +// PATCH: Add the ability to create floppy drvs +// FILE: ::/Kernel/BlkDev/DskAddDev.HC +// TO INSTALL: #include this file at the end of the switch statement. + +case BDT_FLOPPY: + dv->dv_signature=DRV_SIGNATURE_VAL; + if (!BlkDevInit(bd)) + dv->dv_signature=0; + else { + dv->dv_signature=0; + if (make_free) + dv=DrvMakeFreeSlot(bd->first_drive_let); + else + dv=DrvMakeFreeSlot(DrvNextFreeLet(bd->first_drive_let)) + if (bd->heads!=FDCChk(bd)) + dv->fs_type=FSt_UNKNOWN; + else { + FDCReadBlks(bd,&br,0,1); + if (br.signature==MBR_PT_REDSEA && br.signature2==0xAA55) { + dv->dv_signature=DRV_SIGNATURE_VAL; + dv->bd=bd; + dv->fs_type=FSt_REDSEA; + RedSeaInit(dv); + } else + dv->fs_type=FSt_UNKNOWN; + } + } + break; \ No newline at end of file diff --git a/Kernel/BlkDev/Patches/BlkDevInitFDC.HC b/Kernel/BlkDev/Patches/BlkDevInitFDC.HC new file mode 100644 index 0000000..630bad8 --- /dev/null +++ b/Kernel/BlkDev/Patches/BlkDevInitFDC.HC @@ -0,0 +1,8 @@ +// PATCH: Add the ability to init floppy BlkDevs +// FILE: ::/Kernel/BlkDev/DskBlkDev.HC +// TO INSTALL: #include this file at the end of the switch statement. + +case BDT_FLOPPY: + bd->max_writes=bd->max_reads=bd->spt; + res=FDCInit(bd); + break; \ No newline at end of file diff --git a/Kernel/BlkDev/Patches/Let2BlkDevTypeFDC.HC b/Kernel/BlkDev/Patches/Let2BlkDevTypeFDC.HC new file mode 100644 index 0000000..be31e7f --- /dev/null +++ b/Kernel/BlkDev/Patches/Let2BlkDevTypeFDC.HC @@ -0,0 +1,22 @@ +// PATCH: Remaps ltrs W-Z for floppy drives +// FILE: ::/Kernel/BlkDev/DskDrv.HC +// TO INSTALL: Comment out the original function. +// THEN: #include this file after it. + +I64 Let2BlkDevType(U8 drv_let) +{//Drv letter to BlkDev Type. drv_let=0 not allowed. See BDT_NULL. + drv_let=Let2Let(drv_let); + if ('A'<=drv_let<='B') + return BDT_RAM; + if ('C'<=drv_let<='L') + return BDT_ATA; + if ('M'<=drv_let<='P') + return BDT_ISO_FILE_READ; + if ('Q'<=drv_let<='S') + return BDT_ISO_FILE_WRITE; + if ('T'<=drv_let<='V') + return BDT_ATAPI; + if ('W'<=drv_let<='Z') + return BDT_FLOPPY; + return BDT_NULL; +} \ No newline at end of file diff --git a/Kernel/Patches/BlkDevAddFDC.HC b/Kernel/Patches/BlkDevAddFDC.HC deleted file mode 100644 index 1f9e75a..0000000 --- a/Kernel/Patches/BlkDevAddFDC.HC +++ /dev/null @@ -1,28 +0,0 @@ -// PATCH: Add the ability to create floppy drvs -// FILE: ::/Kernel/BlkDev/DskAddDev.HC -// TO INSTALL: #include this file at the end of the switch statement. - -case BDT_FLOPPY: - dv->dv_signature=DRV_SIGNATURE_VAL; - if (!BlkDevInit(bd)) - dv->dv_signature=0; - else { - dv->dv_signature=0; - if (make_free) - dv=DrvMakeFreeSlot(bd->first_drive_let); - else - dv=DrvMakeFreeSlot(DrvNextFreeLet(bd->first_drive_let)) - if (bd->heads!=FDCChk(bd)) - dv->fs_type=FSt_UNKNOWN; - else { - FDCReadBlks(bd,&br,0,1); - if (br.signature==MBR_PT_REDSEA && br.signature2==0xAA55) { - dv->dv_signature=DRV_SIGNATURE_VAL; - dv->bd=bd; - dv->fs_type=FSt_REDSEA; - RedSeaInit(dv); - } else - dv->fs_type=FSt_UNKNOWN; - } - } - break; \ No newline at end of file diff --git a/Kernel/Patches/BlkDevInitFDC.HC b/Kernel/Patches/BlkDevInitFDC.HC deleted file mode 100644 index 630bad8..0000000 --- a/Kernel/Patches/BlkDevInitFDC.HC +++ /dev/null @@ -1,8 +0,0 @@ -// PATCH: Add the ability to init floppy BlkDevs -// FILE: ::/Kernel/BlkDev/DskBlkDev.HC -// TO INSTALL: #include this file at the end of the switch statement. - -case BDT_FLOPPY: - bd->max_writes=bd->max_reads=bd->spt; - res=FDCInit(bd); - break; \ No newline at end of file diff --git a/Kernel/Patches/Let2BlkDevTypeFDC.HC b/Kernel/Patches/Let2BlkDevTypeFDC.HC deleted file mode 100644 index be31e7f..0000000 --- a/Kernel/Patches/Let2BlkDevTypeFDC.HC +++ /dev/null @@ -1,22 +0,0 @@ -// PATCH: Remaps ltrs W-Z for floppy drives -// FILE: ::/Kernel/BlkDev/DskDrv.HC -// TO INSTALL: Comment out the original function. -// THEN: #include this file after it. - -I64 Let2BlkDevType(U8 drv_let) -{//Drv letter to BlkDev Type. drv_let=0 not allowed. See BDT_NULL. - drv_let=Let2Let(drv_let); - if ('A'<=drv_let<='B') - return BDT_RAM; - if ('C'<=drv_let<='L') - return BDT_ATA; - if ('M'<=drv_let<='P') - return BDT_ISO_FILE_READ; - if ('Q'<=drv_let<='S') - return BDT_ISO_FILE_WRITE; - if ('T'<=drv_let<='V') - return BDT_ATAPI; - if ('W'<=drv_let<='Z') - return BDT_FLOPPY; - return BDT_NULL; -} \ No newline at end of file -- cgit v1.2.3