From 8fd2fc0542e3bfa1a9b6126ce759f9bc5aa1ea53 Mon Sep 17 00:00:00 2001 From: Jose Tejada Date: Thu, 4 May 2023 08:57:45 +0200 Subject: [PATCH] cen signals defined in mem.yaml for kicker mikie pinpon roadf roc sbaskt track --- cores/kicker/cfg/common.yaml | 1 - cores/kicker/cfg/mem.yaml | 10 +++++++ cores/kicker/hdl/jtkicker_clocks.v | 48 ------------------------------ cores/kicker/hdl/jtkicker_game.v | 13 +------- cores/mikie/cfg/mem.yaml | 10 +++++++ cores/mikie/hdl/jtmikie_game.v | 13 +------- cores/pinpon/cfg/mem.yaml | 10 +++++++ cores/pinpon/hdl/jtpinpon_game.v | 13 +------- cores/roadf/cfg/mem.yaml | 13 ++++++++ cores/roadf/hdl/jtroadf_game.v | 14 +-------- cores/roc/cfg/mem.yaml | 8 +++++ cores/roc/hdl/jtroc_game.v | 13 +------- cores/sbaskt/cfg/mem.yaml | 14 +++++++++ cores/sbaskt/hdl/jtsbaskt_game.v | 14 +-------- cores/track/cfg/mem.yaml | 14 +++++++++ cores/track/hdl/jttrack_game.v | 14 +-------- modules/jtframe | 2 +- 17 files changed, 87 insertions(+), 137 deletions(-) delete mode 100644 cores/kicker/hdl/jtkicker_clocks.v diff --git a/cores/kicker/cfg/common.yaml b/cores/kicker/cfg/common.yaml index 2133a9eaa..b573095d0 100644 --- a/cores/kicker/cfg/common.yaml +++ b/cores/kicker/cfg/common.yaml @@ -5,7 +5,6 @@ game: - jtkicker_scroll.v - jtkicker_obj.v - jtkicker_objdraw.v - - jtkicker_clocks.v jtframe: - get: - jtframe_ff.v diff --git a/cores/kicker/cfg/mem.yaml b/cores/kicker/cfg/mem.yaml index 877c0aee5..b3e11359c 100644 --- a/cores/kicker/cfg/mem.yaml +++ b/cores/kicker/cfg/mem.yaml @@ -2,6 +2,16 @@ params: - { name: SCR_OFFSET, value: "`SCR_START >> 1" } - { name: OBJ_OFFSET, value: "`OBJ_START >> 1" } - { name: PCM_OFFSET, value: "`PCM_START >> 1" } + +clocks: + clk24: + - mul: 1 + div: 4 + outputs: + - cpu4 + - ti1 + - ti2 + download: post_addr: true noswab: true diff --git a/cores/kicker/hdl/jtkicker_clocks.v b/cores/kicker/hdl/jtkicker_clocks.v deleted file mode 100644 index d880ee695..000000000 --- a/cores/kicker/hdl/jtkicker_clocks.v +++ /dev/null @@ -1,48 +0,0 @@ -/* This file is part of JTCORES. - JTCORES program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - JTCORES program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with JTCORES. If not, see . - - Author: Jose Tejada Gomez. Twitter: @topapate - Version: 1.0 - Date: 16-3-2022 */ - -module jtkicker_clocks( - input [31:0] status, - // 24 MHz domain - input clk24, - output cpu4_cen, - output snd_cen, - output psg_cen, - output ti1_cen, - output ti2_cen -); - -// Define JTFRAME_PLL=jtframe_pll6144 in the .def file -// so the base clock is 49.152MHz instead of 48MHz -// That will make the pixel clock 6.144 instead of 6.0 - -jtframe_frac_cen #(.W(4)) u_pxl_cen ( - .clk ( clk24 ), - .n ( 10'd1 ), - .m ( 10'd4 ), - .cen ( {ti2_cen, ti1_cen, cpu4_cen } ), // 1.5, 3, 6 MHz - .cenb ( ) // 180 shifted -); - -jtframe_cen3p57 #(.CLK24(1)) u_snd_cen( - .clk ( clk24 ), - .cen_3p57 ( snd_cen ), - .cen_1p78 ( psg_cen ) -); - -endmodule \ No newline at end of file diff --git a/cores/kicker/hdl/jtkicker_game.v b/cores/kicker/hdl/jtkicker_game.v index 71b3f6a4e..f35a11a75 100644 --- a/cores/kicker/hdl/jtkicker_game.v +++ b/cores/kicker/hdl/jtkicker_game.v @@ -30,7 +30,7 @@ wire [ 3:0] dipsw_c; wire V16; wire [ 2:0] pal_sel; -wire cpu_cen, cpu4_cen, ti1_cen, ti2_cen; +wire cpu_cen; wire cpu_rnw, cpu_irqn, cpu_nmin; wire vscr_cs, vram_cs, obj1_cs, obj2_cs, flip; wire [ 7:0] vscr_dout, vram_dout, obj_dout, cpu_dout; @@ -55,17 +55,6 @@ always @(*) begin end end -jtkicker_clocks u_clocks( - .status ( status ), - // 24 MHz domain - .clk24 ( clk24 ), - .cpu4_cen ( cpu4_cen ), - .snd_cen ( ), - .psg_cen ( ), - .ti1_cen ( ti1_cen ), - .ti2_cen ( ti2_cen ) -); - `ifndef NOMAIN `MAIN_MODULE u_main( .rst ( rst24 ), diff --git a/cores/mikie/cfg/mem.yaml b/cores/mikie/cfg/mem.yaml index ef820ad00..497240a9e 100644 --- a/cores/mikie/cfg/mem.yaml +++ b/cores/mikie/cfg/mem.yaml @@ -2,6 +2,16 @@ params: - { name: SCR_OFFSET, value: "`SCR_START >> 1" } - { name: OBJ_OFFSET, value: "`OBJ_START >> 1" } - { name: SND_OFFSET, value: "`SND_START >> 1" } + +clocks: + clk24: + - mul: 1 + div: 4 + outputs: + - cpu4 + - ti1 + - ti2 + download: pre_addr: true post_data: true diff --git a/cores/mikie/hdl/jtmikie_game.v b/cores/mikie/hdl/jtmikie_game.v index 9510e56ac..5d3216137 100644 --- a/cores/mikie/hdl/jtmikie_game.v +++ b/cores/mikie/hdl/jtmikie_game.v @@ -32,7 +32,7 @@ wire [ 1:0] dipsw_c; wire V16; wire [ 2:0] pal_sel; -wire cpu_cen, cpu4_cen, ti1_cen, ti2_cen; +wire cpu_cen; wire cpu_rnw, cpu_irqn, cpu_nmin; wire vram_cs, objram_cs, flip; wire [ 7:0] vscr_dout, vram_dout, obj_dout, cpu_dout; @@ -68,17 +68,6 @@ always @(*) begin end end -jtkicker_clocks u_clocks( - .status ( status ), - // 24 MHz domain - .clk24 ( clk24 ), - .cpu4_cen ( cpu4_cen ), - .snd_cen ( ), - .psg_cen ( ), - .ti1_cen ( ti1_cen ), - .ti2_cen ( ti2_cen ) -); - `ifndef NOMAIN jtmikie_main u_main( .rst ( rst24 ), diff --git a/cores/pinpon/cfg/mem.yaml b/cores/pinpon/cfg/mem.yaml index cb27db5fc..a04dcd05c 100644 --- a/cores/pinpon/cfg/mem.yaml +++ b/cores/pinpon/cfg/mem.yaml @@ -1,6 +1,16 @@ params: - { name: SCR_OFFSET, value: "`SCR_START >> 1" } - { name: OBJ_OFFSET, value: "`OBJ_START >> 1" } + +clocks: + clk24: + - mul: 1 + div: 4 + outputs: + - cpu4 + - ti1 + - ti2 + download: pre_addr: true sdram: diff --git a/cores/pinpon/hdl/jtpinpon_game.v b/cores/pinpon/hdl/jtpinpon_game.v index 169a9710e..4060b4b60 100644 --- a/cores/pinpon/hdl/jtpinpon_game.v +++ b/cores/pinpon/hdl/jtpinpon_game.v @@ -30,7 +30,7 @@ wire [ 7:0] dipsw_a, dipsw_b; wire [ 2:0] dipsw_c; // The bit 3 is not connected on the board wire V16; -wire cpu_cen, cpu4_cen, ti1_cen, ti2_cen; +wire cpu_cen; wire cpu_rnw, cpu_irqn, cpu_nmin; wire vram_cs, oram_cs, flip; wire [ 7:0] vram_dout, obj_dout, cpu_dout; @@ -57,17 +57,6 @@ always @(*) begin end end -jtkicker_clocks u_clocks( - .status ( status ), - // 24 MHz domain - .clk24 ( clk24 ), - .cpu4_cen ( cpu4_cen ), - .snd_cen ( ), - .psg_cen ( ), - .ti1_cen ( ti1_cen ), - .ti2_cen ( ti2_cen ) -); - `ifndef NOMAIN assign snd[4:0]=0; diff --git a/cores/roadf/cfg/mem.yaml b/cores/roadf/cfg/mem.yaml index f570db467..fd510ee43 100644 --- a/cores/roadf/cfg/mem.yaml +++ b/cores/roadf/cfg/mem.yaml @@ -3,6 +3,19 @@ params: - { name: OBJ_OFFSET, value: "`OBJ_START >> 1" } - { name: PCM_OFFSET, value: "`PCM_START >> 1" } - { name: SND_OFFSET, value: "`SND_START >> 1" } +clocks: + clk24: + - mul: 1 + div: 4 + outputs: + - cpu4 + - ti1 + - ti2 + - freq: 3579545 + outputs: + - snd + - psg + download: post_addr: true post_data: true diff --git a/cores/roadf/hdl/jtroadf_game.v b/cores/roadf/hdl/jtroadf_game.v index 963bf75fa..7734a8950 100644 --- a/cores/roadf/hdl/jtroadf_game.v +++ b/cores/roadf/hdl/jtroadf_game.v @@ -31,11 +31,10 @@ wire [ 7:0] dipsw_a, dipsw_b; wire [ 2:0] dipsw_c; wire obj_frame; -wire cpu_cen, cpu4_cen; +wire cpu_cen; wire cpu_rnw, cpu_irqn, cpu_nmin; wire vram_cs, objram_cs, flip; wire [ 7:0] vram_dout, obj_dout, cpu_dout; -wire snd_cen, psg_cen; wire m2s_irq, m2s_data; wire main_pause; @@ -72,17 +71,6 @@ always @(posedge clk) begin is_hyper <= &prog_data; end -jtkicker_clocks u_clocks( - .status ( status ), - // 24 MHz domain - .clk24 ( clk24 ), - .cpu4_cen ( cpu4_cen ), - .snd_cen ( snd_cen ), - .psg_cen ( psg_cen ), - .ti1_cen ( ), - .ti2_cen ( ) -); - `ifndef NOMAIN jtroadf_main u_main( .rst ( rst24 ), diff --git a/cores/roc/cfg/mem.yaml b/cores/roc/cfg/mem.yaml index 971efb072..436b378b0 100644 --- a/cores/roc/cfg/mem.yaml +++ b/cores/roc/cfg/mem.yaml @@ -2,6 +2,14 @@ params: - { name: SCR_OFFSET, value: "`SCR_START >> 1" } - { name: OBJ_OFFSET, value: "`OBJ_START >> 1" } - { name: SND_OFFSET, value: "`SND_START >> 1" } + +clocks: + clk24: + - mul: 1 + div: 4 + outputs: + - cpu4 + download: post_addr: true sdram: diff --git a/cores/roc/hdl/jtroc_game.v b/cores/roc/hdl/jtroc_game.v index b102a0ade..b27708373 100644 --- a/cores/roc/hdl/jtroc_game.v +++ b/cores/roc/hdl/jtroc_game.v @@ -31,7 +31,7 @@ wire [10:0] cpu_addr; wire [ 7:0] st_main, st_snd; reg [ 7:0] view_mux; -wire cpu_cen, cpu4_cen, ti1_cen, ti2_cen; +wire cpu_cen; wire cpu_rnw, cpu_irqn, cpu_nmin; wire vram_cs, objram_cs, flip; wire [ 7:0] vram_dout, obj_dout, cpu_dout; @@ -68,17 +68,6 @@ always @(*) begin end end -jtkicker_clocks u_clocks( - .status ( status ), - // 24 MHz domain - .clk24 ( clk24 ), - .cpu4_cen ( cpu4_cen ), - .snd_cen ( ), - .psg_cen ( ), - .ti1_cen ( ), - .ti2_cen ( ) -); - `ifndef NOMAIN jtroc_main u_main( .rst ( rst24 ), diff --git a/cores/sbaskt/cfg/mem.yaml b/cores/sbaskt/cfg/mem.yaml index b4c0c432a..6afac8cff 100644 --- a/cores/sbaskt/cfg/mem.yaml +++ b/cores/sbaskt/cfg/mem.yaml @@ -3,6 +3,20 @@ params: - { name: OBJ_OFFSET, value: "`OBJ_START >> 1" } - { name: PCM_OFFSET, value: "`PCM_START >> 1" } - { name: SND_OFFSET, value: "`SND_START >> 1" } + +clocks: + clk24: + - mul: 1 + div: 4 + outputs: + - cpu4 + - ti1 + - ti2 + - freq: 3579545 + outputs: + - snd + - psg + download: post_data: true sdram: diff --git a/cores/sbaskt/hdl/jtsbaskt_game.v b/cores/sbaskt/hdl/jtsbaskt_game.v index 3602d0714..560d4bb8c 100644 --- a/cores/sbaskt/hdl/jtsbaskt_game.v +++ b/cores/sbaskt/hdl/jtsbaskt_game.v @@ -28,13 +28,12 @@ wire V16; wire [ 3:0] pal_sel; wire obj_frame; -wire cpu_cen, cpu4_cen; +wire cpu_cen; wire cpu_rnw, cpu_irqn, cpu_nmin; wire vscr_cs, vram_cs, objram_cs, flip; wire [ 7:0] vscr_dout, vram_dout, obj_dout, cpu_dout, debug_snd; wire vsync60; -wire snd_cen, psg_cen; wire m2s_irq, m2s_data; @@ -51,17 +50,6 @@ always @(*) begin end end -jtkicker_clocks u_clocks( - .status ( status ), - // 24 MHz domain - .clk24 ( clk24 ), - .cpu4_cen ( cpu4_cen ), - .snd_cen ( snd_cen ), - .psg_cen ( psg_cen ), - .ti1_cen ( ), - .ti2_cen ( ) -); - `ifndef NOMAIN jtsbaskt_main u_main( .rst ( rst24 ), diff --git a/cores/track/cfg/mem.yaml b/cores/track/cfg/mem.yaml index db940f00c..b804bf6f3 100644 --- a/cores/track/cfg/mem.yaml +++ b/cores/track/cfg/mem.yaml @@ -3,6 +3,20 @@ params: - { name: OBJ_OFFSET, value: "`OBJ_START >> 1" } - { name: SND_OFFSET, value: "`SND_START >> 1" } - { name: PCM_OFFSET, value: "`PCM_START >> 1" } + +clocks: + clk24: + - mul: 1 + div: 4 + outputs: + - cpu4 + - ti1 + - ti2 + - freq: 3579545 + outputs: + - snd + - psg + download: post_addr: true post_data: true diff --git a/cores/track/hdl/jttrack_game.v b/cores/track/hdl/jttrack_game.v index 782a6ae1b..ae417484e 100644 --- a/cores/track/hdl/jttrack_game.v +++ b/cores/track/hdl/jttrack_game.v @@ -29,11 +29,10 @@ localparam [24:0] PROM_START = `JTFRAME_PROM_START; wire [ 7:0] dipsw_a, dipsw_b; -wire cpu_cen, cpu4_cen; +wire cpu_cen; wire cpu_rnw, cpu_irqn, cpu_nmin; wire vram_cs, objram_cs, flip; wire [ 7:0] vram_dout, obj_dout, cpu_dout; -wire snd_cen, psg_cen; wire m2s_irq, m2s_data; wire main_pause; @@ -58,17 +57,6 @@ always @(*) begin end end -jtkicker_clocks u_clocks( - .status ( status ), - // 24 MHz domain - .clk24 ( clk24 ), - .cpu4_cen ( cpu4_cen ), - .snd_cen ( snd_cen ), - .psg_cen ( psg_cen ), - .ti1_cen ( ), - .ti2_cen ( ) -); - `ifndef NOMAIN jttrack_main u_main( .rst ( rst24 ), diff --git a/modules/jtframe b/modules/jtframe index 18cd394a0..2254931ce 160000 --- a/modules/jtframe +++ b/modules/jtframe @@ -1 +1 @@ -Subproject commit 18cd394a0f5a9943f7becf0c318e41303e13d45d +Subproject commit 2254931cea53cc441b42d8a3b44ce343f56a40c7