From f93784660ce5853dc2a33d3b05889331130bc12d Mon Sep 17 00:00:00 2001 From: shodge12 <44378937+shodge12@users.noreply.github.com> Date: Fri, 16 Feb 2024 22:27:15 -0500 Subject: [PATCH] Fix PIA2 adrs, added Auto Run 1. Changed PIA 2 addressing to align with real CoCo3 hardware and end at FF2F. 2. Removal of 16 bit sound extentions as they overlap speach / sound cart. This is accompanied by a rework of the sound mixing to be more correct. 3. Re-arranged MiSTer drive LUNs to support future auto-boot from SDC drive 0 4. Added 'Auto Run' feature. You must use slot 2 [SDC]. Take your floopy or HD and copy it to a file name of 'boot.vhd'. This will be auto mounted to drive 0 on the SDC. In the menu, find a new item Auto Run:. It can be set to No, DOS or AUTO.BAS. Choosing dos causes the 'DOS' command to be executed on power up. Setting the option to 'AUTO.BAS' will cause a 'RUN"AUTO' command to be executed upon powerup. Save your settings to cause the changes to be remembered. The Auto Run system re-arms upon using the 'Cold Boot' menu item. To Do... 1. Add Speech / Music cart 2. Fix Color File II 3. Fic Castle of Tharoggad --- COCO3_Comp.xlsx | Bin 10714 -> 10726 bytes CoCo3.qsf | 1 - CoCo3.sv | 26 +++-- changes.txt | 25 ++++- files.qip | 1 + rtl/Auto_Run.sv | 264 +++++++++++++++++++++++++++++++++++++++++++++++ rtl/coco3fpga.sv | 170 +++++++++++++----------------- rtl/cocokey.v | 2 +- 8 files changed, 376 insertions(+), 113 deletions(-) create mode 100644 rtl/Auto_Run.sv diff --git a/COCO3_Comp.xlsx b/COCO3_Comp.xlsx index b398123e1d30f629a72032bc7edc24161b95a184..817c687bf5d54d2f7d98accc4396f717e7c9756d 100644 GIT binary patch delta 3288 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 JTq^Jf{RcOFLG%Cs delta 3242 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 diff --git a/CoCo3.qsf b/CoCo3.qsf index 0997b53..3fb234b 100644 --- a/CoCo3.qsf +++ b/CoCo3.qsf @@ -318,7 +318,6 @@ set_global_assignment -name VHDL_FILE rtl/rom/coco_rom_16.vhd set_global_assignment -name SDC_FILE rtl/CoCo3FPGA.sdc set_global_assignment -name ENABLE_SIGNALTAP ON -set_global_assignment -name USE_SIGNALTAP_FILE Vsync.stp set_global_assignment -name SIGNALTAP_FILE Video_Explorer.stp set_global_assignment -name SIGNALTAP_FILE rom_Exploror.stp1 set_global_assignment -name SOURCE_FILE rom_Exploror.stp1 diff --git a/CoCo3.sv b/CoCo3.sv index 7110600..2c61de4 100644 --- a/CoCo3.sv +++ b/CoCo3.sv @@ -194,20 +194,20 @@ localparam CONF_STR = { "-;", "OCD,Multi-Pak,(Slot 2) CoCoSDC,(Slot3) ECB /Cart,(Slot 4) Disk;", "H3-;", - "H3S0,DSK,Load Disk Drive 0;", - "H3S1,DSK,Load Disk Drive 1;", - "H3S2,DSK,Load Disk Drive 2;", - "H3S3,DSK,Load Disk Drive 3;", + "H3S2,DSK,Load Disk Drive 0;", + "H3S3,DSK,Load Disk Drive 1;", + "H3S4,DSK,Load Disk Drive 2;", + "H3S5,DSK,Load Disk Drive 3;", "H2-;", "H2F1,CCC,Load Cartridge;", "H1-;", - "H1S4,DSKVHD,Load SDC Drive 0;", - "H1S5,DSKVHD,Load SDC Drive 1;", + "H1S0,DSKVHD,Load SDC Drive 0;", + "H1S1,DSKVHD,Load SDC Drive 1;", "H1-;", - "H1S0,DSK,Load OS9 Floppy /d0;", - "H1S1,DSK,Load OS9 Floppy /d1;", - "H1S2,DSK,Load OS9 Floppy /d3;", - "H1S3,DSK,Load OS9 Floppy /d4;", + "H1S2,DSK,Load OS9 Floppy /d0;", + "H1S3,DSK,Load OS9 Floppy /d1;", + "H1S4,DSK,Load OS9 Floppy /d3;", + "H1S5,DSK,Load OS9 Floppy /d4;", "-;", "F2,CAS,Load Cassette;", @@ -242,6 +242,7 @@ localparam CONF_STR = { "OO,Force Turbo,No,Yes;", "o02,Turbo Speed,CoCo Ctrl, 0.89 Mhz,1.78 Mhz,2.86 Mhz, 3.58 Mhz,7.16 Mhz,9.54 Mhz;", "OPR,Memory Size,512K,1M,2M,16M;", + "o89,Auto Run,No,DOS,AUTO.BAS;", "-;", "RM,Cold Boot;", "R0,Reset;", @@ -260,7 +261,7 @@ localparam CONF_STR = { // 0123456789ABCDEFGHIJKLMNOPQRSTUV 0123456789ABCDEFGHIJKLMNOPQRSTUV // -// R OOOO OOR OO TOOOOOOROOOOOO ooo +// R OOOO OOR OO TOOOOOOROOOOOO ooo oo oo //F FF //S SSSSSS @@ -582,6 +583,8 @@ coco3fpga coco3 ( .Mem_Size(Mem_Size), + .AUTO_MODE(Auto_Mode), + .UART_TXD(UART_TXD), .UART_RXD(UART_RXD), .UART_RTS(UART_RTS), @@ -597,6 +600,7 @@ wire [5:0] cocosound; wire [2:0] turbo_speed = status[34:32]; wire [2:0] assigned_turbo_speed; wire [1:0] art = status[38:37]; +wire [1:0] Auto_Mode = status[41:40]; wire AMW_ACK; diff --git a/changes.txt b/changes.txt index bbbad82..091c6f1 100644 --- a/changes.txt +++ b/changes.txt @@ -1,3 +1,23 @@ +1. Changed PIA 2 addressing to align with real CoCo3 hardware and end at FF2F. +2. Removal of 16 bit sound extentions as they overlap speach / sound cart. This is + accompanied by a rework of the sound mixing to be more correct. +3. Re-arranged MiSTer drive LUNs to support future auto-boot from SDC drive 0 +4. Added 'Auto Run' feature. You must use slot 2 [SDC]. Take your floopy or HD + and copy it to a file name of 'boot.vhd'. This will be auto mounted to drive 0 + on the SDC. In the menu, find a new item Auto Run:. It can be set to No, DOS or + AUTO.BAS. Choosing dos causes the 'DOS' command to be executed on power up. Setting + the option to 'AUTO.BAS' will cause a 'RUN"AUTO' command to be executed upon powerup. + Save your settings to cause the changes to be remembered. The Auto Run system re-arms + upon using the 'Cold Boot' menu item. + + +To Do... +1. Add Speech / Music cart +2. Fix Color File II +3. Fic Castle of Tharoggad + + + 1. For cycle accurate 6809, changed PH2 to cpu_cycle_ena. (Improve timing of control register writes) 2. Changed PIA(s) addressing to allow complete mirror through FF00-FF3F 3. Corrected usage of SG6 enable (SW5 in orig code) which allows the usage of SG6. Formerly it was used to @@ -13,8 +33,9 @@ To Do... -1. Fix Color File II -2. Fic Castle of Tharoggad +1. Change PIA 2 addressing to align with real CoCo3 hardware and end at FF2F. +2. Fix Color File II +3. Fic Castle of Tharoggad diff --git a/files.qip b/files.qip index 3e75154..1425d95 100644 --- a/files.qip +++ b/files.qip @@ -23,6 +23,7 @@ set_global_assignment -name VERILOG_FILE rtl/config.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/Auto_Run.sv set_global_assignment -name SYSTEMVERILOG_FILE rtl/ps2_mouse.v set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdram/sdram2.sv set_global_assignment -name SYSTEMVERILOG_FILE rtl/wd1793.sv diff --git a/rtl/Auto_Run.sv b/rtl/Auto_Run.sv new file mode 100644 index 0000000..ae452a4 --- /dev/null +++ b/rtl/Auto_Run.sv @@ -0,0 +1,264 @@ +//////////////////////////////////////////////////////////////////////////////// +// Project Name: CoCo3FPGA Version 5.x.x +// File Name: Auto_Run.sv +// +// CoCo3 in an FPGA +// +//////////////////////////////////////////////////////////////////////////////// +// +//////////////////////////////////////////////////////////////////////////////// +// +// Color Computer 3 compatible system on a chip +// +// +// Copyright (c) 2008 Gary Becker (gary_l_becker@yahoo.com) +// +// All rights reserved +// +// Redistribution and use in source and synthezised forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// Redistributions in synthesized form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// Neither the name of the author nor the names of other contributors may +// be used to endorse or promote products derived from this software without +// specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +// Please report bugs to the author, but before you do so, please +// make sure that this is not a derivative work and that +// you have the latest version of this file. +// +// +//////////////////////////////////////////////////////////////////////////////// +// Stan Hodge +// +// Auto_Run by Stan Hodge 02/16/24 +//////////////////////////////////////////////////////////////////////////////// + + +module Auto_Run( +input RESET_N, +input CLK, +input CLK_1_78, + +input [1:0] MPI_SCS, // slot id +input [1:0] MODE, // from MISTer subsystem 00=NONE, 01=DOS, 10=RUN"AUTO +input AMW_ACK, // from AMW subsystem - Cold Boot setup finished + +input [72:0] KEY_IN, // Keystroke array +output [72:0] KEY_OUT // Modified Keystroke array +); + + +// Programs +// MODE = 01 +// D O S +wire [7:0] DOS_KEYFILE[0:3] = '{8'd4, 8'd15, 8'd19, 8'd48}; + +// MODE = 10 +// R U N 2 A U T O +wire [7:0] RUN_KEYFILE[0:9] = '{8'd18, 8'd21, 8'd14, 8'd55, 8'd34, 8'd1, 8'd21, 8'd20, 8'd15, 8'd48}; + +localparam PRESS_KEY = 1'b1; +localparam RELEASE_KEY = 1'b0; + +reg [3:0] index; +reg shift; +reg [7:0] char; +reg run; // 1=running +reg key_up_down; +reg timer_19_d; + +// 300ms [600ms is aprox 1024000] +reg [19:0] timer; +// timer[19] changes state every 524288 counts, ~ 0.294 seconds. + +reg timer_enable; // 1=run, 0=stop and clear + +localparam st_beg0 = 4'd0; +localparam st_beg1 = 4'd1; +localparam st_beg2 = 4'd2; +localparam st_start = 4'd3; +localparam st_1 = 4'd4; +localparam st_2 = 4'd5; +localparam st_3 = 4'd6; + +reg [3:0] state; + +reg first_time = 1'b1; + +///////////////////////////////////////////////////////////// +// Timer + +always @ (negedge CLK or negedge RESET_N) +begin + if(!RESET_N) + begin + timer <= 20'b00000000000000000000; + end + else + begin + if (CLK_1_78) + begin + if (timer_enable) + timer <= timer + 1'b1; + else + timer <= 20'b00000000000000000000; + end + end +end + +///////////////////////////////////////////////////////////// +// Output + +always @(*) +begin + + KEY_OUT <= KEY_IN; + + if (run) + begin + if (shift) + begin + KEY_OUT[55] <= key_up_down; + KEY_OUT[char] <= key_up_down; + end + else + begin + KEY_OUT[char] <= key_up_down; + end + end +end + + +///////////////////////////////////////////////////////////// +// Main State Mach + +always @ (negedge CLK or negedge RESET_N) +begin + if(!RESET_N) + begin + state <= st_beg0; + shift <= 1'b0; + index <= 4'd0; + run <= 1'b0; + timer_enable <= 1'b0; + key_up_down <= RELEASE_KEY; + timer_19_d <= 1'b0; + end + else + begin + + if (AMW_ACK) + first_time <= 1'b1; + + timer_19_d <= timer[19]; + + case(state) + + st_beg0: + begin + timer_enable <= 1'b1; + if (!timer[19] && timer_19_d) + state <= st_beg1; + end + + st_beg1: + begin + if (!timer[19] && timer_19_d) + state <= st_beg2; + end + + st_beg2: + begin + if (!timer[19] && timer_19_d) + begin + state <= st_start; + timer_enable <= 1'b0; + end + end + + st_start: + begin + if (first_time && (MPI_SCS == 2'b01)) + begin + if (MODE == 2'b01) //DOS + begin + if (DOS_KEYFILE[index] == 8'd55) + shift <= 1'b1; + char <= DOS_KEYFILE[index]; + run <= 1'b1; + state <= st_1; + end + else if (MODE == 2'b10) //RUN"AUTO + begin + if (RUN_KEYFILE[index] == 8'd55) + shift <= 1'b1; + char <= RUN_KEYFILE[index]; + run <= 1'b1; + state <= st_1; + end + end + end + + st_1: + begin + index <= index + 1'b1; + if (shift && (char == 8'd55)) // read next char + state <= st_start; + else + begin + timer_enable <= 1'b1; + key_up_down <= PRESS_KEY; + state <= st_2; + end + end + + st_2: + begin + if (timer[18] == 1'b1) // 300ms time passed + begin + key_up_down <= RELEASE_KEY; + state <= st_3; + end + end + + st_3: + begin + if (timer[18] == 1'b0) // 300ms time passed + begin + shift <= 1'b0; + timer_enable <= 1'b0; + if (char == 7'd48) // we are done + begin + first_time <= 1'b0; + run <= 1'b0; + end + state <= st_start; + end + end + + default:; + endcase + end +end + + +endmodule diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index edd9166..ed55e5a 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -201,7 +201,8 @@ input [64:0] RTC, input F_Turbo, input [2:0] turbo_speed, output [2:0] assigned_turbo_speed, -input [2:0] Mem_Size +input [2:0] Mem_Size, +input [1:0] AUTO_MODE ); @@ -323,7 +324,6 @@ wire HDD_EN_DATA; reg [1:0] MPI_SCS; // IO select reg [1:0] MPI_CTS; // ROM select -reg [1:0] W_PROT; reg SBS; reg [11:0] SAM00; // 8MB 5:0 for 512kb reg [11:0] SAM01; @@ -378,10 +378,6 @@ reg [18:0] LEFT_BUF2; reg [18:0] RIGHT_BUF2; reg [7:0] ORCH_LEFT; reg [7:0] ORCH_RIGHT; -reg [7:0] ORCH_LEFT_EXT; -reg [7:0] ORCH_RIGHT_EXT; -reg [7:0] ORCH_LEFT_EXT_BUF; -reg [7:0] ORCH_RIGHT_EXT_BUF; reg DACLRCLK; reg [5:0] DAC_STATE; wire H_FLAG; @@ -914,13 +910,13 @@ assign DATA_IN = // FF03, FF07, FF0B, FF0F ({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100011) ? {!VSYNC1_IRQ_BUF[1], 3'b011, SEL[1], DDR2, VSYNC1_POL, VSYNC1_IRQ_INT}: // FF20, FF24, FF28, FF2C -({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100100) ? DATA_REG3: +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001000) ? DATA_REG3: // FF21, FF25, FF29, FF2D -({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100101) ? {4'b0011, CAS_MTR, DDR3, 2'b00}: // CD_POL, CD_INT}: +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001001) ? {4'b0011, CAS_MTR, DDR3, 2'b00}: // CD_POL, CD_INT}: // FF22, FF26, FF2A, FF2E -({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100110) ? DATA_REG4: +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001010) ? DATA_REG4: // FF23, FF27, FF2B, FF2F -({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100111) ? {!CART1_FIRQ_BUF[1], 3'b011, SOUND_EN, DDR4, CART1_POL, CART1_FIRQ_INT}: +({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001011) ? {!CART1_FIRQ_BUF[1], 3'b011, SOUND_EN, DDR4, CART1_POL, CART1_FIRQ_INT}: // HiRes Joystick // ({PDL,ADDRESS} == 17'h0FF60) ? PADDLE_LATCH_0[11:4]: // ({PDL,ADDRESS} == 17'h0FF61) ? {PADDLE_LATCH_0[3:0],4'b0000}: @@ -941,7 +937,7 @@ assign DATA_IN = (ADDRESS == 16'hFF74) ? {1'b0, GART_READ[22:16]}: (ADDRESS == 16'hFF75) ? { GART_READ[15:8]}: (ADDRESS == 16'hFF76) ? { GART_READ[7:0]}: - (ADDRESS == 16'hFF7F) ? {2'b11, MPI_CTS, W_PROT, MPI_SCS}: + (ADDRESS == 16'hFF7F) ? {2'b11, MPI_CTS, 2'b00, MPI_SCS}: // (ADDRESS == 16'hFF80) ? {CK_DONE_BUF[1], // CK_FAIL, // CK_STATE}: @@ -1158,6 +1154,7 @@ assign cache_hit = (sdram_cpu_addr[24:1] == sdram_cpu_addr_L[24:1]); // This sig is only used for the cycle accurate 09 reg cpu_cycle_ena; + always @(negedge clk_sys or negedge RESET_N) begin if(!RESET_N) @@ -1363,11 +1360,18 @@ end assign RESET_P = !BUTTON_N[3] // Button | RESET; // CTRL-ALT-DEL or CTRL-ALT-INS +reg first_time = 1'b1; + // Make sure all resets are enabled for a long enough time to allow voltages to settle always @ (posedge clk_sys) begin if (RESET) MUGS <= RESET_INS; //This is holding a across a reset to activate the Easter Egg + if (first_time) + begin + MUGS <= 1'b0; + first_time = 1'b0; + end end always @ (posedge clk_sys or posedge RESET_P) @@ -1573,20 +1577,20 @@ fdc coco_fdc( .WD1793_RD_CTRL(wd1793_read), // SD block level interface - .img_mounted(img_mounted[3:0]), // signaling that new image has been mounted + .img_mounted(img_mounted[5:2]), // 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_lba(sd_lba[2:5]), + .sd_blk_cnt(sd_blk_cnt[2:5]), // number of blocks-1, total size ((sd_blk_cnt+1)*(1<<(BLKSZ+7))) must be <= 16384! + .sd_rd(sd_rd[5:2]), + .sd_wr(sd_wr[5:2]), + .sd_ack(sd_ack[5:2]), // 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_din(sd_buff_din[2:5]), .sd_buff_wr(sd_buff_wr) ); @@ -1623,20 +1627,20 @@ sdc_top coco_sdc_top( .ext_response(ext_response), // SD block level interface - .img_mounted(img_mounted[5:4]), // signaling that new image has been mounted + .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(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_lba(sd_lba[0:1]), + .sd_blk_cnt(sd_blk_cnt[0:1]), // number of blocks-1, total size ((sd_blk_cnt+1)*(1<<(BLKSZ+7))) must be <= 16384! + .sd_rd(sd_rd[1:0]), + .sd_wr(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(sd_buff_din[4:5]), + .sd_buff_din(sd_buff_din[0:1]), .sd_buff_wr(sd_buff_wr) ); @@ -1766,22 +1770,6 @@ begin RST_FF02_N <= 1'b0; 17'h1FF1E: RST_FF02_N <= 1'b0; -/* 17'h1FF20: - RST_FF20_N <= 1'b0; - 17'h1FF24: - RST_FF20_N <= 1'b0; - 17'h1FF28: - RST_FF20_N <= 1'b0; - 17'h1FF2C: - RST_FF20_N <= 1'b0; - 17'h1FF30: - RST_FF20_N <= 1'b0; - 17'h1FF34: - RST_FF20_N <= 1'b0; - 17'h1FF38: - RST_FF20_N <= 1'b0; - 17'h1FF3C: - RST_FF20_N <= 1'b0; */ 17'h1FF22: RST_FF22_N <= 1'b0; 17'h1FF26: @@ -1790,14 +1778,6 @@ begin RST_FF22_N <= 1'b0; 17'h1FF2E: RST_FF22_N <= 1'b0; - 17'h1FF32: - RST_FF22_N <= 1'b0; - 17'h1FF36: - RST_FF22_N <= 1'b0; - 17'h1FF3A: - RST_FF22_N <= 1'b0; - 17'h1FF3E: - RST_FF22_N <= 1'b0; 17'h0FF22: RST_FF22_N <= 1'b0; 17'h0FF26: @@ -1806,14 +1786,6 @@ begin RST_FF22_N <= 1'b0; 17'h0FF2E: RST_FF22_N <= 1'b0; - 17'h0FF32: - RST_FF22_N <= 1'b0; - 17'h0FF36: - RST_FF22_N <= 1'b0; - 17'h0FF3A: - RST_FF22_N <= 1'b0; - 17'h0FF3E: - RST_FF22_N <= 1'b0; 17'h1FF92: RST_FF92_N <= 1'b0; 17'h1FF93: @@ -2518,14 +2490,7 @@ begin ORCH_LEFT <= 8'b10000000; // FF7B ORCH_RIGHT <= 8'b10000000; -// FF7C - ORCH_LEFT_EXT <= 8'b10000000; - ORCH_LEFT_EXT_BUF <= 8'b10000000; -// FF7D - ORCH_RIGHT_EXT <= 8'b10000000; - ORCH_RIGHT_EXT_BUF <= 8'b10000000; // FF7F - W_PROT <= 2'b11; // MPI_SCS <= SWITCH[2:1]; // MPI_CTS <= SWITCH[2:1]; // FF8E-FF8F @@ -2762,30 +2727,20 @@ begin 16'hFF20, 16'hFF24, 16'hFF28, - 16'hFF2C, - 16'hFF30, - 16'hFF34, - 16'hFF38, - 16'hFF3C: + 16'hFF2C: begin if(!DDR3) DD_REG3 <= DATA_OUT; else begin DTOA_CODE <= DATA_OUT[7:2]; -// if({SOUND_EN,SEL} == 3'b100) -// SOUND_DTOA <= DATA_OUT[7:2]; end end 16'hFF21, 16'hFF25, 16'hFF29, - 16'hFF2D, - 16'hFF31, - 16'hFF35, - 16'hFF39, - 16'hFF3D: + 16'hFF2D: begin // CD_INT <= DATA_OUT[0]; // CD_POL <= DATA_OUT[1]; @@ -2796,11 +2751,7 @@ begin 16'hFF22, 16'hFF26, 16'hFF2A, - 16'hFF2E, - 16'hFF32, - 16'hFF36, - 16'hFF3A, - 16'hFF3E: + 16'hFF2E: begin if(!DDR4) DD_REG4 <= DATA_OUT; @@ -2815,11 +2766,7 @@ begin 16'hFF23, 16'hFF27, 16'hFF2B, - 16'hFF2F, - 16'hFF33, - 16'hFF37, - 16'hFF3B, - 16'hFF3F: + 16'hFF2F: begin CART1_FIRQ_INT <= DATA_OUT[0]; CART1_POL <= DATA_OUT[1]; @@ -2831,21 +2778,13 @@ begin 16'hFF7A: begin ORCH_LEFT <= DATA_OUT; - ORCH_LEFT_EXT <= ORCH_LEFT_EXT_BUF; end 16'hFF7B: begin ORCH_RIGHT <= DATA_OUT; - ORCH_RIGHT_EXT <= ORCH_RIGHT_EXT_BUF; end - 16'hFF7C: - ORCH_LEFT_EXT_BUF <= DATA_OUT; - 16'hFF7D: - ORCH_RIGHT_EXT_BUF <= DATA_OUT; 16'hFF7F: begin - W_PROT[0] <= DATA_OUT[2] | !DATA_OUT[3]; - W_PROT[1] <= !DATA_OUT[2] | DATA_OUT[3] | W_PROT[0]; MPI_SCS <= DATA_OUT[1:0]; MPI_CTS <= DATA_OUT[5:4]; end @@ -3373,10 +3312,10 @@ end // The code for the internal and Orchestra sound // Internal Sound generation -assign SOUND = {1'b0, SBS, SOUND_DTOA}; +assign SOUND = {SBS, 7'b0000000} + {SOUND_DTOA, SOUND_DTOA[5:4]}; -assign SOUND_LEFT = {ORCH_LEFT, ORCH_LEFT_EXT} + {SOUND, 8'h00}; -assign SOUND_RIGHT = {ORCH_RIGHT, ORCH_RIGHT_EXT} + {SOUND, 8'h00}; +assign SOUND_LEFT = {ORCH_LEFT, ORCH_LEFT} + {SOUND, SOUND}; +assign SOUND_RIGHT = {ORCH_RIGHT, ORCH_RIGHT} + {SOUND, SOUND}; // the DAC isn't really a DAC but represents the DAC chip on the schematic. @@ -3545,13 +3484,48 @@ COCOKEY coco_keyboard( .SLO_CLK(V_SYNC_N), .PS2_CLK(ps2_clk), .PS2_DATA(ps2_data), - .KEY(KEY), + .KEY(KEY_RCVD), .SHIFT(SHIFT), .SHIFT_OVERRIDE(SHIFT_OVERRIDE), .RESET(RESET), .RESET_INS(RESET_INS) ); +wire [72:0] KEY_RCVD; + +Auto_Run CoCo3_Auto_Run( + .RESET_N(RESET_N), + .CLK(clk_sys), + .CLK_1_78(clk_1_78), + .MPI_SCS(SWITCH[2:1]), + .MODE(AUTO_MODE), + .AMW_ACK(AMW_ACK), + .KEY_IN(KEY_RCVD), + .KEY_OUT(KEY) +); + +// Generate 1.78 Mhz [enable] GP clk +reg clk_1_78; +reg [4:0] clk_178_ctr; + +always @ (negedge clk_sys or negedge RESET_N) +begin + if(!RESET_N) + begin + clk_1_78 <= 1'b0; + clk_178_ctr <= 5'b00000; + end + else + begin + clk_1_78 <= 1'b0; + clk_178_ctr <= clk_178_ctr + 1'b1; + if (clk_178_ctr == 5'd27) + begin + clk_1_78 <= 1'b1; + end + end +end + // PS2 Mouse [MiSTer] // Borrowed from MAC PLUS diff --git a/rtl/cocokey.v b/rtl/cocokey.v index 8c92185..4a87474 100644 --- a/rtl/cocokey.v +++ b/rtl/cocokey.v @@ -92,7 +92,7 @@ reg SHIFT; output SHIFT_OVERRIDE; reg SHIFT_OVERRIDE; output RESET; -reg RESET; +reg RESET = 1'b0; output RESET_INS; reg RESET_INS = 1'b0;