From 05c2d861442e7f39a229ba0f49a5cdb001468c87 Mon Sep 17 00:00:00 2001 From: shodge12 <44378937+shodge12@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:56:20 -0500 Subject: [PATCH] Branch_20240019 All features except reduction in 1793 instances in the code. Added debug code which routes {GPIO, GPIO, GPIO} for the disk size. Also removed reset from GPIO [survives reset]. Started with pattern $80 - did not work. $40 does function. Going back to Master to try $404040 for the sdc mounted size. --- COCO3_Comp.xlsx | Bin 10869 -> 10954 bytes rtl/coco3fpga.sv | 69 ++++++++++++++++++++++++++++------------------- rtl/config.v | 6 ++--- rtl/sdc.sv | 56 +++++++++++++++++++++++++------------- rtl/sdc_top.sv | 15 ++++++++--- 5 files changed, 94 insertions(+), 52 deletions(-) diff --git a/COCO3_Comp.xlsx b/COCO3_Comp.xlsx index 7ab2025be064f3bc2fc13d9e54d2548798ff91cb..7bf649f9b1c383c75755fdec6d098479184a89c5 100644 GIT binary patch delta 3440 zcmYjUcQhMp7mwPCYK$U5jM$W*TC-6?q*iTe)-3U=QED{yNR1Gs6jh^?pmtF+tyz1# zX2og|o6@3uecx}q-~Hn`_nhaR^ZT9Oz0ZB_{ch4{`fi4XYEJcR0RM$X0z)%i$Ur}V zcxZ0=5`Fyo-f9FZ0pNljD=aH2A z=9aUUJ<-p9qM)uo+k?Z7-x7PG7rU0C>jyhI-wGV~w2^!8oB~h>&ewP=TrZi)UMsL4 zr&vqVAMp$;YJn|+g5XGL%w=6uQ>!F2t(lfZVm)2e4>}qUk(tg@EJ44VSJm8pyU~@Av~+Y=ZbR*Z!=_K6VkapiK~n!W@9{B$5tA!q-V9 zSmy{-tD!akjYjhQNJd{?R^*=ocaa|G^D5;fzj9fAlc*O!o` z+QGY>=e~?YbYC_bC71g#jmoPdi{wlN3WV+z-7=Qv%V$Xs(OXbqLE~!)RAsC)`cZ@t z+rev{J?jy*MOl%!;J}guNF3O1hsq%VrKP3Ema}UW&K&SG)YO;fsF0NBy_|aPo|$K8 zk#~KU9g+HJ1!HT=V#--A8oL${60FvoW&B8ak#+k^jvRfhm)&|Qn4?2o6z?=+bNOuE zXXZ=WF;7YSd-H{8AkEy+8&_Po#6I9>7~xy9PY%4jD%jjrpew*&1j1Dus3I%qN_v@l z?WPOtosBQ{m;24ckW=|jL!<<{r3Abgd$Wnh8vj0|5<~mOw|ZS_D#<#%Z8)$xK;3v~ zC+5o$foD>0D{G`K70J9X}Uyt zz-~PkgMDp8ZhQuVX%dE5YQO=On|A#=nc-dE$I%J96@WEF4pKoWhHK?h81K>MBRB0_ z_hRW`kY>`Y-TU3yfyN@=iGEqat@^m_i@l4rh@8IVb7H8M#~u= zL)N%4%Xsml^@vxtI!S@L%wG@|!oi_Fp#Jm)Pu=viE?sQc@D!u@V4WC$y19ldnQSI6 zWBjn-MWl8Ov|b^C{g-yBusj_w{{_Z#_qNUeXN)we_ml2H3osD`L5zP6$5{7H+PYzr zJH%WbpH41Y)rC#>=Nb*c=7HjbEO4AR25 zR2CZ4p~js*p8G9ah~DL76=bfSZ3kgnhwlCGb{+vq28l>Eb~dfT)@?bs&M|lcjzyS7 zMT^S0{N7Tw^oJ03C~wivhwycu@0_D;foc*$o8Eu2!}33S^S&7}is%iQq+Kg!(>`@c z0MCZ7){*qXbmELMh7u>6D|V@Esl#eR;jvD0y^$8!romk~J;-uf@N+Ll;7aM<S zFg%+GUW9YPIQ#N$244aDVSV)qF@qTNeI6LnlQFcOs+hzU(&7Go?E?Eir8<* z3`L$^1PY3g+KTUbr43(+be9j$tjg7Cv%diRRT+ODX<74Lm}Lk{v|Ujjr4aR~T~W#; z#n)T;o`tsl=6VzJp{LG{5-wenU|;j-%2;nkqO4QE6ZKbZOMB$^3!&#HzQ;f7eaf2q zcb2=0&c2`2Hl32|yT`~wn7xo&IqI!n%#O+LW_I)w&h3v*_*M^4KM#X3ZL=Xe0WZgH z`x$p4mt>$C7@STvydH=&b|OPlU0I4Wsai38D zuL9|TTtKI*oms>7dJca~mc))!C86~UJS7rE6nyg#SwLOET9ikKx5CRIpgn9&`6q1=H z*^cV-a-S;@1k0Zo)o}tJ=~5}&Vnx6ZJ(^Lf&Uh;oUxwhC?)4UI^rk6wJY76hJR^NI z-Qs|6q+&Eri&3**w?@4pE)J)I>%l>uv3&U;A80%^0&0n^!EG`9gQU3Kis=ByXa|gc zow6zN43+`PrplzsY6uIcKGf}_=2aav>i*s_h7IS8=R|V$a`LmL@Ybz3nI|u-ebk4vF})a&Vqx6|u@kL7t_2O&ox2cZX1cQu2?Q*&*2UgcoJcp3zf zgFXf|wu{pXatS&Kj25JGVzxHGTYgq6X0=}+Kv$DDWVCoe=7-y{o`{q2)VDS~r8#|{ zc^dK?sZ!!hfqx57s4dkoGtoO^pdapC>q0Tx6_*l~l5iDvb=?Tn{@B0sNXfxhB1>D< zaZ(6e{Yd*iKzUmmgr9B|D)azn$yrSI6KEM$&C;|{Fi~=x6vhgt8ZxafmvJU0b;uawL3ysG_y9W_cCWS zm%9mybmUKBZu0h(5Y^?3r*ve85>l%eGUEABvE5 zGKA~UhPq+qKy(07dghvdn@$1Spr{W0sTeo>1$-p9dDOUbj7BnKU9^4tq!tJMT$C!w z2Yjy9WW9kXX#1(kN+q5RxShFt(Hsp_VIHl9F7j&k?$Bjg%w}0FX94Ofc z_@JBV{u={t-HA~%wk!adaHup71N}L9wTpKKEAQF+$uKz+ewV>3o0iJ7v_0F_UpEN- zc3+d3G+Ky(p@qb9=cGyHIzA8FW}BK2*9j)jDr4W{_<9n`?>@sX{+Klk0a$$zG{kvw zJVd^yv3X9OCmNjW1YAim>GGdDZsWpi?eYD)4b*^v376^bWLL2mUIGA`@l`xLn0~KW z8I}*%*3>2aBw0|8Bl74yspIcmquBRG)54QHQq$>-?>i$`M~vIv@J(J9;}Jpgmuhc& z$DDE}8RU9UCS!Aim60)#k`&I=NOV8ar#X8&RKNX6Es)7l0co3t(%(l%DQcb_bb zTn+Wjexq+vicri$OotKTJq{N!Jml{j&oELv7m^wtg@{n|p?`c}QmBNV3t#gi&Nr(HDT51`3ptL3_kT{Fw31@I?3_gKp#c8hnOs#;QQqh_7ij(rKwKk{~}5PErFWD5`8d+o4N2Ym_P zxSy|;iCaH|Kbv9`y$6Oz?_4cwbyBLk0)F*A+a`%ky;Nu+aTm>>SN4=cX~ljbXt*Qo zvu@z-#&jg>U8l}e?fKO=KK5}pc0aP+Wg%Ri>F658QyaWPpdp_PqQsAzH_OW(?{EP@ zv{%YGKnJk6QZLXanX#wya;?rqxz3&$7^&d#?0@bkqyGfo;dXgwV|%vHe7?qtaUg%t>&6);+(5D%UfGZn<2 z8G(7vor@L^1~8QP*OY8Ef{Ts+JA+6WwoeOsXUv5=h74nkG#2?T zdmYd&2l-ZoEgnG)_ZjiohKBZ-A0lc;xnp)ijqcTRe?C8^m`O{#dzD^eC441O)Hx-; zIAqn1f5<|Zx{RA%OeqZBzj-FPh}}mJBfZ$%tRwcoNbWvU?BhvsY}KN2NhW>v9i>OJ zYgv|q@Of**ng^@VLOW;0+nIGZpN5!m#)GOv}aA(`){mvka siBmkpzZX*i|D7-j0KnsSW4QWH^luL(fM*t0r5M8B6&IvQ68Y=yUl7Y?bN~PV delta 3339 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 E04BC3$^ZZW diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index 5344e75..c337426 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -834,28 +834,36 @@ COCO_ROM_CART CC3_ROM_CART( wire SDC_EN_CS; -assign ENA_ORCC = ({CART_SEL, MPI_CTS} == 3'b100) ? 1'b1: // Orchestra-90CC C000-DFFF Slot 1 - 1'b0; -assign ENA_DISK2 = ({CART_SEL, MPI_CTS} == 3'b101) ? 1'b1: // Alternative Disk controller ROM up to 32K - 1'b0; -assign ENA_PAK = ({CART_SEL, MPI_CTS} == 3'b110) ? 1'b1: // ROM SLOT 3 - 1'b0; -assign ENA_DSK = ({CART_SEL, MPI_CTS} == 3'b111) ? 1'b1: // Disk C000-DFFF Slot 4 - 1'b0; -assign HDD_EN = ({MPI_SCS, ADDRESS[15:5]} == 13'b1111111111010) ? 1'b1: // FF40-FF5F with MPI switch = 4 - 1'b0; +assign ENA_ORCC = ({CART_SEL, MPI_CTS} == 3'b100) ? 1'b1: // Orchestra-90CC C000-DFFF Slot 1 + 1'b0; +assign ENA_DISK2 = ({CART_SEL, MPI_CTS} == 3'b101) ? 1'b1: // Alternative Disk controller ROM up to 32K + 1'b0; +assign ENA_PAK = ({CART_SEL, MPI_CTS} == 3'b110) ? 1'b1: // ROM SLOT 3 + 1'b0; +assign ENA_DSK = ({CART_SEL, MPI_CTS} == 3'b111) ? 1'b1: // Disk C000-DFFF Slot 4 + 1'b0; +`ifdef CoCo3_sdc_fix_os9_driver +assign HDD_EN = ({ext_response, MPI_SCS, ADDRESS[15:5]} == 15'b01111111111010) ? 1'b1: // FF40-FF5F with MPI switch = 4 + 1'b0; -assign SDC_EN_CS = ({MPI_SCS, ADDRESS[15:5]} == 13'b0111111111010) ? 1'b1: // FF40-FF5F with MPI switch = 2 - 1'b0; +assign SDC_EN_CS = (({MPI_SCS, ADDRESS[15:5]} == 13'b0111111111010) | + ((ADDRESS[15:5] == 11'b11111111010) & ext_response)) ? 1'b1: // FF40-FF5F with MPI switch = 2 + 1'b0; +`else +assign HDD_EN = ({MPI_SCS, ADDRESS[15:5]} == 13'b1111111111010) ? 1'b1: // FF40-FF5F with MPI switch = 4 + 1'b0; +assign SDC_EN_CS = ({MPI_SCS, ADDRESS[15:5]} == 13'b0111111111010) ? 1'b1: // FF40-FF5F with MPI switch = 2 + 1'b0; +`endif -assign RS232_EN = ({MPI_SCS, ADDRESS[15:2]} == 16'b0011111111011010) ? 1'b1: //FF68-FF6B - Now in slot 1 - 1'b0; +assign RS232_EN = ({MPI_SCS, ADDRESS[15:2]} == 16'b0011111111011010) ? 1'b1: //FF68-FF6B - Now in slot 1 + 1'b0; -assign SLOT3_HW = ({SWITCH[2:1], ADDRESS[15:5]} == 13'b1011111111010) ? 1'b1: // FF40-FF5F Ensure this only appears in slot 3 PHYSICALLY - 1'b0; +assign SLOT3_HW = ({SWITCH[2:1], ADDRESS[15:5]} == 13'b1011111111010) ? 1'b1: // FF40-FF5F Ensure this only appears in slot 3 PHYSICALLY + 1'b0; -assign VDAC_EN = ({RW_N,ADDRESS[15:0]} == 17'H0FF7E) ? 1'b1: // FF7E - 1'b0; +assign VDAC_EN = ({RW_N,ADDRESS[15:0]} == 17'H0FF7E) ? 1'b1: // FF7E + 1'b0; /* $FF40 - This is the bank latch. The same latch that is used by the Super Program Paks to bank 16K of the Pak ROM at a time. This latch is set to $00 on reset or power up (same as the super program paks). @@ -889,8 +897,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: + SDC_EN_CS ? DATA_SDC: // needs priority due to nitros9 llcocosdc ddriver bug HDD_EN ? DATA_HDD: - SDC_EN_CS ? DATA_SDC: RS232_EN ? DATA_RS232: SLOT3_HW ? {5'b00000, ROM_BANK}: // FF00, FF04, FF08, FF0C @@ -1512,6 +1520,7 @@ wire HALT_sdc, HALT_fdc; wire NMI_09_sdc, NMI_09_fdc; wire SDC_REG_W_ENA, SDC_REG_READ; +wire ext_response; assign FF40_ENA = ({PH_2, RW_N, HDD_EN, ADDRESS[3:0]} == 7'B1010000) ? 1'b1: 1'b0; @@ -1603,6 +1612,10 @@ sdc_top coco_sdc_top( .SDC_REG_W_ENA(SDC_REG_W_ENA), .SDC_REG_READ(SDC_REG_READ), + .ext_response(ext_response), + + .SZ(GPIO), + // SD block level interface .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 @@ -2514,7 +2527,7 @@ begin // MPI_CTS <= SWITCH[2:1]; // FF8E-FF8F GPIO_DIR <= 8'h00; - GPIO_OUT <= 8'h00; +// GPIO_OUT <= 8'h00; // FF90 ROM <= 2'b00; ST_SCS <= 1'b0; @@ -3498,28 +3511,28 @@ begin dac_joya2[7:0] <= 8'd128; if (joy1[0]) // right - dac_joya1[15:8] <= 8'd240; + dac_joya1[15:8] <= 8'd255; if (joy1[1]) // left - dac_joya1[15:8] <= 8'd16; + dac_joya1[15:8] <= 8'd0; if (joy1[2]) // down - dac_joya1[7:0] <= 8'd240; + dac_joya1[7:0] <= 8'd255; if (joy1[3]) // up - dac_joya1[7:0] <= 8'd16; + dac_joya1[7:0] <= 8'd0; if (joy2[0]) // right - dac_joya2[15:8] <= 8'd240; + dac_joya2[15:8] <= 8'd255; if (joy2[1]) // left - dac_joya2[15:8] <= 8'd16; + dac_joya2[15:8] <= 8'd0; if (joy2[2]) // down - dac_joya2[7:0] <= 8'd240; + dac_joya2[7:0] <= 8'd255; if (joy2[3]) // upimg_mounted - dac_joya2[7:0] <= 8'd16; + dac_joya2[7:0] <= 8'd0; end else begin diff --git a/rtl/config.v b/rtl/config.v index 160b111..4fa2be6 100644 --- a/rtl/config.v +++ b/rtl/config.v @@ -84,9 +84,9 @@ `set_feature(CoCo3_CYC_ACC_6809, FEATURE_3) // Use cycle accurate 6809 -//`set_feature(CoCo3_sdc_override_size, FEATURE_4) // Define static size value +`set_feature(CoCo3_sdc_override_size, FEATURE_4) // Define static size value -//`set_feature(CoCo3_sdc_fix_os9_driver, FEATURE_5) // fix sdc query disk size issue in llcocosdc driver in multipak enviroment +`set_feature(CoCo3_sdc_fix_os9_driver, FEATURE_5) // fix sdc query disk size issue in llcocosdc driver in multipak enviroment -//`set_feature(CoCo3_disable_GART_in_GIMEX, FEATURE_6)// Disable GIMEX ram transfers [GIMEX detection in OS( EOU] +`set_feature(CoCo3_disable_GART_in_GIMEX, FEATURE_6)// Disable GIMEX ram transfers [GIMEX detection in OS( EOU] diff --git a/rtl/sdc.sv b/rtl/sdc.sv index 1b31b18..db7f081 100644 --- a/rtl/sdc.sv +++ b/rtl/sdc.sv @@ -59,15 +59,20 @@ module sdc( input SDC_WR, input SDC_RD, - output sdc_always, - output reg sdc_HALT, + output reg ext_response, + + input [7:0] SZ, + + output reg sdc_always, + + // SD block level interface input [1: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 [19:0] img_size, // size of image in bytes. 1MB MAX! + input [63:0] img_size, // size of image in bytes. 1MB MAX! output [31:0] sd_lba[2], output reg [1:0] sd_rd, @@ -87,11 +92,12 @@ reg [7:0] transfer_address; reg new_cmd, new_cmd_d, cmd_done; reg data_inc, run; +reg rxt_res_end; reg transfer_clear; reg [3:0] sdc_data_reg; wire [7:0] sdc_status_reg = {sdc_data_reg, 4'h4}; -reg [15:0] drive_size[2]; +reg [23:0] drive_size[2]; typedef enum { @@ -133,13 +139,14 @@ begin command <= 8'h00; new_cmd <= 1'b0; data_inc <= 1'b0; + rxt_res_end <= 1'b0; transfer_address <= 8'h00; sdc_data_reg <= 4'h0; end else begin data_inc <= 1'b0; - + rxt_res_end <= 1'b0; if (cmd_done) new_cmd <= 1'b0; @@ -188,6 +195,9 @@ begin if (CLK_EN & SDC_RD & (ADDRESS[3:1] == 3'b101) & (run)) // Read @ $ff4A / $ff4B data_inc <= 1'b1; + if (CLK_EN & SDC_RD & (ADDRESS[3:0] == 4'b1001) & (~run)) // Read @ $ff49 [last of size data] + rxt_res_end <= 1'b1; + if (data_inc) transfer_address <= transfer_address + 1'b1; @@ -205,7 +215,6 @@ localparam CMD_EXT = 5'b11000; reg wr_cmd; reg ack_d; -reg ext_response; reg [23:0] response_reg; wire end_ack = ~sd_ack[l_drive] & ack_d; reg l_drive, buffer_upper; @@ -250,6 +259,9 @@ begin sdc_ready <= 1'b0; end + if (rxt_res_end) // If we read ff4b then we've read the ext_response + ext_response <= 1'b0; + case(state) state_idle: begin @@ -271,7 +283,10 @@ begin state <= state_ext; end else // no valid command found + begin + sdc_fail <= 1'b1; cmd_done <= 1'b1; + end end state_read: begin @@ -372,15 +387,16 @@ begin sdc_busy <= 1'b1; state <= state_e1; end -// else if (LSN[23:16] == 8'H67) // This is g [Disable FDC emulation] -// begin -// cmd_done <= 1'b1; -// sdc_always <= 1'b1; // Disable floppy -// state <= state_idle; -// end + else if (LSN[23:16] == 8'H67) // This is g [Disable FDC emulation] + begin + cmd_done <= 1'b1; + sdc_always <= 1'b1; // Disable floppy + state <= state_idle; + end else begin cmd_done <= 1'b1; // All other ext commands... + sdc_fail <= 1'b1; state <= state_idle; end end @@ -389,7 +405,11 @@ begin begin sdc_busy <= 1'b0; ext_response <= 1'b1; - response_reg <= {8'h00, drive_size[l_drive]}; + `ifdef CoCo3_sdc_override_size + response_reg <= { SZ, SZ, SZ}; // This fixes a redirect error in OS9EOU - Value=no hardware + `else + response_reg <= drive_size[l_drive][31:8]; // This returns the correct size of the mounted drive in sectors + `endif state <= state_e2; end @@ -436,8 +456,8 @@ assign sdc_status = {sdc_fail, drive_wp[l_drive], 1'b0, ~drive_ready[l_drive], 2 assign SDC_READ_DATA = (ADDRESS == ADRS_FF42) ? {sdc_data_reg, 4'h0}: (ADDRESS == ADRS_FF43) ? sdc_status_reg: - ((ADDRESS == ADRS_FF48) & ~ext_response) ? sdc_status: - ((ADDRESS == ADRS_FF48) & ext_response) ? response_reg[23:16]: + (ADDRESS == ADRS_FF48) ? sdc_status: + (ADDRESS == ADRS_FF49) ? response_reg[23:16]: ((ADDRESS == ADRS_FF4A) & ~ext_response) ? hd_buff_data: ((ADDRESS == ADRS_FF4A) & ext_response) ? response_reg[15:8]: ((ADDRESS == ADRS_FF4B) & ~ext_response) ? hd_buff_data: @@ -450,7 +470,7 @@ always @(negedge img_mounted[0]) begin drive_wp[0] <= img_readonly; drive_ready[0] <= 1'b1; - drive_size[0] <= {4'h0, img_size[19:8]}; //Size / 256 + drive_size[0] <= img_size[31:0]; end // SD Drive 1 @@ -459,7 +479,7 @@ always @(negedge img_mounted[1]) begin drive_wp[1] <= img_readonly; drive_ready[1] <= 1'b1; - drive_size[1] <= {4'h0, img_size[19:8]}; //Size / 256 + drive_size[1] <= img_size[31:0]; end endmodule @@ -500,4 +520,4 @@ always_ff@(posedge clock) begin end end -endmodule \ No newline at end of file +endmodule diff --git a/rtl/sdc_top.sv b/rtl/sdc_top.sv index 6751623..133e06e 100644 --- a/rtl/sdc_top.sv +++ b/rtl/sdc_top.sv @@ -77,6 +77,10 @@ module sdc_top( input SDC_REG_W_ENA, input SDC_REG_READ, + output ext_response, + + input [7:0] SZ, + // SD block level interface input [1:0] img_mounted, // signaling that new image has been mounted @@ -126,14 +130,14 @@ 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 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); //FDC read data path. =$ff40 or wd1793(s) -assign DATA_HDD = (SDC_EN | sdc_always) ? SDC_READ_DATA: +assign DATA_HDD = (SDC_EN | ext_response) ? 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]) @@ -173,9 +177,14 @@ sdc coco_sdc( .SDC_WR(SDC_REG_W_ENA), .SDC_RD(SDC_REG_READ), + .sdc_HALT(sdc_HALT), + + .ext_response(ext_response), + + .SZ(SZ), + .sdc_always(sdc_always), // SDC is active [output from sdc (sdc is turning off fdc)] - .sdc_HALT(sdc_HALT), // SD block level interface