Update sys. Support for custom AR.

2026-05-24 03:02:58 +00:00 · 2021-01-19 02:55:05 +08:00
parent e4c9aacb03
commit d79ec96b87
10 changed files with 473 additions and 94 deletions
--- a/BBCMicro.sv
+++ b/BBCMicro.sv
@@ -27,7 +27,7 @@ module emu
 	input         RESET,

 	//Must be passed to hps_io module
-	inout  [45:0] HPS_BUS,
+	inout  [45:0] HPS_BUS,

 	//Base video clock. Usually equals to CLK_SYS.
 	output        CLK_VIDEO,
@@ -37,8 +37,8 @@ module emu
 	output        CE_PIXEL,

 	//Video aspect ratio for HDMI. Most retro systems have ratio 4:3.
-	output  [7:0] VIDEO_ARX,
-	output  [7:0] VIDEO_ARY,
+	output [11:0] VIDEO_ARX,
+	output [11:0] VIDEO_ARY,

 	output  [7:0] VGA_R,
 	output  [7:0] VGA_G,
@@ -46,17 +46,18 @@ module emu
 	output        VGA_HS,
 	output        VGA_VS,
 	output        VGA_DE,    // = ~(VBlank | HBlank)
-	output        VGA_F1,
-	output  [1:0] VGA_SL,
+	output        VGA_F1,
+	output [1:0]  VGA_SL,
+	output        VGA_SCALER, // Force VGA scaler

-	/*
-	// Use framebuffer from DDRAM (USE_FB=1 in qsf)
+`ifdef USE_FB
+	// Use framebuffer in DDRAM (USE_FB=1 in qsf)
 	// FB_FORMAT:
 	//    [2:0] : 011=8bpp(palette) 100=16bpp 101=24bpp 110=32bpp
 	//    [3]   : 0=16bits 565 1=16bits 1555
 	//    [4]   : 0=RGB  1=BGR (for 16/24/32 modes)
 	//
-	// FB_STRIDE either 0 (rounded to 256 bytes) or multiple of 16 bytes.
+	// FB_STRIDE either 0 (rounded to 256 bytes) or multiple of pixel size (in bytes)
 	output        FB_EN,
 	output  [4:0] FB_FORMAT,
 	output [11:0] FB_WIDTH,
@@ -74,7 +75,7 @@ module emu
 	output [23:0] FB_PAL_DOUT,
 	input  [23:0] FB_PAL_DIN,
 	output        FB_PAL_WR,
-	*/
+`endif

 	output        LED_USER,  // 1 - ON, 0 - OFF.

@@ -83,20 +84,20 @@ module emu
 	// hint: supply 2'b00 to let the system control the LED.
 	output  [1:0] LED_POWER,
 	output  [1:0] LED_DISK,
-
-	// I/O board button press simulation (active high)
-	// b[1]: user button
-	// b[0]: osd button
-	output  [1:0] BUTTONS,
-
-	input         CLK_AUDIO, // 24.576 MHz
+
+	// I/O board button press simulation (active high)
+	// b[1]: user button
+	// b[0]: osd button
+	output  [1:0] BUTTONS,
+
+	input         CLK_AUDIO, // 24.576 MHz
 	output [15:0] AUDIO_L,
 	output [15:0] AUDIO_R,
 	output        AUDIO_S,   // 1 - signed audio samples, 0 - unsigned
 	output  [1:0] AUDIO_MIX, // 0 - no mix, 1 - 25%, 2 - 50%, 3 - 100% (mono)
-
-	//ADC
-	inout   [3:0] ADC_BUS,
+
+	//ADC
+	inout   [3:0] ADC_BUS,

 	//SD-SPI
 	output        SD_SCK,
@@ -105,6 +106,7 @@ module emu
 	output        SD_CS,
 	input         SD_CD,

+`ifdef USE_DDRAM
 	//High latency DDR3 RAM interface
 	//Use for non-critical time purposes
 	output        DDRAM_CLK,
@@ -117,7 +119,9 @@ module emu
 	output [63:0] DDRAM_DIN,
 	output  [7:0] DDRAM_BE,
 	output        DDRAM_WE,
+`endif

+`ifdef USE_SDRAM
 	//SDRAM interface with lower latency
 	output        SDRAM_CLK,
 	output        SDRAM_CKE,
@@ -129,25 +133,40 @@ module emu
 	output        SDRAM_nCS,
 	output        SDRAM_nCAS,
 	output        SDRAM_nRAS,
-	output        SDRAM_nWE,
-
-	input         UART_CTS,
-	output        UART_RTS,
-	input         UART_RXD,
-	output        UART_TXD,
-	output        UART_DTR,
-	input         UART_DSR,
-
-	// Open-drain User port.
-	// 0 - D+/RX
-	// 1 - D-/TX
+	output        SDRAM_nWE,
+`endif
+
+`ifdef DUAL_SDRAM
+	//Secondary SDRAM
+	input         SDRAM2_EN,
+	output        SDRAM2_CLK,
+	output [12:0] SDRAM2_A,
+	output  [1:0] SDRAM2_BA,
+	inout  [15:0] SDRAM2_DQ,
+	output        SDRAM2_nCS,
+	output        SDRAM2_nCAS,
+	output        SDRAM2_nRAS,
+	output        SDRAM2_nWE,
+`endif
+
+	input         UART_CTS,
+	output        UART_RTS,
+	input         UART_RXD,
+	output        UART_TXD,
+	output        UART_DTR,
+	input         UART_DSR,
+
+	// Open-drain User port.
+	// 0 - D+/RX
+	// 1 - D-/TX
 	// 2..6 - USR2..USR6
-	// Set USER_OUT to 1 to read from USER_IN.
+	// Set USER_OUT to 1 to read from USER_IN.
 	input   [6:0] USER_IN,
 	output  [6:0] USER_OUT,
-
-	input         OSD_STATUS
+
+	input         OSD_STATUS
 );
+

 assign ADC_BUS  = 'Z;
 assign USER_OUT = '1;
@@ -159,9 +178,12 @@ assign LED_USER  = ioctl_download | (vsd_sel & sd_act);
 assign LED_DISK  = {1'b1,~vsd_sel & sd_act};
 assign LED_POWER = 0;
 assign BUTTONS   = 0;
+assign VGA_SCALER= 0;

-assign VIDEO_ARX = status[1] ? 8'd16 : 8'd4;
-assign VIDEO_ARY = status[1] ? 8'd9  : 8'd3; 
+wire [1:0] ar = status[14:13];
+
+assign VIDEO_ARX = (!ar) ? 12'd4 : (ar - 1'd1);
+assign VIDEO_ARY = (!ar) ? 12'd3 : 12'd0;

 wire [1:0] scale = status[3:2];

@@ -172,7 +194,7 @@ parameter CONF_STR = {
 	"S,VHD;",
 	"OC,Autostart,Yes,No;",
 	"-;",
-	"O1,Aspect ratio,4:3,16:9;",
+	"ODE,Aspect ratio,Original,Full Screen,[ARC1],[ARC2];",
 	"O23,Scandoubler Fx,None,HQ2x,CRT 25%,CRT 50%;",
 	"OA,Mouse as Joystick,Yes,No;",
 	"OB,Swap Joysticks,No,Yes;",
--- a/sys/arcade_video.v
+++ b/sys/arcade_video.v
@@ -204,7 +204,7 @@ assign DDRAM_DIN      = {ram_data,ram_data};
 assign DDRAM_WE       = ram_wr;
 assign DDRAM_RD       = 0;

-assign FB_EN     = ~no_rotate;
+assign FB_EN     = fb_en[2];
 assign FB_FORMAT = 5'b00110;
 assign FB_BASE   = {MEM_BASE,o_fb,23'd0};
 assign FB_WIDTH  = vsz;
@@ -236,6 +236,11 @@ always @(posedge CLK_VIDEO) begin
 	end
 end

+initial begin
+	fb_en = 0;
+end
+
+reg  [2:0] fb_en = 0;
 reg [11:0] hsz = 320, vsz = 240;
 reg [11:0] bwidth;
 reg [22:0] bufsize;
@@ -257,6 +262,7 @@ always @(posedge CLK_VIDEO) begin
 			vsz <= vcnt;
 			bwidth <= vcnt + 2'd3;
 			vcnt <= 0;
+			fb_en <= {fb_en[1:0], ~no_rotate};
 		end
 		if(old_vs & ~VGA_VS) bufsize <= hsz * stride;
 	end
--- a/sys/ascal.vhd
+++ b/sys/ascal.vhd
@@ -462,8 +462,8 @@ ARCHITECTURE rtl OF ascal IS
  SIGNAL o_fload : natural RANGE 0 TO 3;
  SIGNAL o_acpt,o_acpt1,o_acpt2,o_acpt3,o_acpt4 : natural RANGE 0 TO 15; -- Alternance pixels FIFO
  SIGNAL o_dshi : natural RANGE 0 TO 3;
-  SIGNAL o_first,o_last,o_last1,o_last2,o_last3 : std_logic;
-  SIGNAL o_lastt1,o_lastt2,o_lastt3 : std_logic;
+  SIGNAL o_first,o_last,o_last1,o_last2 : std_logic;
+  SIGNAL o_lastt1,o_lastt2,o_lastt3,o_lastt4 : std_logic;
  SIGNAL o_alt,o_altx : unsigned(3 DOWNTO 0);
  SIGNAL o_hdown,o_vdown : std_logic;
  SIGNAL o_primv,o_lastv,o_bibv : unsigned(0 TO 2);
@@ -2029,7 +2029,8 @@ BEGIN
      o_acpt1<=o_acpt; o_acpt2<=o_acpt1; o_acpt3<=o_acpt2; o_acpt4<=o_acpt3;
      o_ad1<=o_ad; o_ad2<=o_ad1; o_ad3<=o_ad2;
      o_sh1<=o_sh; o_sh2<=o_sh1; o_sh3<=o_sh2; o_sh4<=o_sh3;
-      o_lastt1<=o_last; o_lastt2<=o_lastt1; o_lastt3<=o_lastt2;
+      o_lastt1<=o_last;   o_lastt2<=o_lastt1;
+      o_lastt3<=o_lastt2; o_lastt4<=o_lastt3;
      
      ------------------------------------------------------
      IF o_sh3='1' THEN
@@ -2059,7 +2060,7 @@ BEGIN
          o_hpix2<=hpix_v;
          o_first<='0';
        END IF;
-        IF o_lastt3='1' THEN
+        IF o_lastt4='1' THEN
          -- Right edge. Keep last pixel.
          o_hpix0<=o_hpix0;
        END IF;
--- a/sys/hdmi_config.sv
+++ b/sys/hdmi_config.sv
@@ -111,32 +111,32 @@ wire [15:0] init_data[82] =

 	{8'h17, 8'b01100010},   // Aspect ratio 16:9 [1]=1, 4:3 [1]=0

-	{8'h18, ypbpr ? 8'h88 : limited[0] ? 8'h8D : limited[1] ? 8'h8E : 8'h00},  // CSC Scaling Factors and Coefficients for RGB Full->Limited.
-	{8'h19, ypbpr ? 8'h2E : limited[0] ? 8'hBC : 8'hFE},                     // Taken from table in ADV7513 Programming Guide.
-	{8'h1A, ypbpr ? 8'h18 : 8'h00},         // CSC Channel A.
-	{8'h1B, ypbpr ? 8'h93 : 8'h00},
-	{8'h1C, ypbpr ? 8'h1F : 8'h00},
-	{8'h1D, ypbpr ? 8'h3F : 8'h00},
-	{8'h1E, ypbpr ? 8'h08 : 8'h01},
-	{8'h1F, 8'h00},
+	{8'h18, ypbpr ? 8'h86 : limited[0] ? 8'h8D : limited[1] ? 8'h8E : 8'h00},  // CSC Scaling Factors and Coefficients for RGB Full->Limited.
+	{8'h19, ypbpr ? 8'hDF : limited[0] ? 8'hBC : 8'hFE},                     // Taken from table in ADV7513 Programming Guide.
+	{8'h1A, ypbpr ? 8'h1A : 8'h00},         // CSC Channel A.
+	{8'h1B, ypbpr ? 8'h3F : 8'h00},
+	{8'h1C, ypbpr ? 8'h1E : 8'h00},
+	{8'h1D, ypbpr ? 8'hE2 : 8'h00},
+	{8'h1E, ypbpr ? 8'h07 : 8'h01},
+	{8'h1F, ypbpr ? 8'hE7 : 8'h00},

-	{8'h20, ypbpr ? 8'h03 : 8'h00},         // CSC Channel B.
-	{8'h21, ypbpr ? 8'h67 : 8'h00},
-	{8'h22, ypbpr ? 8'h0B : limited[0] ? 8'h0D : 8'h0E},
-	{8'h23, ypbpr ? 8'h71 : limited[0] ? 8'hBC : 8'hFE},
+	{8'h20, ypbpr ? 8'h04 : 8'h00},         // CSC Channel B.
+	{8'h21, ypbpr ? 8'h1C : 8'h00},
+	{8'h22, ypbpr ? 8'h08 : limited[0] ? 8'h0D : 8'h0E},
+	{8'h23, ypbpr ? 8'h11 : limited[0] ? 8'hBC : 8'hFE},
 	{8'h24, ypbpr ? 8'h01 : 8'h00},
-	{8'h25, ypbpr ? 8'h28 : 8'h00},
-	{8'h26, ypbpr ? 8'h00 : 8'h01},
+	{8'h25, ypbpr ? 8'h91 : 8'h00},
+	{8'h26, ypbpr ? 8'h01 : 8'h01},
 	{8'h27, 8'h00},

-	{8'h28, ypbpr ? 8'h1E : 8'h00},         // CSC Channel C.
-	{8'h29, ypbpr ? 8'h21 : 8'h00},
-	{8'h2A, ypbpr ? 8'h19 : 8'h00},
-	{8'h2B, ypbpr ? 8'hB2 : 8'h00},
-	{8'h2C, ypbpr ? 8'h08 : limited[0] ? 8'h0D : 8'h0E},
-	{8'h2D, ypbpr ? 8'h2D : limited[0] ? 8'hBC : 8'hFE},
-	{8'h2E, ypbpr ? 8'h08 : 8'h01},
-	{8'h2F, 8'h00},
+	{8'h28, ypbpr ? 8'h1D : 8'h00},         // CSC Channel C.
+	{8'h29, ypbpr ? 8'hAE : 8'h00},
+	{8'h2A, ypbpr ? 8'h1B : 8'h00},
+	{8'h2B, ypbpr ? 8'h73 : 8'h00},
+	{8'h2C, ypbpr ? 8'h06 : limited[0] ? 8'h0D : 8'h0E},
+	{8'h2D, ypbpr ? 8'hDF : limited[0] ? 8'hBC : 8'hFE},
+	{8'h2E, ypbpr ? 8'h07 : 8'h01},
+	{8'h2F, ypbpr ? 8'hE7 : 8'h00},

 	{8'h3B, 8'b0000_0000},	// Pixel repetition [6:5] b00 AUTO. [4:3] b00 x1 mult of input clock. [2:1] b00 x1 pixel rep to send to HDMI Rx.

--- a/sys/hps_io.v
+++ b/sys/hps_io.v
@@ -126,7 +126,8 @@ module hps_io #(parameter STRLEN=0, PS2DIV=0, WIDE=0, VDNUM=1, PS2WE=0)
 	output reg [32:0] TIMESTAMP,

 	// UART flags
-	input      [15:0] uart_mode,
+	output reg  [7:0] uart_mode,
+	output reg [31:0] uart_speed,

 	// ps2 keyboard emulation
 	output            ps2_kbd_clk_out,
@@ -248,6 +249,8 @@ always@(posedge clk_sys) begin : uio_block
 	reg        old_status_set = 0;
 	reg        old_info = 0;
 	reg  [7:0] info_n = 0;
+	reg [15:0] tmp1;
+	reg  [7:0] tmp2;

 	old_status_set <= status_set;
 	if(~old_status_set & status_set) begin
@@ -453,9 +456,6 @@ always@(posedge clk_sys) begin : uio_block
 				//RTC
 				'h24: TIMESTAMP[(byte_cnt-6'd1)<<4 +:16] <= io_din;

-				//UART flags
-				'h28: io_dout <= uart_mode;
-
 				//status set
 				'h29: if(!byte_cnt[MAX_W:3]) begin
 							case(byte_cnt[2:0])
@@ -479,6 +479,15 @@ always@(posedge clk_sys) begin : uio_block
 							{gamma_wr, gamma_value} <= {1'b1,io_din[7:0]};
 							if (byte_cnt[1:0] == 3) byte_cnt <= 1;
 						end
+
+				// UART
+				'h3b: if(!byte_cnt[MAX_W:2]) begin
+							case(byte_cnt[1:0])
+								1: tmp2 <= io_din[7:0];
+								2: tmp1 <= io_din;
+								3: {uart_speed, uart_mode} <= {io_din, tmp1, tmp2};
+							endcase
+						end
 			endcase
 		end
 	end
--- a/sys/mt32pi.sv
+++ b/sys/mt32pi.sv
@@ -0,0 +1,283 @@
+//
+// Communication module to MT32-pi (external MIDI emulator on RPi)
+// (C) 2020 Sorgelig, Kitrinx
+//
+// https://github.com/dwhinham/mt32-pi
+//
+
+module mt32pi
+(
+	input             CLK_AUDIO,
+
+	input             CLK_VIDEO,
+	input             CE_PIXEL,
+	input             VGA_VS,
+	input             VGA_DE,
+
+	input       [6:0] USER_IN,
+	output      [6:0] USER_OUT,
+
+	input             reset,
+	input             midi_tx,
+	output            midi_rx,
+
+	output reg [15:0] mt32_i2s_r,
+	output reg [15:0] mt32_i2s_l,
+
+	output reg        mt32_available,
+
+	input             mt32_mode_req,
+	input       [1:0] mt32_rom_req,
+	input       [7:0] mt32_sf_req,
+
+	output reg  [7:0] mt32_mode,
+	output reg  [7:0] mt32_rom,
+	output reg  [7:0] mt32_sf,
+	output reg        mt32_newmode,
+
+	output reg        mt32_lcd_en,
+	output reg        mt32_lcd_pix,
+	output reg        mt32_lcd_update
+);
+
+//
+// Pin | USB Name | Signal
+// ----+----------+--------------
+// 0   | D+       | I/O I2C_SDA / RX (midi in)
+// 1   | D-       | O   TX (midi out)
+// 2   | TX-      | I   I2S_WS (1 == right)
+// 3   | GND_d    | I   I2C_SCL
+// 4   | RX+      | I   I2S_BCLK
+// 5   | RX-      | I   I2S_DAT
+// 6   | TX+      | -   none
+//
+
+assign USER_OUT[0]   = sda_out;
+assign USER_OUT[1]   = midi_tx;
+assign USER_OUT[6:2] = '1;
+
+
+//
+// crossed/straight cable selection
+//
+
+generate
+	genvar i;
+	for(i = 0; i<2; i++) begin : clk_rate
+		wire clk_in = i ? USER_IN[6] : USER_IN[4];
+		reg [4:0] cnt;
+		always @(posedge CLK_AUDIO) begin : clkr
+			reg       clk_sr, clk, old_clk;
+			reg [4:0] cnt_tmp;
+
+			clk_sr <= clk_in;
+			if (clk_sr == clk_in) clk <= clk_sr;
+
+			if(~&cnt_tmp) cnt_tmp <= cnt_tmp + 1'd1;
+			else cnt <= '1;
+
+			old_clk <= clk;
+			if(~old_clk & clk) begin
+				cnt <= cnt_tmp;
+				cnt_tmp <= 0;
+			end
+		end
+	end
+	
+	reg crossed;
+	always @(posedge CLK_AUDIO) crossed <= (clk_rate[0].cnt <= clk_rate[1].cnt);
+endgenerate
+
+wire   i2s_ws   = crossed ? USER_IN[2] : USER_IN[5];
+wire   i2s_data = crossed ? USER_IN[5] : USER_IN[2];
+wire   i2s_bclk = crossed ? USER_IN[4] : USER_IN[6];
+assign midi_rx  = ~mt32_available ? USER_IN[0] : crossed ? USER_IN[6] : USER_IN[4];
+
+
+//
+// i2s receiver
+//
+
+always @(posedge CLK_AUDIO) begin : i2s_proc
+	reg [15:0] i2s_buf = 0;
+	reg  [4:0] i2s_cnt = 0;
+	reg        clk_sr;
+	reg        i2s_clk = 0;
+	reg        old_clk, old_ws;
+	reg        i2s_next = 0;
+
+	// Debounce clock
+	clk_sr <= i2s_bclk;
+	if (clk_sr == i2s_bclk) i2s_clk <= clk_sr;
+
+	// Latch data and ws on rising edge
+	old_clk <= i2s_clk;
+	if (i2s_clk && ~old_clk) begin
+
+		if (~i2s_cnt[4]) begin
+			i2s_cnt <= i2s_cnt + 1'd1;
+			i2s_buf[~i2s_cnt[3:0]] <= i2s_data;
+		end
+
+		// Word Select will change 1 clock before the new word starts
+		old_ws <= i2s_ws;
+		if (old_ws != i2s_ws) i2s_next <= 1;
+	end
+
+	if (i2s_next) begin
+		i2s_next <= 0;
+		i2s_cnt <= 0;
+		i2s_buf <= 0;
+
+		if (i2s_ws) mt32_i2s_l <= i2s_buf;
+		else        mt32_i2s_r <= i2s_buf;
+	end
+	
+	if (reset) begin
+		i2s_buf    <= 0;
+		mt32_i2s_l <= 0;
+		mt32_i2s_r <= 0;
+	end
+end
+
+
+//
+// i2c slave
+//
+
+reg        sda_out;
+reg  [7:0] lcd_data[1024];
+reg        lcd_sz;
+
+reg        reset_r  = 0;
+wire [7:0] mode_req = reset_r ? 8'hA0 : mt32_mode_req ? 8'hA2 : 8'hA1;
+wire [7:0] rom_req  = {6'd0, mt32_rom_req};
+
+always @(posedge CLK_AUDIO) begin : i2c_slave
+	reg        sda_sr, scl_sr;
+	reg        old_sda, old_scl;
+	reg        sda, scl;
+	reg  [7:0] tmp;
+	reg  [3:0] cnt = 0;
+	reg [10:0] bcnt = 0;
+	reg        ack;
+	reg        i2c_rw;
+	reg        disp, dispdata;
+	reg  [2:0] div;
+	reg        old_reset;
+	
+	old_reset <= reset;
+	if(old_reset & ~reset) sda_out <= 1;
+
+	div <= div + 1'd1;
+	if(!div) begin
+		sda_sr <= USER_IN[0];
+		if(sda_sr == USER_IN[0]) sda <= sda_sr;
+		old_sda <= sda;
+
+		scl_sr <= USER_IN[3];
+		if(scl_sr == USER_IN[3]) scl <= scl_sr;
+		old_scl <= scl;
+
+		//start
+		if(old_scl & scl & old_sda & ~sda) begin
+			cnt <= 9;
+			bcnt <= 0;
+			ack <= 0;
+			i2c_rw <= 0;
+			disp <= 0;
+			dispdata <= 0;
+		end
+
+		//stop
+		if(old_scl & scl & ~old_sda & sda) begin
+			cnt <= 0;
+			if(dispdata) begin
+				lcd_sz <= ~bcnt[9];
+				mt32_lcd_update <= ~mt32_lcd_update;
+			end
+		end
+
+		//data latch
+		if(~old_scl && scl && cnt) begin
+			tmp <= {tmp[6:0], sda};
+			cnt <= cnt - 1'd1;
+		end
+
+		if(!cnt) sda_out <= 1;
+
+		//data set
+		if(old_scl && ~scl) begin
+			sda_out <= 1;
+			if(cnt == 1) begin
+				if(!bcnt) begin
+					if(tmp[7:1] == 'h45 || tmp[7:1] == 'h3c) begin
+						disp <= (tmp[7:1] == 'h3c);
+						sda_out <= 0;
+						mt32_available <= 1;
+						ack <= 1;
+						i2c_rw <= tmp[0];
+						bcnt <= bcnt + 1'd1;
+						cnt <= 10;
+					end
+					else begin
+						// wrong address, stop
+						cnt <= 0;
+					end
+				end
+				else if(ack) begin
+					if(~i2c_rw) begin
+						if(disp) begin
+							if(bcnt == 1) dispdata <= (tmp[7:6] == 2'b01);
+							else if(dispdata) lcd_data[bcnt[9:0] - 2'd2] <= tmp;
+						end
+						else begin
+							if(bcnt == 1) mt32_mode <= tmp;
+							if(bcnt == 2) mt32_rom  <= tmp;
+							if(bcnt == 3) mt32_sf   <= tmp;
+							if(bcnt == 3) mt32_newmode <= ~mt32_newmode;
+						end
+					end
+					if(~&bcnt) bcnt <= bcnt + 1'd1;
+					sda_out <= 0;
+					cnt <= 10;
+				end
+			end
+			else if(i2c_rw && ack && cnt && ~disp) begin
+				if(bcnt == 1) sda_out <= mode_req[cnt[2:0] - 2'd2];
+				if(bcnt == 2) sda_out <= rom_req[cnt[2:0] - 2'd2];
+				if(bcnt == 3) sda_out <= mt32_sf_req[cnt[2:0] - 2'd2];
+				if(bcnt == 3) reset_r <= 0;
+			end
+		end
+	end
+
+	if(reset) begin
+		reset_r <= 1;
+		mt32_available <= 0;
+	end
+end
+
+always @(posedge CLK_VIDEO) begin
+	reg old_de, old_vs;
+	reg [7:0] hcnt;
+	reg [6:0] vcnt;
+	reg [7:0] sh;
+
+	if(CE_PIXEL) begin
+		old_de <= VGA_DE;
+		old_vs <= VGA_VS;
+
+		if(~&hcnt) hcnt <= hcnt + 1'd1;
+		sh <= (sh << 1) | (~old_de & VGA_DE);
+		if(sh[7]) hcnt <= 0;
+
+		if(old_de & ~VGA_DE & ~&vcnt) vcnt <= vcnt + 1'd1;
+		if(~old_vs & VGA_VS) vcnt <= 0;
+
+		mt32_lcd_en  <= mt32_available & ~hcnt[7] && (lcd_sz ? !vcnt[6] : !vcnt[6:5]);
+		mt32_lcd_pix <= lcd_data[{vcnt[5:3],hcnt[6:0]}][vcnt[2:0]];
+	end
+end
+
+endmodule
--- a/sys/spdif.v
+++ b/sys/spdif.v
@@ -67,6 +67,8 @@ reg         spdif_out_q;

 reg [5:0]   parity_count_q;

+reg         channel_status_bit;
+
 //-----------------------------------------------------------------
 // Subframe Counter
 //-----------------------------------------------------------------
@@ -142,7 +144,7 @@ assign subframe_w[28] = 1'b0; // Valid
 assign subframe_w[29] = 1'b0;

 // Timeslots 30 = Channel status bit
-assign subframe_w[30] = 1'b0;
+assign subframe_w[30] = channel_status_bit ; //was constant 1'b0 enabling copy-bit;

 // Timeslots 31 = Even Parity bit (31:4)
 assign subframe_w[31] = 1'b0;
@@ -150,9 +152,9 @@ assign subframe_w[31] = 1'b0;
 //-----------------------------------------------------------------
 // Preamble
 //-----------------------------------------------------------------
-localparam PREAMBLE_Z = 8'b00010111;
-localparam PREAMBLE_Y = 8'b00100111;
-localparam PREAMBLE_X = 8'b01000111;
+localparam PREAMBLE_Z = 8'b00010111; // "B" channel A data at start of block
+localparam PREAMBLE_Y = 8'b00100111; // "W" channel B data
+localparam PREAMBLE_X = 8'b01000111; // "M" channel A data not at start of block

 reg [7:0] preamble_r;

@@ -168,6 +170,15 @@ begin
    // Left Channel (but not start of block)?
    else
        preamble_r = PREAMBLE_X; // X(M)
+
+    if (subframe_count_q[8:1] == 8'd2) // frame 2 => subframes 4 and 5 => 0 = copy inhibited, 1 = copy permitted
+        channel_status_bit = 1'b1;
+    else if (subframe_count_q[8:1] == 8'd15) // frame 15 => 0 = no indication, 1 = original media
+        channel_status_bit = 1'b1;
+    else if (subframe_count_q[8:1] == 8'd25) // frame 24 to 27 => sample frequency, 0100 = 48kHz, 0000 = 44kHz (l2r)
+        channel_status_bit = 1'b1;
+    else
+        channel_status_bit = 1'b0; // everything else defaults to 0        
 end

 always @ (posedge rst_i or posedge clk_i )
--- a/sys/sys.qip
+++ b/sys/sys.qip
@@ -20,6 +20,7 @@ set_global_assignment -name VERILOG_FILE       [file join $::quartus(qip_path) a
 set_global_assignment -name VERILOG_FILE       [file join $::quartus(qip_path) iir_filter.v ]
 set_global_assignment -name SYSTEMVERILOG_FILE [file join $::quartus(qip_path) ltc2308.sv ]
 set_global_assignment -name VERILOG_FILE       [file join $::quartus(qip_path) sigma_delta_dac.v ]
+set_global_assignment -name SYSTEMVERILOG_FILE [file join $::quartus(qip_path) mt32pi.sv ]
 set_global_assignment -name SYSTEMVERILOG_FILE [file join $::quartus(qip_path) hdmi_config.sv ]
 set_global_assignment -name SYSTEMVERILOG_FILE [file join $::quartus(qip_path) mcp23009.sv ]
 set_global_assignment -name SYSTEMVERILOG_FILE [file join $::quartus(qip_path) ddr_svc.sv ]
--- a/sys/sys_top.sdc
+++ b/sys/sys_top.sdc
@@ -21,29 +21,30 @@ set_clock_groups -exclusive \

 set_false_path -from [get_ports {KEY*}]
 set_false_path -from [get_ports {BTN_*}]
-set_false_path -to [get_ports {LED_*}]
-set_false_path -to [get_ports {VGA_*}]
-set_false_path -to [get_ports {AUDIO_SPDIF}]
-set_false_path -to [get_ports {AUDIO_L}]
-set_false_path -to [get_ports {AUDIO_R}]
-set_false_path -to {cfg[*]}
+set_false_path -to   [get_ports {LED_*}]
+set_false_path -to   [get_ports {VGA_*}]
+set_false_path -to   [get_ports {AUDIO_SPDIF}]
+set_false_path -to   [get_ports {AUDIO_L}]
+set_false_path -to   [get_ports {AUDIO_R}]
+set_false_path -to   {cfg[*]}
 set_false_path -from {cfg[*]}
 set_false_path -from {VSET[*]}
-set_false_path -to {wcalc[*] hcalc[*]}
-set_false_path -to {width[*] height[*]}
+set_false_path -to   {wcalc[*] hcalc[*]}
+set_false_path -to   {width[*] height[*]}

 set_multicycle_path -to {*_osd|osd_vcnt*} -setup 2
 set_multicycle_path -to {*_osd|osd_vcnt*} -hold 1
-set_false_path -to {*_osd|v_cnt*}
-set_false_path -to {*_osd|v_osd_start*}
-set_false_path -to {*_osd|v_info_start*}
-set_false_path -to {*_osd|h_osd_start*}
+
+set_false_path -to   {*_osd|v_cnt*}
+set_false_path -to   {*_osd|v_osd_start*}
+set_false_path -to   {*_osd|v_info_start*}
+set_false_path -to   {*_osd|h_osd_start*}
 set_false_path -from {*_osd|v_osd_start*}
 set_false_path -from {*_osd|v_info_start*}
 set_false_path -from {*_osd|h_osd_start*}
 set_false_path -from {*_osd|rot*}
 set_false_path -from {*_osd|dsp_width*}
-set_false_path -to {*_osd|half}
+set_false_path -to   {*_osd|half}

 set_false_path -to   {WIDTH[*] HFP[*] HS[*] HBP[*] HEIGHT[*] VFP[*] VS[*] VBP[*]}
 set_false_path -from {WIDTH[*] HFP[*] HS[*] HBP[*] HEIGHT[*] VFP[*] VS[*] VBP[*]}
@@ -51,4 +52,11 @@ set_false_path -to   {FB_BASE[*] FB_BASE[*] FB_WIDTH[*] FB_HEIGHT[*] LFB_HMIN[*]
 set_false_path -from {FB_BASE[*] FB_BASE[*] FB_WIDTH[*] FB_HEIGHT[*] LFB_HMIN[*] LFB_HMAX[*] LFB_VMIN[*] LFB_VMAX[*]}
 set_false_path -to   {vol_att[*] scaler_flt[*] led_overtake[*] led_state[*]}
 set_false_path -from {vol_att[*] scaler_flt[*] led_overtake[*] led_state[*]}
-set_false_path -from {aflt_* acx* acy* areset*}
+set_false_path -from {aflt_* acx* acy* areset* arc*}
+set_false_path -from {vs_line*}
+
+set_false_path -from {ascal|o_ihsize*}
+set_false_path -from {ascal|o_ivsize*}
+set_false_path -from {ascal|o_format*}
+set_false_path -from {ascal|o_hdown}
+set_false_path -from {ascal|o_vdown}
--- a/sys/sys_top.v
+++ b/sys/sys_top.v
@@ -287,7 +287,7 @@ cyclonev_hps_interface_mpu_general_purpose h2f_gp
 reg [15:0] cfg;

 reg        cfg_set      = 0;
-wire       vga_fb       = cfg[12];
+wire       vga_fb       = cfg[12] | vga_force_scaler;
 wire [1:0] hdmi_limited = {cfg[11],cfg[8]};

 `ifdef DEBUG_NOHDMI
@@ -303,7 +303,7 @@ wire       ypbpr_en     = cfg[5];
 wire       io_osd_vga   = io_ss1 & ~io_ss2;
 `ifndef DUAL_SDRAM
 	wire    sog          = cfg[9];
-	wire    vga_scaler   = cfg[2];
+	wire    vga_scaler   = cfg[2] | vga_force_scaler;
 `endif

 reg        cfg_custom_t = 0;
@@ -316,7 +316,7 @@ reg  [6:0] coef_addr;
 reg  [8:0] coef_data;
 reg        coef_wr = 0;

-wire [7:0] ARX, ARY;
+wire[11:0] ARX, ARY;
 reg [11:0] VSET = 0, HSET = 0;
 reg        FREESCALE = 0;
 reg  [2:0] scaler_flt;
@@ -337,6 +337,10 @@ reg [23:0] acy0 = -24'd6216759;
 reg [23:0] acy1 =  24'd6143386;
 reg [23:0] acy2 = -24'd2023767;
 reg        areset = 0;
+reg [11:0] arc1x = 0;
+reg [11:0] arc1y = 0;
+reg [11:0] arc2x = 0;
+reg [11:0] arc2y = 0;

 always@(posedge clk_sys) begin
 	reg  [7:0] cmd;
@@ -455,6 +459,15 @@ always@(posedge clk_sys) begin
 					14: acy2[23:16]      <= io_din[7:0];
 				endcase
 			end
+			if(cmd == 'h3A) begin
+				cnt <= cnt + 1'd1;
+				case(cnt[3:0])
+					 0: arc1x <= io_din[11:0];
+					 1: arc1y <= io_din[11:0];
+					 2: arc2x <= io_din[11:0];
+					 3: arc2y <= io_din[11:0];
+				endcase
+			end
 		end
 	end

@@ -778,9 +791,30 @@ always @(posedge clk_vid) begin
 	reg [11:0] videoh;
 	reg [11:0] height;
 	reg [11:0] width;
+	reg [11:0] arx;
+	reg [11:0] ary;

 	height <= (VSET && (VSET < HEIGHT)) ? VSET : HEIGHT;
 	width  <= (HSET && (HSET < WIDTH))  ? HSET : WIDTH;
+	
+	if(!ARY) begin
+		if(ARX == 1) begin
+			arx <= arc1x;
+			ary <= arc1y;
+		end
+		else if(ARX == 2) begin
+			arx <= arc2x;
+			ary <= arc2y;
+		end
+		else begin
+			arx <= 0;
+			ary <= 0;
+		end
+	end
+	else begin
+		arx <= ARX;
+		ary <= ARY;
+	end

 	state <= state + 1'd1;
 	case(state)
@@ -791,18 +825,20 @@ always @(posedge clk_vid) begin
 				vmax <= LFB_VMAX;
 				state<= 0;
 			end
-			else if(ARX && ARY && !FREESCALE) begin
-				wcalc <= (height*ARX)/ARY;
-				hcalc <= (width*ARY)/ARX;
-			end
-			else begin
+			else if(FREESCALE || !arx || !ary) begin
 				wcalc <= width;
 				hcalc <= height;
 			end
+			else begin
+				wcalc <= (height*arx)/ary;
+				hcalc <= (width*ary)/arx;
+			end
+
 		6: begin
 				videow <= (wcalc > width)  ? width  : wcalc[11:0];
 				videoh <= (hcalc > height) ? height : hcalc[11:0];
 			end
+
 		7: begin
 				hmin <= ((WIDTH  - videow)>>1);
 				hmax <= ((WIDTH  - videow)>>1) + videow - 1'd1;
@@ -1335,6 +1371,7 @@ wire  [7:0] r_out, g_out, b_out, hr_out, hg_out, hb_out;
 wire        vs_fix, hs_fix, de_emu, vs_emu, hs_emu, f1;
 wire        hvs_fix, hhs_fix, hde_emu;
 wire        clk_vid, ce_pix, clk_ihdmi, ce_hpix;
+wire        vga_force_scaler;

 `ifdef USE_DDRAM
 	wire        ram_clk;
@@ -1422,6 +1459,7 @@ emu emu
 	.VGA_VS(vs_emu),
 	.VGA_DE(de_emu),
 	.VGA_F1(f1),
+	.VGA_SCALER(vga_force_scaler),

 	.CLK_VIDEO(clk_vid),
 	.CE_PIXEL(ce_pix),