From 2a12d8a8810acf9d4969ea5713dcab3dc5f30dfa Mon Sep 17 00:00:00 2001 From: shodge12 <44378937+shodge12@users.noreply.github.com> Date: Fri, 19 Jan 2024 10:30:32 -0500 Subject: [PATCH] Added changes for cart in FE00 5. Recoded Cartridge bank switching to only exist when MiSTer slot 3 is selected. [removed soft multipak select] 13. Fixed incorrect addressing of FE00-FEFF for CARTs which gets PITFALL and RAMPAGE working --- COCO3_Comp.xlsx | Bin 10756 -> 10786 bytes rtl/coco3fpga.sv | 72 +++++++++++++---------------------------------- 2 files changed, 19 insertions(+), 53 deletions(-) diff --git a/COCO3_Comp.xlsx b/COCO3_Comp.xlsx index 80af881c9d967ba48f183f109b4dc7a3fb721e78..fae516e94a7c8f355b927166812a2c5c7f05c023 100644 GIT binary patch delta 3305 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 delta 3307 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 Z{ojyZS`v3Zr6VCtu diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index 2168d1e..401ce8a 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -724,14 +724,13 @@ assign BLOCK_ADDRESS = ({MMU_EN, MMU_TR, ADDRESS[15:13]} == 5'b1 ({VEC_PAG_RAM, MMU_EN, MMU_TR, ADDRESS[15:8]} ==11'b01111111110) ? SAM17: // 011 1111 1110 FE00-FEFF RAM Vector page {9'h007, ADDRESS[15:13]}; -assign RAM_CS = (ADDRESS[15:0]== 16'hFFE8) ? 1'b1: // GART 1 - (ADDRESS[15:0]== 16'hFFE9) ? 1'b1: // GART 2 - ({ADDRESS[15:8]}== 8'hFF) ? 1'b0: // Hardware (FF00-FFFF) always Excluded - (ADDRESS[15:8] == 8'b11111110) ? 1'b1: // Always enabled in FEXX Secondary Vectors - ROM_SEL ? 1'b0: // Internal ROM -// FLASH_CE_S ? 1'b0: // Cart ROM - CART_SEL ? 1'b0: // Cart ROM - 1'b1; +assign RAM_CS = (ADDRESS[15:0]== 16'hFFE8) ? 1'b1: // GART 1 + (ADDRESS[15:0]== 16'hFFE9) ? 1'b1: // GART 2 + ({ADDRESS[15:8]}== 8'hFF) ? 1'b0: // Hardware (FF00-FFFF) always Excluded + ({VEC_PAG_RAM, ADDRESS[15:8]} == 9'b111111110) ? 1'b1: // If VEC_PAG_RAM then include FEXX Secondary Vectors + ROM_SEL ? 1'b0: // Internal ROM + CART_SEL ? 1'b0: // Cart ROM + 1'b1; @@ -747,13 +746,13 @@ assign RAM_CS = (ADDRESS[15:0]== 16'hFFE8) ? 1'b1: // GART 1 assign ROM_SEL = (ADDRESS[15:4] == 12'b111111111111) ? 1'b1: // Enable for Vectors (ADDRESS[15:9] == 7'b1111111) ? 1'b0: // Disabled for FE00 - FFFF - ({ROM[1], RAM, BLOCK_ADDRESS[11:2], ADDRESS[14]} == 13'b0000000011110) ? 1'b1: // Enabled Read, 16K Int, Page 7, x1 - ({ROM, RAM, BLOCK_ADDRESS[11:2]} == 13'b1000000001111) ? 1'b1: // Enabled 32K int, Page 7, x + ({ROM[1], RAM, BLOCK_ADDRESS[11:2], ADDRESS[14]} == 13'b0000000011110) ? 1'b1: // Enabled Read, 16K Int, Page 7, x1 $78000-$7BFFF + ({ROM, RAM, BLOCK_ADDRESS[11:2]} == 13'b1000000001111) ? 1'b1: // Enabled 32K int, Page 7, x $78000-$7FFFF 1'b0; -assign CART_SEL = (ADDRESS[15:9] == 7'b1111111) ? 1'b0: // Disabled for FE00 - FFFF - ({ROM[1], RAM, BLOCK_ADDRESS[11:2], ADDRESS[14]} == 13'b0000000011111) ? 1'b1: // Enabled Read, 16K Cart, Page 7, x1 - ({ROM, RAM, BLOCK_ADDRESS[11:2]} == 13'b1100000001111) ? 1'b1: // Enabled 32K Cart, Page 7, x1 +assign CART_SEL = (ADDRESS[15:8] == 8'b11111111) ? 1'b0: // Disabled for FF00 - FFFF + ({ROM[1], RAM, BLOCK_ADDRESS[11:2], ADDRESS[14]} == 13'b0000000011111) ? 1'b1: // Enabled Read, 16K Cart, Page 7, x1 $7C000-$7FEFF + ({ROM, RAM, BLOCK_ADDRESS[11:2]} == 13'b1100000001111) ? 1'b1: // Enabled 32K Cart, Page 7, x1 $78000-$7FEFF 1'b0; //ROM @@ -768,7 +767,6 @@ assign FLASH_ADDRESS = ENA_DSK ? {9'b000000100, ADDRESS[12:0] ENA_ORCC ? {9'b000000101, ADDRESS[12:0]}: //8K Orchestra 8K 90CC Slot 1 ({ENA_PAK, ROM[1]} == 2'b10) ? {5'b00000,ROM_BANK, ADDRESS[13:0]}: //16K External R CART ROM ({ENA_PAK, ROM} == 3'b111) ? {4'b0000,ROM_BANK, ~ADDRESS[14], ADDRESS[13:0]}: //32K External R CART ROM -// ROM_SEL {7'b0000000,ADDRESS[14:0]}; @@ -849,10 +847,15 @@ assign SDC_EN_CS = ({MPI_SCS, ADDRESS[15:4]} == 14'b01111111110100) ? 1'b1: // 1'b0; assign RS232_EN = (ADDRESS[15:2] == 14'b11111111011010) ? 1'b1: //FF68-FF6B 1'b0; -assign SLOT3_HW = ({MPI_SCS, ADDRESS[15:5]} == 13'b1011111111010) ? 1'b1: // FF40-FF5F - 1'b0; +assign SLOT3_HW = ({SWITCH[2:1], ADDRESS[15:5]} == 13'b1011111111010) ? 1'b1: // FF40-FF5F Ensure this only appears in slot 3 PHYSICALLY + 1'b0; + assign VDAC_EN = ({RW_N,ADDRESS[15:0]} == 17'H0FF7E) ? 1'b1: // FF7E 1'b0; +/* +$FF40 - This is the bank latch. The same latch that is used by the Super Program Paks to bank 16K of the Pak ROM +at a time. This latch is set to $00 on reset or power up (same as the super program paks). +*/ always @(negedge clk_sys or negedge RESET_N) begin @@ -872,43 +875,6 @@ begin end end -/* -$FF40 - This is the bank latch. The same latch that is used by the Super Program Paks to bank 16K of the Pak ROM -at a time. The initial design simply used 32K banks - this would allow the Super Program Paks to function, but -wastes 16K per Bank. This was done so the banks could house any of the 32K CoCo 3 Program PAKs as well. This latch -is set to $00 on reset or power up (same as the super program paks). - -$FF41 - the CTS* WRITE data latch. This was incorporated because the CTS* line is read only. I could have just -derived a new CTS* that is active on both reads and writes, however, some PAKs utilize a copy protection scheme -whereas they write to the PAK area. As long as the PAK was in ROM, nothing happened, but if trying to run from a -R/W* RAMPAK, or from disk (wheras the CoCo is placed in the allram mode and the PAK transferred there and executed), -then the PAK code would be corrupted and a crash would occur. This behavior could be patched out of the PAK but I -wanted to be able to execute the PAK code verbatim. Thus this latch at $FF41. A byte of data is written to $FF41. -It is latched and a flip-flop is triggered (this flip-flop starts up un-triggered - either at power on or reset). -Once the flip-flop is triggered, it indicates a valid byte has been stored at $FF41 and then any READ of the CTS* -area will WRITE the byte from $FF41 into the SRAM at the memory location that was READ, the flip-flop is also -reset by this action. This allows writing to the CTS* area while still providing the Read Only protection offered -by the CTS* signal. -$FF42 - BANK 0 latch - this was incorporated because Aaron wanted to be able to start up with his operating code in -bank $00, however, the super program PAKs must start at bank $00. So, whatever is written into this latch will -be the bank that is accessed as BANK 0. This is reset to $00 only at power on (Not reset). So, whatever is written -here will be the bank accessed as bank 00 from that point forward, until it is changed again. Reset will not change it. -$FF43 - Bank Size latch. Only two bits used.: - Bit 0 = 0 = 32K BANK SIZE, =1=16K Banks Size - Bit 1 = 0 = Use lower 16K of each 32K bank - Bit 1 = 1 = Use upper 16K of each 32K bank -Bit 1 is only effective if bank size is set to 16K by bit 0. This register is set to $00 at power on or reset, -and was added to reduce wasted memory. Under proper program control this allows two 16K or less program paks to -exist in each 32K bank. - -$FF44-$FF4A = bank 1 through bank 7 latches. The largest super program pak that I am aware of was RoboCop, -consuming 8 banks of 16K for 128K total. These work just like the latch at $FF42 EXCEPT they affect banks 1-7. -They are also set to $01-$07 (respectively) on power up (but not reset). This allows a Super Program Pak to reside -in any banks in any order, by simply writing the proper data into these latches. -*/ - -// If W_PROT[1] = 1 then ROM_RW is 0, else ROM_RW = !RW_N - `ifdef Config_Debug wire Config_FLAG = `Config_Debug_FLAG;