From 1c88facd627a47855d561bcf90bfccd5562a5301 Mon Sep 17 00:00:00 2001 From: Gehstock Date: Sun, 13 May 2018 11:49:14 +0200 Subject: [PATCH] some Work on MAX --- Commodore - MAX_MiST/rtl/MAX.sv | 22 +++++++++--------- ORAO_MiST/rtl/build_id.v | 4 ++-- .../rtl/T80/Z1013_Mist.pti_db_list.ddb | Bin 295 -> 0 bytes .../rtl/T80/Z1013_Mist.tis_db_list.ddb | Bin 295 -> 0 bytes 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 Robotron - Z1013_MiST/rtl/T80/Z1013_Mist.pti_db_list.ddb delete mode 100644 Robotron - Z1013_MiST/rtl/T80/Z1013_Mist.tis_db_list.ddb diff --git a/Commodore - MAX_MiST/rtl/MAX.sv b/Commodore - MAX_MiST/rtl/MAX.sv index a1e5e5dd..98e34e63 100644 --- a/Commodore - MAX_MiST/rtl/MAX.sv +++ b/Commodore - MAX_MiST/rtl/MAX.sv @@ -36,7 +36,7 @@ wire ps2_kbd_clk, ps2_kbd_data; wire [31:0] status; wire [1:0] buttons; wire [1:0] switches; - +assign LED = 1; reg [7:0] reset_cnt; always @(posedge clk_cpu) begin @@ -95,14 +95,14 @@ wire [3:0]COL_DO; //SID wire [7:0]SID_DO; //CARD -wire [7:0]CARD_DO; +wire [7:0]CART_DO; wire [7:0]cia_pai; wire [7:0]cia_pao; wire [7:0]cia_pbi; wire [7:0]cia_pbo; wire enableCPU, enableCIA, enableVIC = 1; -wire enablePixel; +wire enablePixel = 1; wire pulseRd; pll pll( @@ -144,7 +144,7 @@ video_mixer #(.LINE_LENGTH(600), .HALF_DEPTH(0)) video_mixer .SPI_SS3(SPI_SS3), .SPI_DI(SPI_DI), .scanlines(scandoubler_disable ? 2'b00 : {status[4:3] == 3, status[4:3] == 2}), - .scandoubler_disable(1),//scandoubler_disable), + .scandoubler_disable(scandoubler_disable), .hq2x(status[4:3]==1), .ypbpr(ypbpr), .ypbpr_full(1), @@ -174,7 +174,7 @@ assign AUDIO_R = AUDIO_L; //CPU MOS6510 cpu_6510 U5 ( - .clk(clk_cpu), + .clk(phi0_cpu), .reset(reset), .enable(enableCPU), .nmi_n(nNMI), @@ -191,8 +191,8 @@ cpu_6510 U5 ( //PLA MOS6703 pla_6703 pla_6703 ( .A(ADDR_BUS[15:10]), - .DI(),// Color Data - .DO(),// DataBUS + .DI(CPU_DO),// Color Data + .DO(),//CPU_DI),// DataBUS .CLK(clk_cpu), .BA(BA), .RW_IN(RW), @@ -266,9 +266,9 @@ vic_656x vic_656x ( fpga64_rgbcolor fpga64_rgbcolor ( .index(VIC_ColIndex), - .r(r), - .g(g), - .b(b) + .r(r[5:0]), + .g(g[5:0]), + .b(b[5:0]) ); //CIA MOS6526 @@ -300,7 +300,7 @@ sid_6581 sid_6581 ( .reset(reset), .cs(~nSID), .we(~RW), - .addr({4'b0,ADDR_BUS[3:0]}), + .addr(ADDR_BUS[3:0]), .data_i(CPU_DO), .data_o(SID_DO), .poti_x(~(cia_pao[7] & JoyA[5]) | (cia_pao[6] & JoyB[5])),//todo diff --git a/ORAO_MiST/rtl/build_id.v b/ORAO_MiST/rtl/build_id.v index ffb52837..a4f360fe 100644 --- a/ORAO_MiST/rtl/build_id.v +++ b/ORAO_MiST/rtl/build_id.v @@ -1,2 +1,2 @@ -`define BUILD_DATE "180430" -`define BUILD_TIME "162546" +`define BUILD_DATE "180511" +`define BUILD_TIME "215937" diff --git a/Robotron - Z1013_MiST/rtl/T80/Z1013_Mist.pti_db_list.ddb b/Robotron - Z1013_MiST/rtl/T80/Z1013_Mist.pti_db_list.ddb deleted file mode 100644 index 471809249f2af0c11eec3dd80b04b1324d2f2fde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmWe(U|?9w%?KnJ7_xxS7)Xbu78Pga=P4K(>lx}9C^(g7=Al+yu z8Y={QDTJpcDY&L&mH?H?f%P*mG(zdCP#Q$3LkwrAU`$F(NJwBx5=dwcP?#iqhy^J5 z|36STEg@wBQ09W*pWwqBOJ+7i$aOF~**uP&^Qcz#ugu-p=10si%}ut=&M|+T9@+lA z^Jk{SjK(azpZ}xTmo%su7(_4{*4c)I860j{#^TD<%h$nQ(DUVEc}Zg01BRK*tO}3U zG+NwKHP+v4V!m&O%F$D+6bv_?P*dHgvQNd>+*se%&fH$rba}+_qoz7`M=oE#eBSon S_4`M!s^7b+f8{zK*p&b*D`VjR diff --git a/Robotron - Z1013_MiST/rtl/T80/Z1013_Mist.tis_db_list.ddb b/Robotron - Z1013_MiST/rtl/T80/Z1013_Mist.tis_db_list.ddb deleted file mode 100644 index c48987b3c519142ff233fef8ff8bbeea6ae812ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmWe(U|?9w%?KnJ7_xxS7)Xbu78Pga=P4K(>lx}9C^(g7=Al+yu z8Y={QDTJpcDY&L&mH?H?f%P*mG(zdCP#Q$3LkwrAU`$F(NJwBx5=dwcP?#iqhy^J5 z|36STEg@wBQ09W*pWwqBOJ+7i$aOf|G(V1=^Qcz#ugu-p=10si%}ut=&M|+T9@+lA z^Jk{SjK(azpZ}xTmo%su7(_4{*4c)I860j{#^TD<%h$nQ(DUVEc}Zg01BRK*tO}3U zG+NwKHP+v4V!m&O%F$D+6bv_?P*dHgvQNd>+*se%&fH$rba}+_qoz7`M=oE#eBSon S_4`M!s^7b+f8{zK*p&cuGh|`_