Merge pull request #241 from davidgiven/neo

davidgiven · web-flow · commit f1ca11f4aee9 · 2025-05-21T01:26:50.000+02:00
Allow DPBs and DPHs to be defined separately.
diff --git a/include/cpm65.inc b/include/cpm65.inc
@@ -161,7 +161,7 @@
 #define DPB_CKS      11  /* checksum vector size */
 #define DPB_OFF      13  /* number of reserved sectors */
 
-.macro define_drive name, sectors, blocksize, dirents, reserved
+.macro define_dpb name, sectors, blocksize, dirents, reserved
     .if \blocksize == 1024
         block_shift = 3
     .elseif \blocksize == 2048
@@ -217,13 +217,6 @@
 
 .data
 \name:
-    .word 0, 0, 0, 0    ; CP/M workspace
-    .word directory_buffer
-    .word 1f
-    .word 2f
-    .word 3f
-
-1:
     .word 0             ; unused
     .byte block_shift   ; block shift
     .byte (1<<block_shift)-1 ; block mask
@@ -235,10 +228,23 @@
     .word checksum_buffer_size ; checksum vector size
     .word \reserved     ; number of reserved _sectors_ on disk
 
+    checksum_buffer_size_\name = checksum_buffer_size
+    allocation_vector_size_\name = allocation_vector_size
+.endmacro
+
+.macro define_dph name, dpb
+.data
+\name:
+    .word 0, 0, 0, 0    ; CP/M workspace
+    .word directory_buffer
+    .word \dpb
+    .word 1f
+    .word 2f
+
 NOINIT
 
-2: .fill checksum_buffer_size
-3: .fill allocation_vector_size
+1: .fill checksum_buffer_size_\dpb
+2: .fill allocation_vector_size_\dpb
 
 .endmacro
 
diff --git a/src/arch/apple2e/apple2e.S b/src/arch/apple2e/apple2e.S
@@ -1412,8 +1412,9 @@ mem_base:   .byte __TPA0_START__@mos16hi, __TPA1_START__@mos16hi
 mem_end:    .byte __TPA0_END__@mos16hi,   __TPA1_END__@mos16hi
 
 ; DPH for drive 0 and 1
-define_drive dph, 0x42e, 1024, 64, 32
-define_drive dph_b, 0x42e, 1024, 64, 32
+define_dpb dpb, 0x42e, 1024, 64, 32
+define_dph dph, dpb
+define_dph dph_b, dpb
 
 .section aligneddata, "ax", @nobits
 disk_twos_buffer:   .fill 86 ; must be aligned
diff --git a/src/arch/atari800/atari800.S b/src/arch/atari800/atari800.S
@@ -1108,13 +1108,15 @@ mem_end:  .byte 0
 ; 18 reserved sectors
 
 #ifdef ATARI_HD
-define_drive dph, 8190, 2048, 128, 18
-define_drive dph_b, 8190, 2048, 128, 18
+define_dpb atari_hd, 8190, 2048, 128, 18
+define_dph dph, atari_hd
+define_dph dph_b, atari_hd
 #else
-define_drive dph, 720, 1024, 64, 18
-define_drive dph_b, 720, 1024, 64, 18
-define_drive dph_c, 720, 1024, 64, 18
-define_drive dph_d, 720, 1024, 64, 18
+define_dpb atari_fd, 720, 1024, 64, 18
+define_dph dph, atari_fd
+define_dph dph_b, atari_fd
+define_dph dph_c, atari_fd
+define_dph dph_d, atari_fd
 #endif
 
     .section .noinit, "ax", @nobits
diff --git a/src/arch/bbcmicro/bbcmicro.S b/src/arch/bbcmicro/bbcmicro.S
@@ -507,7 +507,8 @@ drvtop: .word drv_TTY
 
 ; DPH for drive 0 (our only drive)
 
-define_drive dph, 0x600, 1024, 64, 0
+define_dpb dpb, 0x600, 1024, 64, 0
+define_dph dph, dpb
 
 directory_buffer = _start
 
diff --git a/src/arch/commodore/c64.S b/src/arch/commodore/c64.S
@@ -993,7 +993,8 @@ mem_end:    .byte __USERTPA_END__@mos16hi
 
 ; DPH for drive 0 (our only drive)
 
-define_drive dph, 136*10, 1024, 64, 0
+define_dpb dpb, 136*10, 1024, 64, 0
+define_dph dph, dpb
 
 NOINIT
 
diff --git a/src/arch/commodore/ieee488.S b/src/arch/commodore/ieee488.S
@@ -485,8 +485,9 @@ directory_buffer: .fill 128
 disk_buffer:      .fill 256
 buffer_dirty:     .fill 1 ; non-zero if sector needs flushing
 
-; DPH for drive 0 (our only drive)
+; DPH and DPB for drive 0 (our only drive)
 
-define_drive dph, 136*10, 1024, 64, 0
+define_dpb dpb_1541, 136*10, 1024, 64, 0
+define_dph dph, dpb_1541
 
 
diff --git a/src/arch/kim-1/kim-1-iec.S b/src/arch/kim-1/kim-1-iec.S
@@ -413,7 +413,8 @@ zendproc
 
 ; DPH for drive 0 (our only drive)
 
-define_drive dph0, 136*10, 1024, 64, 0
+define_dpb dpb, 136*10, 1024, 64, 0
+define_dph dph0, dpb
 
 .bss
 
diff --git a/src/arch/kim-1/kim-1-k1013.S b/src/arch/kim-1/kim-1-k1013.S
@@ -286,10 +286,11 @@ dphtab:
     .word dph3
 dphtab_end:
 
-define_drive dph0, 77*52, 2048, 128, 52
-define_drive dph1, 77*52, 2048, 128, 52
-define_drive dph2, 77*52, 2048, 128, 52
-define_drive dph3, 77*52, 2048, 128, 52
+define_dpb dpb, 77*52, 2048, 128, 52
+define_dph dph0, dpb
+define_dph dph1, dpb
+define_dph dph2, dpb
+define_dph dph3, dpb
 
 .bss
 
diff --git a/src/arch/kim-1/kim-1-sdcard.S b/src/arch/kim-1/kim-1-sdcard.S
@@ -202,7 +202,8 @@ zendproc
 
 ; DPH for drives 0
 
-define_drive dph0, 4096*64, 4096, 1024, 64
+define_dpb dpb, 4096*64, 4096, 1024, 64
+define_dph dph0, dpb
 
 .bss
 
diff --git a/src/arch/kim-1/kim-1-sdshield.S b/src/arch/kim-1/kim-1-sdshield.S
@@ -247,10 +247,11 @@ dphtab:
     .word dph_floppyD
 dphtab_end:
 
-define_drive dph_floppyA, TRACKS*SECTORS_PER_TRACK*2, 2048, 128, SECTORS_PER_TRACK*2
-define_drive dph_floppyB, TRACKS*SECTORS_PER_TRACK*2, 2048, 128, SECTORS_PER_TRACK*2
-define_drive dph_floppyC, TRACKS*SECTORS_PER_TRACK*2, 2048, 128, SECTORS_PER_TRACK*2
-define_drive dph_floppyD, TRACKS*SECTORS_PER_TRACK*2, 2048, 128, SECTORS_PER_TRACK*2
+define_dpb dpb, TRACKS*SECTORS_PER_TRACK*2, 2048, 128, SECTORS_PER_TRACK*2
+define_dph dph_floppyA, dpb
+define_dph dph_floppyB, dpb
+define_dph dph_floppyC, dpb
+define_dph dph_floppyD, dpb
 
 .bss
 
diff --git a/src/arch/nano6502/nano6502.S b/src/arch/nano6502/nano6502.S
@@ -1110,25 +1110,27 @@ cpm_sector: .fill 3
 ; DPH for drives
 ;
 
-define_drive dph_a, 128*64, 2048, 128, 0
-define_drive dph_b, 128*64, 2048, 128, 0
-define_drive dph_c, 128*64, 2048, 128, 0
-define_drive dph_d, 128*64, 2048, 128, 0
-
-define_drive dph_e, 128*64, 2048, 128, 0
-define_drive dph_f, 128*64, 2048, 128, 0
-define_drive dph_g, 128*64, 2048, 128, 0
-define_drive dph_h, 128*64, 2048, 128, 0
-
-define_drive dph_i, 128*64, 2048, 128, 0
-define_drive dph_j, 128*64, 2048, 128, 0
-define_drive dph_k, 128*64, 2048, 128, 0
-define_drive dph_l, 128*64, 2048, 128, 0
-
-define_drive dph_m, 128*64, 2048, 128, 0
-define_drive dph_n, 128*64, 2048, 128, 0
-define_drive dph_o, 128*64, 2048, 128, 0
-define_drive dph_p, 128*64, 2048, 128, 0
+define_dpb hd, 128*64, 2048, 128, 0
+
+define_dph dph_a, hd
+define_dph dph_b, hd
+define_dph dph_c, hd
+define_dph dph_d, hd
+
+define_dph dph_e, hd
+define_dph dph_f, hd
+define_dph dph_g, hd
+define_dph dph_h, hd
+
+define_dph dph_i, hd
+define_dph dph_j, hd
+define_dph dph_k, hd
+define_dph dph_l, hd
+
+define_dph dph_m, hd
+define_dph dph_n, hd
+define_dph dph_o, hd
+define_dph dph_p, hd
 
 directory_buffer = _start
 NOINIT
diff --git a/src/arch/oric/oric.S b/src/arch/oric/oric.S
@@ -1495,7 +1495,8 @@ mem_end:    .byte __TPA0_END__@mos16hi,   __TPA1_END__@mos16hi
 
 ; DPH for drive 0 (our only drive)
 
-define_drive dph, 2844, 2048, 64, 34
+define_dpb dpb, 2844, 2048, 64, 34
+define_dph dph, dpb
 
 .bss
 
diff --git a/src/arch/osi/osi.S b/src/arch/osi/osi.S
@@ -833,19 +833,18 @@ mem_base: .byte __USERTPA_START__@mos16hi
 
 #ifndef FLOPPY8
 #ifdef TRACKS80
-define_drive dph_a, 1280, 1024, 64, 16
-define_drive dph_b, 1280, 1024, 64, 16
-define_drive dph_c, 1280, 1024, 64, 16
-define_drive dph_d, 1280, 1024, 64, 16
+define_dpb dpb, 1280, 1024, 64, 16
 #else
-define_drive dph_a, 640, 1024, 64, 16
-define_drive dph_b, 640, 1024, 64, 16
-define_drive dph_c, 640, 1024, 64, 16
-define_drive dph_d, 640, 1024, 64, 16
+define_dpb dpb, 640, 1024, 64, 16
 #endif
+define_dph dph_a, dpb
+define_dph dph_b, dpb
+define_dph dph_c, dpb
+define_dph dph_d, dpb
 #else
-define_drive dph_a, 1848, 1024, 64, 24
-define_drive dph_b, 1848, 1024, 64, 24
+define_dpb dpb, 1848, 1024, 64, 24
+define_dph dph_a, dpb
+define_dph dph_b, dpb
 #endif
 
     .section .noinit, "ax", @nobits
diff --git a/src/arch/snes/bios.S b/src/arch/snes/bios.S
@@ -153,9 +153,13 @@ mem_end:    .byte __TPA_END__@mos16hi
 ; This must point at the _last_ driver.
 drvtop: .word drv_TTY
 
-define_drive dph_romdisk, 160*72, 4096, 256, 0
-define_drive dph_ramdisk, 128*1024/128, 1024, 32, 0
-define_drive dph_fdddisk, 160*72, 4096, 256, 0
+define_dpb dpb_romdisk, 160*72, 4096, 256, 0
+define_dpb dpb_ramdisk, 128*1024/128, 1024, 32, 0
+define_dpb dpb_fdddisk, 160*72, 4096, 256, 0
+
+define_dph dph_romdisk, dpb_romdisk
+define_dph dph_ramdisk, dpb_ramdisk
+define_dph dph_fdddisk, dpb_fdddisk
 
 .data
 dphtab:
diff --git a/src/arch/sorbus/sorbus.S b/src/arch/sorbus/sorbus.S
@@ -478,7 +478,8 @@ mem_end:    .byte  $d0
 ; DPH for drive 0 (our only drive)
 
 ; drive parameters: total sectors, bytes per block, dir entries, boot sectors
-define_drive dph, 32768, 2048, 1024, 256
+define_dpb dpb, 32768, 2048, 1024, 256
+define_dph dph, dpb
 
 NOINIT
 
diff --git a/src/arch/x16/x16.S b/src/arch/x16/x16.S
@@ -450,7 +450,8 @@ mem_end:    .byte __TPA0_END__@mos16hi,   __TPA1_END__@mos16hi
 
 ; DPH for drive 0 (our only drive)
 
-define_drive dph, 128*64, 2048, 128, 0
+define_dpb dpb, 128*64, 2048, 128, 0
+define_dph dph, dpb
 
 NOINIT
 
