Macintosh-HW
/
MacPlus_MiSTer
mirror of https://github.com/MiSTer-devel/MacPlus_MiSTer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix floppy access.

This commit is contained in:
Sorgelig 2022-03-10 15:08:58 +08:00
parent e879af35a1
commit daa1bc86fb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MacPlus.sv
View File

@ -792,11 +792,14 @@ wire download_cycle = dio_download && dioBusControl;
////////////////////////// SDRAM /////////////////////////////////
wire [24:0] sdram_addr = download_cycle ? { 4'b0001, dio_a[20:0] } : { 3'b000, ~_romOE, _romOE ? memoryAddr[21:19] : {2'b00,status_mod}, memoryAddr[18:1] };
wire [24:0] sdram_addr = download_cycle ? {4'b0001, dio_a[20:0] } :
~_romOE ? {4'b0001, 2'b00, status_mod, memoryAddr[18:1]} :
{3'b000, (dskReadAckInt || dskReadAckExt), memoryAddr[21:1]};
wire [15:0] sdram_din = download_cycle ? dio_data : memoryDataOut;
wire [1:0] sdram_ds = download_cycle ? 2'b11 : { !_memoryUDS, !_memoryLDS };
wire sdram_we = download_cycle ? dio_write : !_ramWE;
wire sdram_oe = download_cycle ? 1'b0 : (!_ramOE || !_romOE);
wire sdram_oe = download_cycle ? 1'b0 : (!_ramOE || !_romOE || dskReadAckInt || dskReadAckExt);
wire [15:0] sdram_do = download_cycle ? 16'hffff : (dskReadAckInt || dskReadAckExt) ? extra_rom_data_demux : sdram_out;
// during rom/disk download ffff is returned so the screen is black during download

3
rtl/addrController_top.v
View File

@ -137,8 +137,7 @@ module addrController_top(
// RAM/ROM control signals
wire videoControlActive = _hblank;
wire extraRomRead = dskReadAckInt || dskReadAckExt;
assign _romOE = ~(extraRomRead || (cpuBusControl && selectROM && _cpuRW));
assign _romOE = ~(cpuBusControl && selectROM && _cpuRW);
wire extraRamRead = sndReadAck;
assign _ramOE = ~((videoBusControl && videoControlActive) || (extraRamRead) ||