diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index b110924..043ec07 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -1050,22 +1050,22 @@ assign DATA_IN = SLOT3_HW ? {5'b00000, ROM_BANK}: // WF_RDFIFO_RDREQ ? WF_RDFIFO_DATA: // SPI_EN ? SPI_DATA: -// FF00, FF04, FF08, FF0C, FF10, FF14, FF18, FF1C -({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100000) ? DATA_REG1: -// FF01, FF05, FF09, FF0D, FF11, FF15, FF19, FF1D -({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100001) ? {!HSYNC1_IRQ_BUF[1], 3'b011, SEL[0], DDR1, HSYNC1_POL, HSYNC1_IRQ_INT}: -// FF02, FF06, FF0A, FF0E, FF12, FF16, FF1A, FF1E -({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100010) ? DATA_REG2: -// FF03, FF07, FF0B, FF0F, FF13, FF17, FF1B, FF1F -({ADDRESS[15:5], ADDRESS[1:0]} == 16'b1111111100011) ? {!VSYNC1_IRQ_BUF[1], 3'b011, SEL[1], DDR2, VSYNC1_POL, VSYNC1_IRQ_INT}: -// FF20, FF24, FF28, FF2C, FF30, FF34, FF38, FF3C -({ADDRESS[15:5], ADDRESS[1:0]} == 16'b1111111100100) ? DATA_REG3: -// FF21, FF25, FF29, FF2D, FF31, FF35, FF39, FF3D -({ADDRESS[15:5], ADDRESS[1:0]} == 16'b1111111100101) ? {4'b0011, CAS_MTR, DDR3, 2'b00}: // CD_POL, CD_INT}: -// FF22, FF26, FF2A, FF2E, FF32, FF36, FF3A, FF3E -({ADDRESS[15:5], ADDRESS[1:0]} == 16'b1111111100110) ? DATA_REG4: -// FF23, FF27, FF2B, FF2F, FF33, FF37, FF3B, FF3F -({ADDRESS[15:5], ADDRESS[1:0]} == 16'b1111111100111) ? {!CART1_FIRQ_BUF[1], 3'b011, SOUND_EN, DDR4, CART1_POL, CART1_FIRQ_INT}: +// FF00, FF04, FF08, FF0C +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000000) ? DATA_REG1: +// FF01, FF05, FF09, FF0D +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000001) ? {!HSYNC1_IRQ_BUF[1], 3'b011, SEL[0], DDR1, HSYNC1_POL, HSYNC1_IRQ_INT}: +// FF02, FF06, FF0A, FF0E +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000010) ? DATA_REG2: +// FF03, FF07, FF0B, FF0F +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000011) ? {!VSYNC1_IRQ_BUF[1], 3'b011, SEL[1], DDR2, VSYNC1_POL, VSYNC1_IRQ_INT}: +// FF20, FF24, FF28, FF2C +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001000) ? DATA_REG3: +// FF21, FF25, FF29, FF2D +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001001) ? {4'b0011, CAS_MTR, DDR3, 2'b00}: // CD_POL, CD_INT}: +// FF22, FF26, FF2A, FF2E +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001010) ? DATA_REG4: +// FF23, FF27, FF2B, FF2F +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001011) ? {!CART1_FIRQ_BUF[1], 3'b011, SOUND_EN, DDR4, CART1_POL, CART1_FIRQ_INT}: // HiRes Joystick // ({PDL,ADDRESS} == 17'h0FF60) ? PADDLE_LATCH_0[11:4]: // ({PDL,ADDRESS} == 17'h0FF61) ? {PADDLE_LATCH_0[3:0],4'b0000}: @@ -1760,7 +1760,7 @@ begin if (~(firq_tmr == 16'hffff)) firq_tmr = firq_tmr + 1'b1; else - cart_firq_enable <= SWITCH[4]; + cart_firq_enable <= SWITCH[4] & ~ioctl_download; if ((ioctl_index[5:0] == 6'd1) & ioctl_wr) begin @@ -2888,6 +2888,7 @@ begin DDR2 <= DATA_OUT[2]; SEL[1] <= DATA_OUT[3]; end +/* 16'hFF10: begin if(!DDR1) @@ -2992,6 +2993,7 @@ begin DDR2 <= DATA_OUT[2]; SEL[1] <= DATA_OUT[3]; end +*/ 16'hFF20: begin if(!DDR3) @@ -3136,6 +3138,7 @@ begin DDR4 <= DATA_OUT[2]; SOUND_EN <= DATA_OUT[3]; end +/* 16'hFF30: begin if(!DDR3) @@ -3280,6 +3283,7 @@ begin DDR4 <= DATA_OUT[2]; SOUND_EN <= DATA_OUT[3]; end +*/ 16'hFF7A: begin ORCH_LEFT <= DATA_OUT;