diff --git a/fpga/rtl/top.sv b/fpga/rtl/top.sv index 1b72c54..f83edcc 100755 --- a/fpga/rtl/top.sv +++ b/fpga/rtl/top.sv @@ -34,7 +34,7 @@ module zx_ula( input sd_cd, input sd_miso_tape_in, - output sd_mosi, + output sd_mosi_tape_out, output reg sd_sck, output reg sd_cs ); @@ -409,7 +409,7 @@ divmmc divmmc0( .ramwr_mask(div_ramwr_mask), .cpuwait(div_wait) ); -assign sd_mosi = (~sd_cd)? sd_mosi0 : tape_out; +assign sd_mosi_tape_out = (divmmc_en == DIVMMC_OFF)? tape_out : sd_mosi0; /* ULAPLUS */ diff --git a/fpga/syn/zx_ula.qsf b/fpga/syn/zx_ula.qsf index f54d91b..eeeb76f 100755 --- a/fpga/syn/zx_ula.qsf +++ b/fpga/syn/zx_ula.qsf @@ -112,7 +112,7 @@ set_location_assignment PIN_38 -to sd_cd set_location_assignment PIN_39 -to sd_cs set_location_assignment PIN_40 -to sd_miso_tape_in set_location_assignment PIN_41 -to sd_sck -set_location_assignment PIN_42 -to sd_mosi +set_location_assignment PIN_42 -to sd_mosi_tape_out set_location_assignment PIN_47 -to vd[2] set_location_assignment PIN_48 -to vd[0] set_location_assignment PIN_49 -to vd[7] diff --git a/fpga/tb/testbench_zx_ula.v b/fpga/tb/testbench_zx_ula.v index 747adca..6b2ba6f 100644 --- a/fpga/tb/testbench_zx_ula.v +++ b/fpga/tb/testbench_zx_ula.v @@ -90,7 +90,7 @@ zx_ula zx_ula1( .sd_cd(1'b1), .sd_cs(), .sd_sck(), - .sd_mosi(sd_mosi_miso), + .sd_mosi_tape_out(sd_mosi_miso), .sd_miso_tape_in(sd_mosi_miso), .ps2_clk(), .ps2_dat(),