2023 - 5.1 init...

CTF = Compile Time Feature...

1.	Interrupt system restored to previous code - improved compadibility.
2.	Changed to cycle accurate 6809 (Greg Miller) at speeds up to 9.56Mhz. [CTF]
3.	Recoded sdc and fdc to only have one instance of the wd1773.
4.	Re-added software disable in sdc [Ext 'g'].
5.	Recoded Cartridge bank switching to only exist when MiSTer slot 3 is selected. [removed soft multipak select]
6.	Moved CoCo Hardware RS-232 from always existing to only existing in multipak slot 1.
7.	Changed ADRS (SDS sig) decoding to = FF40-FF5f per hardware.
8.	Fixed coding problem in os9 driver llcocosdc to work with MPI properly. [CTF]
9.	Set default disk size to constant $555555 to fix os9 redirect problem. [CTF]
10	Disabled GART [GIMEX hardware DMA] to prevent OS9 from detecting GIMEX. [CTF]
11	Corrected missing begin statement in master timing loop.
12.	Fixed Donkey King DAPD issue in Tom Mix program [DPAD now moved joysticks to limits under dpad
13. Fixed incorrect addressing of FE00-FEFF for CARTs which gets PITFALL and RAMPAGE working
To Do
0.	Update framework
This commit is contained in:
shodge12 committed 2023-10-23 19:35:57 -04:00
1 parent 32aa486cdb
commit 7e58577658
17 files changed
+5456 -981

No files matched your search

+144 -150
View File
@@ -47,6 +47,8 @@
// of this controller will be shutdown and the normal 4 drive fdc will take
// over dfc on a different mpi slot.
//
// Ver 2.00 Implemented with single 1793 ...
//
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -77,6 +79,8 @@ module sdc_top(
input SDC_REG_W_ENA,
input SDC_REG_READ,
output ext_response,
// SD block level interface
input [1:0] img_mounted, // signaling that new image has been mounted
@@ -124,70 +128,103 @@ begin
end
localparam SDC_MAGIC_CMD = 8'h43;
wire sdc_always;
wire [7:0] FF40_READ_VALUE = {HALT_EN, DRIVE_SEL_EXT[3], DENSITY, WRT_PREC, MOTOR, DRIVE_SEL_EXT[2:0]};
wire SDC_EN = (FF40_READ_VALUE == SDC_MAGIC_CMD);
wire SDC_EN = ((FF40_READ_VALUE == SDC_MAGIC_CMD) | sdc_always);
wire [7:0] SDC_READ_DATA;
wire sdc_always;
wire FF40_RD = ({SDC_EN_CS, ADDRESS[3:0]} == 5'h10);
wire FF40_RD = ({SDC_EN_CS, ADDRESS[3:0]} == 5'b10000);
//FDC read data path. =$ff40 or wd1793(s)
assign DATA_HDD = (SDC_EN | sdc_always) ? SDC_READ_DATA:
(SDC_EN_CS & (ADDRESS[3:1] == 3'b001)) ? SDC_READ_DATA: // FF42 & FF43
(FF40_RD) ? FF40_READ_VALUE:
(WD1793_RD) ? DATA_1793: //(1793[s])
8'h00;
assign DATA_HDD =
(FF40_RD) ? FF40_READ_VALUE:
(SDC_EN | ext_response) ? SDC_READ_DATA:
(SDC_EN_CS & (ADDRESS[3:1] == 3'b001)) ? SDC_READ_DATA: // FF42 & FF43
(WD1793_RD) ? DATA_1793: //(1793[s])
8'h00;
wire [31:0] sdc_sd_lba[2];
wire [31:0] fdc_sd_lba[2];
wire [31:0] wd1793_sd_lba;
wire [1:0] sdc_sd_rd;
wire wd1793_sd_rd;
wire [1:0] fdc_sd_rd;
wire [1:0] sdc_sd_wr;
wire [1:0] fdc_sd_wr;
wire wd1793_sd_wr;
wire [7:0] sdc_sd_buff_din[2];
wire [7:0] fdc_sd_buff_din[2];
wire [7:0] wd1793_sd_buff_din;
wire wd1793_sd_ack;
wire sdc_HALT;
assign sd_lba[0:1] = (SDC_EN | sdc_always) ? sdc_sd_lba[0:1]:
assign sd_lba[0:1] = SDC_EN ? sdc_sd_lba[0:1]:
fdc_sd_lba[0:1];
assign sd_rd[1:0] = (SDC_EN | sdc_always) ? sdc_sd_rd[1:0]:
assign fdc_sd_lba[0] = wd1793_sd_lba;
assign fdc_sd_lba[1] = wd1793_sd_lba;
assign sd_rd[1:0] = SDC_EN ? sdc_sd_rd[1:0]:
fdc_sd_rd[1:0];
assign fdc_sd_rd[0] = (drive_index == 3'd1) ? wd1793_sd_rd:
1'b0;
assign fdc_sd_rd[1] = (drive_index == 3'd2) ? wd1793_sd_rd:
1'b0;
assign sd_wr[1:0] = (SDC_EN | sdc_always) ? sdc_sd_wr[1:0]:
assign sd_wr[1:0] = SDC_EN ? sdc_sd_wr[1:0]:
fdc_sd_wr[1:0];
assign sd_buff_din[0:1] = (SDC_EN | sdc_always) ? sdc_sd_buff_din[0:1]:
assign fdc_sd_wr[0] = (drive_index == 3'd1) ? wd1793_sd_wr:
1'b0;
assign fdc_sd_wr[1] = (drive_index == 3'd2) ? wd1793_sd_wr:
1'b0;
assign sd_buff_din[0:1] = SDC_EN ? sdc_sd_buff_din[0:1]:
fdc_sd_buff_din[0:1];
sdc coco_sdc(
.CLK(CLK), // clock
.RESET_N(RESET_N), // async reset
.ADDRESS(ADDRESS), // i/o port addr [extended for coco]
.SDC_DATA_IN(DATA_IN), // data in
.SDC_READ_DATA, // data out
assign fdc_sd_buff_din[0] = wd1793_sd_buff_din;
assign fdc_sd_buff_din[1] = wd1793_sd_buff_din;
.SDC_EN(SDC_EN), // SDC is active [input to sdc]
assign wd1793_sd_ack = (drive_index == 3'd1) ? sd_ack[0]:
(drive_index == 3'd2) ? sd_ack[1]:
sd_ack[0]; // default is drive 1
sdc coco_sdc(
.CLK(CLK), // clock
.RESET_N(RESET_N), // async reset
.ADDRESS(ADDRESS), // i/o port addr [extended for coco]
.SDC_DATA_IN(DATA_IN), // data in
.SDC_READ_DATA(SDC_READ_DATA), // data out
.SDC_EN(SDC_EN), // SDC is active [input to sdc]
.CLK_EN(CLK_EN),
.SDC_WR(SDC_REG_W_ENA),
.SDC_RD(SDC_REG_READ),
.sdc_always(sdc_always), // SDC is active [output from sdc (sdc is turning off fdc)]
.sdc_HALT(sdc_HALT),
// SD block level interface
.ext_response(ext_response),
.sdc_always(sdc_always),
.img_mounted(img_mounted[1:0]), // signaling that new image has been mounted
.img_readonly(img_readonly), // mounted as read only. valid only for active bit in img_mounted
.img_size(img_size), // size of image in bytes.
// SD block level interface
.sd_lba(sdc_sd_lba[0:1]),
.sd_rd(sdc_sd_rd[1:0]),
.sd_wr(sdc_sd_wr[1:0]),
.sd_ack(sd_ack[1:0]),
// Drive descripters
.drive_wp(drive_wp),
.drive_ready(drive_ready),
.drive_size(drive_size[0:1]),
// SD byte level access. Signals for 2-PORT altsyncram.
.sd_buff_addr(sd_buff_addr),
.sd_buff_dout(sd_buff_dout),
@@ -199,15 +236,14 @@ sdc coco_sdc(
// $ff40 control register [part 1]
wire [3:0] DRIVE_SEL_EXT_PRE = {DATA_IN[6], DATA_IN[2:0]};
wire [3:0] DRIVE_SEL_EXT_PRE = {DATA_IN[6] // Side Select
, DATA_IN[2:0]}; // ONLY 2 drives (DS)
reg [2:0] drive_index;
// SD blk system is a array of 4 systems - one for each drive.
// To keep disk track memory, we created 4 wd1793's to match the sd block interfaces
// For the interface back to the coco - we need to isolate the wd1793 the computer is talking
// to and route those feedback signals back to the coco. This is accomplished via the drive
// select. 'drive_index' identifies which controller is addressd.
// 'drive_index' identifies which controller is addressd.
// drive 1-2 for the sdc is denoted as 1 , 2 [0 is no drive selected]
always @(negedge FF40_CLK or negedge RESET_N)
begin
@@ -217,30 +253,36 @@ begin
MOTOR <= 1'b0;
WRT_PREC <= 1'b0;
DENSITY <= 1'b0;
drive_index <= 3'd0;
drive_index <= 3'd0;
end
else
begin
if (FF40_ENA)
begin
DRIVE_SEL_EXT <= {4'b0000,
DATA_IN[6], // Drive Select [3] / Side Select
1'b0,
DATA_IN[1:0]}; // Drive Select [1:0] (2 drives + side select)
DRIVE_SEL_EXT <= {4'b0000, DRIVE_SEL_EXT_PRE};
MOTOR <= DATA_IN[3]; // Turn on motor, not used here just checked, 0=MotorOff 1=MotorOn
WRT_PREC <= DATA_IN[4]; // Write Precompensation, not used here
DENSITY <= DATA_IN[5]; // Density, not used here just checked
case(DRIVE_SEL_EXT_PRE)
4'b0010:
drive_index <= 3'd1;
drive_index <= 3'd2;
4'b0001:
drive_index <= 3'd0;
4'b1010:
drive_index <= 3'd1;
4'b1010:
drive_index <= 3'd2;
4'b1001:
drive_index <= 3'd1;
4'b1011: // This is what the Magic Number $43 does so we select a non-active drive
drive_index <= 3'd0;
4'b1000: // This is no drive with DS = illegal drive
drive_index <= 3'd0;
4'b0000: // This is no drive (maybe 0 in ff40) = illegal drive
drive_index <= 3'd0;
default:
drive_index <= 3'd0;
endcase
end
@@ -259,6 +301,8 @@ begin
if (FF40_ENA)
begin
HALT_EN <= DATA_IN[7]; // Normal Halt enable, 0=Disabled 1=Enabled
if (sdc_always)
HALT_EN <= 1'b0;
end
end
end
@@ -266,18 +310,14 @@ end
// Control signals for the wd1793
wire INTRQ[2];
wire DRQ[2];
wire selected_DRQ;
wire selected_INTRQ;
wire WR[2];
wire RD[2];
wire RD_E[2];
//wire CE;
wire WR;
wire RD;
wire RD_E;
wire HALT_EN_RST;
wire [7:0] DATA_1793;
wire [7:0] dout[2];
reg read;
reg write;
reg read_d;
@@ -289,8 +329,7 @@ reg read1;
reg write1;
reg [1:0] ADDRESS_L;
assign RD[0] = (read || RD_E[0]) && (drive_index == 3'd0);
assign RD[1] = (read || RD_E[1]) && (drive_index == 3'd1);
assign RD = (read || RD_E); // Even with no drive selected allow read to the controller
// The idea here is to "stretch" the CPU read and write signals to ensure we catch a 8 mhz enable.
// For writes we will buffer the data out to ensure it does not go away.
@@ -301,18 +340,18 @@ assign RD[1] = (read || RD_E[1]) && (drive_index == 3'd1);
// It is heavily dependant on address and write data being available just after
// the previous cycle.
always @(negedge CLK or negedge RESET_N)
wire wd1793_r_w_sync_rst = RESET_N;
always @(negedge CLK or negedge wd1793_r_w_sync_rst)
begin
if(!RESET_N)
if(!wd1793_r_w_sync_rst)
begin
read_d <= 1'b0;
write_d <= 1'b0;
r_w_active <= 1'b0;
clk_8Mhz_enable_found <= 1'b0;
WR[0] <= 1'b0;
WR[1] <= 1'b0;
RD_E[0] <= 1'b0;
RD_E[1] <= 1'b0;
WR <= 1'b0;
RD_E <= 1'b0;
read1 <= 1'b0;
write1 <= 1'b0;
read <= 1'b0;
@@ -322,10 +361,10 @@ begin
begin
// synchronizers
read1 <= WD1793_RD_CTRL & ~(SDC_EN | sdc_always);
read1 <= WD1793_RD_CTRL & ~SDC_EN;
read <= read1;
write1 <= WD1793_WR_CTRL & ~(SDC_EN | sdc_always);
write1 <= WD1793_WR_CTRL & ~SDC_EN;
write <= write1;
// delays for edge detection
@@ -342,26 +381,16 @@ begin
// Synchronus rising edge of write
if ((write == 1'b1) && (write_d == 1'b0))
begin
// Set Writes
// Set Write
r_w_active <= 1'b1;
case (drive_index)
3'd0:
WR[0] <= 1'b1;
3'd1:
WR[1] <= 1'b1;
endcase
WR <= 1'b1;
end
// Synchronus rising edge of read
if ((read == 1'b1) && (read_d == 1'b0))
begin
r_w_active <= 1'b1;
case (drive_index)
3'd0:
RD_E[0] <= 1'b1;
3'd1:
RD_E[1] <= 1'b1;
endcase
RD_E <= 1'b1;
end
// Clears
@@ -373,39 +402,23 @@ begin
begin
clk_8Mhz_enable_found <= 1'b0;
r_w_active <= 1'b0;
WR[0] <= 1'b0;
WR[1] <= 1'b0;
RD_E[0] <= 1'b0;
RD_E[1] <= 1'b0;
WR <= 1'b0;
RD_E <= 1'b0;
end
end
end
// NMI from disk controller
// Selected INTRQ
assign selected_INTRQ = (drive_index == 3'd0) ? INTRQ[0]:
(drive_index == 3'd1) ? INTRQ[1]:
1'b0;
assign NMI_09 = DENSITY & selected_INTRQ; // Send NMI if Double Density (Halt Mode)
assign NMI_09 = ~SDC_EN & DENSITY & selected_INTRQ; // Send NMI if Double Density (Halt Mode)
// HALT from disk controller
// Selected DRQ
assign selected_DRQ = (drive_index == 3'd0) ? DRQ[0]:
(drive_index == 3'd1) ? DRQ[1]:
1'b1;
assign HALT = (HALT_EN & ~selected_DRQ) | sdc_HALT;
assign HALT = (~SDC_EN & HALT_EN & ~selected_DRQ) | sdc_HALT;
assign HALT_EN_RST = RESET_N & ~selected_INTRQ; // From controller schematic
// Data bus selection
assign DATA_1793 = (drive_index == 3'd0) ? dout[0]:
(drive_index == 3'd1) ? dout[1]:
8'd0;
// The SD_BLK interface and thus the wd1793 will allways transfer 1 blk. This is blk qty - 1 per spec.
assign sd_blk_cnt[1] = 6'd0;
@@ -414,6 +427,9 @@ assign sd_blk_cnt[0] = 6'd0;
reg drive_wp[2];
reg [1:0] drive_ready = 2'b00;
reg [1:0] double_sided = 2'b00;
reg [31:0] drive_size[2];
wire [31:0] selected_drive_size;
wire selected_drive_ready, selected_drive_wp, selected_double_sided;
// As drives are mounted in MISTer this logic saves the write protect and generates ready for
// changing drives to the wd1793.
@@ -427,6 +443,7 @@ always @(negedge img_mounted[0])
begin
drive_wp[0] <= img_readonly;
drive_ready[0] <= 1'b1;
drive_size[0] <= img_size[31:0]; //Size / 256 on [31:8]
double_sided[0]<= (img_size > 64'd368600) & (img_size < 64'd740000);//20'd368640;
end
@@ -436,90 +453,67 @@ always @(negedge img_mounted[1])
begin
drive_wp[1] <= img_readonly;
drive_ready[1] <= 1'b1;
drive_size[1] <= img_size[31:0]; //Size / 256 on [31:8]
double_sided[1]<= (img_size > 64'd368600) & (img_size < 64'd740000);//20'd368640;
end
assign selected_drive_size = (drive_index == 3'd1) ? drive_size[0]:
(drive_index == 3'd2) ? drive_size[1]:
drive_size[0]; // default is drive 1
wd1793 #(1,1) coco_wd1793_0
assign selected_drive_wp = (drive_index == 3'd1) ? drive_wp[0]:
(drive_index == 3'd2) ? drive_wp[1]:
drive_wp[0]; // default is drive 1
assign selected_double_sided= (drive_index == 3'd1) ? double_sided[0]:
(drive_index == 3'd2) ? double_sided[1]:
double_sided[0]; // default is drive 1
assign selected_drive_ready = (drive_index == 3'd1) ? drive_ready[0]:
(drive_index == 3'd2) ? drive_ready[1]:
drive_ready[0]; // default is drive 1
wd1793 #(1,0) coco_wd1793_sdc
(
.clk_sys(~CLK),
.ce(ena_8Mhz),
.reset(~RESET_N),
.io_en(1'b1),
.rd(RD[0]),
.wr(WR[0]),
.rd(RD),
.wr(WR),
.addr(ADDRESS_L[1:0]),
.din(DATA_IN_L),
.dout(dout[0]),
.drq(DRQ[0]),
.intrq(INTRQ[0]),
.dout(DATA_1793),
.drq(selected_DRQ),
.intrq(selected_INTRQ),
.img_mounted(img_mounted[0]),
.img_size(img_size),
.img_mounted(1'b0), // Not used when using _override
.img_mounted_overide(1'b1), // Load img_size and layout on each clock
.img_size(selected_drive_size[19:0]),
.sd_lba(fdc_sd_lba[0]),
.sd_rd(fdc_sd_rd[0]),
.sd_wr(fdc_sd_wr[0]),
.sd_ack(sd_ack[0]),
.sd_lba(wd1793_sd_lba),
.sd_rd(wd1793_sd_rd),
.sd_wr(wd1793_sd_wr),
.sd_ack(wd1793_sd_ack),
.sd_buff_addr(sd_buff_addr),
.sd_buff_dout(sd_buff_dout),
.sd_buff_din(fdc_sd_buff_din[0]),
.sd_buff_din(wd1793_sd_buff_din),
.sd_buff_wr(sd_buff_wr),
.wp(drive_wp[0]),
.wp(selected_drive_wp),
.size_code(3'd5), // 5 is 18 sector x 256 bits COCO standard
.layout(~double_sided[0]), // 0 = Track-Side-Sector, 1 - Side-Track-Sector
.side(double_sided[0] & DRIVE_SEL_EXT[3]),
.ready(drive_ready[0]),
.size_code(3'd5), // 5 is 18 sector x 256 bits COCO standard
.layout(~selected_double_sided), // 0 = Track-Side-Sector, 1 - Side-Track-Sector
.side(selected_double_sided & DRIVE_SEL_EXT[3]),
.ready(selected_drive_ready),
.input_active(0),
.input_active(0), // Section not used
.input_addr(0),
.input_data(0),
.input_wr(0),
.buff_din(0)
);
wd1793 #(1,0) coco_wd1793_1
(
.clk_sys(~CLK),
.ce(ena_8Mhz),
.reset(~RESET_N),
.io_en(1'b1),
.rd(RD[1]),
.wr(WR[1]),
.addr(ADDRESS_L[1:0]),
.din(DATA_IN_L),
.dout(dout[1]),
.drq(DRQ[1]),
.intrq(INTRQ[1]),
.img_mounted(img_mounted[1]),
.img_size(img_size),
.sd_lba(fdc_sd_lba[1]),
.sd_rd(fdc_sd_rd[1]),
.sd_wr(fdc_sd_wr[1]),
.sd_ack(sd_ack[1]),
.sd_buff_addr(sd_buff_addr),
.sd_buff_dout(sd_buff_dout),
.sd_buff_din(fdc_sd_buff_din[1]),
.sd_buff_wr(sd_buff_wr),
.wp(drive_wp[1]),
.size_code(3'd5), // 5 is 18 sector x 256 bits COCO standard
.layout(~double_sided[1]), // 0 = Track-Side-Sector, 1 - Side-Track-Sector
.side(double_sided[1] & DRIVE_SEL_EXT[3]),
.ready(drive_ready[1]),
.input_active(0),
.input_addr(0),
.input_data(0),
.input_wr(0),
.buff_din(0)
);
endmodule