From 8f4f68869a3706313ddff6dd052ca2ff2dda7a12 Mon Sep 17 00:00:00 2001 From: sorgelig Date: Tue, 11 Jun 2019 06:30:28 +0800 Subject: [PATCH] Use dedicated 48K rom for 48K mode. Remove mic+ear feed from tape_in. --- ZX-Spectrum.sv | 4 ++-- releases/spectrum.rom | Bin 180224 -> 196608 bytes releases/spectrum.rom_rc196 | Bin 180224 -> 196608 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ZX-Spectrum.sv b/ZX-Spectrum.sv index ebe6c9c..069a789 100644 --- a/ZX-Spectrum.sv +++ b/ZX-Spectrum.sv @@ -557,7 +557,7 @@ always_comb begin 'b001XX: page_rom <= 4'b1100; //plusd 'b0001X: page_rom <= { 2'b11, plus3, ~plus3 }; //MF128/+3 'b00001: page_rom <= { 2'b10, page_reg_plus3[2], page_reg[4] }; //+3 - 'b00000: page_rom <= { 3'b011, zx48 | page_reg[4] }; //up to +2 + 'b00000: page_rom <= { zx48, 2'b11, zx48 | page_reg[4] }; //up to +2 endcase end @@ -1059,7 +1059,7 @@ always @(posedge clk_sys) begin end end -assign tape_in = tape_loaded_reg ? tape_vin : tape_adc_act ? tape_adc : ~(ear_out | mic_out); +assign tape_in = tape_loaded_reg ? tape_vin : tape_adc_act & tape_adc; wire tape_adc, tape_adc_act; ltc2308_tape ltc2308_tape diff --git a/releases/spectrum.rom b/releases/spectrum.rom index ee31936d8c7bb4a1de8388185e218de3783102fc..aa8eba4b22dd9f71b005658df1844503a5ae5368 100644 GIT binary patch delta 85 zcmV-b0IL6hfD3?t41k0IqyoT_z)J$Z0<%rP1q%e$r7#JzR?G7T1g{Y`6|+s#FbD+w r%L;yzf!lKf-~J7=_uEej1I>;Cvq|P960?Cwk_4A9J^~4|3H|p1&h8^2 delta 12 TcmZo@;Av>!ZfId#!gK%t9T^0J diff --git a/releases/spectrum.rom_rc196 b/releases/spectrum.rom_rc196 index 978b1f17bcb9a0ea3c8835dfbcba5715390cd238..e7b8bb3693231a58511b507e801f7392124687a6 100644 GIT binary patch delta 85 zcmV-b0IL6hfD3?t41k0IqyoT_z)J$Z0<%rP1q%e$r7#JzR?G7T1g{Y`6|+s#FbD+w r%L;yzf!lKf-~J7=_uEej1I>;Cvq|P960?Cwk_4A9J^~4|3H|p1&h8^2 delta 12 TcmZo@;Av>!ZfId#!gK%t9T^0J