Setting up for Multiple Config Builds.

First features setting up horz and vert ints to Mister_video correctly.
This commit is contained in:
shodge12 committed 2022-04-24 09:55:52 -04:00
1 parent 3d8bd2e279
commit a08bbd7f12
4 files changed
+176 -13

No files matched your search

+1
View File
@@ -18,6 +18,7 @@ set_global_assignment -name VERILOG_FILE rtl/cassette.v
set_global_assignment -name VERILOG_FILE rtl/rtc.sv set_global_assignment -name VERILOG_FILE rtl/rtc.sv
set_global_assignment -name VERILOG_FILE rtl/AMW.v set_global_assignment -name VERILOG_FILE rtl/AMW.v
set_global_assignment -name VERILOG_FILE rtl/square_gen.v set_global_assignment -name VERILOG_FILE rtl/square_gen.v
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/fdc.sv
set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdc.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/sdc_top.sv
+10 -7
View File
@@ -89,7 +89,8 @@ reg [2:0] BIT;
reg [3:0] STATE; reg [3:0] STATE;
reg [7:0] SCAN; reg [7:0] SCAN;
wire PARITY; wire PARITY;
reg [10:0] TIMER; //reg [10:0] TIMER;
reg [15:0] TIMER;
reg KILLER; reg KILLER;
wire RESET_X; wire RESET_X;
@@ -121,7 +122,7 @@ begin
if(!RESET_N) if(!RESET_N)
begin begin
KILLER <= 1'b1; KILLER <= 1'b1;
TIMER <= 11'h000; TIMER <= 16'h000;
end end
else else
begin begin
@@ -129,20 +130,22 @@ begin
if (ENA == 1'b0 && ENA_D == 1'b1) if (ENA == 1'b0 && ENA_D == 1'b1)
begin begin
case(TIMER) case(TIMER)
11'h000: 16'h0000:
begin begin
KILLER <= 1'b1; KILLER <= 1'b1;
if(STATE != 4'h0) if(STATE != 4'h0)
TIMER <= 11'h001; TIMER <= 16'h0001;
end end
11'h7FD: // 11'h7FD:
16'hFFFD:
begin begin
KILLER <= 1'b0; KILLER <= 1'b0;
TIMER <= 11'h7FE; // TIMER <= 11'h7FE;
TIMER <= 16'hFFFE;
end end
default: default:
if(STATE == 4'h0) if(STATE == 4'h0)
TIMER <= 11'h000; TIMER <= 16'h0000;
else else
TIMER <= TIMER + 1'b1; TIMER <= TIMER + 1'b1;
endcase endcase
+40 -6
View File
@@ -71,6 +71,8 @@
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Define Config features
`include "..\RTL\config.v"
module coco3fpga( module coco3fpga(
@@ -908,6 +910,11 @@ in any banks in any order, by simply writing the proper data into these latches.
// If W_PROT[1] = 1 then ROM_RW is 0, else ROM_RW = !RW_N // If W_PROT[1] = 1 then ROM_RW is 0, else ROM_RW = !RW_N
`ifdef Config_Debug
wire Config_FLAG = `Config_Debug_FLAG;
wire Config_Debug_Value = `Config_Debug_Value;
`endif
assign DATA_IN = assign DATA_IN =
(sdram_BE_0) ? hold_data_L[7:0]: (sdram_BE_0) ? hold_data_L[7:0]:
(sdram_BE_1) ? hold_data_L[15:8]: (sdram_BE_1) ? hold_data_L[15:8]:
@@ -967,8 +974,7 @@ assign DATA_IN =
// (ADDRESS == 16'hFF88) ? BUFF_DATA[7:0]: // (ADDRESS == 16'hFF88) ? BUFF_DATA[7:0]:
(ADDRESS == 16'hFF8E) ? GPIO_DIR: (ADDRESS == 16'hFF8E) ? GPIO_DIR:
// (ADDRESS == 16'hFF8F) ? {GPIO[7:0]}: (ADDRESS == 16'hFF8F) ? {GPIO[7:0]}:
(ADDRESS == 16'hFF8F) ? {3'b000, ps2_button, ps2_x1, ps2_y1, ps2_x2, ps2_y2}:
(ADDRESS == 16'hFF90) ? {COCO1, MMU_EN, GIME_IRQ, GIME_FIRQ, VEC_PAG_RAM, ST_SCS, ROM}: (ADDRESS == 16'hFF90) ? {COCO1, MMU_EN, GIME_IRQ, GIME_FIRQ, VEC_PAG_RAM, ST_SCS, ROM}:
(ADDRESS == 16'hFF91) ? {2'b00, TIMER_INS, 4'b0000, MMU_TR}: (ADDRESS == 16'hFF91) ? {2'b00, TIMER_INS, 4'b0000, MMU_TR}:
@@ -1034,8 +1040,13 @@ assign DATA_IN =
(ADDRESS == 16'hFFCF) ? {V_SYNC,VBLANK,H_SYNC,HBLANK, (ADDRESS == 16'hFFCF) ? {V_SYNC,VBLANK,H_SYNC,HBLANK,
KEY[0],KEY[64],KEY[63],KEY[62]}: KEY[0],KEY[64],KEY[63],KEY[62]}:
`ifdef Config_Debug
(ADDRESS == 16'hFFF0) ? Config_FLAG:
(ADDRESS == 16'hFFF1) ? Config_Debug_Value:
`else
(ADDRESS == 16'hFFF0) ? Version_Hi: (ADDRESS == 16'hFFF0) ? Version_Hi:
(ADDRESS == 16'hFFF1) ? (Version_Lo + BOARD_TYPE): (ADDRESS == 16'hFFF1) ? (Version_Lo + BOARD_TYPE):
`endif
(ADDRESS == 16'hFFF2) ? 8'hFE: (ADDRESS == 16'hFFF2) ? 8'hFE:
(ADDRESS == 16'hFFF3) ? 8'hEE: (ADDRESS == 16'hFFF3) ? 8'hEE:
(ADDRESS == 16'hFFF4) ? 8'hFE: (ADDRESS == 16'hFFF4) ? 8'hFE:
@@ -1634,11 +1645,25 @@ begin
end end
end end
assign CART_INT_N = CART_INT_IN_N;
assign VSYNC_INT_N = V_SYNC_N;
//assign HSYNC_INT_N = (H_SYNC_N | !H_FLAG); //assign HSYNC_INT_N = (H_SYNC_N | !H_FLAG);
assign HSYNC_INT_N = H_SYNC_N;
//assign TIMER_INT_N = ; `ifdef CoCo3_Horz_INT_FIX
wire HBORDER_INT;
assign HSYNC_INT_N = HBORDER_INT;
`else
assign HSYNC_INT_N = H_SYNC_N;
`endif
`ifdef CoCo3_Vert_INT_FIX
wire VBORDER_INT;
assign VSYNC_INT_N = VBORDER_INT;
`else
assign VSYNC_INT_N = V_SYNC_N;
`endif
assign CART_INT_N = CART_INT_IN_N;
assign KEY_INT_N = (KEYBOARD_IN == 8'hFF); assign KEY_INT_N = (KEYBOARD_IN == 8'hFF);
//*********************************************************************** //***********************************************************************
@@ -3976,6 +4001,15 @@ COCO3VIDEO MISTER_COCOVID(
.ROM_ADDRESS(font_adrs), .ROM_ADDRESS(font_adrs),
.ROM_DATA1(font_data), .ROM_DATA1(font_data),
// Interrupts
`ifdef CoCo3_Horz_INT_FIX
.HBORDER_INT(HBORDER_INT),
`endif
`ifdef CoCo3_Vert_INT_FIX
.VBORDER_INT(VBORDER_INT),
`endif
.HBORDER(HBORDER), .HBORDER(HBORDER),
.VBORDER(VBORDER) .VBORDER(VBORDER)
+125
View File
@@ -0,0 +1,125 @@
////////////////////////////////////////////////////////////////////////////////
// Project Name: CoCo3FPGA Version 5.x.x
// File Name: config.v
//
// CoCo3 in an FPGA
//
////////////////////////////////////////////////////////////////////////////////
//
// CPU section copyrighted by John Kent
//
////////////////////////////////////////////////////////////////////////////////
//
// Color Computer 3 compatible system on a chip
//
// Version : 5.x
//
// Copyright (c) 2008 Gary Becker ([email protected])
//
// 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.
//
////////////////////////////////////////////////////////////////////////////////
// Gary Becker
// [email protected]
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
// MISTer Conversion by Stan Hodge and Alan Steremberg (& Gary Becker)
// [email protected]
//
////////////////////////////////////////////////////////////////////////////////
// This file is a configuration definition file. The CoCo3FPGA for MiSTer source files
// can be built into multiple objects which have mutually exclusive features.
// The debug value holds upto 8 feature settings [1 per bit] - when Config_Debug is set this appears at FFF1
`define Config_Debug
`define Config_Debug_Value (`config_value_1 + `config_value_2 + `config_value_3 + `config_value_4 + `config_value_5 + `config_value_6 + `config_value_7 + `config_value_8)
`define Config_Debug_FLAG 8'h55
// Feature list - note the support area below needs editing for debug support...
///////////////////////////////////////////////////////////////////////////////////////////////////////////
`define CoCo3_Horz_INT_FIX 8'h01 // Connection of the horz int to the Mister CoCo3 V5 rasterizer
`define CoCo3_Vert_INT_FIX 8'h02 // Connection of the vert int to the Mister CoCo3 V5 rasterizer
///////////////////////////////////////////////////////////////////////////////////////////////////////////
// This is support info to create the Config_Debug_Value referenced above
`ifdef CoCo3_Horz_INT_FIX
`define config_value_1 `CoCo3_Horz_INT_FIX
`else
`define config_value_1 8'h00
`endif
`ifdef CoCo3_Vert_INT_FIX
`define config_value_2 `CoCo3_Vert_INT_FIX
`else
`define config_value_2 8'h00
`endif
`ifdef NOT_DEFINED_YET
`define config_value_3 `NOT_DEFINED_YET
`else
`define config_value_3 8'h00
`endif
`ifdef NOT_DEFINED_YET
`define config_value_4 `NOT_DEFINED_YET
`else
`define config_value_4 8'h00
`endif
`ifdef NOT_DEFINED_YET
`define config_value_5 `NOT_DEFINED_YET
`else
`define config_value_5 8'h00
`endif
`ifdef NOT_DEFINED_YET
`define config_value_6 `NOT_DEFINED_YET
`else
`define config_value_6 8'h00
`endif
`ifdef NOT_DEFINED_YET
`define config_value_7 `NOT_DEFINED_YET
`else
`define config_value_7 8'h00
`endif
`ifdef NOT_DEFINED_YET
`define config_value_8 `NOT_DEFINED_YET
`else
`define config_value_8 8'h00
`endif