github.com/mist-devel.mist-board
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-board.git synced 2026-02-25 07:50:06 +00:00
Code Issues Releases Wiki Activity

Mono VBI fix and Gauntlet-II 4 player support

Browse Source
This commit is contained in:
harbaum
2014-04-14 10:47:40 +00:00
parent 692bff247f
commit c24c038592
3 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cores/mist/mist_top.v
View File

@@ -48,6 +48,10 @@ wire steroids = system_ctrl[23] && system_ctrl[24]; // a STE on steroids
wire ethernec_present = system_ctrl[25];
// usb target port on io controller is used for redirection of
// 0=nothing 1=rs232 2=printer 3=midi
wire [1:0] usb_redirection = system_ctrl[27:26];
wire video_read;
wire [22:0] video_address;
wire st_de, st_hs, st_vs;
@@ -289,8 +293,12 @@ wire ste_dma_snd_xsirq, ste_dma_snd_xsirq_delayed;
wire mfp_io7 = system_ctrl[8] ^ (ste?ste_dma_snd_xsirq:1'b0);
// input 0 is busy from printer which is pulled up when the printer cannot accept further data
// if no printer redirection is being used this is wired to the extra joystick ports provided
// by the "gauntlet2 adapter". If no extra joystick ports are present this will return 1
wire mfp_io0 = (usb_redirection == 2'd2)?parallel_fifo_full:~joy0[4];
// inputs 1,2 and 6 are inputs from serial which have pullups before an inverter
wire [7:0] mfp_gpio_in = {mfp_io7, 1'b0, !dma_irq, !acia_irq, !blitter_irq, 2'b00, parallel_fifo_full};
wire [7:0] mfp_gpio_in = {mfp_io7, 1'b0, !dma_irq, !acia_irq, !blitter_irq, 2'b00, mfp_io0};
wire [1:0] mfp_timer_in = {st_de, ste?ste_dma_snd_xsirq_delayed:parallel_fifo_full};
mfp mfp (
@@ -498,13 +506,20 @@ reg [1:0] sclk;
always @ (posedge clk_8)
sclk <= sclk + 2'd1;
wire [7:0] port_a_out /* synthesis keep */;
wire [7:0] port_b_out /* synthesis keep */;
wire [7:0] port_a_out;
wire [7:0] port_b_out;
assign floppy_side = port_a_out[0];
assign floppy_sel = port_a_out[2:1];
wire [7:0] ym_audio_out_l, ym_audio_out_r;
// extra joysticks are wired to the printer port
// using the "gauntlet2 interface", fire of
// joystick 0 is connected to the mfp I0 (busy)
wire [7:0] port_b_in = { ~joy0[0], ~joy0[1], ~joy0[2], ~joy0[3],
~joy1[0], ~joy1[1], ~joy1[2], ~joy1[3]};
wire [7:0] port_a_in = { 2'b11, ~joy1[4], 5'b11111 };
YM2149 ym2149 (
.I_DA ( tg68_dat_out[15:8] ),
.O_DA ( psg_data_out ),
@@ -524,12 +539,12 @@ YM2149 ym2149 (
.stereo (system_ctrl[22] ),
// port a
.I_IOA ( 8'd0 ),
.I_IOA ( port_a_in ),
.O_IOA ( port_a_out ),
.O_IOA_OE_L ( ),
// port b
.I_IOB ( 8'd0 ),
.I_IOB ( port_b_in ),
.O_IOB ( port_b_out ),
.O_IOB_OE_L ( ),
@@ -1088,6 +1103,9 @@ wire [7:0] parallel_data_out;
wire parallel_strobe_out;
wire parallel_data_out_available;
// extra joystick interface
wire [5:0] joy0, joy1;
// connection between io controller and ethernet controller
// mac address transfer io controller -> ethernec
wire [31:0] eth_status;
@@ -1112,6 +1130,10 @@ user_io user_io(
.ikbd_data_out_available (ikbd_data_from_acia_available),
.ikbd_strobe_in (ikbd_strobe_to_acia),
.ikbd_data_in (ikbd_data_to_acia),
// extra joysticks
.joy0 (joy0),
.joy1 (joy1),
// serial/rs232 interface
.serial_strobe_out (serial_strobe_from_mfp),

19
cores/mist/user_io.v
View File

@@ -14,6 +14,9 @@ module user_io(
input ikbd_data_out_available,
input [7:0] ikbd_data_out,
// four extra joysticks
output reg [5:0] joy0, joy1, joy2, joy3,
// serial data from mfp to io controller
output reg serial_strobe_out,
input serial_data_out_available,
@@ -230,7 +233,21 @@ module user_io(
eth_rx_write_byte <= { sbuf, SPI_MOSI };
eth_rx_write_strobe <= 1'b1;
end
end
// four extra joysticks ...
if(cmd == 8'h10)
joy0 <= { sbuf[4:0], SPI_MOSI };
if(cmd == 8'h11)
joy1 <= { sbuf[4:0], SPI_MOSI };
if(cmd == 8'h12)
joy2 <= { sbuf[4:0], SPI_MOSI };
if(cmd == 8'h13)
joy3 <= { sbuf[4:0], SPI_MOSI };
end
end
end

15
cores/mist/video.v
View File

@@ -129,13 +129,12 @@ always @(posedge clk) begin
// v_event is the begin of hsync. The hatari video.h says vbi happens 64 clock cycles
// ST hor counter runs at 16Mhz, thus the trigger is 128 events after h_sync
// xyz
if(st_h_active && (st_hcnt == (v_event))) begin
// vsync starts at begin of blanking phase
if(vcnt == t7_v_blank_bot - de_v_offset - 10'd0) st_vs <= 1'b1; //XXX 2!
if(vcnt == t7_v_blank_bot - de_v_offset + 10'd4) st_vs <= 1'b1; //XXX -2!
// vsync ends at begin of top border
if(vcnt == t10_v_border_top - de_v_offset - 10'd0) st_vs <= 1'b0; //XXX 2!
if(vcnt == t10_v_border_top - de_v_offset + 10'd0) st_vs <= 1'b0; //XXX -2!
end
end
@@ -508,7 +507,8 @@ always @(posedge clk) begin
if((vcnt == { 8'd97, 2'b00} ) && (vga_hcnt == 10'd0) && (bottom_overscan_cnt != 0))
bottom_overscan_cnt <= bottom_overscan_cnt - 4'd1;
if((vcnt[9:2] == 8'd98)||(vcnt[9:2] == 8'd99)||(vcnt[9:2] == 8'd100)) begin
if((vcnt[9:2] == 8'd97)||(vcnt[9:2] == 8'd98)||(vcnt[9:2] == 8'd99)||
(vcnt[9:2] == 8'd100)||(vcnt[9:2] == 8'd101)) begin
// syncmode has changed from 1 to 0 (50 to 60 hz)
if((syncmode[1] == 1'b0) && (last_syncmode == 1'b1))
bottom_overscan_cnt <= 4'd15;
@@ -518,7 +518,8 @@ always @(posedge clk) begin
if((vcnt == {8'd133, 2'b00 }) && (vga_hcnt == 10'd0) && (top_overscan_cnt != 0))
top_overscan_cnt <= top_overscan_cnt - 4'd1;
if((vcnt[9:2] == 8'd134)||(vcnt[9:2] == 8'd135)||(vcnt[9:2] == 8'd136)) begin
if((vcnt[9:2] == 8'd133)||(vcnt[9:2] == 8'd134)||(vcnt[9:2] == 8'd135)||
(vcnt[9:2] == 8'd136)||(vcnt[9:2] == 8'd137)) begin
// syncmode has changed from 1 to 0 (50 to 60 hz)
if((syncmode[1] == 1'b0) && (last_syncmode == 1'b1))
top_overscan_cnt <= 4'd15;
@@ -730,9 +731,7 @@ always @(posedge clk) begin
// according to hatari the video counter is reloaded 3 lines before
// the vbi occurs. This is right after the display has been painted.
// The video address counter is reloaded right after display ends
// TODO: -1 and pacmania works ...
if((vga_hcnt == t3_h_blank_left) && (vcnt == (t7_v_blank_bot-de_v_offset-10'd3))) begin // +1
if((vga_hcnt == t3_h_blank_left) && (vcnt == (t7_v_blank_bot-de_v_offset+10'd1))) begin // +1
vaddr <= _v_bas_ad;
// copy syncmode