Introduce Coco 3 Plus for MiSTer
Add original-firmware Sound & Speech, four configurable Multi-Pak sockets, bounded per-slot ROM allocation and a nine-page menu organized around devices and media. Repair inherited clock/reset/CPU-memory/video paths and add explicit conditional external-I/O timing contracts. Preserve native Main startup-file ordering, saved layouts, stock-core separation and the coco3plus media profile. Provide native Windows tool downloads, pinned ToolShed ROM assembly, fresh Quartus builds, functional and fitted timing checks, reviewed release packaging and passwordless SSH installation with backups. Retain original component notices, document contribution copyright and keep SSC ROM inputs outside Git. Validation: Quartus17.0.2 Build602 seed5, zero errors; 15 functional jobs, 368 both-corner timing scopes and eight tooling-integrity checks pass. The renamed build reaches Disk BASIC, PRINT1+1 returns2 and SSC loads ready. Physical cold power cycling and conditional board-delay assumptions remain separate. Full original upstream histories are preserved before this single consolidated implementation commit.
This commit is contained in:
1 parent
8b8cf72d1f
commit
cb40fed3b9
126 files changed
+12795
-528
No files matched your search
+68
-30
@@ -1,3 +1,5 @@
|
||||
// Original Coco 3 Plus contributions: Copyright (c) 2026 Brian K. Holman.
|
||||
// Original component notices/terms retained; see COPYRIGHT.md and LICENSING.md.
|
||||
//
|
||||
// sdram
|
||||
// Copyright (c) 2015-2019 Sorgelig
|
||||
@@ -81,10 +83,14 @@ localparam OP_MODE = 2'b00; // only 00 (standard operation) allow
|
||||
localparam NO_WRITE_BURST = 1'b1; // 0= write burst enabled, 1=only single access write
|
||||
localparam MODE = {3'b000, NO_WRITE_BURST, OP_MODE, CAS_LATENCY, ACCESS_TYPE, BURST_CODE};
|
||||
|
||||
localparam sdram_startup_cycles= 14'd12100;// 100us, plus a little more, @ 100MHz
|
||||
localparam startup_refresh_max = 14'b11111111111111;
|
||||
// AS4C32M16SB requires 200 us with stable inputs before initialization.
|
||||
// 25,000 cycles at 114.545454 MHz leaves >218 us, including command spacing.
|
||||
localparam sdram_startup_cycles= 15'd25000;
|
||||
localparam startup_refresh_max = 15'h7fff;
|
||||
//localparam cycles_per_refresh = 14'd780; // (64000*100)/8192-1 Calc'd as (64ms @ 100MHz)/8192 rose
|
||||
localparam cycles_per_refresh = 14'd890; // (64000*100)/8192-1 Calc'd as (64ms @ 114.560MHz)/8192 rose (act 895)
|
||||
// Reserve the bounded command/recovery latency before the 894.9-cycle limit
|
||||
// (64 ms / 8192 at 114.545454 MHz). Do not wait for twice this interval.
|
||||
localparam cycles_per_refresh = 14'd880;
|
||||
|
||||
// SDRAM commands
|
||||
wire [2:0] CMD_NOP = 3'b111;
|
||||
@@ -95,7 +101,7 @@ wire [2:0] CMD_PRECHARGE = 3'b010;
|
||||
wire [2:0] CMD_AUTO_REFRESH = 3'b001;
|
||||
wire [2:0] CMD_LOAD_MODE = 3'b000;
|
||||
|
||||
reg [13:0] refresh_count = startup_refresh_max - sdram_startup_cycles;
|
||||
reg [14:0] refresh_count = startup_refresh_max - sdram_startup_cycles;
|
||||
reg [2:0] command;
|
||||
|
||||
localparam STATE_STARTUP = 0;
|
||||
@@ -105,6 +111,7 @@ localparam STATE_RW1 = 3;
|
||||
localparam STATE_IDLE = 4;
|
||||
localparam STATE_DLY1 = 5;
|
||||
localparam STATE_DLY2 = 6;
|
||||
localparam STATE_DLY3 = 20;
|
||||
localparam STATE_IDLE_7 = 17;
|
||||
localparam STATE_IDLE_6 = 16;
|
||||
localparam STATE_IDLE_5 = 15;
|
||||
@@ -114,10 +121,32 @@ localparam STATE_IDLE_2 = 12;
|
||||
localparam STATE_IDLE_1 = 11;
|
||||
|
||||
reg [15:0] dq_reg;
|
||||
// CL3's output launches on the preceding edge (READ T4 -> launch T6,
|
||||
// receive T7). Preserve the original READY alignment: adding another cycle
|
||||
// selects burst beat two. Pin setup/hold remains checked in external-io.sdc.
|
||||
localparam READ_CAPTURE_EXTRA = 0;
|
||||
|
||||
// Research: CPU-only activation stage. Request arbitration controls state,
|
||||
// while payload snapshots isolate the external bus from the output mux tree.
|
||||
reg [24:0] cpu_address_snapshot;
|
||||
reg [7:0] cpu_data_snapshot;
|
||||
reg cpu_rnw_snapshot;
|
||||
localparam STATE_CPU_ACTIVE = 18;
|
||||
// Research: keep video address arithmetic out of the SDRAM output mux.
|
||||
// The next state consumes the snapshot from the arbitration edge, adding one
|
||||
// fast clock before ACTIVE. No address/command is issued from an invalid sample.
|
||||
reg [24:0] video_address_snapshot;
|
||||
localparam STATE_VIDEO_ACTIVE = 19;
|
||||
always @(posedge clk) video_address_snapshot <= sdram_vid_addr;
|
||||
always @(posedge clk) begin
|
||||
cpu_address_snapshot <= sdram_cpu_addr;
|
||||
cpu_data_snapshot <= sdram_cpu_din;
|
||||
cpu_rnw_snapshot <= sdram_cpu_rnw;
|
||||
end
|
||||
|
||||
always @(posedge clk) begin
|
||||
reg [CAS_LATENCY+BURST_LENGTH:0] data_cpu_ready_delay;
|
||||
reg [CAS_LATENCY+BURST_LENGTH:0] data_vid_ready_delay;
|
||||
reg [CAS_LATENCY+BURST_LENGTH+READ_CAPTURE_EXTRA:0] data_cpu_ready_delay;
|
||||
reg [CAS_LATENCY+BURST_LENGTH+READ_CAPTURE_EXTRA:0] data_vid_ready_delay;
|
||||
|
||||
reg saved_wr;
|
||||
reg saved_vid;
|
||||
@@ -127,9 +156,9 @@ always @(posedge clk) begin
|
||||
|
||||
refresh_count <= refresh_count + 1'b1;
|
||||
|
||||
data_vid_ready_delay[CAS_LATENCY+BURST_LENGTH] <= 0;
|
||||
data_vid_ready_delay[CAS_LATENCY+BURST_LENGTH+READ_CAPTURE_EXTRA] <= 0;
|
||||
|
||||
data_cpu_ready_delay[CAS_LATENCY+BURST_LENGTH] <= 0;
|
||||
data_cpu_ready_delay[CAS_LATENCY+BURST_LENGTH+READ_CAPTURE_EXTRA] <= 0;
|
||||
|
||||
data_cpu_ready_delay <= data_cpu_ready_delay>>1;
|
||||
data_vid_ready_delay <= data_vid_ready_delay>>1;
|
||||
@@ -206,7 +235,7 @@ always @(posedge clk) begin
|
||||
state <= STATE_IDLE;
|
||||
sdram_busy <= 1'b0;
|
||||
// mask possible refresh to reduce colliding.
|
||||
if(refresh_count > cycles_per_refresh) begin
|
||||
if(refresh_count >= cycles_per_refresh) begin
|
||||
state <= STATE_IDLE_7;
|
||||
command <= CMD_AUTO_REFRESH;
|
||||
refresh_count <= 0;
|
||||
@@ -216,47 +245,53 @@ always @(posedge clk) begin
|
||||
|
||||
STATE_IDLE: begin
|
||||
saved_vid <= 1'b0;
|
||||
if(refresh_count > (cycles_per_refresh<<1))
|
||||
if(refresh_count >= cycles_per_refresh)
|
||||
begin
|
||||
state <= STATE_IDLE_1;
|
||||
sdram_busy <= 1'b1;
|
||||
end
|
||||
else
|
||||
begin
|
||||
if(sdram_cpu_req & !sdram_cpu_ack) // request has to go away after ready=0
|
||||
begin
|
||||
// fix byte writes [no new command until data is actually written]
|
||||
if (~sdram_cpu_rnw)
|
||||
{cas_addr[12:9],SDRAM_BA,SDRAM_A,cas_addr[8:0]} <= {~sdram_cpu_addr[0], sdram_cpu_addr[0], 2'b10, sdram_cpu_addr[24:1]}; // Bytes by A0 for writes
|
||||
else
|
||||
{cas_addr[12:9],SDRAM_BA,SDRAM_A,cas_addr[8:0]} <= {2'b00, 2'b10, sdram_cpu_addr[24:1]}; // No bytes for reads...
|
||||
|
||||
saved_data <= {sdram_cpu_din, sdram_cpu_din};
|
||||
saved_wr <= ~sdram_cpu_rnw;
|
||||
command <= CMD_ACTIVE;
|
||||
state <= STATE_WAIT;
|
||||
sdram_busy <= 1'b1;
|
||||
end
|
||||
if(sdram_cpu_req & !sdram_cpu_ack)
|
||||
begin
|
||||
state <= STATE_CPU_ACTIVE;
|
||||
sdram_busy <= 1'b1;
|
||||
end
|
||||
else
|
||||
begin
|
||||
if (sdram_vid_req)
|
||||
begin
|
||||
{cas_addr[12:9],SDRAM_BA,SDRAM_A,cas_addr[8:0]} <= {2'b00, 2'b10, sdram_vid_addr[24:1]}; // No bytes for reads...
|
||||
command <= CMD_ACTIVE;
|
||||
state <= STATE_VIDEO_ACTIVE;
|
||||
saved_vid <= 1'b1;
|
||||
saved_wr <= 1'b0;
|
||||
sdram_busy <= 1'b1;
|
||||
state <= STATE_WAIT;
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
STATE_VIDEO_ACTIVE: begin
|
||||
{cas_addr[12:9],SDRAM_BA,SDRAM_A,cas_addr[8:0]} <= {2'b00, 2'b10, video_address_snapshot[24:1]};
|
||||
command <= CMD_ACTIVE;
|
||||
state <= STATE_WAIT;
|
||||
end
|
||||
|
||||
STATE_CPU_ACTIVE: begin
|
||||
if (~cpu_rnw_snapshot)
|
||||
{cas_addr[12:9],SDRAM_BA,SDRAM_A,cas_addr[8:0]} <= {~cpu_address_snapshot[0], cpu_address_snapshot[0], 2'b10, cpu_address_snapshot[24:1]};
|
||||
else
|
||||
{cas_addr[12:9],SDRAM_BA,SDRAM_A,cas_addr[8:0]} <= {2'b00, 2'b10, cpu_address_snapshot[24:1]};
|
||||
saved_data <= {cpu_data_snapshot, cpu_data_snapshot};
|
||||
saved_wr <= ~cpu_rnw_snapshot;
|
||||
command <= CMD_ACTIVE;
|
||||
state <= STATE_WAIT;
|
||||
end
|
||||
|
||||
STATE_WAIT: state <= STATE_WAIT1;
|
||||
STATE_WAIT1: begin
|
||||
if (saved_wr)
|
||||
begin
|
||||
if ((data_vid_ready_delay[5:1] == 5'b00000) && (data_cpu_ready_delay[5:1] == 5'b00000))
|
||||
if ((data_vid_ready_delay[CAS_LATENCY+BURST_LENGTH+READ_CAPTURE_EXTRA:1] == '0) && (data_cpu_ready_delay[CAS_LATENCY+BURST_LENGTH+READ_CAPTURE_EXTRA:1] == '0))
|
||||
state <= STATE_RW1; // added for clk > 100Mhz
|
||||
end
|
||||
else
|
||||
@@ -283,17 +318,20 @@ always @(posedge clk) begin
|
||||
state <= STATE_IDLE;
|
||||
if (saved_vid)
|
||||
begin
|
||||
data_vid_ready_delay[CAS_LATENCY+BURST_LENGTH] <= 1;
|
||||
data_vid_ready_delay[CAS_LATENCY+BURST_LENGTH+READ_CAPTURE_EXTRA] <= 1;
|
||||
state <= STATE_DLY1;
|
||||
end
|
||||
else
|
||||
data_cpu_ready_delay[CAS_LATENCY+BURST_LENGTH] <= 1;
|
||||
data_cpu_ready_delay[CAS_LATENCY+BURST_LENGTH+READ_CAPTURE_EXTRA] <= 1;
|
||||
state <= STATE_DLY1;
|
||||
end
|
||||
end
|
||||
STATE_DLY1:
|
||||
state <= STATE_DLY2;
|
||||
STATE_DLY2:
|
||||
state <= STATE_DLY3;
|
||||
STATE_DLY3:
|
||||
// Eight clocks between legal back-to-back ACTIVEs, >=63 ns tRC.
|
||||
state <= STATE_IDLE;
|
||||
endcase
|
||||
|
||||
|
||||
Reference in new issue
Block a user