From 85b889b6158951ca955f39c4d741ebad0b968954 Mon Sep 17 00:00:00 2001 From: shodge12 <44378937+shodge12@users.noreply.github.com> Date: Thu, 17 Feb 2022 01:48:11 -0500 Subject: [PATCH] Moved cocosdc to slot 2... Cocosdc with 2 .vhd and 2 floppies now in mpi slot 2. Fdc stinn in slot 4 and now both run under os9. --- CoCo3.sv | 42 ++++++++------ files.qip | 1 + rtl/coco3fpga.sv | 141 ++++++++++++++++++++++++++++++++++------------- rtl/fdc.sv | 93 +++++-------------------------- rtl/sdc_top.sv | 16 +++--- 5 files changed, 149 insertions(+), 144 deletions(-) diff --git a/CoCo3.sv b/CoCo3.sv index 5cec092..7b01eb1 100644 --- a/CoCo3.sv +++ b/CoCo3.sv @@ -193,14 +193,22 @@ localparam CONF_STR = { "COCO3;UART19200:9600:4800:2400:1200:300;", "-;", //"OCD,Multi-Pak Slot,Orch 90,ECB / Cart,Disk;", - "OCD,Multi-Pak Slot,(Slot3) ECB /Cart,(Slot 4) Disk;", + "OCD,Multi-Pak,(Slot 2) CoCoSDC,(Slot3) ECB /Cart,(Slot 4) Disk;", "-;", - "H2S0,DSKVHD,Load Disk Drive 0;", - "H2S1,DSKVHD,Load Disk Drive 1;", - "H2S2,DSK,Load Disk Drive 2;", - "H2S3,DSK,Load Disk Drive 3;", + "H3S0,DSK,Load Disk Drive 0;", + "H3S1,DSK,Load Disk Drive 1;", + "H3S2,DSK,Load Disk Drive 2;", + "H3S3,DSK,Load Disk Drive 3;", "-;", - "H1F1,CCC,Load Cartridge;", + "H2F1,CCC,Load Cartridge;", + "-;", + "H1S4,DSKVHD,Load SDC Drive 0;", + "H1S5,DSKVHD,Load SDC Drive 1;", + "-;", + "H1S0,DSK,Load OS9 Floppy /d0;", + "H1S1,DSK,Load OS9 Floppy /d1;", + "H1S2,DSK,Load OS9 Floppy /d3;", + "H1S3,DSK,Load OS9 Floppy /d4;", "-;", "F2,CAS,Load Cassette;", @@ -288,8 +296,8 @@ assign CLK_VIDEO = clk_sys; wire [64:0] RTC; -// SD - 4 drives 512 size blocks [the wd1793 translates to a 256 byte sector size] -hps_io #(.CONF_STR(CONF_STR),.PS2DIV(2400), .VDNUM(4), .BLKSZ(2)) hps_io +// SD - 6 drives [4 fdc and 2 sdc] 512 size blocks [the wd1793 translates to a 256 byte sector size] +hps_io #(.CONF_STR(CONF_STR),.PS2DIV(2400), .VDNUM(6), .BLKSZ(2)) hps_io ( .clk_sys(clk_sys), // .clk_sys(CLK_50M), (SRH) @@ -298,7 +306,7 @@ hps_io #(.CONF_STR(CONF_STR),.PS2DIV(2400), .VDNUM(4), .BLKSZ(2)) hps_io .buttons(buttons), .status(status), - .status_menumask({ (mpi != 2'b11), (mpi != 2'b10),direct_video}), + .status_menumask({ ~(mpi == 2'b11), ~(mpi == 2'b10),~(mpi == 2'b01), 1'b1}), .forced_scandoubler(forced_scandoubler), .RTC(RTC), .gamma_bus(gamma_bus), @@ -343,21 +351,21 @@ hps_io #(.CONF_STR(CONF_STR),.PS2DIV(2400), .VDNUM(4), .BLKSZ(2)) hps_io ); // SD block level interface -wire [3:0] img_mounted; +wire [5:0] img_mounted; wire img_readonly; wire [63:0] img_size; -wire [31:0] sd_lba[4]; -wire [3:0] sd_blk_cnt[4]; +wire [31:0] sd_lba[6]; +wire [3:0] sd_blk_cnt[6]; -wire [3:0] sd_rd; -wire [3:0] sd_wr; -wire [3:0] sd_ack; +wire [5:0] sd_rd; +wire [5:0] sd_wr; +wire [5:0] sd_ack; // SD byte level access. Signals for 2-PORT altsyncram. wire [8:0] sd_buff_addr; wire [7:0] sd_buff_dout; -wire [7:0] sd_buff_din[4]; +wire [7:0] sd_buff_din[6]; wire sd_buff_wr; @@ -563,7 +571,7 @@ wire AMW_ACK; wire cpu_speed = status[11]; -wire [1:0] mpi = (status[13:12]==2'b00) ? 2'b10: 2'b11; +wire [1:0] mpi = status[13:12] + 1'b1; wire video=status[14]; wire cartint=status[16]; wire sg4v6 = status[21]; diff --git a/files.qip b/files.qip index 92435cb..df7b76b 100644 --- a/files.qip +++ b/files.qip @@ -20,6 +20,7 @@ set_global_assignment -name VERILOG_FILE rtl/AMW.v set_global_assignment -name VERILOG_FILE rtl/square_gen.v set_global_assignment -name SYSTEMVERILOG_FILE rtl/fdc.sv set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdc.sv +set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdc_top.sv set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdram/sdram2.sv set_global_assignment -name SYSTEMVERILOG_FILE rtl/wd1793.sv set_global_assignment -name SYSTEMVERILOG_FILE CoCo3.sv diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index c07eb06..c0f4ab8 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -133,28 +133,28 @@ input joy_use_dpad, input [9:0] SWITCH, // roms, cartridges, etc -input [7:0] ioctl_data, +input [7:0] ioctl_data, input [24:0] ioctl_addr, input ioctl_download, input ioctl_wr, input [15:0] ioctl_index, // SD block level interface -input [3:0] img_mounted, // signaling that new image has been mounted +input [5:0] img_mounted, // signaling that new image has been mounted input img_readonly, // mounted as read only. valid only for active bit in img_mounted input [63:0] img_size, // size of image in bytes. 1MB MAX! -output [31:0] sd_lba[4], -output [5:0] sd_blk_cnt[4], // number of blocks-1, total size ((sd_blk_cnt+1)*(1<<(BLKSZ+7))) must be <= 16384! +output [31:0] sd_lba[6], +output [5:0] sd_blk_cnt[6], // number of blocks-1, total size ((sd_blk_cnt+1)*(1<<(BLKSZ+7))) must be <= 16384! -output reg [3:0] sd_rd, -output reg [3:0] sd_wr, -input [3:0] sd_ack, +output reg [5:0] sd_rd, +output reg [5:0] sd_wr, +input [5:0] sd_ack, // SD byte level access. Signals for 2-PORT altsyncram. input [8:0] sd_buff_addr, input [7:0] sd_buff_dout, -output [7:0] sd_buff_din[4], +output [7:0] sd_buff_din[6], input sd_buff_wr, // GPIO @@ -636,7 +636,6 @@ reg [7:0] GPIO_OUT; reg [7:0] GPIO_DIR; wire [7:0] ROM_DATA; wire [7:0] CART_DATA; -wire [7:0] fdc_probe; wire clk_sys; reg hold; @@ -680,7 +679,7 @@ assign PROBE[7:0] = {2'b00, cache_hit, COCO3_ROM_WRITE, ioctl_wr, ioctl_download assign PROBE[15:8] = 8'h00; assign PROBE[23:16] = 8'h00; //assign PROBE[31:24] = {3'b000, DATA_OUT[3], MOTOR, DRIVE_SEL_EXT[0], HDD_EN, ADDRESS[0]}; -assign PROBE[31:24] = {2'b00, fdc_probe[5:0]}; +assign PROBE[31:24] = {8'h00}; assign clk_sys = CLK_57; @@ -755,8 +754,16 @@ assign CART_SEL = (ADDRESS[15:9] == 7'b1 //11 32 External +//assign FLASH_ADDRESS = ENA_DSK ? {9'b000000100, ADDRESS[12:0]}: //8K Disk BASIC 8K Slot 4 +// ENA_DISK2 ? {7'b1111111, ADDRESS[14:0]}: //ROM Anternative Disk Controller +// ENA_ORCC ? {9'b000000101, ADDRESS[12:0]}: //8K Orchestra 8K 90CC Slot 1 +// ({ENA_PAK, ROM[1]} == 2'b10) ? {5'b00000,ROM_BANK, ADDRESS[13:0]}: //16K External R CART ROM +// ({ENA_PAK, ROM} == 3'b111) ? {4'b0000,ROM_BANK, ~ADDRESS[14], ADDRESS[13:0]}: //32K External R CART ROM +// ROM_SEL +// {7'b0000000,ADDRESS[14:0]}; + assign FLASH_ADDRESS = ENA_DSK ? {9'b000000100, ADDRESS[12:0]}: //8K Disk BASIC 8K Slot 4 - ENA_DISK2 ? {7'b1111111, ADDRESS[14:0]}: //ROM Anternative Disk Controller + ENA_DISK2 ? {9'b000000100, ADDRESS[12:0]}: //[maps to same disk rom] ENA_ORCC ? {9'b000000101, ADDRESS[12:0]}: //8K Orchestra 8K 90CC Slot 1 ({ENA_PAK, ROM[1]} == 2'b10) ? {5'b00000,ROM_BANK, ADDRESS[13:0]}: //16K External R CART ROM ({ENA_PAK, ROM} == 3'b111) ? {4'b0000,ROM_BANK, ~ADDRESS[14], ADDRESS[13:0]}: //32K External R CART ROM @@ -906,7 +913,8 @@ assign DATA_IN = (sdram_BE_0) ? hold_data_L[7:0]: (sdram_BE_1) ? hold_data_L[15:8]: FLASH_CE_S ? FLASH_DATA: - (HDD_EN | SDC_EN_CS) ? DATA_HDD: + HDD_EN ? DATA_HDD: + SDC_EN_CS ? DATA_SDC: RS232_EN ? DATA_RS232: SLOT3_HW ? {5'b00000, ROM_BANK}: // FF00, FF04, FF08, FF0C @@ -1419,26 +1427,41 @@ COCO_VID_RAM_BUF VIDEO_BUFF ( // Disk I/O //===================================================================================== -wire FF40_ENA; -wire FF40_read; -wire wd1793_data_read; -wire wd1793_read; -wire wd1793_write; +wire FF40_ENA, sdc_FF40_ENA; +wire wd1793_data_read, sdc_wd1793_data_read; +wire wd1793_read, sdc_wd1793_read; +wire wd1793_write, sdc_wd1793_write; +wire [7:0] DATA_SDC; + +wire HALT_sdc, HALT_fdc; +wire NMI_09_sdc, NMI_09_fdc; + wire SDC_REG_W_ENA, SDC_REG_READ; -assign FF40_ENA = ({PH_2, RW_N, HDD_EN, ADDRESS[3:0]} == 7'B1010000) ? 1'b1: - 1'b0; +assign FF40_ENA = ({PH_2, RW_N, HDD_EN, ADDRESS[3:0]} == 7'B1010000) ? 1'b1: + 1'b0; -assign FF40_read = ({HDD_EN, ADDRESS[3:0]} == 5'h10); -assign wd1793_data_read = (HDD_EN && ADDRESS[3]); +assign wd1793_data_read = (HDD_EN && ADDRESS[3]); -assign wd1793_read = (RW_N && HDD_EN && ADDRESS[3]); -assign wd1793_write = (~RW_N && HDD_EN && ADDRESS[3]); +assign wd1793_read = (RW_N && HDD_EN && ADDRESS[3]); +assign wd1793_write = (~RW_N && HDD_EN && ADDRESS[3]); -assign SDC_REG_W_ENA = ({PH_2, RW_N, HDD_EN} == 3'B101) ? 1'b1: // This is for the FF40/4F SDC detect - 1'b0; +assign sdc_FF40_ENA = ({PH_2, RW_N, SDC_EN_CS, ADDRESS[3:0]} == 7'B1010000) ? 1'b1: + 1'b0; -assign SDC_REG_READ = HDD_EN & RW_N; // This is for the FF40/4F SDC detect +assign sdc_wd1793_data_read = (SDC_EN_CS && ADDRESS[3]); + +assign sdc_wd1793_read = (RW_N && SDC_EN_CS && ADDRESS[3]); +assign sdc_wd1793_write = (~RW_N && SDC_EN_CS && ADDRESS[3]); + +assign SDC_REG_W_ENA = ({PH_2, RW_N, SDC_EN_CS} == 3'B101) ? 1'b1: // This is for the FF40/4F SDC detect + 1'b0; +assign SDC_REG_READ = SDC_EN_CS & RW_N; // This is for the FF40/4F SDC detect + +assign HALT = HALT_fdc | HALT_sdc; +assign NMI_09 = NMI_09_fdc | NMI_09_sdc; + +// Slot 4 fdc fdc coco_fdc( .CLK(clk_sys), // clock @@ -1447,8 +1470,8 @@ fdc coco_fdc( .CLK_EN(PH_2), .DATA_IN(DATA_OUT), // data in .DATA_HDD(DATA_HDD), // data out - .HALT(HALT), // DMA request - .NMI_09(NMI_09), + .HALT(HALT_fdc), // DMA request + .NMI_09(NMI_09_fdc), // FDC host r/w handling .FF40_CLK(clk_sys), @@ -1460,30 +1483,70 @@ fdc coco_fdc( .WD1793_WR_CTRL(wd1793_write), .WD1793_RD_CTRL(wd1793_read), +// SD block level interface + .img_mounted(img_mounted[3: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_lba(sd_lba[0:3]), + .sd_blk_cnt(sd_blk_cnt[0:3]), // number of blocks-1, total size ((sd_blk_cnt+1)*(1<<(BLKSZ+7))) must be <= 16384! + .sd_rd(sd_rd[3:0]), + .sd_wr(sd_wr[3:0]), + .sd_ack(sd_ack[3:0]), + +// SD byte level access. Signals for 2-PORT altsyncram. + .sd_buff_addr(sd_buff_addr), + .sd_buff_dout(sd_buff_dout), + .sd_buff_din(sd_buff_din[0:3]), + .sd_buff_wr(sd_buff_wr) + +); + +// Slot 2 sdc + +sdc_top coco_sdc_top( + .CLK(clk_sys), // clock + .RESET_N(RESET_N), // async reset + .ADDRESS(ADDRESS[3:0]), // i/o port addr for wd1793 & FF48+ + .CLK_EN(PH_2), + .DATA_IN(DATA_OUT), // data in + .DATA_HDD(DATA_SDC), // data out + .HALT(HALT_sdc), // DMA request + .NMI_09(NMI_09_sdc), + +// FDC host r/w handling + .FF40_CLK(clk_sys), + .FF40_ENA(sdc_FF40_ENA), + + .SDC_EN_CS(SDC_EN_CS), + .WD1793_RD(sdc_wd1793_data_read), + + .WD1793_WR_CTRL(sdc_wd1793_write), + .WD1793_RD_CTRL(sdc_wd1793_read), + // SDC I/O .SDC_REG_W_ENA(SDC_REG_W_ENA), .SDC_REG_READ(SDC_REG_READ), // SD block level interface - .img_mounted(img_mounted), // signaling that new image has been mounted + .img_mounted(img_mounted[5:4]), // 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. + .img_size(img_size), // size of image in bytes. - .sd_lba(sd_lba), - .sd_blk_cnt(sd_blk_cnt), // number of blocks-1, total size ((sd_blk_cnt+1)*(1<<(BLKSZ+7))) must be <= 16384! - .sd_rd(sd_rd), - .sd_wr(sd_wr), - .sd_ack(sd_ack), + .sd_lba(sd_lba[4:5]), + .sd_blk_cnt(sd_blk_cnt[4:5]), // number of blocks-1, total size ((sd_blk_cnt+1)*(1<<(BLKSZ+7))) must be <= 16384! + .sd_rd(sd_rd[5:4]), + .sd_wr(sd_wr[5:4]), + .sd_ack(sd_ack[5:4]), // SD byte level access. Signals for 2-PORT altsyncram. .sd_buff_addr(sd_buff_addr), .sd_buff_dout(sd_buff_dout), - .sd_buff_din(sd_buff_din), - .sd_buff_wr(sd_buff_wr), - - .probe(fdc_probe) + .sd_buff_din(sd_buff_din[4:5]), + .sd_buff_wr(sd_buff_wr) ); + reg cart_firq_enable; reg firq_trig; diff --git a/rtl/fdc.sv b/rtl/fdc.sv index da4b457..5d16a28 100644 --- a/rtl/fdc.sv +++ b/rtl/fdc.sv @@ -70,9 +70,6 @@ module fdc( input WD1793_WR_CTRL, // 1793 RD & WR control signal generation input WD1793_RD_CTRL, -// SDC I/O - input SDC_REG_W_ENA, - input SDC_REG_READ, // SD block level interface @@ -90,9 +87,8 @@ module fdc( input [8:0] sd_buff_addr, input [7:0] sd_buff_dout, output [7:0] sd_buff_din[4], - input sd_buff_wr, + input sd_buff_wr - output [7:0] probe ); wire [7:0] DRIVE_SEL_EXT; @@ -102,7 +98,7 @@ wire DENSITY; wire HALT_EN; // Diagnostics only -assign probe = {2'd0, HALT_EN_RST, sd_buff_wr, WR[0], RD[0], HALT_EN, HALT}; +//assign probe = {2'd0, HALT_EN_RST, sd_buff_wr, WR[0], RD[0], HALT_EN, HALT}; // Generate a 8.333 Mhz enable for the fdc... and control writes wire ena_8Mhz; @@ -122,77 +118,16 @@ begin end end -localparam SDC_MAGIC_CMD = 8'h43; 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 [7:0] SDC_READ_DATA; -wire sdc_always; wire FF40_RD = ({HDD_EN, ADDRESS[3:0]} == 5'h10); //FDC read data path. =$ff40 or wd1793(s) -assign DATA_HDD = (SDC_EN | sdc_always) ? SDC_READ_DATA: - (HDD_EN & (ADDRESS[3:1] == 3'b001)) ? SDC_READ_DATA: // FF42 & FF43 - (FF40_RD) ? FF40_READ_VALUE: +assign DATA_HDD = (FF40_RD) ? FF40_READ_VALUE: (WD1793_RD) ? DATA_1793: //(1793[s]) 8'h00; -wire [31:0] sdc_sd_lba[2]; -wire [31:0] fdc_sd_lba[2]; -wire [1:0] sdc_sd_rd; -wire [1:0] fdc_sd_rd; -wire [1:0] sdc_sd_wr; -wire [1:0] fdc_sd_wr; -wire [7:0] sdc_sd_buff_din[2]; -wire [7:0] fdc_sd_buff_din[2]; -wire sdc_HALT; - -assign sd_lba[0:1] = (SDC_EN | sdc_always) ? sdc_sd_lba[0:1]: - fdc_sd_lba[0:1]; - -assign sd_rd[1:0] = (SDC_EN | sdc_always) ? sdc_sd_rd[1:0]: - fdc_sd_rd[1:0]; - -assign sd_wr[1:0] = (SDC_EN | sdc_always) ? 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]: - 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 - - .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 - - .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_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]), - -// SD byte level access. Signals for 2-PORT altsyncram. - .sd_buff_addr(sd_buff_addr), - .sd_buff_dout(sd_buff_dout), - .sd_buff_din(sdc_sd_buff_din[0:1]), - .sd_buff_wr(sd_buff_wr) -); @@ -335,10 +270,10 @@ begin begin // synchronizers - read1 <= WD1793_RD_CTRL & ~(SDC_EN | sdc_always); + read1 <= WD1793_RD_CTRL; read <= read1; - write1 <= WD1793_WR_CTRL & ~(SDC_EN | sdc_always); + write1 <= WD1793_WR_CTRL; write <= write1; // delays for edge detection @@ -427,7 +362,7 @@ assign selected_DRQ = (drive_index == 3'd0) ? DRQ[0]: (drive_index == 3'd3) ? DRQ[3]: 1'b1; -assign HALT = (HALT_EN & ~selected_DRQ) | sdc_HALT; +assign HALT = (HALT_EN & ~selected_DRQ); assign HALT_EN_RST = RESET_N & ~selected_INTRQ; // From controller schematic @@ -508,14 +443,14 @@ wd1793 #(1,1) coco_wd1793_0 .img_mounted(img_mounted[0]), .img_size(img_size), - .sd_lba(fdc_sd_lba[0]), - .sd_rd(fdc_sd_rd[0]), - .sd_wr(fdc_sd_wr[0]), + .sd_lba(sd_lba[0]), + .sd_rd(sd_rd[0]), + .sd_wr(sd_wr[0]), .sd_ack(sd_ack[0]), .sd_buff_addr(sd_buff_addr), .sd_buff_dout(sd_buff_dout), - .sd_buff_din(fdc_sd_buff_din[0]), + .sd_buff_din(sd_buff_din[0]), .sd_buff_wr(sd_buff_wr), .wp(drive_wp[0]), @@ -549,14 +484,14 @@ wd1793 #(1,0) coco_wd1793_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_lba(sd_lba[1]), + .sd_rd(sd_rd[1]), + .sd_wr(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_din(sd_buff_din[1]), .sd_buff_wr(sd_buff_wr), .wp(drive_wp[1]), diff --git a/rtl/sdc_top.sv b/rtl/sdc_top.sv index 08ead3c..6751623 100644 --- a/rtl/sdc_top.sv +++ b/rtl/sdc_top.sv @@ -67,7 +67,7 @@ module sdc_top( input FF40_CLK, // FDC Write support input FF40_ENA, - input HDD_EN, // FDC Read Data support + input SDC_EN_CS, // FDC Read Data support input WD1793_RD, input WD1793_WR_CTRL, // 1793 RD & WR control signal generation @@ -93,9 +93,7 @@ module sdc_top( input [8:0] sd_buff_addr, input [7:0] sd_buff_dout, output [7:0] sd_buff_din[2], - input sd_buff_wr, - - output [7:0] probe + input sd_buff_wr ); wire [7:0] DRIVE_SEL_EXT; @@ -105,7 +103,7 @@ wire DENSITY; wire HALT_EN; // Diagnostics only -assign probe = {2'd0, HALT_EN_RST, sd_buff_wr, WR[0], RD[0], HALT_EN, HALT}; +//assign probe = {2'd0, HALT_EN_RST, sd_buff_wr, WR[0], RD[0], HALT_EN, HALT}; // Generate a 8.333 Mhz enable for the fdc... and control writes wire ena_8Mhz; @@ -131,12 +129,12 @@ wire [7:0] FF40_READ_VALUE = {HALT_EN, DRIVE_SEL_EXT[3], DENSITY, WRT_PREC, MOT wire SDC_EN = (FF40_READ_VALUE == SDC_MAGIC_CMD); wire [7:0] SDC_READ_DATA; wire sdc_always; -wire FF40_RD = ({HDD_EN, ADDRESS[3:0]} == 5'h10); +wire FF40_RD = ({SDC_EN_CS, ADDRESS[3:0]} == 5'h10); //FDC read data path. =$ff40 or wd1793(s) assign DATA_HDD = (SDC_EN | sdc_always) ? SDC_READ_DATA: - (HDD_EN & (ADDRESS[3:1] == 3'b001)) ? SDC_READ_DATA: // FF42 & FF43 + (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; @@ -414,8 +412,8 @@ assign sd_blk_cnt[1] = 6'd0; assign sd_blk_cnt[0] = 6'd0; reg drive_wp[2]; -reg [1:0] drive_ready = 4'B0; -reg [1:0] double_sided = 4'B0; +reg [1:0] drive_ready = 2'b00; +reg [1:0] double_sided = 2'b00; // As drives are mounted in MISTer this logic saves the write protect and generates ready for // changing drives to the wd1793.