more fixes to settings import/export

* fix compatibility with Windows
* add RAW export option

ip/altera_epcq_controller_mod/altera_epcq_controller.sv

@@ -1,611 +0,0 @@
-// (C) 2001-2015 Altera Corporation. All rights reserved.
-// Your use of Altera Corporation's design tools, logic functions and other 
-// software and tools, and its AMPP partner logic functions, and any output 
-// files any of the foregoing (including device programming or simulation 
-// files), and any associated documentation or information are expressly subject 
-// to the terms and conditions of the Altera Program License Subscription 
-// Agreement, Altera MegaCore Function License Agreement, or other applicable 
-// license agreement, including, without limitation, that your use is for the 
-// sole purpose of programming logic devices manufactured by Altera and sold by 
-// Altera or its authorized distributors.  Please refer to the applicable 
-// agreement for further details.
-
-
-// (C) 2001-2015 Altera Corporation. All rights reserved.
-// Your use of Altera Corporation's design tools, logic functions and other 
-// software and tools, and its AMPP partner logic functions, and any output 
-// files any of the foregoing (including device programming or simulation 
-// files), and any associated documentation or information are expressly subject 
-// to the terms and conditions of the Altera Program License Subscription 
-// Agreement, Altera MegaCore Function License Agreement, or other applicable 
-// license agreement, including, without limitation, that your use is for the 
-// sole purpose of programming logic devices manufactured by Altera and sold by 
-// Altera or its authorized distributors.  Please refer to the applicable 
-// agreement for further details.
-
-
-
-`timescale 1ps / 1ps
-
-module altera_epcq_controller #(
-	parameter CS_WIDTH		= 1,
-	parameter ENABLE_4BYTE_ADDR = 1,
-	parameter ADDR_WIDTH	= 22,
-	parameter ASI_WIDTH		= 1,
-	parameter DEVICE_FAMILY = "CYCLONE V",
-	parameter ASMI_ADDR_WIDTH = 22,
-	parameter CHIP_SELS = 1
-)(
-	input 	wire		  								clk,
-	input 	wire		  								reset_n,
-	                                        			
-	// ports to access csr                        			
-	input 	wire										avl_csr_write,
-	input 	wire		  								avl_csr_read,
-	input 	wire 	[2:0] 								avl_csr_addr,
-	input 	wire 	[31:0] 								avl_csr_wrdata,
-	output 	reg 	[31:0] 								avl_csr_rddata,
-	output 	reg 		 								avl_csr_rddata_valid,
-	output 	reg 			 							avl_csr_waitrequest,
-	                                        			
-	// ports to access memory        			
-	input	wire		  								avl_mem_write,
-	input	wire										avl_mem_read,
-	input	wire  	[ADDR_WIDTH-1:0]					avl_mem_addr,			
-	input	wire	[31:0]								avl_mem_wrdata,
-	input	wire 	[3:0]								avl_mem_byteenable,
-	input	wire	[6:0]								avl_mem_burstcount,
-	output	wire	[31:0]								avl_mem_rddata,
-	output	reg											avl_mem_rddata_valid,
-	output 	reg 			 							avl_mem_waitrequest,
-	
-	// interrupt signal
-	output	reg 										irq,
-	
-	// Disable dedicated active serial interface
-	input  	wire	[ASI_WIDTH-1:0]						epcq_dataout,
-	output  reg											epcq_dclk,
-	output  reg		[CS_WIDTH-1:0] 						epcq_scein,
-	output  reg		[ASI_WIDTH-1:0]						epcq_sdoin,
-	output  reg		[ASI_WIDTH-1:0]						epcq_dataoe,
-	
-	// ASMI PARALLEL interface
-	input   wire	[ASI_WIDTH-1:0]						ddasi_dataoe,
-	output  reg 	[ASI_WIDTH-1:0]						ddasi_dataout,
-	input   wire 										ddasi_dclk,
-	input   wire 	[CS_WIDTH-1:0] 						ddasi_scein,
-	input   reg		[ASI_WIDTH-1:0]  					ddasi_sdoin,
-	
-	input   wire										asmi_busy,
-	input   wire										asmi_data_valid,
-	input   wire	[7:0]  								asmi_dataout,
-	output  reg											asmi_clkin,
-	output  reg											asmi_reset,
-	output  reg		[CS_WIDTH-1:0] 						asmi_sce,
-	output	reg	    [ASMI_ADDR_WIDTH-1:0]  				asmi_addr,
-	output  reg		[7:0]  								asmi_datain,
-	output  reg											asmi_fast_read,
-	output  wire										asmi_rden,
-	output  reg											asmi_shift_bytes,
-	output  reg 										asmi_en4b_addr,
-	output  wire										asmi_wren,
-	output  reg											asmi_write,
-	
-	input   wire										asmi_illegal_erase,
-	input   wire										asmi_illegal_write,
-	input   wire	[7:0]  								asmi_rdid_out,
-	input   wire	[7:0]  								asmi_status_out,
-	input   wire	[7:0]  								asmi_epcs_id,
-	output  reg											asmi_read_rdid,
-	output  reg											asmi_read_status,
-	output	reg											asmi_read_sid,
-	output  reg 										asmi_bulk_erase,
-	output  reg											asmi_sector_erase,
-	output  reg											asmi_sector_protect
-);
-	localparam LOCAL_ADDR_WIDTH = ADDR_WIDTH+2;
-	localparam CSR_DATA_WIDTH   = 32;
-	localparam LAST_ADDR_BIT    = (ASMI_ADDR_WIDTH == 24) ? 15 :
-									(ASMI_ADDR_WIDTH == 32) ? 23 : 15;
-	
-	reg  [8:0] wr_burstcount_cnt, rd_burstcount_cnt;
-	reg	 [8:0] rd_mem_burstcount, wr_mem_burstcount;
-	
-	wire last_wr_byte;
-	wire access_csr_status, access_csr_sid, access_csr_rdid, access_csr_mem_op, access_isr, access_imr, access_sce;
-	wire read_status_combi, read_sid_combi, read_rdid_combi, read_isr_combi, read_imr_combi, write_isr_combi, write_imr_combi, write_sce_combi;
-	wire bulk_erase_combi, sector_erase_combi, sector_protect_combi;
-	wire wren_combi, illegal_write_combi, illegal_erase_combi;
-	wire m_illegal_write_combi, m_illegal_erase_combi;
-	wire read_mem_combi, write_mem_combi;
-	wire data_valid_combi, pending_wr_data;
-	wire detect_addroffset;
-	wire [8:0] wfifo_data_in_0, wfifo_data_in_1, wfifo_data_in_2, wfifo_data_in_3;
-	wire [ADDR_WIDTH-1:0] temp_mem_addr;
-	
-	reg reset_n_reg;
-	reg wr_mem_waitrequest, local_waitrequest;
-	reg illegal_write_reg, illegal_erase_reg, m_illegal_write_reg, m_illegal_erase_reg;
-	reg read_status_valid, read_sid_valid, read_rdid_valid, read_isr_valid, read_imr_valid;
-	reg read_status_en, read_sid_en, read_rdid_en;
-	reg wren_internal;
-	reg [LOCAL_ADDR_WIDTH-1:0] wr_mem_addr;
-	reg [7:0] rd_data_reg [4];
-	reg [3:0][8:0] wr_data_reg;
-	reg [1:0] rd_cnt;
-	reg [1:0] wr_cnt;
-	reg [3:0] wr_data_reg_full;
-	reg detect_addroffset_reg, asmi_busy_reg;
-	reg [2:0] temp_sce;
-	
-	// Direct connection
-	assign asmi_clkin 		= clk;
-	assign asmi_reset 		= ~reset_n;
-	assign ddasi_dataout 	= epcq_dataout;
-	assign epcq_dclk 		= ddasi_dclk;
-	assign epcq_scein		= ddasi_scein;
-	assign epcq_sdoin		= ddasi_sdoin;
-	assign epcq_dataoe		= ddasi_dataoe;
-	
-	// chip select
-	generate if (DEVICE_FAMILY == "Arria 10") begin
-		always @(posedge clk or negedge reset_n) begin
-			if (~reset_n) begin
-				asmi_sce			<= {CS_WIDTH{1'b0}};
-			end 
-// to pack the address space this is needed
-			else if (write_mem_combi || read_mem_combi) begin
-				if (CHIP_SELS == 1 ) 					
-					asmi_sce			<= 3'b001;
-				else if (CHIP_SELS == 2 && avl_mem_addr[ADDR_WIDTH-1] == 0) 
-					asmi_sce			<= 3'b001;
-				else if (CHIP_SELS == 2 && avl_mem_addr[ADDR_WIDTH-1] == 1) 
-					asmi_sce			<= 3'b010;
-				else if (CHIP_SELS == 3 && avl_mem_addr[ADDR_WIDTH-1] == 1)	
-					asmi_sce			<= 3'b100;
-				else if (CHIP_SELS == 3 && avl_mem_addr[ADDR_WIDTH-1:ADDR_WIDTH-2] == 0) 	
-					asmi_sce			<= 3'b001;
-				else if (CHIP_SELS == 3 && avl_mem_addr[ADDR_WIDTH-1:ADDR_WIDTH-2] == 1) 	
-					asmi_sce			<= 3'b010;
-				else
-					asmi_sce			<= {CS_WIDTH{1'b0}};
-			end
-			else if (write_sce_combi) begin
-				asmi_sce			<= avl_csr_wrdata[2:0];
-			end
-			else if (asmi_en4b_addr) begin
-				asmi_sce			<= temp_sce;
-			end
-		end
-// decoder ring  if the CHIP_SEL is only 1 then avalon address is the temp address
-//		if the chipsele is 2 then need to remove top address bit
-//		if the chipelect is 3 then remove the top 2 address bits.  
-		assign temp_mem_addr	= CHIP_SELS == 1 ? avl_mem_addr:( CHIP_SELS == 2 ? {1'b0,avl_mem_addr[ADDR_WIDTH-2:0]}:{2'b00,avl_mem_addr[ADDR_WIDTH-3:0]});
-	end
-	else begin
-		always @(posedge clk) begin
-			asmi_sce				<= {CS_WIDTH{1'b0}};
-		end
-		assign temp_mem_addr	= avl_mem_addr;
-	end
-	endgenerate
-	
-	// wait_request generation logic
-	assign avl_mem_waitrequest = (asmi_busy || asmi_busy_reg) ? 1'b1 : (local_waitrequest || wr_mem_waitrequest);
-	assign avl_csr_waitrequest = (asmi_busy || asmi_busy_reg) ? 1'b1 : (local_waitrequest || wr_mem_waitrequest);
-	
-	// access CSR decoding logic
-	assign access_csr_status	= (avl_csr_addr == 3'b000);
-	assign access_csr_sid		= (avl_csr_addr == 3'b001);
-	assign access_csr_rdid		= (avl_csr_addr == 3'b010);
-	assign access_csr_mem_op	= (avl_csr_addr == 3'b011);
-	assign access_isr			= (avl_csr_addr == 3'b100);
-	assign access_imr			= (avl_csr_addr == 3'b101);
-	assign access_sce			= (avl_csr_addr == 3'b110);
-	
-	// read/write memory combi logic
-	assign read_mem_combi		= (avl_mem_read && ~avl_mem_waitrequest);
-	assign write_mem_combi		= (avl_mem_write && ~avl_mem_waitrequest);
-
-	// read csr logic
-	assign read_status_combi	= (avl_csr_read && access_csr_status && ~avl_csr_waitrequest);
-	assign read_sid_combi		= (avl_csr_read && access_csr_sid && ~avl_csr_waitrequest);
-	assign read_rdid_combi		= (avl_csr_read && access_csr_rdid && ~avl_csr_waitrequest);
-	assign read_isr_combi		= (avl_csr_read && access_isr && ~avl_csr_waitrequest);
-	assign read_imr_combi		= (avl_csr_read && access_imr && ~avl_csr_waitrequest);
-	assign write_isr_combi		= (avl_csr_write && access_isr && ~avl_csr_waitrequest);
-	assign write_imr_combi		= (avl_csr_write && access_imr && ~avl_csr_waitrequest);
-	assign write_sce_combi		= (avl_csr_write && access_sce && ~avl_csr_waitrequest);
-	
-	// write csr logic
-	assign bulk_erase_combi		= (avl_csr_write && access_csr_mem_op && ~avl_csr_waitrequest && avl_csr_wrdata[1:0] == 2'b01);
-	assign sector_erase_combi	= (avl_csr_write && access_csr_mem_op && ~avl_csr_waitrequest && avl_csr_wrdata[1:0] == 2'b10);
-	assign sector_protect_combi	= (avl_csr_write && access_csr_mem_op && ~avl_csr_waitrequest && avl_csr_wrdata[1:0] == 2'b11);
-	assign illegal_write_combi	= (asmi_illegal_write) ? 1'b1 :
-									(write_isr_combi && avl_csr_wrdata[1]) ? 1'b0 : 
-										illegal_write_reg;
-	assign illegal_erase_combi	= (asmi_illegal_erase) ? 1'b1 :
-									(write_isr_combi && avl_csr_wrdata[0]) ? 1'b0 : 
-										illegal_erase_reg;
-	assign m_illegal_write_combi= (write_imr_combi) ? avl_csr_wrdata[1] : m_illegal_write_reg;
-	assign m_illegal_erase_combi= (write_imr_combi) ? avl_csr_wrdata[0] : m_illegal_erase_reg;
-	assign wren_combi			= (sector_protect_combi || sector_erase_combi || bulk_erase_combi);
-										
-	assign asmi_rden			= (rd_burstcount_cnt > 9'd0);		// deasserted at the last 2 byte - refer to ASMI_PARALLEL UG
-
-	// interrupt signal
-	assign irq = (illegal_write_reg && m_illegal_write_reg) || (illegal_erase_reg && m_illegal_erase_reg);
-	
-	assign last_wr_byte = (wr_burstcount_cnt == wr_mem_burstcount - 9'd1) ? 1'b1 : 1'b0;
-	
-	assign asmi_wren = wren_internal || asmi_en4b_addr || asmi_shift_bytes || asmi_write;
-	
-	assign data_valid_combi = (rd_burstcount_cnt[1:0] == 2'b00) ? asmi_data_valid : 1'b0;
-	
-	assign wfifo_data_in_0 = {avl_mem_byteenable[0], avl_mem_wrdata[7:0]   };
-	assign wfifo_data_in_1 = {avl_mem_byteenable[1], avl_mem_wrdata[15:8]  };
-	assign wfifo_data_in_2 = {avl_mem_byteenable[2], avl_mem_wrdata[23:16] };
-	assign wfifo_data_in_3 = {avl_mem_byteenable[3], avl_mem_wrdata[31:24] };
-	
-	assign avl_mem_rddata  = {rd_data_reg[3], rd_data_reg[2], rd_data_reg[1], rd_data_reg[0]};
-	assign pending_wr_data = (|wr_data_reg_full) ? 1'b1 : 1'b0;
-	assign detect_addroffset = (pending_wr_data && wr_data_reg[wr_cnt][8]) ? 1'b1 : 
-								(wr_burstcount_cnt == {9{1'b0}}) ? 1'b0 : detect_addroffset_reg;
-
-	//-------------------------------- array to store write data -------------------------------------
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			wr_data_reg			<= '{{9{1'b0}}, {9{1'b0}}, {9{1'b0}}, {9{1'b0}}};
-			wr_data_reg_full	<= {4{1'b0}};
-		end 
-		else if (write_mem_combi) begin
-			wr_data_reg			<= {wfifo_data_in_3, wfifo_data_in_2, wfifo_data_in_1, wfifo_data_in_0};
-			wr_data_reg_full	<= {4{1'b1}};
-		end
-		else if (wr_data_reg_full > 4'b0000) begin
-			wr_data_reg_full	<= wr_data_reg_full << 1;
-		end
-	end
-	
-	//-------------------------------- array to store read data -------------------------------------
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			rd_data_reg			<= '{{8{1'b0}}, {8{1'b0}}, {8{1'b0}}, {8{1'b0}}};
-			rd_cnt				<= {2{1'b0}};
-		end 
-		else if (asmi_data_valid) begin
-			rd_data_reg[rd_cnt]	<= asmi_dataout;
-			rd_cnt				<= rd_cnt + 2'b01;
-		end
-	end
-	
-	//------------------------------- Enable 4-byte addressing out of reset ----------------------
-	generate 
-	if (ENABLE_4BYTE_ADDR) begin
-		typedef enum logic[1:0] {EN4B_CHIP1, EN4B_CHIP2, EN4B_CHIP3, IDLE} state_t;
-		state_t state;
-	
-		always @(posedge clk or negedge reset_n_reg) begin	// use reset_n_reg because user is allow to send cmd to ASMI_PARALLEL 2 clock cycles after reset
-			if (~reset_n_reg) begin	
-				state					<= EN4B_CHIP1;
-				asmi_en4b_addr			<= 1'b1;
-				temp_sce				<= 3'b001;
-			end
-			else begin
-				case (state)
-					EN4B_CHIP1 : begin
-									asmi_en4b_addr			<= 1'b1;
-									if (~asmi_busy) begin
-										if (CHIP_SELS > 1) begin
-											state					<= EN4B_CHIP2;
-											temp_sce				<= 3'b010;
-										end
-										else begin
-											state					<= IDLE;
-											temp_sce				<= 3'b000;
-										end
-									end
-								 end
-					EN4B_CHIP2 : begin
-									asmi_en4b_addr			<= 1'b1;
-									if (~asmi_busy) begin
-										if (CHIP_SELS > 2) begin
-											state					<= EN4B_CHIP3;
-											temp_sce				<= 3'b100;
-										end
-										else begin
-											state					<= IDLE;
-											temp_sce				<= 3'b000;
-										end
-									end
-								 end
-					EN4B_CHIP3 : begin
-									asmi_en4b_addr			<= 1'b1;
-									if (~asmi_busy) begin
-										state					<= IDLE;
-										temp_sce				<= 3'b000;
-									end
-								 end
-					IDLE	   : begin
-									asmi_en4b_addr			<= 1'b0;
-									state					<= IDLE;
-									temp_sce				<= 3'b000;
-								 end
-					default : 	 begin
-									asmi_en4b_addr			<= 1'b0;
-									state					<= IDLE;
-									temp_sce				<= 3'b000;
-								 end
-				endcase
-			end
-		end
-	end
-	else begin
-		always @(posedge clk) begin
-			asmi_en4b_addr				<= 1'b0;
-			temp_sce					<= 3'b000;
-		end
-	end
-	endgenerate
-	
-	//--------------------------------------- Waitrequest logic ----------------------------------
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			wr_mem_waitrequest			<= 1'b0;
-			local_waitrequest			<= 1'b0;
-		end
-		else begin
-			if (read_mem_combi || read_status_combi || read_sid_combi || read_rdid_combi || bulk_erase_combi || sector_erase_combi || sector_protect_combi || asmi_en4b_addr) begin		// no back pressure during imr & isr access
-				local_waitrequest		<= 1'b1;
-			end
-			else if (asmi_busy_reg && ~asmi_busy) begin
-				local_waitrequest		<= 1'b0;
-			end
-			
-			if (write_mem_combi) begin
-				wr_mem_waitrequest	<= 1'b1;
-			end
-			else if ((~pending_wr_data && ~asmi_write) || asmi_busy_reg && ~asmi_busy) begin
-				wr_mem_waitrequest	<= 1'b0;
-			end
-		end
-	end
-	
-	// -------------------------------------- MEM ACCESS -----------------------------------------
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			rd_mem_burstcount			<= {9{1'b0}};
-			wr_mem_burstcount			<= {9{1'b0}};
-			wr_mem_addr					<= {LOCAL_ADDR_WIDTH{1'b0}};
-		end
-		else begin
-			if (read_mem_combi) begin
-				rd_mem_burstcount		<= {avl_mem_burstcount, 2'b00}; 
-			end
-			if (write_mem_combi && (wr_burstcount_cnt == {9{1'b0}})) begin
-				wr_mem_addr				<= {temp_mem_addr, 2'b00};
-				wr_mem_burstcount		<= {avl_mem_burstcount, 2'b00}; 
-			end
-		end
-	end
-	
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			wr_burstcount_cnt				<= {9{1'b0}};
-		end
-		else begin
-			if (pending_wr_data) begin
-				wr_burstcount_cnt			<= wr_burstcount_cnt + 9'd1;
-			end
-			else if (wr_burstcount_cnt == wr_mem_burstcount) begin
-				wr_burstcount_cnt			<= {9{1'b0}};
-			end
-		end
-	end
-	
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			rd_burstcount_cnt				<= {9{1'b0}};
-		end
-		else begin
-			if (read_mem_combi) begin
-				rd_burstcount_cnt			<= 9'd1;
-			end
-			else if (rd_burstcount_cnt == rd_mem_burstcount) begin		// each rd 4 burst
-				rd_burstcount_cnt			<= {9{1'b0}};
-			end
-			else if (asmi_data_valid && rd_burstcount_cnt > 0) begin
-				rd_burstcount_cnt			<= rd_burstcount_cnt + 9'd1;
-			end
-		end
-	end
-	
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			asmi_addr					<= {ASMI_ADDR_WIDTH{1'b0}};
-		end
-		else begin
-			if (sector_erase_combi) begin // set lower 16 bits to zero so that erase at starting address of each sector
-				asmi_addr				<= {avl_csr_wrdata[LAST_ADDR_BIT : 8], {16{1'b0}}};	
-			end
-			if (read_mem_combi) begin
-				asmi_addr				<= {temp_mem_addr, 2'b00};
-			end
-			
-			if (detect_addroffset && ~detect_addroffset_reg) begin
-				asmi_addr			<= wr_mem_addr + {{LOCAL_ADDR_WIDTH-9{1'b0}}, wr_burstcount_cnt};
-			end
-
-		end
-	end
-	
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			asmi_datain					<= {8{1'b0}};
-			wr_cnt						<= {2{1'b0}};
-			asmi_shift_bytes			<= 1'b0;
-		end
-		else begin
-			if (sector_protect_combi) begin
-				asmi_datain				<= {{1{1'b0}}, avl_csr_wrdata[11], avl_csr_wrdata[12], avl_csr_wrdata[10:8], {2{1'b0}}};	// BP3, TB, BP2, BP1, BP0
-			end
-			if (pending_wr_data) begin
-				asmi_datain				<= wr_data_reg[wr_cnt][7:0];
-				wr_cnt					<= wr_cnt + 2'd1;
-			end
-			if (pending_wr_data && wr_data_reg[wr_cnt][8]) begin
-				asmi_shift_bytes		<= 1'b1;
-			end
-			else begin
-				asmi_shift_bytes		<= 1'b0;
-			end
-		end
-	end
-	
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			asmi_read_status			<= 1'b0;
-			asmi_read_sid				<= 1'b0;
-			asmi_read_rdid				<= 1'b0;
-			asmi_bulk_erase				<= 1'b0;
-			asmi_sector_erase			<= 1'b0;
-			asmi_sector_protect			<= 1'b0;
-			wren_internal				<= 1'b0;
-			asmi_write					<= 1'b0;
-			asmi_fast_read				<= 1'b0;
-			asmi_busy_reg				<= 1'b0;
-			avl_mem_rddata_valid		<= 1'b0;
-			detect_addroffset_reg		<= 1'b0;
-			reset_n_reg					<= 1'b0;
-		end
-		else begin
-			asmi_read_status			<= read_status_combi;
-			asmi_read_sid				<= read_sid_combi;
-			asmi_read_rdid				<= read_rdid_combi;
-			asmi_bulk_erase				<= bulk_erase_combi;
-			asmi_sector_erase			<= sector_erase_combi;				
-			asmi_sector_protect			<= sector_protect_combi;
-			wren_internal				<= wren_combi;
-			asmi_write					<= last_wr_byte;
-			asmi_fast_read				<= read_mem_combi;
-			asmi_busy_reg				<= asmi_busy;
-			avl_mem_rddata_valid		<= data_valid_combi;
-			detect_addroffset_reg		<= detect_addroffset;
-			reset_n_reg					<= 1'b1;
-		end
-	end
-	
-	// --------------------------------------------- CSR ACCESS -------------------------------------
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			illegal_write_reg			<= 1'b0;
-			illegal_erase_reg			<= 1'b0;
-			m_illegal_write_reg			<= 1'b0;
-			m_illegal_erase_reg			<= 1'b0;
-		end
-		else begin
-			illegal_write_reg			<= illegal_write_combi;
-			illegal_erase_reg			<= illegal_erase_combi;
-			m_illegal_write_reg			<= m_illegal_write_combi;
-			m_illegal_erase_reg			<= m_illegal_erase_combi;
-		end
-	end
-	
-	// csr read only registers enable logic
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			read_status_en				<= 1'b0;
-			read_sid_en 				<= 1'b0;
-			read_rdid_en				<= 1'b0;
-		end
-		else if (asmi_read_status) begin
-			read_status_en				<= 1'b1;
-		end
-		else if (asmi_read_sid) begin
-			read_sid_en					<= 1'b1;
-		end
-		else if (asmi_read_rdid) begin
-			read_rdid_en				<= 1'b1;
-		end
-		else if (asmi_busy == 0) begin
-			read_status_en				<= 1'b0;
-			read_sid_en 				<= 1'b0;
-			read_rdid_en				<= 1'b0;
-		end
-	end
-	
-	// generation logic for avl csr read data valid
-	assign avl_csr_rddata_valid	= read_status_valid || read_sid_valid || read_rdid_valid || read_isr_valid || read_imr_valid;
-	
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			read_status_valid			<= 1'b0;
-			read_sid_valid				<= 1'b0;
-			read_rdid_valid				<= 1'b0;
-			read_isr_valid				<= 1'b0;
-			read_imr_valid				<= 1'b0;
-		end
-		else begin
-			if (read_status_en && asmi_busy == 0) begin
-				read_status_valid			<= 1'b1;
-			end
-			else begin
-				read_status_valid			<= 1'b0;
-			end
-			
-			if (read_sid_en && asmi_busy == 0) begin
-				read_sid_valid				<= 1'b1;
-			end
-			else begin
-				read_sid_valid				<= 1'b0;
-			end
-			
-			if (read_rdid_en && asmi_busy == 0) begin
-				read_rdid_valid				<= 1'b1;
-			end
-			else begin
-				read_rdid_valid				<= 1'b0;
-			end
-			
-			if (read_isr_combi) begin
-				read_isr_valid				<= 1'b1;
-			end
-			else begin
-				read_isr_valid				<= 1'b0;
-			end
-			
-			if (read_imr_combi) begin
-				read_imr_valid				<= 1'b1;
-			end
-			else begin
-				read_imr_valid				<= 1'b0;
-			end
-		end
-	end
-	
-	// generation logic for avl csr read data
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			avl_csr_rddata				<= {CSR_DATA_WIDTH{1'b0}};
-		end
-		else begin
-			if (read_status_en && asmi_busy == 0) begin
-				avl_csr_rddata				<= {{CSR_DATA_WIDTH-8{1'b0}}, asmi_status_out};
-			end
-			if (read_sid_en && asmi_busy == 0) begin
-				avl_csr_rddata				<= {{CSR_DATA_WIDTH-8{1'b0}}, asmi_epcs_id};
-			end
-			if (read_rdid_en && asmi_busy == 0) begin
-				avl_csr_rddata				<= {{CSR_DATA_WIDTH-8{1'b0}}, asmi_rdid_out};
-			end
-			if (read_isr_combi) begin
-				avl_csr_rddata				<= {{CSR_DATA_WIDTH-2{1'b0}}, illegal_write_reg, illegal_erase_reg};
-			end
-			if (read_imr_combi) begin
-				avl_csr_rddata				<= {{CSR_DATA_WIDTH-2{1'b0}}, m_illegal_write_reg, m_illegal_erase_reg};
-			end
-		end
-	end
-	
-
-endmodule

ip/altera_epcq_controller_mod/altera_epcq_controller_arb.sv

@@ -1,230 +0,0 @@
-// (C) 2001-2015 Altera Corporation. All rights reserved.
-// Your use of Altera Corporation's design tools, logic functions and other 
-// software and tools, and its AMPP partner logic functions, and any output 
-// files any of the foregoing (including device programming or simulation 
-// files), and any associated documentation or information are expressly subject 
-// to the terms and conditions of the Altera Program License Subscription 
-// Agreement, Altera MegaCore Function License Agreement, or other applicable 
-// license agreement, including, without limitation, that your use is for the 
-// sole purpose of programming logic devices manufactured by Altera and sold by 
-// Altera or its authorized distributors.  Please refer to the applicable 
-// agreement for further details.
-
-
-// (C) 2001-2014 Altera Corporation. All rights reserved.
-// Your use of Altera Corporation's design tools, logic functions and other 
-// software and tools, and its AMPP partner logic functions, and any output 
-// files any of the foregoing (including device programming or simulation 
-// files), and any associated documentation or information are expressly subject 
-// to the terms and conditions of the Altera Program License Subscription 
-// Agreement, Altera MegaCore Function License Agreement, or other applicable 
-// license agreement, including, without limitation, that your use is for the 
-// sole purpose of programming logic devices manufactured by Altera and sold by 
-// Altera or its authorized distributors.  Please refer to the applicable 
-// agreement for further details.
-
-`timescale 1ps / 1ps
-
-module altera_epcq_controller_arb #(
-	parameter CS_WIDTH		= 1,
-	parameter ENABLE_4BYTE_ADDR = 1,
-	parameter ADDR_WIDTH	= 22,
-	parameter ASI_WIDTH		= 1,
-	parameter DEVICE_FAMILY = "CYCLONE V",
-	parameter ASMI_ADDR_WIDTH = 22,
-	parameter CHIP_SELS = 1
-)(
-	input 	wire		  								clk,
-	input 	wire		  								reset_n,
-	                                        			
-	// ports to access csr                        			
-	input 	wire										avl_csr_write,
-	input 	wire		  								avl_csr_read,
-	input 	wire 	[2:0] 								avl_csr_addr,
-	input 	wire 	[31:0] 								avl_csr_wrdata,
-	output 	reg 	[31:0] 								avl_csr_rddata,
-	output 	reg 		 								avl_csr_rddata_valid,
-	output 	reg 			 							avl_csr_waitrequest,
-	                                        			
-	// ports to access memory        			
-	input	wire		  								avl_mem_write,
-	input	wire										avl_mem_read,
-	input	wire  	[ADDR_WIDTH-1:0]					avl_mem_addr,			
-	input	wire	[31:0]								avl_mem_wrdata,
-	input	wire 	[3:0]								avl_mem_byteenable,
-	input	wire	[6:0]								avl_mem_burstcount,
-	output	wire	[31:0]								avl_mem_rddata,
-	output	reg											avl_mem_rddata_valid,
-	output 	reg 			 							avl_mem_waitrequest,
-	
-	// interrupt signal
-	output	reg 										irq,
-	
-	// Disable dedicated active serial interface
-	input  	wire	[ASI_WIDTH-1:0]						epcq_dataout,
-	output  reg											epcq_dclk,
-	output  reg		[CS_WIDTH-1:0] 						epcq_scein,
-	output  reg		[ASI_WIDTH-1:0]						epcq_sdoin,
-	output  reg		[ASI_WIDTH-1:0]						epcq_dataoe,
-	
-	// ASMI PARALLEL interface
-	input   wire	[ASI_WIDTH-1:0]						ddasi_dataoe,
-	output  reg 	[ASI_WIDTH-1:0]						ddasi_dataout,
-	input   wire 										ddasi_dclk,
-	input   wire 	[CS_WIDTH-1:0] 						ddasi_scein,
-	input   reg		[ASI_WIDTH-1:0]  					ddasi_sdoin,
-	
-	input   wire										asmi_busy,
-	input   wire										asmi_data_valid,
-	input   wire	[7:0]  								asmi_dataout,
-	output  reg											asmi_clkin,
-	output  reg											asmi_reset,
-	output  reg		[CS_WIDTH-1:0] 						asmi_sce,
-	output	reg	    [ASMI_ADDR_WIDTH-1:0]  				asmi_addr,
-	output  reg		[7:0]  								asmi_datain,
-	output  reg											asmi_fast_read,
-	output  wire										asmi_rden,
-	output  reg											asmi_shift_bytes,
-	output  reg 										asmi_en4b_addr,
-	output  wire										asmi_wren,
-	output  reg											asmi_write,
-	
-	input   wire										asmi_illegal_erase,
-	input   wire										asmi_illegal_write,
-	input   wire	[7:0]  								asmi_rdid_out,
-	input   wire	[7:0]  								asmi_status_out,
-	input   wire	[7:0]  								asmi_epcs_id,
-	output  reg											asmi_read_rdid,
-	output  reg											asmi_read_status,
-	output	reg											asmi_read_sid,
-	output  reg 										asmi_bulk_erase,
-	output  reg											asmi_sector_erase,
-	output  reg											asmi_sector_protect
-);
-
-	reg temp_mem_write, temp_mem_read, mem_write, mem_read, back_pressured_ctrl;
-	reg [ADDR_WIDTH-1:0] temp_mem_addr, mem_addr;		
-	reg [31:0] temp_mem_wrdata, mem_wrdata;
-	reg [3:0] temp_mem_byteenable, mem_byteenable;
-	reg [6:0] temp_mem_burstcount, mem_burstcount;
-	
-	wire back_pressured, temp_csr_waitrequest, temp_mem_waitrequest;
-
-	//-------------------- Arbitration logic between avalon csr and mem interface -----------
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			back_pressured_ctrl		<= 1'b0;
-		end 
-		else if (back_pressured) begin
-			back_pressured_ctrl		<= 1'b1;
-		end
-		else if (~temp_csr_waitrequest) begin
-			back_pressured_ctrl		<= 1'b0;
-		end
-	end
-
-	always @(posedge clk or negedge reset_n) begin
-		if (~reset_n) begin
-			mem_write 			<= 1'b0;
-			mem_read 			<= 1'b0;
-			mem_addr			<= {ADDR_WIDTH{1'b0}};
-			mem_wrdata			<= {32{1'b0}};
-			mem_byteenable		<= {4{1'b0}};
-			mem_burstcount		<= {7{1'b0}};
-		end 
-		else if ((avl_csr_write || avl_csr_read) && ~avl_csr_waitrequest && (avl_mem_write || avl_mem_read) && ~avl_mem_waitrequest) begin
-			// to back pressure master
-			mem_write 			<= avl_mem_write;
-			mem_read 			<= avl_mem_read;
-			mem_addr			<= avl_mem_addr;
-			mem_wrdata			<= avl_mem_wrdata;
-			mem_byteenable		<= avl_mem_byteenable;
-			mem_burstcount		<= avl_mem_burstcount;
-		end
-	end
-	
-	assign back_pressured	   = ((avl_csr_write || avl_csr_read) && ~temp_csr_waitrequest && (avl_mem_write || avl_mem_read)) ? 1'b1 : 1'b0; // to back pressure controller
-	assign avl_csr_waitrequest = (~avl_csr_write && ~avl_csr_read && back_pressured_ctrl) ? 1'b1 : temp_csr_waitrequest;
-	assign avl_mem_waitrequest = (back_pressured_ctrl) ? 1'b1 : temp_mem_waitrequest;
-	assign temp_mem_write	   = (back_pressured) ? 1'b0 :
-									(back_pressured_ctrl) ? mem_write : avl_mem_write;
-	assign temp_mem_read	   = (back_pressured) ? 1'b0 :
-									(back_pressured_ctrl) ? mem_read : avl_mem_read;
-	assign temp_mem_addr	   = (back_pressured) ? {ADDR_WIDTH{1'b0}} :
-									(back_pressured_ctrl) ? mem_addr : avl_mem_addr;
-	assign temp_mem_wrdata	   = (back_pressured) ? {32{1'b0}} :
-									(back_pressured_ctrl) ? mem_wrdata : avl_mem_wrdata;
-	assign temp_mem_byteenable = (back_pressured) ? {4{1'b0}} :
-									(back_pressured_ctrl) ? mem_byteenable : avl_mem_byteenable;
-	assign temp_mem_burstcount = (back_pressured) ? {7{1'b0}} :
-									(back_pressured_ctrl) ? mem_burstcount : avl_mem_burstcount;
-	
-	
-	//---------------------------------------------------------------------------------------//
-	
-	altera_epcq_controller #(
-		.CS_WIDTH		   (CS_WIDTH),
-		.DEVICE_FAMILY     (DEVICE_FAMILY),
-		.ADDR_WIDTH        (ADDR_WIDTH),
-		.ASMI_ADDR_WIDTH   (ASMI_ADDR_WIDTH),
-		.ASI_WIDTH         (ASI_WIDTH),
-		.CHIP_SELS	 (CHIP_SELS),
-		.ENABLE_4BYTE_ADDR (ENABLE_4BYTE_ADDR)
-	) controller (
-		.clk                  (clk),                  
-		.reset_n              (reset_n),              
-		.avl_csr_read         (avl_csr_read),         
-		.avl_csr_waitrequest  (temp_csr_waitrequest),  
-		.avl_csr_write        (avl_csr_write),        
-		.avl_csr_addr         (avl_csr_addr),         
-		.avl_csr_wrdata       (avl_csr_wrdata),       
-		.avl_csr_rddata       (avl_csr_rddata),       
-		.avl_csr_rddata_valid (avl_csr_rddata_valid), 
-		.avl_mem_write        (temp_mem_write),        
-		.avl_mem_burstcount   (temp_mem_burstcount),   
-		.avl_mem_waitrequest  (temp_mem_waitrequest),  
-		.avl_mem_read         (temp_mem_read),         
-		.avl_mem_addr         (temp_mem_addr),         
-		.avl_mem_wrdata       (temp_mem_wrdata),
-		.avl_mem_byteenable   (temp_mem_byteenable),
-		.avl_mem_rddata       (avl_mem_rddata),       
-		.avl_mem_rddata_valid (avl_mem_rddata_valid), 
-		.asmi_status_out      (asmi_status_out),      
-		.asmi_epcs_id         (asmi_epcs_id),         
-		.asmi_illegal_erase   (asmi_illegal_erase),   
-		.asmi_illegal_write   (asmi_illegal_write),   
-		.ddasi_dataoe         (ddasi_dataoe),         
-		.ddasi_dclk           (ddasi_dclk),           
-		.ddasi_scein          (ddasi_scein),          
-		.ddasi_sdoin          (ddasi_sdoin),          
-		.asmi_busy            (asmi_busy),            
-		.asmi_data_valid      (asmi_data_valid),      
-		.asmi_dataout         (asmi_dataout),         
-		.epcq_dataout         (epcq_dataout),         
-		.ddasi_dataout        (ddasi_dataout),        
-		.asmi_read_rdid       (asmi_read_rdid),       
-		.asmi_read_status     (asmi_read_status),     
-		.asmi_read_sid        (asmi_read_sid),        
-		.asmi_bulk_erase      (asmi_bulk_erase),      
-		.asmi_sector_erase    (asmi_sector_erase),    
-		.asmi_sector_protect  (asmi_sector_protect),  
-		.epcq_dclk            (epcq_dclk),            
-		.epcq_scein           (epcq_scein),           
-		.epcq_sdoin           (epcq_sdoin),           
-		.epcq_dataoe          (epcq_dataoe),          
-		.asmi_clkin           (asmi_clkin),           
-		.asmi_reset           (asmi_reset),           
-		.asmi_sce			  (asmi_sce),
-		.asmi_addr            (asmi_addr),            
-		.asmi_datain          (asmi_datain),          
-		.asmi_fast_read       (asmi_fast_read),       
-		.asmi_rden            (asmi_rden),            
-		.asmi_shift_bytes     (asmi_shift_bytes),     
-		.asmi_wren            (asmi_wren),            
-		.asmi_write           (asmi_write),           
-		.asmi_rdid_out        (asmi_rdid_out),        
-		.asmi_en4b_addr       (asmi_en4b_addr),       
-		.irq                  (irq)                   
-	);                                                
-
-endmodule

ip/altera_epcq_controller_mod/altera_epcq_controller_fifo.v

@@ -1,176 +0,0 @@
-// (C) 2001-2015 Altera Corporation. All rights reserved.
-// Your use of Altera Corporation's design tools, logic functions and other 
-// software and tools, and its AMPP partner logic functions, and any output 
-// files any of the foregoing (including device programming or simulation 
-// files), and any associated documentation or information are expressly subject 
-// to the terms and conditions of the Altera Program License Subscription 
-// Agreement, Altera MegaCore Function License Agreement, or other applicable 
-// license agreement, including, without limitation, that your use is for the 
-// sole purpose of programming logic devices manufactured by Altera and sold by 
-// Altera or its authorized distributors.  Please refer to the applicable 
-// agreement for further details.
-
-
-// megafunction wizard: %FIFO%
-// GENERATION: STANDARD
-// VERSION: WM1.0
-// MODULE: scfifo 
-
-// ============================================================
-// File Name: altera_epcq_controller_fifo.v
-// Megafunction Name(s):
-// 			scfifo
-//
-// Simulation Library Files(s):
-// 			altera_mf
-// ============================================================
-// ************************************************************
-// THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
-//
-// 14.1.0 Internal Build 64 05/14/2014 PN Full Version
-// ************************************************************
-
-
-//Copyright (C) 1991-2014 Altera Corporation. All rights reserved.
-//Your use of Altera Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
-//functions, and any output files from any of the foregoing 
-//(including device programming or simulation files), and any 
-//associated documentation or information are expressly subject 
-//to the terms and conditions of the Altera Program License 
-//Subscription Agreement, the Altera Quartus II License Agreement,
-//the Altera MegaCore Function License Agreement, or other 
-//applicable license agreement, including, without limitation, 
-//that your use is for the sole purpose of programming logic 
-//devices manufactured by Altera and sold by Altera or its 
-//authorized distributors.  Please refer to the applicable 
-//agreement for further details.
-
-
-// synopsys translate_off
-`timescale 1 ps / 1 ps
-// synopsys translate_on
-module altera_epcq_controller_fifo #(
-	parameter DEVICE_FAMILY = "CYCLONE V",
-	parameter MEMORY_TYPE	= "RAM_BLOCK_TYPE=MLAB"
-)(
-	clock,
-	data,
-	rdreq,
-	wrreq,
-	empty,
-	full,
-	q);
-
-	input	  clock;
-	input	[35:0]  data;
-	input	  rdreq;
-	input	  wrreq;
-	output	  empty;
-	output	  full;
-	output	[35:0]  q;
-
-	wire  sub_wire0;
-	wire  sub_wire1;
-	wire [35:0] sub_wire2;
-	wire  empty = sub_wire0;
-	wire  full = sub_wire1;
-	wire [35:0] q = sub_wire2[35:0];
-
-	scfifo	scfifo_component (
-				.clock (clock),
-				.data (data),
-				.rdreq (rdreq),
-				.wrreq (wrreq),
-				.empty (sub_wire0),
-				.full (sub_wire1),
-				.q (sub_wire2),
-				.aclr (),
-				.almost_empty (),
-				.almost_full (),
-				.sclr (),
-				.usedw ());
-	defparam
-		scfifo_component.add_ram_output_register = "OFF",
-		scfifo_component.intended_device_family = DEVICE_FAMILY,
-		scfifo_component.lpm_hint = MEMORY_TYPE,
-		scfifo_component.lpm_numwords = 1024,
-		scfifo_component.lpm_showahead = "ON",
-		scfifo_component.lpm_type = "scfifo",
-		scfifo_component.lpm_width = 36,
-		scfifo_component.lpm_widthu = 10,
-		scfifo_component.overflow_checking = "ON",
-		scfifo_component.underflow_checking = "ON",
-		scfifo_component.use_eab = "ON";
-
-
-endmodule
-
-// ============================================================
-// CNX file retrieval info
-// ============================================================
-// Retrieval info: PRIVATE: AlmostEmpty NUMERIC "0"
-// Retrieval info: PRIVATE: AlmostEmptyThr NUMERIC "-1"
-// Retrieval info: PRIVATE: AlmostFull NUMERIC "0"
-// Retrieval info: PRIVATE: AlmostFullThr NUMERIC "-1"
-// Retrieval info: PRIVATE: CLOCKS_ARE_SYNCHRONIZED NUMERIC "0"
-// Retrieval info: PRIVATE: Clock NUMERIC "0"
-// Retrieval info: PRIVATE: Depth NUMERIC "1024"
-// Retrieval info: PRIVATE: Empty NUMERIC "1"
-// Retrieval info: PRIVATE: Full NUMERIC "1"
-// Retrieval info: PRIVATE: INTENDED_DEVICE_FAMILY STRING "Cyclone IV GX"
-// Retrieval info: PRIVATE: LE_BasedFIFO NUMERIC "0"
-// Retrieval info: PRIVATE: LegacyRREQ NUMERIC "0"
-// Retrieval info: PRIVATE: MAX_DEPTH_BY_9 NUMERIC "0"
-// Retrieval info: PRIVATE: OVERFLOW_CHECKING NUMERIC "0"
-// Retrieval info: PRIVATE: Optimize NUMERIC "0"
-// Retrieval info: PRIVATE: RAM_BLOCK_TYPE NUMERIC "2"
-// Retrieval info: PRIVATE: SYNTH_WRAPPER_GEN_POSTFIX STRING "0"
-// Retrieval info: PRIVATE: UNDERFLOW_CHECKING NUMERIC "0"
-// Retrieval info: PRIVATE: UsedW NUMERIC "0"
-// Retrieval info: PRIVATE: Width NUMERIC "8"
-// Retrieval info: PRIVATE: dc_aclr NUMERIC "0"
-// Retrieval info: PRIVATE: diff_widths NUMERIC "0"
-// Retrieval info: PRIVATE: msb_usedw NUMERIC "0"
-// Retrieval info: PRIVATE: output_width NUMERIC "8"
-// Retrieval info: PRIVATE: rsEmpty NUMERIC "1"
-// Retrieval info: PRIVATE: rsFull NUMERIC "0"
-// Retrieval info: PRIVATE: rsUsedW NUMERIC "0"
-// Retrieval info: PRIVATE: sc_aclr NUMERIC "0"
-// Retrieval info: PRIVATE: sc_sclr NUMERIC "0"
-// Retrieval info: PRIVATE: wsEmpty NUMERIC "0"
-// Retrieval info: PRIVATE: wsFull NUMERIC "1"
-// Retrieval info: PRIVATE: wsUsedW NUMERIC "0"
-// Retrieval info: LIBRARY: altera_mf altera_mf.altera_mf_components.all
-// Retrieval info: CONSTANT: ADD_RAM_OUTPUT_REGISTER STRING "OFF"
-// Retrieval info: CONSTANT: INTENDED_DEVICE_FAMILY STRING "Cyclone IV GX"
-// Retrieval info: CONSTANT: LPM_HINT STRING "RAM_BLOCK_TYPE=M9K"
-// Retrieval info: CONSTANT: LPM_NUMWORDS NUMERIC "1024"
-// Retrieval info: CONSTANT: LPM_SHOWAHEAD STRING "ON"
-// Retrieval info: CONSTANT: LPM_TYPE STRING "scfifo"
-// Retrieval info: CONSTANT: LPM_WIDTH NUMERIC "8"
-// Retrieval info: CONSTANT: LPM_WIDTHU NUMERIC "10"
-// Retrieval info: CONSTANT: OVERFLOW_CHECKING STRING "ON"
-// Retrieval info: CONSTANT: UNDERFLOW_CHECKING STRING "ON"
-// Retrieval info: CONSTANT: USE_EAB STRING "ON"
-// Retrieval info: USED_PORT: clock 0 0 0 0 INPUT NODEFVAL "clock"
-// Retrieval info: USED_PORT: data 0 0 8 0 INPUT NODEFVAL "data[7..0]"
-// Retrieval info: USED_PORT: empty 0 0 0 0 OUTPUT NODEFVAL "empty"
-// Retrieval info: USED_PORT: full 0 0 0 0 OUTPUT NODEFVAL "full"
-// Retrieval info: USED_PORT: q 0 0 8 0 OUTPUT NODEFVAL "q[7..0]"
-// Retrieval info: USED_PORT: rdreq 0 0 0 0 INPUT NODEFVAL "rdreq"
-// Retrieval info: USED_PORT: wrreq 0 0 0 0 INPUT NODEFVAL "wrreq"
-// Retrieval info: CONNECT: @clock 0 0 0 0 clock 0 0 0 0
-// Retrieval info: CONNECT: @data 0 0 8 0 data 0 0 8 0
-// Retrieval info: CONNECT: @rdreq 0 0 0 0 rdreq 0 0 0 0
-// Retrieval info: CONNECT: @wrreq 0 0 0 0 wrreq 0 0 0 0
-// Retrieval info: CONNECT: empty 0 0 0 0 @empty 0 0 0 0
-// Retrieval info: CONNECT: full 0 0 0 0 @full 0 0 0 0
-// Retrieval info: CONNECT: q 0 0 8 0 @q 0 0 8 0
-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo.v TRUE
-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo.inc FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo.cmp FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo.bsf FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo_inst.v FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo_bb.v FALSE
-// Retrieval info: LIB_FILE: altera_mf

ip/altera_epcq_controller_mod/altera_epcq_controller_hw.tcl

@@ -1,453 +0,0 @@
-# (C) 2001-2015 Altera Corporation. All rights reserved.
-# Your use of Altera Corporation's design tools, logic functions and other 
-# software and tools, and its AMPP partner logic functions, and any output 
-# files any of the foregoing (including device programming or simulation 
-# files), and any associated documentation or information are expressly subject 
-# to the terms and conditions of the Altera Program License Subscription 
-# Agreement, Altera MegaCore Function License Agreement, or other applicable 
-# license agreement, including, without limitation, that your use is for the 
-# sole purpose of programming logic devices manufactured by Altera and sold by 
-# Altera or its authorized distributors.  Please refer to the applicable 
-# agreement for further details.
-
-
-# TCL File Generated by Component Editor 14.1
-# Fri May 09 18:08:10 MYT 2014
-# DO NOT MODIFY
-
-
-# 
-# altera_epcq_controller_core "Altera EPCQ Serial Flash controller core" v14.1
-# Altera Coorperation 2014.05.23.15:01:29
-# This component is a serial flash controller which allows user to access Altera EPCQ devices
-# 
-
-# 
-# request TCL package from ACDS 14.1
-# 
-package require -exact qsys 14.1
-
-
-
-# 
-# module altera_epcq_controller
-# 
-set_module_property DESCRIPTION "This component is a serial flash controller which allows user to access Altera EPCQ devices"
-set_module_property NAME altera_epcq_controller_core
-set_module_property VERSION 16.1
-set_module_property INTERNAL true
-set_module_property OPAQUE_ADDRESS_MAP true
-set_module_property AUTHOR "Altera Corporation"
-set_module_property DISPLAY_NAME "Altera EPCQ Serial Flash controller core"
-set_module_property INSTANTIATE_IN_SYSTEM_MODULE true
-set_module_property HIDE_FROM_QUARTUS true
-set_module_property EDITABLE true
-set_module_property REPORT_TO_TALKBACK false
-set_module_property ALLOW_GREYBOX_GENERATION false
-set_module_property REPORT_HIERARCHY false
-set_module_property VALIDATION_CALLBACK "validate"
-# 
-# file sets
-# 
-add_fileset QUARTUS_SYNTH QUARTUS_SYNTH "" ""
-set_fileset_property QUARTUS_SYNTH TOP_LEVEL altera_epcq_controller_arb
-set_fileset_property QUARTUS_SYNTH ENABLE_RELATIVE_INCLUDE_PATHS false
-set_fileset_property QUARTUS_SYNTH ENABLE_FILE_OVERWRITE_MODE false
-add_fileset_file altera_epcq_controller_arb.sv SYSTEM_VERILOG PATH altera_epcq_controller_arb.sv TOP_LEVEL_FILE
-add_fileset_file altera_epcq_controller.sv SYSTEM_VERILOG PATH altera_epcq_controller.sv 
-
-add_fileset SIM_VERILOG SIM_VERILOG "" ""
-set_fileset_property SIM_VERILOG TOP_LEVEL altera_epcq_controller_arb
-set_fileset_property SIM_VERILOG ENABLE_RELATIVE_INCLUDE_PATHS false
-set_fileset_property SIM_VERILOG ENABLE_FILE_OVERWRITE_MODE true
-add_fileset_file altera_epcq_controller_arb.sv SYSTEM_VERILOG PATH altera_epcq_controller_arb.sv TOP_LEVEL_FILE
-add_fileset_file altera_epcq_controller.sv SYSTEM_VERILOG PATH altera_epcq_controller.sv
-
-#
-# add system info parameter
-add_parameter           deviceFeaturesSystemInfo   STRING 			"None"
-set_parameter_property  deviceFeaturesSystemInfo   system_info		"DEVICE_FEATURES"
-set_parameter_property  deviceFeaturesSystemInfo   VISIBLE false
-
-# 
-# parameters
-# 
-add_parameter           DEVICE_FAMILY		STRING          ""
-set_parameter_property  DEVICE_FAMILY		SYSTEM_INFO     "DEVICE_FAMILY"
-set_parameter_property  DEVICE_FAMILY		HDL_PARAMETER   true
-set_parameter_property  DEVICE_FAMILY		VISIBLE	      	false
-
-add_parameter ADDR_WIDTH INTEGER 19
-set_parameter_property ADDR_WIDTH DEFAULT_VALUE 19
-set_parameter_property ADDR_WIDTH DISPLAY_NAME ADDR_WIDTH
-set_parameter_property ADDR_WIDTH DERIVED true
-set_parameter_property ADDR_WIDTH TYPE INTEGER
-set_parameter_property ADDR_WIDTH VISIBLE false
-set_parameter_property ADDR_WIDTH UNITS None
-set_parameter_property ADDR_WIDTH ALLOWED_RANGES {19, 20, 21, 22, 23, 24, 25, 26, 27, 28}		
-set_parameter_property ADDR_WIDTH HDL_PARAMETER true
-
-add_parameter ASMI_ADDR_WIDTH INTEGER 24
-set_parameter_property ASMI_ADDR_WIDTH DEFAULT_VALUE 24
-set_parameter_property ASMI_ADDR_WIDTH DISPLAY_NAME ASMI_ADDR_WIDTH
-set_parameter_property ASMI_ADDR_WIDTH DERIVED true
-set_parameter_property ASMI_ADDR_WIDTH TYPE INTEGER
-set_parameter_property ASMI_ADDR_WIDTH VISIBLE false
-set_parameter_property ASMI_ADDR_WIDTH UNITS None
-set_parameter_property ASMI_ADDR_WIDTH ALLOWED_RANGES {24, 32}		
-set_parameter_property ASMI_ADDR_WIDTH HDL_PARAMETER true
-
-add_parameter ASI_WIDTH INTEGER 1
-set_parameter_property ASI_WIDTH DEFAULT_VALUE 1
-set_parameter_property ASI_WIDTH DISPLAY_NAME ASI_WIDTH
-set_parameter_property ASI_WIDTH DERIVED true
-set_parameter_property ASI_WIDTH TYPE INTEGER
-set_parameter_property ASI_WIDTH VISIBLE false
-set_parameter_property ASI_WIDTH UNITS None
-set_parameter_property ASI_WIDTH ALLOWED_RANGES {1, 4}
-set_parameter_property ASI_WIDTH HDL_PARAMETER true
-
-add_parameter CS_WIDTH INTEGER 1
-set_parameter_property CS_WIDTH DEFAULT_VALUE 1
-set_parameter_property CS_WIDTH DISPLAY_NAME CS_WIDTH
-set_parameter_property CS_WIDTH DERIVED true
-set_parameter_property CS_WIDTH TYPE INTEGER
-set_parameter_property CS_WIDTH VISIBLE false
-set_parameter_property CS_WIDTH UNITS None
-set_parameter_property CS_WIDTH ALLOWED_RANGES {1, 3}
-set_parameter_property CS_WIDTH HDL_PARAMETER true
-
-add_parameter CHIP_SELS INTEGER "1"
-set_parameter_property CHIP_SELS DISPLAY_NAME "Number of Chip Selects used"
-set_parameter_property CHIP_SELS ALLOWED_RANGES {1 2 3}
-set_parameter_property CHIP_SELS DESCRIPTION "Number of EPCQ(L) devices that are attached and need a CHIPSEL"
-set_parameter_property CHIP_SELS HDL_PARAMETER true
-set_parameter_property CHIP_SELS AFFECTS_GENERATION true
-
-add_parameter DDASI	INTEGER "0"
-set_parameter_property DDASI DISPLAY_NAME "Disable dedicated Active Serial interface"
-set_parameter_property DDASI DESCRIPTION "Check to route ASMIBLOCK signals to top level of design"
-set_parameter_property DDASI AFFECTS_GENERATION true
-set_parameter_property DDASI VISIBLE false
-set_parameter_property DDASI DERIVED false
-
-add_parameter ENABLE_4BYTE_ADDR	INTEGER "0"
-set_parameter_property ENABLE_4BYTE_ADDR DISPLAY_NAME "Enable 4-byte addressing mode"
-set_parameter_property ENABLE_4BYTE_ADDR DESCRIPTION "Check to enable 4-byte addressing mode for device larger than 128Mbyte"
-set_parameter_property ENABLE_4BYTE_ADDR AFFECTS_GENERATION true
-set_parameter_property ENABLE_4BYTE_ADDR VISIBLE false
-set_parameter_property ENABLE_4BYTE_ADDR HDL_PARAMETER true
-set_parameter_property ENABLE_4BYTE_ADDR DERIVED true
-
-# SPI device selection
-add_parameter FLASH_TYPE STRING "EPCQ16"
-set_parameter_property FLASH_TYPE DISPLAY_NAME "Configuration device type"
-set_parameter_property FLASH_TYPE DESCRIPTION "Select targeted EPCS/EPCQ devices"
-set_parameter_property FLASH_TYPE AFFECTS_GENERATION true
-set_parameter_property FLASH_TYPE VISIBLE true
-set_parameter_property FLASH_TYPE DERIVED false
-
-add_parameter IO_MODE STRING "STANDARD"
-set_parameter_property IO_MODE DISPLAY_NAME "Choose I/O mode"
-set_parameter_property IO_MODE ALLOWED_RANGES {"STANDARD" "QUAD"}
-set_parameter_property IO_MODE DESCRIPTION "Select extended data width when Fast Read operation is enabled"
-
-# 
-# display items
-# 
-
-
-# 
-# connection point clock_sink
-# 
-add_interface clock_sink clock end
-set_interface_property clock_sink clockRate 0
-set_interface_property clock_sink ENABLED true
-set_interface_property clock_sink EXPORT_OF ""
-set_interface_property clock_sink PORT_NAME_MAP ""
-set_interface_property clock_sink CMSIS_SVD_VARIABLES ""
-set_interface_property clock_sink SVD_ADDRESS_GROUP ""
-
-add_interface_port clock_sink clk clk Input 1
-
-
-# 
-# connection point reset
-# 
-add_interface reset reset end
-set_interface_property reset associatedClock clock_sink
-set_interface_property reset synchronousEdges DEASSERT
-set_interface_property reset ENABLED true
-set_interface_property reset EXPORT_OF ""
-set_interface_property reset PORT_NAME_MAP ""
-set_interface_property reset CMSIS_SVD_VARIABLES ""
-set_interface_property reset SVD_ADDRESS_GROUP ""
-
-add_interface_port reset reset_n reset_n Input 1
-
-
-# 
-# connection point avl_csr
-# 
-add_interface avl_csr avalon end
-set_interface_property avl_csr addressUnits WORDS
-set_interface_property avl_csr associatedClock clock_sink
-set_interface_property avl_csr associatedReset reset
-set_interface_property avl_csr bitsPerSymbol 8
-set_interface_property avl_csr burstOnBurstBoundariesOnly false
-set_interface_property avl_csr burstcountUnits WORDS
-set_interface_property avl_csr explicitAddressSpan 0
-set_interface_property avl_csr holdTime 0
-set_interface_property avl_csr linewrapBursts false
-set_interface_property avl_csr maximumPendingReadTransactions 1
-set_interface_property avl_csr maximumPendingWriteTransactions 0
-set_interface_property avl_csr readLatency 0
-set_interface_property avl_csr readWaitTime 0
-set_interface_property avl_csr setupTime 0
-set_interface_property avl_csr timingUnits Cycles
-set_interface_property avl_csr writeWaitTime 0
-set_interface_property avl_csr ENABLED true
-set_interface_property avl_csr EXPORT_OF ""
-set_interface_property avl_csr PORT_NAME_MAP ""
-set_interface_property avl_csr CMSIS_SVD_VARIABLES ""
-set_interface_property avl_csr SVD_ADDRESS_GROUP ""
-
-add_interface_port avl_csr avl_csr_read read Input 1
-add_interface_port avl_csr avl_csr_waitrequest waitrequest Output 1
-add_interface_port avl_csr avl_csr_write write Input 1
-add_interface_port avl_csr avl_csr_addr address Input 3
-add_interface_port avl_csr avl_csr_wrdata writedata Input 32
-add_interface_port avl_csr avl_csr_rddata readdata Output 32
-add_interface_port avl_csr avl_csr_rddata_valid readdatavalid Output 1
-
-
-# 
-# connection point avl_mem
-# 
-add_interface avl_mem avalon end
-set_interface_property avl_mem addressUnits WORDS
-set_interface_property avl_mem associatedClock clock_sink
-set_interface_property avl_mem associatedReset reset
-set_interface_property avl_mem bitsPerSymbol 8
-set_interface_property avl_mem burstOnBurstBoundariesOnly false
-set_interface_property avl_mem burstcountUnits WORDS
-set_interface_property avl_mem explicitAddressSpan 0
-set_interface_property avl_mem holdTime 0
-set_interface_property avl_mem linewrapBursts true
-set_interface_property avl_mem maximumPendingReadTransactions 1
-set_interface_property avl_mem maximumPendingWriteTransactions 0
-set_interface_property avl_mem constantBurstBehavior true
-set_interface_property avl_mem readLatency 0
-set_interface_property avl_mem readWaitTime 0
-set_interface_property avl_mem setupTime 0
-set_interface_property avl_mem timingUnits Cycles
-set_interface_property avl_mem writeWaitTime 0
-set_interface_property avl_mem ENABLED true
-set_interface_property avl_mem EXPORT_OF ""
-set_interface_property avl_mem PORT_NAME_MAP ""
-set_interface_property avl_mem CMSIS_SVD_VARIABLES ""
-set_interface_property avl_mem SVD_ADDRESS_GROUP ""
-
-add_interface_port avl_mem avl_mem_write write Input 1
-add_interface_port avl_mem avl_mem_burstcount burstcount Input 7
-add_interface_port avl_mem avl_mem_waitrequest waitrequest Output 1
-add_interface_port avl_mem avl_mem_read read Input 1
-add_interface_port avl_mem avl_mem_addr address Input ADDR_WIDTH
-add_interface_port avl_mem avl_mem_wrdata writedata Input 32
-add_interface_port avl_mem avl_mem_rddata readdata Output 32
-add_interface_port avl_mem avl_mem_rddata_valid readdatavalid Output 1
-add_interface_port avl_mem avl_mem_byteenable byteenable Input 4
-
-
-# 
-# connection point conduit_out
-# 
-add_interface asmi_status_out conduit end
-add_interface_port asmi_status_out asmi_status_out conduit_status_out Input 8
-
-add_interface asmi_epcs_id conduit end
-add_interface_port asmi_epcs_id asmi_epcs_id conduit_epcs_id Input 8
-
-add_interface asmi_illegal_erase conduit end
-add_interface_port asmi_illegal_erase asmi_illegal_erase conduit_illegal_erase Input 1
-
-add_interface asmi_illegal_write conduit end
-add_interface_port asmi_illegal_write asmi_illegal_write conduit_illegal_write Input 1
-
-add_interface ddasi_dataoe conduit end
-add_interface_port ddasi_dataoe ddasi_dataoe conduit_ddasi_dataoe Input ASI_WIDTH
-
-add_interface ddasi_dclk conduit end
-add_interface_port ddasi_dclk ddasi_dclk conduit_ddasi_dclk Input 1
-
-add_interface ddasi_scein conduit end
-add_interface_port ddasi_scein ddasi_scein conduit_ddasi_scein Input CS_WIDTH
-
-add_interface ddasi_sdoin conduit end
-add_interface_port ddasi_sdoin ddasi_sdoin conduit_ddasi_sdoin Input ASI_WIDTH
-
-add_interface asmi_busy conduit end
-add_interface_port asmi_busy asmi_busy conduit_busy Input 1
-
-add_interface asmi_data_valid conduit end
-add_interface_port asmi_data_valid asmi_data_valid conduit_data_valid Input 1
-
-add_interface asmi_dataout conduit end
-add_interface_port asmi_dataout asmi_dataout conduit_dataout Input 8
-
-add_interface epcq_dataout conduit end
-add_interface_port epcq_dataout epcq_dataout conduit_epcq_dataout Input ASI_WIDTH
-
-add_interface ddasi_dataout conduit end
-add_interface_port ddasi_dataout ddasi_dataout conduit_ddasi_dataout Output ASI_WIDTH
-
-add_interface asmi_read_rdid conduit end
-add_interface_port asmi_read_rdid asmi_read_rdid conduit_read_rdid Output 1
-
-add_interface asmi_read_status conduit end
-add_interface_port asmi_read_status asmi_read_status conduit_read_status Output 1
-
-add_interface asmi_read_sid conduit end
-add_interface_port asmi_read_sid asmi_read_sid conduit_read_sid Output 1
-
-add_interface asmi_bulk_erase conduit end
-add_interface_port asmi_bulk_erase asmi_bulk_erase conduit_bulk_erase Output 1
-
-add_interface asmi_sector_erase conduit end
-add_interface_port asmi_sector_erase asmi_sector_erase conduit_sector_erase Output 1
-
-add_interface asmi_sector_protect conduit end
-add_interface_port asmi_sector_protect asmi_sector_protect conduit_sector_protect Output 1
-
-add_interface epcq_dclk conduit end
-add_interface_port epcq_dclk epcq_dclk conduit_epcq_dclk Output 1
-
-add_interface epcq_scein conduit end
-add_interface_port epcq_scein epcq_scein conduit_epcq_scein Output CS_WIDTH
-
-add_interface epcq_sdoin conduit end
-add_interface_port epcq_sdoin epcq_sdoin conduit_epcq_sdoin Output ASI_WIDTH
-
-add_interface epcq_dataoe conduit end
-add_interface_port epcq_dataoe epcq_dataoe conduit_epcq_dataoe Output ASI_WIDTH
-
-add_interface asmi_clkin conduit end
-add_interface_port asmi_clkin asmi_clkin conduit_clkin Output 1
-
-add_interface asmi_reset conduit end
-add_interface_port asmi_reset asmi_reset conduit_reset Output 1
-
-add_interface asmi_sce conduit end
-add_interface_port asmi_sce asmi_sce conduit_asmi_sce Output CS_WIDTH
-
-add_interface asmi_addr conduit end
-add_interface_port asmi_addr asmi_addr conduit_addr Output ASMI_ADDR_WIDTH
-
-add_interface asmi_datain conduit end
-add_interface_port asmi_datain asmi_datain conduit_datain Output 8
-
-add_interface asmi_fast_read conduit end
-add_interface_port asmi_fast_read asmi_fast_read conduit_fast_read Output 1
-
-add_interface asmi_rden conduit end
-add_interface_port asmi_rden asmi_rden conduit_rden Output 1
-
-add_interface asmi_shift_bytes conduit end
-add_interface_port asmi_shift_bytes asmi_shift_bytes conduit_shift_bytes Output 1
-
-add_interface asmi_wren conduit end
-add_interface_port asmi_wren asmi_wren conduit_wren Output 1
-
-add_interface asmi_write conduit end
-add_interface_port asmi_write asmi_write conduit_write Output 1
-
-add_interface asmi_rdid_out conduit end
-add_interface_port asmi_rdid_out asmi_rdid_out conduit_rdid_out Input 8
-
-add_interface asmi_en4b_addr conduit end
-add_interface_port asmi_en4b_addr asmi_en4b_addr conduit_en4b_addr Output 1
-
-# 
-# connection point interrupt_sender
-# 
-add_interface interrupt_sender interrupt end
-set_interface_property interrupt_sender associatedAddressablePoint avl_csr
-set_interface_property interrupt_sender associatedClock clock_sink
-set_interface_property interrupt_sender associatedReset reset
-set_interface_property interrupt_sender bridgedReceiverOffset ""
-set_interface_property interrupt_sender bridgesToReceiver ""
-set_interface_property interrupt_sender ENABLED true
-set_interface_property interrupt_sender EXPORT_OF ""
-set_interface_property interrupt_sender PORT_NAME_MAP ""
-set_interface_property interrupt_sender CMSIS_SVD_VARIABLES ""
-set_interface_property interrupt_sender SVD_ADDRESS_GROUP ""
-
-add_interface_port interrupt_sender irq irq Output 1
-
-proc validate {} {
-	set all_supported_SPI_list {"EPCS16" "EPCS64" "EPCS128" "EPCQ16" "EPCQ32" "EPCQ64" "EPCQ128" "EPCQ256" \
-							"EPCQ512" "EPCQL256" "EPCQL512" "EPCQL1024"}
-							
-	set_parameter_property  FLASH_TYPE  	"ALLOWED_RANGES"  $all_supported_SPI_list
-	set DEVICE_FAMILY 		[ get_parameter_value DEVICE_FAMILY ]
-	set CHIP_SELS			    [ get_parameter_value CHIP_SELS]
-	set temp_addr_width 	[ proc_get_derive_addr_width [ get_parameter_value FLASH_TYPE ] ]
-	set_parameter_value		ENABLE_4BYTE_ADDR	[ proc_get_derive_enable_2byte_addr  [ get_parameter_value FLASH_TYPE ] ]
-	
-	if { [ get_parameter_value ENABLE_4BYTE_ADDR ] } {
-		set_parameter_value ASMI_ADDR_WIDTH 32
-	} else {
-		set_parameter_value ASMI_ADDR_WIDTH 24
-	}
-	
-	# check whether devices supporting multiple flash - only for Arria 10
-	if {[check_device_family_equivalence $DEVICE_FAMILY "Arria 10"]} {
-		set is_multi_flash_support	"true"
-		if {$CHIP_SELS eq 3 } {set_parameter_value 	ADDR_WIDTH 		[ expr $temp_addr_width + 2]}
-		if {$CHIP_SELS eq 2 } {set_parameter_value 	ADDR_WIDTH 		[ expr $temp_addr_width + 1]}
-		if {$CHIP_SELS eq 1 } {set_parameter_value 	ADDR_WIDTH 		$temp_addr_width }
-	} else {
-		set is_multi_flash_support	"false"
-		set_parameter_value 	ADDR_WIDTH 		$temp_addr_width
-	}
-	
-}
-
-proc proc_get_derive_enable_2byte_addr {flash_type} {
-    if { [ string match "*256*" "$flash_type" ] || [ string match "*512*" "$flash_type" ] || [ string match "*1024*" "$flash_type" ]} {
-		return true
-	} else {
-		return false
-	}
-}
-
-proc proc_get_derive_addr_width {flash_type} {
-    switch $flash_type {
-        "EPCS16" - "EPCQ16" {
-            return 19 
-        }
-        "EPCS64" - "EPCQ64" {
-            return 21
-        }
-        "EPCS128" - "EPCQ128" {
-            return 22
-        }
-		"EPCQ32" {
-            return 20
-		}
-        "EPCQ256" - "EPCQL256" {
-            return 23
-        }
-        "EPCQ512" - "EPCQL512" {
-            return 24
-        }
-        "EPCQL1024" {
-            return 25
-        }
-        default {
-            # Should never enter this function
-            send_message error "$flash_type is not a valid flash type"
-        }
-    
-    }
-}

ip/altera_epcq_controller_mod/altera_epcq_controller_sw.tcl

@@ -1,58 +0,0 @@
-# (C) 2001-2015 Altera Corporation. All rights reserved.
-# Your use of Altera Corporation's design tools, logic functions and other 
-# software and tools, and its AMPP partner logic functions, and any output 
-# files any of the foregoing (including device programming or simulation 
-# files), and any associated documentation or information are expressly subject 
-# to the terms and conditions of the Altera Program License Subscription 
-# Agreement, Altera MegaCore Function License Agreement, or other applicable 
-# license agreement, including, without limitation, that your use is for the 
-# sole purpose of programming logic devices manufactured by Altera and sold by 
-# Altera or its authorized distributors.  Please refer to the applicable 
-# agreement for further details.
-
-
-#
-# altera_epcq_controller_sw.tcl
-#
-
-# Create a new driver
-create_driver altera_epcq_controller_mod_driver
-
-# Associate it with some hardware known as "altera_epcq_controller"
-set_sw_property hw_class_name altera_epcq_controller_mod
-
-# The version of this driver
-set_sw_property version 14.1
-
-# This driver may be incompatible with versions of hardware less
-# than specified below. Updates to hardware and device drivers
-# rendering the driver incompatible with older versions of
-# hardware are noted with this property assignment.
-set_sw_property min_compatible_hw_version 14.1
-
-# Initialize the driver in alt_sys_init()
-set_sw_property auto_initialize true
-
-# This driver only works when the following combinations of interfaces 
-# are enabled and connected as a group of CSR interfaces.
-set_sw_property csr_interfaces "avl_mem,avl_csr"
-
-# The EPCQ interrupt has an interrupt but it is not used in the driver. 
-# These assignments are still required by the Nios II SBT
-set_sw_property isr_preemption_supported true
-set_sw_property supported_interrupt_apis "legacy_interrupt_api enhanced_interrupt_api"
-
-# Location in generated BSP that above sources will be copied into
-set_sw_property bsp_subdirectory drivers
-
-# Header files
-add_sw_property include_source HAL/inc/altera_epcq_controller_mod.h
-add_sw_property include_source inc/altera_epcq_controller_mod_regs.h
-
-# C/C++ source files
-add_sw_property c_source HAL/src/altera_epcq_controller_mod.c
-
-
-# This driver supports HAL & UCOSII BSP (OS) types
-add_sw_property supported_bsp_type HAL 
-add_sw_property supported_bsp_type UCOSII

ip/altera_epcq_controller_mod/altera_epcq_controller_wrapper.sv.terp

@@ -1,248 +0,0 @@
-// (C) 2001-2015 Altera Corporation. All rights reserved.
-// Your use of Altera Corporation's design tools, logic functions and other 
-// software and tools, and its AMPP partner logic functions, and any output 
-// files any of the foregoing (including device programming or simulation 
-// files), and any associated documentation or information are expressly subject 
-// to the terms and conditions of the Altera Program License Subscription 
-// Agreement, Altera MegaCore Function License Agreement, or other applicable 
-// license agreement, including, without limitation, that your use is for the 
-// sole purpose of programming logic devices manufactured by Altera and sold by 
-// Altera or its authorized distributors.  Please refer to the applicable 
-// agreement for further details.
-
-
-
-`timescale 1ps / 1ps
-
-${MULTICHIP}
-${DDASI_ON}		
-${SID_EN}
-${BULK_ERASE_EN}
-${4BYTE_ADDR_EN}
-
-module altera_epcq_controller_wrapper #(
-	parameter CS_WIDTH		= 1,
-	parameter DEVICE_FAMILY = "Arria V",
-	parameter ADDR_WIDTH	= 24,
-	parameter ASI_WIDTH		= 1,
-	parameter ENABLE_4BYTE_ADDR = 1,
-	parameter ASMI_ADDR_WIDTH = 22,
-	parameter CHIP_SELS       = 1
-)(
-	input 	wire		  								clk,
-	input 	wire		  								reset_n,
-	                                        			
-	// ports to access csr                        			
-	input 	wire										avl_csr_write,
-	input 	wire		  								avl_csr_read,
-	input 	wire 	[2:0] 								avl_csr_addr,
-	input 	wire 	[31:0] 								avl_csr_wrdata,
-	output 	wire	[31:0] 								avl_csr_rddata,
-	output 	wire		 								avl_csr_rddata_valid,
-	output 	wire			 							avl_csr_waitrequest,
-	                                        			
-	// ports to access memory        			
-	input	wire		  								avl_mem_write,
-	input	wire										avl_mem_read,
-	input	wire  	[ADDR_WIDTH-1:0]					avl_mem_addr,			
-	input	wire	[31:0]								avl_mem_wrdata,
-	input	wire	[6:0]								avl_mem_burstcount,
-	input	wire 	[3:0]								avl_mem_byteenable,
-	output	wire	[31:0]								avl_mem_rddata,
-	output	wire										avl_mem_rddata_valid,
-	output 	wire			 							avl_mem_waitrequest,
-
-`ifdef DDASI_ON
-	output 	wire	[ASI_WIDTH-1:0]						epcq_dataout, 
-    output 	wire			 							epcq_dclk,    
-    output 	wire	[CS_WIDTH-1:0]  					epcq_scein,   
-    output 	wire	[ASI_WIDTH-1:0]						epcq_sdoin,   
-    output 	wire	[ASI_WIDTH-1:0]						epcq_dataoe,  
-`endif
-
-	// interrupt signal
-	output	reg 										irq
-);
-
-`ifdef DDASI_ON
-	wire	[ASI_WIDTH-1:0]						ddasi_dataoe;
-	wire 	[ASI_WIDTH-1:0]						ddasi_dataout;
-	wire 										ddasi_dclk;
-	wire 	[CS_WIDTH-1:0]						ddasi_scein;
-	wire	[ASI_WIDTH-1:0]  					ddasi_sdoin;
-`endif
-	wire										asmi_busy;
-	wire										asmi_data_valid;
-	wire	[7:0]  								asmi_dataout;
-	wire										asmi_clkin;
-	wire										asmi_reset;
-`ifdef MULTICHIP
-	wire	[CS_WIDTH-1:0]  					asmi_sce;
-`endif
-	wire    [ASMI_ADDR_WIDTH-1:0]  				asmi_addr;
-	wire	[7:0]  								asmi_datain;
-	wire										asmi_fast_read;
-	wire										asmi_rden;
-	wire										asmi_shift_bytes;
-	wire										asmi_wren;
-	wire										asmi_write;
-	
-	wire										asmi_illegal_erase;
-	wire										asmi_illegal_write;
-	wire	[7:0]  								asmi_rdid_out;
-	wire	[7:0]  								asmi_status_out;
-`ifdef ENABLE_SID
-	wire	[7:0]  								asmi_epcs_id;
-`endif
-	wire										asmi_read_rdid;
-	wire										asmi_read_status;
-	wire										asmi_read_sid;
-`ifdef ENABLE_4BYTE_ADDR_CODE
-	wire										asmi_en4b_addr;
-`endif
-`ifdef ENABLE_BULK_ERASE
-	wire										asmi_bulk_erase;
-`endif
-	wire										asmi_sector_erase;
-	wire										asmi_sector_protect;
-
-	altera_epcq_controller_core	#(
-		.DEVICE_FAMILY 		(DEVICE_FAMILY),
-		.ADDR_WIDTH			(ADDR_WIDTH),
-		.ASI_WIDTH			(ASI_WIDTH),
-		.ASMI_ADDR_WIDTH   	(ASMI_ADDR_WIDTH),
-		.CS_WIDTH			(CS_WIDTH),
-		.ENABLE_4BYTE_ADDR	(ENABLE_4BYTE_ADDR),
-		.CHIP_SELS          (CHIP_SELS)
-	) epcq_controller_inst (
-		.clk						 (clk					 ),
-		.reset_n                     (reset_n                ),
-		.avl_csr_write               (avl_csr_write          ),
-		.avl_csr_read                (avl_csr_read           ),
-		.avl_csr_addr                (avl_csr_addr           ),
-		.avl_csr_wrdata              (avl_csr_wrdata         ),
-		.avl_csr_rddata              (avl_csr_rddata         ),
-		.avl_csr_rddata_valid        (avl_csr_rddata_valid   ),
-		.avl_csr_waitrequest         (avl_csr_waitrequest    ),
-		.avl_mem_write               (avl_mem_write          ),
-		.avl_mem_read                (avl_mem_read           ),
-		.avl_mem_addr			     (avl_mem_addr			 ),					
-		.avl_mem_wrdata              (avl_mem_wrdata         ),
-		.avl_mem_burstcount          (avl_mem_burstcount     ),
-		.avl_mem_byteenable          (avl_mem_byteenable     ),
-		.avl_mem_rddata              (avl_mem_rddata         ),
-		.avl_mem_rddata_valid        (avl_mem_rddata_valid   ),
-		.avl_mem_waitrequest         (avl_mem_waitrequest    ),
-		.irq                         (irq                    ),
-`ifdef DDASI_ON
-		.epcq_dataout                (epcq_dataout           ),
-		.epcq_dclk                   (epcq_dclk              ),
-		.epcq_scein                  (epcq_scein             ),
-		.epcq_sdoin                  (epcq_sdoin             ),
-		.epcq_dataoe                 (epcq_dataoe            ),
-		.ddasi_dataoe                (ddasi_dataoe           ),
-		.ddasi_dataout               (ddasi_dataout          ),
-		.ddasi_dclk                  (ddasi_dclk             ),
-		.ddasi_scein                 (ddasi_scein            ),
-		.ddasi_sdoin                 (ddasi_sdoin            ),
-`else
-		.epcq_dataout                ({ASI_WIDTH{1'b0}}	     ),
-		.epcq_dclk                   (	         	         ),
-		.epcq_scein                  (	         	         ),
-		.epcq_sdoin                  (	         	         ),
-		.epcq_dataoe                 (	         	         ),
-		.ddasi_dataoe                ({ASI_WIDTH{1'b0}}      ),
-		.ddasi_dataout               (				         ),
-		.ddasi_dclk                  (1'b0	         	     ),
-		.ddasi_scein                 ({CS_WIDTH{1'b0}}       ),
-		.ddasi_sdoin                 ({ASI_WIDTH{1'b0}}      ),
-`endif
-		.asmi_busy                   (asmi_busy              ),
-		.asmi_data_valid             (asmi_data_valid        ),
-		.asmi_dataout                (asmi_dataout           ),
-		.asmi_clkin                  (asmi_clkin             ),
-		.asmi_reset                  (asmi_reset             ),
-`ifdef MULTICHIP
-		.asmi_sce					 (asmi_sce				),
-`else
-		.asmi_sce					 (						),
-`endif
-		.asmi_addr                   (asmi_addr              ),
-		.asmi_datain                 (asmi_datain            ),
-		.asmi_fast_read              (asmi_fast_read         ),
-		.asmi_rden                   (asmi_rden              ),
-		.asmi_shift_bytes            (asmi_shift_bytes       ),
-		.asmi_wren                   (asmi_wren              ),
-		.asmi_write                  (asmi_write             ),
-		.asmi_illegal_erase          (asmi_illegal_erase     ),
-		.asmi_illegal_write          (asmi_illegal_write     ),
-		.asmi_rdid_out               (asmi_rdid_out          ),
-		.asmi_status_out             (asmi_status_out        ),
-`ifdef ENABLE_SID
-		.asmi_epcs_id                (asmi_epcs_id			 ),
-		.asmi_read_sid               (asmi_read_sid			 ),
-`else
-		.asmi_epcs_id                ({8{1'b0}}			 	 ),
-		.asmi_read_sid               (						 ),
-`endif
-		.asmi_read_rdid              (asmi_read_rdid         ),
-		.asmi_read_status            (asmi_read_status       ),
-`ifdef ENABLE_4BYTE_ADDR_CODE
-		.asmi_en4b_addr              (asmi_en4b_addr         ),
-`else
-		.asmi_en4b_addr              (				         ),
-`endif
-`ifdef ENABLE_BULK_ERASE
-		.asmi_bulk_erase             (asmi_bulk_erase        ),
-`else
-		.asmi_bulk_erase             (				        ),
-`endif
-		.asmi_sector_erase           (asmi_sector_erase      ),
-		.asmi_sector_protect         (asmi_sector_protect    )
-	);
-	
-	altera_asmi_parallel asmi_parallel_inst (
-		.busy                   (asmi_busy              ),
-		.data_valid             (asmi_data_valid        ),
-		.dataout                (asmi_dataout           ),
-		.clkin                  (asmi_clkin             ),
-		.reset                  (asmi_reset             ),
-`ifdef MULTICHIP
-		.sce					(asmi_sce				),
-`endif
-		.addr                   (asmi_addr				),
-		.datain                 (asmi_datain            ),
-		.fast_read              (asmi_fast_read         ),
-		.rden                   (asmi_rden              ),
-		.shift_bytes            (asmi_shift_bytes       ),
-		.wren                   (asmi_wren              ),
-		.write                  (asmi_write             ),
-		.illegal_erase          (asmi_illegal_erase     ),
-		.illegal_write          (asmi_illegal_write     ),
-		.rdid_out               (asmi_rdid_out          ),
-		.status_out             (asmi_status_out        ),
-		.read_dummyclk			(1'b0),
-`ifdef ENABLE_SID
-		.epcs_id                (asmi_epcs_id           ),
-		.read_sid               (asmi_read_sid          ),
-`endif
-		.read_rdid              (asmi_read_rdid         ),
-		.read_status            (asmi_read_status       ),
-`ifdef ENABLE_4BYTE_ADDR_CODE
-		.en4b_addr              (asmi_en4b_addr         ),
-`endif
-`ifdef ENABLE_BULK_ERASE
-		.bulk_erase             (asmi_bulk_erase        ),
-`endif
-`ifdef DDASI_ON
-		.asmi_dataoe            (ddasi_dataoe           ),   
-		.asmi_dataout           (ddasi_dataout          ),   
-		.asmi_dclk              (ddasi_dclk             ),   
-		.asmi_scein             (ddasi_scein            ),   
-		.asmi_sdoin             (ddasi_sdoin            )    
-`endif           
-		.sector_erase           (asmi_sector_erase      ),
-		.sector_protect         (asmi_sector_protect    )
-	);
-	
-endmodule

ip/altera_epcq_controller_mod/altera_epcq_controller_wrapper_hw.tcl

@@ -1,648 +0,0 @@
-# (C) 2001-2015 Altera Corporation. All rights reserved.
-# Your use of Altera Corporation's design tools, logic functions and other 
-# software and tools, and its AMPP partner logic functions, and any output 
-# files any of the foregoing (including device programming or simulation 
-# files), and any associated documentation or information are expressly subject 
-# to the terms and conditions of the Altera Program License Subscription 
-# Agreement, Altera MegaCore Function License Agreement, or other applicable 
-# license agreement, including, without limitation, that your use is for the 
-# sole purpose of programming logic devices manufactured by Altera and sold by 
-# Altera or its authorized distributors.  Please refer to the applicable 
-# agreement for further details.
-
-
-package require -exact qsys 14.1
-package require -exact altera_terp 1.0
-
-
-# 
-# module altera_trace_wrapper
-# 
-set_module_property DESCRIPTION "This component is a serial flash controller which allows user to access Altera EPCQ devices"
-set_module_property NAME altera_epcq_controller_mod
-set_module_property VERSION 17.1
-set_module_property INTERNAL false
-set_module_property OPAQUE_ADDRESS_MAP true
-set_module_property GROUP "Basic Functions/Configuration and Programming"
-set_module_property AUTHOR "Altera Corporation"
-set_module_property DISPLAY_NAME "Altera Serial Flash Controller"
-set_module_property INSTANTIATE_IN_SYSTEM_MODULE true
-set_module_property HIDE_FROM_QUARTUS true
-set_module_property EDITABLE true
-set_module_property ALLOW_GREYBOX_GENERATION false
-set_module_property REPORT_HIERARCHY false
-set_module_property ELABORATION_CALLBACK	elaboration
-
-add_fileset QUARTUS_SYNTH QUARTUS_SYNTH add_topwrapper_fileset_proc
-set_fileset_property QUARTUS_SYNTH TOP_LEVEL altera_epcq_controller_wrapper
-set_fileset_property QUARTUS_SYNTH ENABLE_RELATIVE_INCLUDE_PATHS false
-set_fileset_property QUARTUS_SYNTH ENABLE_FILE_OVERWRITE_MODE false
-
-add_fileset SIM_VERILOG SIM_VERILOG add_topwrapper_fileset_proc
-set_fileset_property SIM_VERILOG TOP_LEVEL altera_epcq_controller_wrapper
-set_fileset_property SIM_VERILOG ENABLE_RELATIVE_INCLUDE_PATHS false
-set_fileset_property SIM_VERILOG ENABLE_FILE_OVERWRITE_MODE true
-# 
-# parameters
-#
-# +-----------------------------------
-# | device family info
-# +-----------------------------------
-set all_supported_device_families_list {"Arria 10" "Cyclone V" "Arria V GZ" "Arria V" "Stratix V" "Stratix IV" \
-											"Cyclone IV GX" "Cyclone IV E" "Cyclone III GL" "Arria II GZ" "Arria II GX"}
-									
-proc check_device_ini {device_families_list}     {
-
-    set enable_max10    [get_quartus_ini enable_max10_active_serial ENABLED]
-    
-    if {$enable_max10 == 1} {
-        lappend device_families_list    "MAX 10 FPGA"
-     } 
-    return $device_families_list
-}
-
-set device_list    [check_device_ini $all_supported_device_families_list]
-set_module_property SUPPORTED_DEVICE_FAMILIES    $device_list
-
-add_parameter 			DEVICE_FAMILY 	STRING
-set_parameter_property 	DEVICE_FAMILY 	SYSTEM_INFO 	{DEVICE_FAMILY}
-set_parameter_property 	DEVICE_FAMILY 	VISIBLE 		false
-set_parameter_property  DEVICE_FAMILY 	HDL_PARAMETER true
-
-add_parameter ASI_WIDTH INTEGER 1
-set_parameter_property ASI_WIDTH DEFAULT_VALUE 1
-set_parameter_property ASI_WIDTH DISPLAY_NAME ASI_WIDTH
-set_parameter_property ASI_WIDTH DERIVED true
-set_parameter_property ASI_WIDTH TYPE INTEGER
-set_parameter_property ASI_WIDTH VISIBLE false
-set_parameter_property ASI_WIDTH UNITS None
-set_parameter_property ASI_WIDTH ALLOWED_RANGES {1, 4}
-set_parameter_property ASI_WIDTH HDL_PARAMETER true
-
-add_parameter CS_WIDTH INTEGER 1
-set_parameter_property CS_WIDTH DEFAULT_VALUE 1
-set_parameter_property CS_WIDTH DISPLAY_NAME CS_WIDTH
-set_parameter_property CS_WIDTH DERIVED true
-set_parameter_property CS_WIDTH TYPE INTEGER
-set_parameter_property CS_WIDTH VISIBLE false
-set_parameter_property CS_WIDTH UNITS None
-set_parameter_property CS_WIDTH ALLOWED_RANGES {1, 3}
-set_parameter_property CS_WIDTH HDL_PARAMETER true
-
-add_parameter ADDR_WIDTH INTEGER 19
-set_parameter_property ADDR_WIDTH DEFAULT_VALUE 19
-set_parameter_property ADDR_WIDTH DISPLAY_NAME ADDR_WIDTH
-set_parameter_property ADDR_WIDTH DERIVED true
-set_parameter_property ADDR_WIDTH TYPE INTEGER
-set_parameter_property ADDR_WIDTH VISIBLE false
-set_parameter_property ADDR_WIDTH UNITS None
-# 16M-19bit, 32M-20bit, 64M-21bit, 128M-22bit, 256M-23bit, 512M-24bit, 1024M-25bit, 2048M-26bit...
-set_parameter_property ADDR_WIDTH ALLOWED_RANGES {19, 20, 21, 22, 23, 24, 25, 26, 27, 28}	
-set_parameter_property ADDR_WIDTH HDL_PARAMETER true
-
-add_parameter ASMI_ADDR_WIDTH INTEGER 24
-set_parameter_property ASMI_ADDR_WIDTH DEFAULT_VALUE 24
-set_parameter_property ASMI_ADDR_WIDTH DISPLAY_NAME ASMI_ADDR_WIDTH
-set_parameter_property ASMI_ADDR_WIDTH DERIVED true
-set_parameter_property ASMI_ADDR_WIDTH TYPE INTEGER
-set_parameter_property ASMI_ADDR_WIDTH VISIBLE false
-set_parameter_property ASMI_ADDR_WIDTH UNITS None
-set_parameter_property ASMI_ADDR_WIDTH ALLOWED_RANGES {24, 32}		
-set_parameter_property ASMI_ADDR_WIDTH HDL_PARAMETER true
-
-add_parameter ENABLE_4BYTE_ADDR	INTEGER "0"
-set_parameter_property ENABLE_4BYTE_ADDR DISPLAY_NAME "Enable 4-byte addressing mode"
-set_parameter_property ENABLE_4BYTE_ADDR DESCRIPTION "Check to enable 4-byte addressing mode for device larger than 128Mbyte"
-set_parameter_property ENABLE_4BYTE_ADDR AFFECTS_GENERATION true
-set_parameter_property ENABLE_4BYTE_ADDR VISIBLE false
-set_parameter_property ENABLE_4BYTE_ADDR HDL_PARAMETER true
-set_parameter_property ENABLE_4BYTE_ADDR DERIVED true
-
-# +-----------------------------------
-
-# add system info parameter
-add_parameter           deviceFeaturesSystemInfo   STRING 			"None"
-set_parameter_property  deviceFeaturesSystemInfo   system_info		"DEVICE_FEATURES"
-set_parameter_property  deviceFeaturesSystemInfo   VISIBLE false
-
-add_parameter DDASI	INTEGER "0"
-set_parameter_property DDASI DISPLAY_NAME "Disable dedicated Active Serial interface"
-set_parameter_property DDASI DESCRIPTION "Check to route ASMIBLOCK signals to top level of design"
-set_parameter_property DDASI AFFECTS_GENERATION true
-set_parameter_property DDASI VISIBLE false
-set_parameter_property DDASI DERIVED false
-
-add_parameter clkFreq LONG
-set_parameter_property clkFreq DEFAULT_VALUE {0}
-set_parameter_property clkFreq DISPLAY_NAME {clkFreq}
-set_parameter_property clkFreq VISIBLE {0}
-set_parameter_property clkFreq AFFECTS_GENERATION {1}
-set_parameter_property clkFreq HDL_PARAMETER {0}
-set_parameter_property clkFreq SYSTEM_INFO {clock_rate clk}
-set_parameter_property clkFreq SYSTEM_INFO_TYPE {CLOCK_RATE}
-set_parameter_property clkFreq SYSTEM_INFO_ARG {clock_sink}
-
-# 
-# connection point clock_sink
-# 
-add_interface clock_sink clock end
-set_interface_property clock_sink clockRate 0
-set_interface_property clock_sink ENABLED true
-set_interface_property clock_sink EXPORT_OF ""
-set_interface_property clock_sink PORT_NAME_MAP ""
-set_interface_property clock_sink CMSIS_SVD_VARIABLES ""
-set_interface_property clock_sink SVD_ADDRESS_GROUP ""
-
-add_interface_port clock_sink clk clk Input 1
-
-
-# 
-# connection point reset
-# 
-add_interface reset reset end
-set_interface_property reset associatedClock clock_sink
-set_interface_property reset synchronousEdges DEASSERT
-set_interface_property reset ENABLED true
-set_interface_property reset EXPORT_OF ""
-set_interface_property reset PORT_NAME_MAP ""
-set_interface_property reset CMSIS_SVD_VARIABLES ""
-set_interface_property reset SVD_ADDRESS_GROUP ""
-
-add_interface_port reset reset_n reset_n Input 1
-
-
-# 
-# connection point avl_csr
-# 
-add_interface avl_csr avalon end
-set_interface_property avl_csr addressUnits WORDS
-set_interface_property avl_csr associatedClock clock_sink
-set_interface_property avl_csr associatedReset reset
-set_interface_property avl_csr bitsPerSymbol 8
-set_interface_property avl_csr burstOnBurstBoundariesOnly false
-set_interface_property avl_csr burstcountUnits WORDS
-set_interface_property avl_csr explicitAddressSpan 0
-set_interface_property avl_csr holdTime 0
-set_interface_property avl_csr linewrapBursts false
-set_interface_property avl_csr maximumPendingReadTransactions 1
-set_interface_property avl_csr maximumPendingWriteTransactions 0
-set_interface_property avl_csr readLatency 0
-set_interface_property avl_csr readWaitTime 0
-set_interface_property avl_csr setupTime 0
-set_interface_property avl_csr timingUnits Cycles
-set_interface_property avl_csr writeWaitTime 0
-set_interface_property avl_csr ENABLED true
-set_interface_property avl_csr EXPORT_OF ""
-set_interface_property avl_csr PORT_NAME_MAP ""
-set_interface_property avl_csr CMSIS_SVD_VARIABLES ""
-set_interface_property avl_csr SVD_ADDRESS_GROUP ""
-
-add_interface_port avl_csr avl_csr_read read Input 1
-add_interface_port avl_csr avl_csr_waitrequest waitrequest Output 1
-add_interface_port avl_csr avl_csr_write write Input 1
-add_interface_port avl_csr avl_csr_addr address Input 3
-add_interface_port avl_csr avl_csr_wrdata writedata Input 32
-add_interface_port avl_csr avl_csr_rddata readdata Output 32
-add_interface_port avl_csr avl_csr_rddata_valid readdatavalid Output 1
-
-# 
-# connection point avl_mem
-# 
-add_interface avl_mem avalon end
-set_interface_property avl_mem addressUnits WORDS
-set_interface_property avl_mem associatedClock clock_sink
-set_interface_property avl_mem associatedReset reset
-set_interface_property avl_mem bitsPerSymbol 8
-set_interface_property avl_mem burstOnBurstBoundariesOnly false
-set_interface_property avl_mem burstcountUnits WORDS
-set_interface_property avl_mem explicitAddressSpan 0
-set_interface_property avl_mem holdTime 0
-set_interface_property avl_mem linewrapBursts true
-set_interface_property avl_mem maximumPendingReadTransactions 1
-set_interface_property avl_mem maximumPendingWriteTransactions 0
-set_interface_property avl_mem constantBurstBehavior true
-set_interface_property avl_mem readLatency 0
-set_interface_property avl_mem readWaitTime 0
-set_interface_property avl_mem setupTime 0
-set_interface_property avl_mem timingUnits Cycles
-set_interface_property avl_mem writeWaitTime 0
-set_interface_property avl_mem ENABLED true
-set_interface_property avl_mem EXPORT_OF ""
-set_interface_property avl_mem PORT_NAME_MAP ""
-set_interface_property avl_mem CMSIS_SVD_VARIABLES ""
-set_interface_property avl_mem SVD_ADDRESS_GROUP ""
-
-add_interface_port avl_mem avl_mem_write write Input 1
-add_interface_port avl_mem avl_mem_burstcount burstcount Input 7
-add_interface_port avl_mem avl_mem_waitrequest waitrequest Output 1
-add_interface_port avl_mem avl_mem_read read Input 1
-add_interface_port avl_mem avl_mem_addr address Input ADDR_WIDTH
-add_interface_port avl_mem avl_mem_wrdata writedata Input 32
-add_interface_port avl_mem avl_mem_rddata readdata Output 32
-add_interface_port avl_mem avl_mem_rddata_valid readdatavalid Output 1
-add_interface_port avl_mem avl_mem_byteenable byteenable Input 4
-
-# 
-# connection point interrupt_sender
-# 
-add_interface interrupt_sender interrupt end
-set_interface_property interrupt_sender associatedAddressablePoint avl_csr
-set_interface_property interrupt_sender associatedClock clock_sink
-set_interface_property interrupt_sender associatedReset reset
-set_interface_property interrupt_sender bridgedReceiverOffset ""
-set_interface_property interrupt_sender bridgesToReceiver ""
-set_interface_property interrupt_sender ENABLED true
-set_interface_property interrupt_sender EXPORT_OF ""
-set_interface_property interrupt_sender PORT_NAME_MAP ""
-set_interface_property interrupt_sender CMSIS_SVD_VARIABLES ""
-set_interface_property interrupt_sender SVD_ADDRESS_GROUP ""
-
-add_interface_port interrupt_sender irq irq Output 1
-
-proc proc_get_derive_addr_width {flash_type} {
-    switch $flash_type {
-        "EPCS16" - "EPCQ16" {
-            return 19 
-        }
-        "EPCS64" - "EPCQ64" {
-            return 21
-        }
-        "EPCS128" - "EPCQ128" {
-            return 22
-        }
-		"EPCQ32" {
-            return 20
-		}
-        "EPCQ256" - "EPCQL256" {
-            return 23
-        }
-        "EPCQ512" - "EPCQL512" {
-            return 24
-        }
-        "EPCQL1024" {
-            return 25
-        }
-        default {
-            # Should never enter this function
-            send_message error "$flash_type is not a valid flash type"
-        }
-    
-    }
-}
-
-set all_supported_SPI_list {"EPCS16" "EPCS64" "EPCS128" "EPCQ16" "EPCQ32" "EPCQ64" "EPCQ128" "EPCQ256" \
-							"EPCQ512" "EPCQL256" "EPCQL512" "EPCQL1024"}
-							
-# SPI device selection
-add_parameter FLASH_TYPE STRING "EPCQ16"
-set_parameter_property FLASH_TYPE DISPLAY_NAME "Configuration device type"
-set_parameter_property FLASH_TYPE ALLOWED_RANGES $all_supported_SPI_list
-set_parameter_property FLASH_TYPE DESCRIPTION "Select targeted EPCS/EPCQ devices"
-set_parameter_property FLASH_TYPE AFFECTS_GENERATION true
-set_parameter_property FLASH_TYPE VISIBLE true
-set_parameter_property FLASH_TYPE DERIVED false
-
-add_parameter IO_MODE STRING "STANDARD"
-set_parameter_property IO_MODE DISPLAY_NAME "Choose I/O mode"
-set_parameter_property IO_MODE ALLOWED_RANGES {"STANDARD" "QUAD"}
-set_parameter_property IO_MODE DESCRIPTION "Select extended data width when Fast Read operation is enabled"
-
-add_parameter CHIP_SELS INTEGER "1"
-set_parameter_property CHIP_SELS DISPLAY_NAME "Number of Chip Selects used"
-set_parameter_property CHIP_SELS ALLOWED_RANGES {1 2 3}
-set_parameter_property CHIP_SELS DESCRIPTION "Number of EPCQ(L) devices that are attached and need a CHIPSEL"
-set_parameter_property CHIP_SELS HDL_PARAMETER true
-set_parameter_property CHIP_SELS AFFECTS_GENERATION true
-#
-# Add instance 
-#
-proc add_topwrapper_fileset_proc {altera_epcq_controller} {
-	# QSPI that supported for 4-byte addressing - en4b_addr, ex4b_addr
-	set supported_4byte_addr 	{"EPCQ256" "EPCQ512" "EPCQL256" "EPCQL512" "EPCQL1024" "N25Q512"}
-	set DDASI 					[ get_parameter_value DDASI ]
-	set DEVICE_FAMILY 			[ get_parameter_value DEVICE_FAMILY ]
-	set FLASH_TYPE 				[ get_parameter_value FLASH_TYPE ]
-	set ADDR_WIDTH				[ get_parameter_value ADDR_WIDTH ]
-	set is_4byte_addr_support	"false"
-	
-	# check whether devices supporting multiple flash - only for Arria 10
-	if {[check_device_family_equivalence $DEVICE_FAMILY "Arria 10"]} {
-		set MULTICHIP 1
-	} else {
-		set MULTICHIP 0
-	}
-	
-	if { $DDASI eq "1" } {
-		set DDASI_ON 1
-	} else {
-		set DDASI_ON 0
-	}
-	
-	if { $FLASH_TYPE eq "EPCS16" || $FLASH_TYPE eq "EPCS64" } {
-		set ENABLE_SID 1
-	} else {
-		set ENABLE_SID 0
-	}
-	
-	if { $FLASH_TYPE eq "EPCQL512" || $FLASH_TYPE eq "EPCQL1024" } {
-		set ENABLE_BULK_ERASE 0
-	} else {
-		set ENABLE_BULK_ERASE 1
-	}
-	
-	 # check whether SPI device support 4-byte addressing
-	foreach re_spi_1   $supported_4byte_addr {
-		if {$re_spi_1 eq $FLASH_TYPE} {
-			set is_4byte_addr_support	"true"
-			break;
-		 }
-	 }
-	 
-	if {$is_4byte_addr_support eq "true"} {
-		set ENABLE_4BYTE_ADDR_CODE 1
-	} else {
-		set ENABLE_4BYTE_ADDR_CODE 0
-	}
-	
-	# ---------------------------------
-	#   Terp for top level wrapper
-	# ---------------------------------
-	#Do Terp
-	set template_file [ file join "./" "altera_epcq_controller_wrapper.sv.terp" ]  
-	set template   [ read [ open $template_file r ] ]
-	
-	if {$DDASI_ON} {
-		set params(DDASI_ON) 		"`define DDASI_ON" 	
-	} else {
-		set params(DDASI_ON) 		"" 	
-	}
-	
-	if {$MULTICHIP} {
-		set params(MULTICHIP) 		"`define MULTICHIP" 	
-	} else {
-		set params(MULTICHIP) 		"" 	
-	}
-	
-	if {$ENABLE_SID} {
-		set params(SID_EN) 			"`define ENABLE_SID"
-	} else {
-		set params(SID_EN) 			""
-	}
-	
-	if {$ENABLE_BULK_ERASE} {
-		set params(BULK_ERASE_EN) 	"`define ENABLE_BULK_ERASE"
-	} else {
-		set params(BULK_ERASE_EN) 	""
-	}
-	
-	if {$ENABLE_4BYTE_ADDR_CODE} {
-		set params(4BYTE_ADDR_EN) 		"`define ENABLE_4BYTE_ADDR_CODE"
-	} else {
-		set params(4BYTE_ADDR_EN) 		""
-	}
-	
-	set result   					[ altera_terp $template params ]
-	
-	#Add top wrapper file
-	add_fileset_file ./altera_epcq_controller_wrapper.sv SYSTEM_VERILOG TEXT $result 
-}
-
-# This proc is called by elaboration proc to set embeddedsw C Macros assignments 
-# used by downstream tools
-proc set_cmacros {is_qspi flash_type} {
-    if {$is_qspi eq "true"} {
-        set_module_assignment embeddedsw.CMacro.IS_EPCS 0
-    } else {
-        set_module_assignment embeddedsw.CMacro.IS_EPCS 1
-    }
-
-    #string name of flash
-    set_module_assignment embeddedsw.CMacro.FLASH_TYPE $flash_type
-
-    #page size in bytes
-    set_module_assignment embeddedsw.CMacro.PAGE_SIZE 256
-    
-    #sector and subsector size in bytes
-    set_module_assignment embeddedsw.CMacro.SUBSECTOR_SIZE 4096
-    set_module_assignment embeddedsw.CMacro.SECTOR_SIZE 65536
-
-    #set number of sectors
-    switch $flash_type {
-        "EPCS16" - "EPCQ16" {
-            set_module_assignment embeddedsw.CMacro.NUMBER_OF_SECTORS 32
-        }
-        "EPCQ32" {
-            set_module_assignment embeddedsw.CMacro.NUMBER_OF_SECTORS 64
-		}
-        "EPCS64" - "EPCQ64" {
-            set_module_assignment embeddedsw.CMacro.NUMBER_OF_SECTORS 128
-        }
-        "EPCS128" - "EPCQ128" {
-            set_module_assignment embeddedsw.CMacro.NUMBER_OF_SECTORS 256
-        }
-        "EPCQ256" - "EPCQL256" {
-            set_module_assignment embeddedsw.CMacro.NUMBER_OF_SECTORS 512
-        }
-        "EPCQ512" - "EPCQL512" {
-            set_module_assignment embeddedsw.CMacro.NUMBER_OF_SECTORS 1024
-        }
-        "EPCQL1024" {
-            set_module_assignment embeddedsw.CMacro.NUMBER_OF_SECTORS 2048
-        }
-        default {
-            # Should never enter this function
-            send_message error "$flash_type is not a valid flash type"
-        }
-    }
-}
-
-proc elaboration {} {
-	# QSPI that supported for 4-byte addressing - en4b_addr, ex4b_addr
-	set supported_4byte_addr 	{"EPCQ256" "EPCQ512" "EPCQL256" "EPCQL512" "EPCQL1024" "N25Q512"}
-	set DDASI_ON 				[ get_parameter_value DDASI ]
-	set FLASH_TYPE 				[ get_parameter_value FLASH_TYPE ]
-	set IO_MODE 				[ get_parameter_value IO_MODE ]
-	set DEVICE_FAMILY 			[ get_parameter_value DEVICE_FAMILY ]
-	set ASI_WIDTH 				[ get_parameter_value ASI_WIDTH ]
-	set CS_WIDTH 				[ get_parameter_value CS_WIDTH ]
-	set ASMI_ADDR_WIDTH 		[ get_parameter_value ASMI_ADDR_WIDTH ]
-	set CHIP_SELS			    [ get_parameter_value CHIP_SELS]
-	set temp_addr_width 		[ proc_get_derive_addr_width [ get_parameter_value FLASH_TYPE ] ]
-	set clkFreq 				[ get_parameter_value clkFreq ]
-	set is_4byte_addr_support	"false"
-	set is_qspi					"false"
-
-    # we're not using slow and expensive EPCS flash, thus higher frequency allowed
-	if { $clkFreq > 50000000 } {
-		send_message error "The maximum input clock frequency for Altera Serial Flash controller is 25Mhz."
-	}
-	
-	# check whether SPI device support 4-byte addressing
-	foreach re_spi_1   $supported_4byte_addr {
-		if {$re_spi_1 eq $FLASH_TYPE} {
-			set is_4byte_addr_support	"true"
-			break;
-		 }
-	 }
-	 
-	if {$is_4byte_addr_support eq "true"} {
-		set_parameter_value 	ENABLE_4BYTE_ADDR "1"
-		set_parameter_value		ASMI_ADDR_WIDTH 32
-	} else {
-		set_parameter_value 	ENABLE_4BYTE_ADDR "0"
-		set_parameter_value		ASMI_ADDR_WIDTH 24
-	}
-	
-	# check whether devices supporting multiple flash - only for Arria 10
-	if {[check_device_family_equivalence $DEVICE_FAMILY "Arria 10"]} {
-		set is_multi_flash_support	"true"
-		if {$CHIP_SELS eq 3 } {set_parameter_value 	ADDR_WIDTH 		[ expr $temp_addr_width + 2]}
-		if {$CHIP_SELS eq 2 } {set_parameter_value 	ADDR_WIDTH 		[ expr $temp_addr_width + 1]}
-		if {$CHIP_SELS eq 1 } {set_parameter_value 	ADDR_WIDTH 		$temp_addr_width }
-	} else {
-		set is_multi_flash_support	"false"
-		set_parameter_value 	ADDR_WIDTH 		$temp_addr_width
-	}
-	
-	
-	set_instance_parameter_value	altera_epcq_controller_core DDASI $DDASI_ON
-	set_instance_parameter_value	altera_epcq_controller_core FLASH_TYPE $FLASH_TYPE
-	set_instance_parameter_value	altera_epcq_controller_core IO_MODE $IO_MODE
-	set_instance_parameter_value	altera_epcq_controller_core ASI_WIDTH $ASI_WIDTH
-	set_instance_parameter_value	altera_epcq_controller_core CS_WIDTH $CS_WIDTH
-	set_instance_parameter_value	altera_epcq_controller_core CHIP_SELS $CHIP_SELS
-	set_instance_parameter_value	altera_epcq_controller_core ASMI_ADDR_WIDTH [ get_parameter_value ASMI_ADDR_WIDTH ]
-	set_instance_parameter_value	altera_epcq_controller_core ADDR_WIDTH [ get_parameter_value ADDR_WIDTH ]
-	set_instance_parameter_value	altera_epcq_controller_core ENABLE_4BYTE_ADDR [ get_parameter_value ENABLE_4BYTE_ADDR ]
-
-	set QSPI_list {"EPCQ16" "EPCQ32" "EPCQ64" "EPCQ128" "EPCQ256" "EPCQ512" "EPCQL256" "EPCQL512" "EPCQL1024" \
-					"N25Q512" "S25FL127S"}
-	
-	# devices that supported QSPI - Quad/Dual data width, asmi_dataout, asmi_sdoin, asmi_dataoe
-	set supported_QSPI_devices_list {"Arria 10" "Cyclone V" "Arria V GZ" "Arria V" "Stratix V"}
-	
-	# devices that supported simulation
-	set supported_sim_devices_list {"Arria 10" "Cyclone V" "Arria V GZ" "Arria V" "Stratix V" "MAX 10 FPGA"}
-	
-	# check whether is QSPI devices
-	foreach re_spi_0   $QSPI_list {
-		if {$re_spi_0 eq $FLASH_TYPE} { 
-			set is_qspi		"true"
-			break;
-		 }
-	 }
-	 
-	if {[check_device_family_equivalence $DEVICE_FAMILY $supported_QSPI_devices_list]} {
-		set is_qspi_devices_list	"true"
-	} else {
-		set is_qspi_devices_list	"false"
-	}
-	
-	if {[check_device_family_equivalence $DEVICE_FAMILY $supported_sim_devices_list]} {
-		set is_sim_devices_list	"true"
-	} else {
-		set is_sim_devices_list	"false"
-	}
-	
-	if {$is_qspi_devices_list eq "true" && $is_qspi eq "true"} {
-		set_parameter_property	IO_MODE	ENABLED		true
-		set_instance_parameter_value 	altera_asmi_parallel DATA_WIDTH 		$IO_MODE
-		set_parameter_value ASI_WIDTH 4
-    } else {
-		set_parameter_property	IO_MODE	ENABLED		false
-		set_parameter_value ASI_WIDTH 1
-	}
-	
-	if { $FLASH_TYPE eq "EPCQL512" || $FLASH_TYPE eq "EPCQL1024" } {
-		set_instance_parameter_value 	altera_asmi_parallel gui_bulk_erase 		false
-		set ENABLE_BULK_ERASE 0
-	} else {
-		set_instance_parameter_value 	altera_asmi_parallel gui_bulk_erase 		true
-		set ENABLE_BULK_ERASE 1
-	}
-	
-	if { $is_multi_flash_support eq "true"} {
-		set_parameter_value CS_WIDTH 3
-		set_parameter_property	CHIP_SELS	ENABLED		true
-	} else {
-		set_parameter_value CS_WIDTH 1
-		set_parameter_property	CHIP_SELS	ENABLED		false
-	}
-	
-	set_instance_parameter_value 	altera_asmi_parallel EPCS_TYPE 				$FLASH_TYPE
-	set_instance_parameter_value 	altera_asmi_parallel gui_fast_read 			true
-	set_instance_parameter_value 	altera_asmi_parallel gui_page_write 		true
-	
-	if { $FLASH_TYPE eq "EPCS16" || $FLASH_TYPE eq "EPCS64" } {
-		set_instance_parameter_value 	altera_asmi_parallel gui_read_sid 		true
-	} else {
-		set_instance_parameter_value 	altera_asmi_parallel gui_read_sid 		false
-	}
-	
-	set_instance_parameter_value 	altera_asmi_parallel gui_read_rdid 			true
-	set_instance_parameter_value 	altera_asmi_parallel gui_read_status 		true
-	set_instance_parameter_value 	altera_asmi_parallel gui_sector_erase 		true
-	set_instance_parameter_value 	altera_asmi_parallel gui_sector_protect 	true
-	set_instance_parameter_value 	altera_asmi_parallel gui_wren 				true
-	set_instance_parameter_value 	altera_asmi_parallel gui_write 				true
-	set_instance_parameter_value 	altera_asmi_parallel gui_read_dummyclk		true
-	set_instance_parameter_value 	altera_asmi_parallel PAGE_SIZE 				256
-	set_instance_parameter_value 	altera_asmi_parallel gui_use_asmiblock		$DDASI_ON
-	
-	if {$is_sim_devices_list eq "true"} {
-		set_instance_parameter_value 	altera_asmi_parallel ENABLE_SIM			true
-	} else {
-		set_instance_parameter_value 	altera_asmi_parallel ENABLE_SIM			false
-	}
-
-    set_cmacros $is_qspi $FLASH_TYPE
-}
-
-# add ASMI PARALLEL
-add_hdl_instance 		altera_asmi_parallel altera_asmi_parallel
-
-# add EPCQ CONTROLLER
-add_hdl_instance 		altera_epcq_controller_core altera_epcq_controller_core
-
-# +-------------------------------------
-# | Add settings needed by Nios tools
-# +-------------------------------------
-# Tells us component is a flash 
-set_module_assignment embeddedsw.memoryInfo.IS_FLASH 1
-
-# interface assignments for embedded software
-set_interface_assignment avl_mem embeddedsw.configuration.isFlash 1
-set_interface_assignment avl_mem embeddedsw.configuration.isMemoryDevice 1
-set_interface_assignment avl_mem embeddedsw.configuration.isNonVolatileStorage 1
-set_interface_assignment avl_mem embeddedsw.configuration.isPrintableDevice 0
-
-# These assignments tells tools to create byte-addressed .hex files only
-set_module_assignment embeddedsw.memoryInfo.GENERATE_HEX 1
-set_module_assignment embeddedsw.memoryInfo.USE_BYTE_ADDRESSING_FOR_HEX 1
-set_module_assignment embeddedsw.memoryInfo.GENERATE_DAT_SYM 0
-set_module_assignment embeddedsw.memoryInfo.GENERATE_FLASH 0
-
-# Width of memory
-set_module_assignment embeddedsw.memoryInfo.MEM_INIT_DATA_WIDTH 32
-
-# Output directories for programming files
-#set_module_assignment embeddedsw.memoryInfo.DAT_SYM_INSTALL_DIR {SIM_DIR}
-#set_module_assignment embeddedsw.memoryInfo.FLASH_INSTALL_DIR {APP_DIR}
-set_module_assignment embeddedsw.memoryInfo.HEX_INSTALL_DIR {QPF_DIR}
-
-# Module assignments related to names of simulation files
-#set_module_assignment postgeneration.simulation.init_file.param_name {INIT_FILENAME}
-#set_module_assignment postgeneration.simulation.init_file.type {MEM_INIT}
-
-# +-------------------------------------
-# | Add settings needed by DTG tools
-# +-------------------------------------
-# add device tree properties
-set_module_assignment embeddedsw.dts.vendor "altr"
-set_module_assignment embeddedsw.dts.name "epcq"
-set_module_assignment embeddedsw.dts.group "epcq"
-set_module_assignment embeddedsw.dts.compatible "altr,epcq-1.0"
-
-## Add documentation links for user guide and/or release notes
-add_documentation_link "User Guide" https://documentation.altera.com/#/link/sfo1400787952932/iga1431459459085 
-add_documentation_link "Release Notes" https://documentation.altera.com/#/link/hco1421698042087/hco1421697689300

ip/altera_jtag_avalon_master_mod/altera_jtag_avalon_master_mod_hw.tcl

@@ -5,7 +5,7 @@ package require -exact sopc 9.1
 # |
 set_module_property NAME altera_jtag_avalon_master_mod
 set_module_property DESCRIPTION "The JTAG to Avalon Master Bridge is a collection of pre-wired components that provide an Avalon Master using the new JTAG channel."
-set_module_property VERSION "17.1"
+set_module_property VERSION "20.1"
 set_module_property GROUP "Basic Functions/Bridges and Adaptors/Memory Mapped"
 set_module_property AUTHOR  "Altera Corporation"
 set_module_property DISPLAY_NAME "JTAG to Avalon Master Bridge (customized)"
@@ -108,7 +108,7 @@ proc compose {} {
     add_instance transacto   altera_avalon_packets_to_master
     add_instance b2p_adapter channel_adapter
     add_instance p2b_adapter channel_adapter
-    
+
     # altera_reset_bridge parameters
     set_instance_parameter clk_rst SYNCHRONOUS_EDGES none
     # altera_jtag_dc_streaming parameters
@@ -175,7 +175,7 @@ proc compose {} {
     set_instance_parameter transacto FIFO_DEPTHS            [ get_parameter_value FIFO_DEPTHS ]
     # |
     # +-----------------------------------
-    
+
     # +-----------------------------------
     # | connection point clk
     # |
@@ -217,7 +217,7 @@ proc compose {} {
     add_connection clk_src.out_clk transacto.clk
     add_connection clk_src.out_clk b2p_adapter.clk
     add_connection clk_src.out_clk p2b_adapter.clk
-    
+
     add_connection clk_rst.out_reset jtag_phy_embedded_in_jtag_master.clock_reset
     add_connection clk_rst.out_reset timing_adt.reset
     add_connection clk_rst.out_reset fifo.clk_reset
@@ -226,7 +226,7 @@ proc compose {} {
     add_connection clk_rst.out_reset transacto.clk_reset
     add_connection clk_rst.out_reset b2p_adapter.reset
     add_connection clk_rst.out_reset p2b_adapter.reset
-    
+
     add_connection jtag_phy_embedded_in_jtag_master.src                timing_adt.in
     add_connection timing_adt.out         fifo.in
     add_connection fifo.out               b2p.in_bytes_stream

ip/i2c_opencores/HAL/inc/i2c_opencores.h

@@ -17,7 +17,7 @@ int I2C_start(alt_u32 base, alt_u32 add, alt_u32 read);
 alt_u32 I2C_read(alt_u32 base,alt_u32 last);
 alt_u32 I2C_write(alt_u32 base,alt_u8 data, alt_u32 last);
 void SPI_read(alt_u32 base, alt_u8 *rdata, int len);
-void SPI_write(alt_u32 base, alt_u8 *wdata, int len);
+void SPI_write(alt_u32 base, const alt_u8 *wdata, int len);
 #define I2C_OK (0)
 #define I2C_ACK (0)
 #define I2C_NOACK (1)

ip/i2c_opencores/HAL/src/i2c_opencores.c

@@ -197,7 +197,7 @@ void SPI_read(alt_u32 base, alt_u8 *rdata, int len)
     }
 }
 
-void SPI_write(alt_u32 base, alt_u8 *wdata, int len)
+void SPI_write(alt_u32 base, const alt_u8 *wdata, int len)
 {
     int i;
 

ip/osd_generator/inc/osd_generator_regs.h

@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2019  Markus Hiienkari <mhiienka@niksula.hut.fi>
+// Copyright (C) 2019-2020  Markus Hiienkari <mhiienka@niksula.hut.fi>
 //
 // This file is part of Open Source Scan Converter project.
 //
@@ -20,32 +20,42 @@
 #ifndef OSD_GENERATOR_REGS_H_
 #define OSD_GENERATOR_REGS_H_
 
-#include <alt_types.h>
+#define OSD_CHAR_ROWS 30
+#define OSD_CHAR_COLS 16
+#define OSD_CHAR_SECTIONS 2
+
+#include <stdint.h>
 
 typedef union {
     struct {
-        alt_u8 enable:1;
-        alt_u8 status_refresh:1;
-        alt_u8 menu_active:1;
-        alt_u8 status_timeout:2;
-        alt_u8 x_offset:3;
-        alt_u8 y_offset:3;
-        alt_u8 x_size:2;
-        alt_u8 y_size:2;
-        alt_u32 osd_rsv:17;
+        uint8_t enable:1;
+        uint8_t status_refresh:1;
+        uint8_t menu_active:1;
+        uint8_t status_timeout:2;
+        uint8_t x_offset:3;
+        uint8_t y_offset:3;
+        uint8_t x_size:2;
+        uint8_t y_size:2;
+        uint8_t border_color:2;
+        uint32_t osd_rsv:15;
     } __attribute__((packed, __may_alias__));
-    alt_u32 data;
+    uint32_t data;
 } osd_config_reg;
 
 // char regs
 typedef struct {
-    char row1[16];
-    char row2[16];
-} osd_char_regs;
+    char data[OSD_CHAR_ROWS][OSD_CHAR_SECTIONS][OSD_CHAR_COLS];
+} osd_char_array;
 
 typedef struct {
+    uint32_t mask;
+} osd_enable_color_reg;
+
+typedef struct {
+    osd_char_array osd_array;
     osd_config_reg osd_config;
-    osd_char_regs osd_chars;
+    osd_enable_color_reg osd_sec_enable[OSD_CHAR_SECTIONS];
+    osd_enable_color_reg osd_row_color;
 } __attribute__((packed, __may_alias__)) osd_regs;
 
 #endif //OSD_GENERATOR_REGS_H_

ip/osd_generator/osd_generator_hw.tcl

@@ -23,11 +23,11 @@ set_module_property REPORT_HIERARCHY false
 #
 # parameters
 #
-add_parameter USE_MEMORY_BLOCKS INTEGER 1
-set_parameter_property USE_MEMORY_BLOCKS DISPLAY_NAME "Use memory blocks for character array"
-set_parameter_property USE_MEMORY_BLOCKS DISPLAY_HINT boolean
-set_parameter_property USE_MEMORY_BLOCKS UNITS None
-set_parameter_property USE_MEMORY_BLOCKS HDL_PARAMETER true
+#add_parameter USE_MEMORY_BLOCKS INTEGER 1
+#set_parameter_property USE_MEMORY_BLOCKS DISPLAY_NAME "Use memory blocks for character array"
+#set_parameter_property USE_MEMORY_BLOCKS DISPLAY_HINT boolean
+#set_parameter_property USE_MEMORY_BLOCKS UNITS None
+#set_parameter_property USE_MEMORY_BLOCKS HDL_PARAMETER true
 
 # 
 # file sets
@@ -109,7 +109,7 @@ set_interface_property avalon_s PORT_NAME_MAP ""
 set_interface_property avalon_s CMSIS_SVD_VARIABLES ""
 set_interface_property avalon_s SVD_ADDRESS_GROUP ""
 
-add_interface_port avalon_s avalon_s_address address Input 4
+add_interface_port avalon_s avalon_s_address address Input 8
 add_interface_port avalon_s avalon_s_writedata writedata Input 32
 add_interface_port avalon_s avalon_s_readdata readdata Output 32
 add_interface_port avalon_s avalon_s_byteenable byteenable Input 4
@@ -156,4 +156,4 @@ add_interface_port osd_if vclk vclk Input 1
 add_interface_port osd_if xpos xpos Input 11
 add_interface_port osd_if ypos ypos Input 11
 add_interface_port osd_if osd_enable osd_enable Output 1
-add_interface_port osd_if osd_color osd_color Output 1
+add_interface_port osd_if osd_color osd_color Output 2

ip/osd_generator/osd_generator_sw.tcl

@@ -18,7 +18,7 @@ set_sw_property version 1.0
 #
 # Multiple-Version compatibility was introduced in version 7.1;
 # prior versions are therefore excluded.
-set_sw_property min_compatible_hw_version 7.1
+set_sw_property min_compatible_hw_version 1.0
 
 # Initialize the driver in alt_sys_init()
 set_sw_property auto_initialize false

ip/osd_generator/osd_generator_top.sv

@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2019  Markus Hiienkari <mhiienka@niksula.hut.fi>
+// Copyright (C) 2019-2020  Markus Hiienkari <mhiienka@niksula.hut.fi>
 //
 // This file is part of Open Source Scan Converter project.
 //
@@ -17,16 +17,14 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-module osd_generator_top #(
-    parameter USE_MEMORY_BLOCKS = 0
-) (
+module osd_generator_top (
     // common
     input clk_i,
     input rst_i,
     // avalon slave
     input [31:0] avalon_s_writedata,
     output [31:0] avalon_s_readdata,
-    input [3:0] avalon_s_address,
+    input [7:0] avalon_s_address,
     input [3:0] avalon_s_byteenable,
     input avalon_s_write,
     input avalon_s_read,
@@ -37,21 +35,33 @@ module osd_generator_top #(
     input [10:0] xpos,
     input [10:0] ypos,
     output reg osd_enable,
-    output reg osd_color
+    output reg [1:0] osd_color
 );
 
-localparam CHAR_ROWS = 2;
+localparam CHAR_ROWS = 30;
 localparam CHAR_COLS = 16;
+localparam CHAR_SECTIONS = 2;
+localparam CHAR_SEC_SEPARATOR = 2;
 
-localparam OSD_CONFIG_REGNUM =   4'h0;
+localparam BG_BLACK =   2'h0;
+localparam BG_BLUE =    2'h1;
+localparam BG_YELLOW =  2'h2;
+localparam BG_WHITE =   2'h3;
+
+localparam OSD_CONFIG_REGNUM =          8'hf0;
+localparam OSD_ROW_LSEC_ENABLE_REGNUM = 8'hf1;
+localparam OSD_ROW_RSEC_ENABLE_REGNUM = 8'hf2;
+localparam OSD_ROW_COLOR_REGNUM =       8'hf3;
 
 reg [31:0] osd_config;
+reg [31:0] config_reg[OSD_ROW_LSEC_ENABLE_REGNUM:OSD_ROW_COLOR_REGNUM] /* synthesis ramstyle = "logic" */;
 
 reg [10:0] xpos_osd_area_scaled, xpos_text_scaled;
 reg [10:0] ypos_osd_area_scaled, ypos_text_scaled;
 reg [7:0] x_ptr[2:5], y_ptr[2:5] /* synthesis ramstyle = "logic" */;
-reg osd_text_act_pp[2:5], osd_act_pp[3:5];
+reg osd_text_act_pp[2:6], osd_act_pp[3:6];
 reg [14:0] to_ctr, to_ctr_ms;
+reg char_px;
 
 wire render_enable = osd_config[0];
 wire status_refresh = osd_config[1];
@@ -61,34 +71,28 @@ wire [2:0] x_offset = osd_config[7:5];
 wire [2:0] y_offset = osd_config[10:8];
 wire [1:0] x_size = osd_config[12:11];
 wire [1:0] y_size = osd_config[14:13];
+wire [1:0] border_color = osd_config[16:15];
 
 wire [10:0] xpos_scaled_w = (xpos >> x_size)-({3'h0, x_offset} << 3);
 wire [10:0] ypos_scaled_w = (ypos >> y_size)-({3'h0, y_offset} << 3);
 wire [7:0] rom_rdaddr;
 wire [0:7] char_data[7:0];
-wire [4:0] char_idx = CHAR_COLS*(ypos_text_scaled >> 3) + (xpos_text_scaled >> 3);
+wire [4:0] char_row = (ypos_text_scaled >> 3);
+wire [5:0] char_col = (xpos_text_scaled >> 3) - (((xpos_text_scaled >> 3) >= CHAR_COLS) ? CHAR_SEC_SEPARATOR : 0);
+wire [9:0] char_idx = 32*char_row + char_col;
 
 assign avalon_s_waitrequest_n = 1'b1;
 
-generate
-    if (USE_MEMORY_BLOCKS == 1) begin
-        char_array char_array_inst (
-            .byteena_a(avalon_s_byteenable),
-            .data(avalon_s_writedata),
-            .rdaddress(char_idx),
-            .rdclock(vclk),
-            .wraddress(avalon_s_address-1'b1),
-            .wrclock(clk_i),
-            .wren(avalon_s_chipselect && avalon_s_write && (avalon_s_address > 4'h0)),
-            .q(rom_rdaddr)
-        );
-    end else begin
-        reg [7:0] char_ptr[CHAR_ROWS*CHAR_COLS-1:0], char_ptr_pp3[7:0] /* synthesis ramstyle = "logic" */;
-        reg [4:0] char_idx_pp[2:3];
-        
-        assign rom_rdaddr = char_ptr_pp3[char_idx_pp[3][2:0]];
-    end
-endgenerate
+char_array char_array_inst (
+    .byteena_a(avalon_s_byteenable),
+    .data(avalon_s_writedata),
+    .rdaddress(char_idx),
+    .rdclock(vclk),
+    .wraddress(avalon_s_address),
+    .wrclock(clk_i),
+    .wren(avalon_s_chipselect && avalon_s_write && (avalon_s_address < CHAR_ROWS*CHAR_COLS*CHAR_SECTIONS)),
+    .q(rom_rdaddr)
+);
 
 char_rom char_rom_inst (
     .clock(vclk),
@@ -97,13 +101,13 @@ char_rom char_rom_inst (
 );
 
 // Pipeline structure
-// |    0     |    1     |    2    |    3    |    4    |   5    |
-// |----------|----------|---------|---------|---------|--------|
-// > POS_TEXT | POS_AREA |         |         |         |        |
-// >          |   PTR    |   PTR   |   PTR   |   PTR   |        |
-// >          |  ENABLE  | ENABLE  | ENABLE  | ENABLE  | ENABLE |
-// >          |  INDEX   |  INDEX  |         |         |        |
-// >          |          |         | CHARROM | CHARROM | COLOR  |
+// |    0     |    1     |    2    |    3    |    4    |    5    |   6    |
+// |----------|----------|---------|---------|---------|---------|--------|
+// > POS_TEXT | POS_AREA |         |         |         |         |        |
+// >          |   PTR    |   PTR   |   PTR   |   PTR   |         |        |
+// >          |  ENABLE  | ENABLE  | ENABLE  | ENABLE  | ENABLE  | ENABLE |
+// >          |  INDEX   |  INDEX  |         |         |         |        |
+// >          |          |         | CHARROM | CHARROM | CHAR_PX | COLOR  |
 integer idx, pp_idx;
 always @(posedge vclk) begin
     xpos_text_scaled <= xpos_scaled_w;
@@ -119,32 +123,38 @@ always @(posedge vclk) begin
         y_ptr[pp_idx] <= y_ptr[pp_idx-1];
     end
 
-    osd_text_act_pp[2] <= render_enable & (menu_active || (to_ctr_ms > 0)) & ((xpos_text_scaled < 8*CHAR_COLS) && (ypos_text_scaled < 8*CHAR_ROWS));
-    for(pp_idx = 3; pp_idx <= 5; pp_idx = pp_idx+1) begin
+    osd_text_act_pp[2] <= render_enable &
+                          (menu_active || (to_ctr_ms > 0)) &
+                          (((xpos_text_scaled < 8*CHAR_COLS) & config_reg[OSD_ROW_LSEC_ENABLE_REGNUM][ypos_text_scaled/8]) |
+                           ((xpos_text_scaled >= 8*(CHAR_COLS+CHAR_SEC_SEPARATOR)) & (xpos_text_scaled < 8*(2*CHAR_COLS+CHAR_SEC_SEPARATOR)) & config_reg[OSD_ROW_RSEC_ENABLE_REGNUM][ypos_text_scaled/8])) &
+                          (ypos_text_scaled < 8*CHAR_ROWS);
+    for(pp_idx = 3; pp_idx <= 6; pp_idx = pp_idx+1) begin
         osd_text_act_pp[pp_idx] <= osd_text_act_pp[pp_idx-1];
     end
 
-    osd_act_pp[3] <= render_enable & (menu_active || (to_ctr_ms > 0)) & ((xpos_osd_area_scaled < 8*(CHAR_COLS+1)) && (ypos_osd_area_scaled < 8*(CHAR_ROWS+1)));
-    for(pp_idx = 4; pp_idx <= 5; pp_idx = pp_idx+1) begin
+    osd_act_pp[3] <= render_enable &
+                     (menu_active || (to_ctr_ms > 0)) &
+                     (((xpos_osd_area_scaled/8 < (CHAR_COLS+1)) & config_reg[OSD_ROW_LSEC_ENABLE_REGNUM][(ypos_osd_area_scaled/8) ? ((ypos_osd_area_scaled/8)-1) : 0]) |
+                      ((xpos_osd_area_scaled/8 >= (CHAR_COLS+1)) & (xpos_osd_area_scaled/8 < (2*CHAR_COLS+CHAR_SEC_SEPARATOR+1)) & (config_reg[OSD_ROW_RSEC_ENABLE_REGNUM][(ypos_osd_area_scaled/8)-1] | config_reg[OSD_ROW_RSEC_ENABLE_REGNUM][ypos_osd_area_scaled/8]))) &
+                     (ypos_osd_area_scaled < 8*(CHAR_ROWS+1));
+    for(pp_idx = 4; pp_idx <= 6; pp_idx = pp_idx+1) begin
         osd_act_pp[pp_idx] <= osd_act_pp[pp_idx-1];
     end
 
-    osd_enable <= osd_act_pp[5];
-    osd_color = osd_text_act_pp[5] ? char_data[y_ptr[5]][x_ptr[5]] : 1'b0;
-end
+    char_px <= char_data[y_ptr[5]][x_ptr[5]];
 
-generate
-    if (USE_MEMORY_BLOCKS == 0) begin
-        always @(posedge vclk) begin
-            char_idx_pp[2] <= char_idx;
-            char_idx_pp[3] <= char_idx_pp[2];
+    osd_enable <= osd_act_pp[6];
 
-            for(idx = 0; idx <= 7; idx = idx+1) begin
-                char_ptr_pp3[idx] <= char_ptr[{char_idx_pp[2][4:3], 3'(idx)}];
-            end
+    if (osd_text_act_pp[6]) begin
+        if (char_px) begin
+            osd_color <= config_reg[OSD_ROW_COLOR_REGNUM][char_row] ? BG_YELLOW : BG_WHITE;
+        end else begin
+            osd_color <= BG_BLUE;
         end
+    end else begin // border
+        osd_color <= border_color;
     end
-endgenerate
+end
 
 // OSD status timeout counters
 always @(posedge clk_i)
@@ -188,39 +198,37 @@ always @(posedge clk_i or posedge rst_i) begin
     end
 end
 
-
 genvar i;
 generate
-    if (USE_MEMORY_BLOCKS == 0) begin
-        for (i = 0; i < (CHAR_ROWS*CHAR_COLS); i = i + 4) begin : genreg
-            always @(posedge clk_i or posedge rst_i) begin
-                if (rst_i) begin
-                    char_ptr[i] <= 0;
-                    char_ptr[i+1] <= 0;
-                    char_ptr[i+2] <= 0;
-                    char_ptr[i+3] <= 0;
-                end else begin
-                    if (avalon_s_chipselect && avalon_s_write && (avalon_s_address==1+(i/4))) begin
-                        if (avalon_s_byteenable[3])
-                            char_ptr[i+3] <= avalon_s_writedata[31:24];
-                        if (avalon_s_byteenable[2])
-                            char_ptr[i+2] <= avalon_s_writedata[23:16];
-                        if (avalon_s_byteenable[1])
-                            char_ptr[i+1] <= avalon_s_writedata[15:8];
-                        if (avalon_s_byteenable[0])
-                            char_ptr[i] <= avalon_s_writedata[7:0];
-                    end
+    for (i=OSD_ROW_LSEC_ENABLE_REGNUM; i <= OSD_ROW_COLOR_REGNUM; i++) begin : gen_reg
+        always @(posedge clk_i or posedge rst_i) begin
+            if (rst_i) begin
+                config_reg[i] <= 0;
+            end else begin
+                if (avalon_s_chipselect && avalon_s_write && (avalon_s_address==i)) begin
+                    if (avalon_s_byteenable[3])
+                        config_reg[i][31:24] <= avalon_s_writedata[31:24];
+                    if (avalon_s_byteenable[2])
+                        config_reg[i][23:16] <= avalon_s_writedata[23:16];
+                    if (avalon_s_byteenable[1])
+                        config_reg[i][15:8] <= avalon_s_writedata[15:8];
+                    if (avalon_s_byteenable[0])
+                        config_reg[i][7:0] <= avalon_s_writedata[7:0];
                 end
             end
         end
     end
 endgenerate
 
+
 always @(*) begin
     if (avalon_s_chipselect && avalon_s_read) begin
         case (avalon_s_address)
-            OSD_CONFIG_REGNUM: avalon_s_readdata = osd_config;
-            default: avalon_s_readdata = 32'h00000000;
+            OSD_CONFIG_REGNUM:              avalon_s_readdata = osd_config;
+            OSD_ROW_LSEC_ENABLE_REGNUM:     avalon_s_readdata = config_reg[OSD_ROW_LSEC_ENABLE_REGNUM];
+            OSD_ROW_RSEC_ENABLE_REGNUM:     avalon_s_readdata = config_reg[OSD_ROW_RSEC_ENABLE_REGNUM];
+            OSD_ROW_COLOR_REGNUM:           avalon_s_readdata = config_reg[OSD_ROW_COLOR_REGNUM];
+            default:                        avalon_s_readdata = 32'h00000000;
         endcase
     end else begin
         avalon_s_readdata = 32'h00000000;

ip/sc_config/inc/sc_config_regs.h

@@ -81,10 +81,10 @@ typedef union {
 typedef union {
     struct {
         alt_u16 v_active:11;
-        alt_u8 v_backporch:6;
+        alt_u8 v_backporch:8;
         alt_u8 v_synclen:3;
         alt_u8 v_mask:6;
-        alt_u8 v_rsv:3;
+        alt_u8 v_rsv:1;
         alt_u8 v_multmode:3;
     } __attribute__((packed, __may_alias__));
     alt_u32 data;

ossc.cof

@@ -10,7 +10,7 @@
 		<user_name>Page_0</user_name>
 		<page_flags>1</page_flags>
 		<bit0>
-			<sof_filename>output_files/ossc.sof</sof_filename> 
+			<sof_filename>output_files/ossc.sof<compress_bitstream>1</compress_bitstream></sof_filename> 
 		</bit0>
 	</sof_data>
 	<version>10</version>

ossc.qsf

@@ -41,7 +41,7 @@ set_global_assignment -name DEVICE EP4CE15E22C8
 set_global_assignment -name TOP_LEVEL_ENTITY ossc
 set_global_assignment -name ORIGINAL_QUARTUS_VERSION 13.1
 set_global_assignment -name PROJECT_CREATION_TIME_DATE "17:27:03  MAY 17, 2014"
-set_global_assignment -name LAST_QUARTUS_VERSION "17.1.0 Lite Edition"
+set_global_assignment -name LAST_QUARTUS_VERSION "20.1.1 Lite Edition"
 set_global_assignment -name PROJECT_OUTPUT_DIRECTORY output_files
 set_global_assignment -name MIN_CORE_JUNCTION_TEMP 0
 set_global_assignment -name MAX_CORE_JUNCTION_TEMP 85
@@ -179,7 +179,7 @@ set_global_assignment -name CYCLONEIII_CONFIGURATION_DEVICE EPCS16
 set_global_assignment -name VERILOG_INPUT_VERSION SYSTEMVERILOG_2005
 set_global_assignment -name VERILOG_SHOW_LMF_MAPPING_MESSAGES OFF
 
-set_global_assignment -name TIMEQUEST_MULTICORNER_ANALYSIS ON
+set_global_assignment -name TIMING_ANALYZER_MULTICORNER_ANALYSIS ON
 set_global_assignment -name SMART_RECOMPILE ON
 
 set_global_assignment -name PHYSICAL_SYNTHESIS_EFFORT NORMAL
@@ -218,11 +218,18 @@ set_global_assignment -name ENABLE_SIGNALTAP OFF
 set_global_assignment -name USE_SIGNALTAP_FILE output_files/ossc_la.stp
 
 set_global_assignment -name FITTER_EFFORT "AUTO FIT"
-set_global_assignment -name SEED 6
+set_global_assignment -name SEED 2
 
 
 
 
+set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_BD[0]
+set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_BD[3]
+set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_BD[7]
+set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_GD[7]
+set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_RD[1]
+set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_RD[5]
+set_instance_assignment -name FAST_OUTPUT_REGISTER ON -to HDMI_TX_RD[7]
 set_global_assignment -name VERILOG_FILE rtl/videogen.v
 set_global_assignment -name VERILOG_FILE rtl/ir_rcv.v
 set_global_assignment -name VERILOG_FILE rtl/ossc.v

ossc.sdc

@@ -10,8 +10,8 @@ set_false_path -to {sys:sys_inst|sys_pio_1:pio_1|readdata*}
 ### Scanconverter clock constraints ###
 
 create_clock -period 108MHz -name pclk_1x [get_ports PCLK_in]
-create_clock -period 33MHz -name pclk_2x_source [get_ports PCLK_in] -add
-create_clock -period 33MHz -name pclk_3x_source [get_ports PCLK_in] -add
+create_clock -period 54MHz -name pclk_2x_source [get_ports PCLK_in] -add
+create_clock -period 54MHz -name pclk_3x_source [get_ports PCLK_in] -add
 create_clock -period 33MHz -name pclk_4x_source [get_ports PCLK_in] -add
 create_clock -period 33MHz -name pclk_5x_source [get_ports PCLK_in] -add
 
@@ -53,8 +53,9 @@ foreach_in_collection c [get_clocks "pclk_1x pclk_*_source"] {
     set_input_delay -clock $c -max $TVP_dmax $critinputs -add_delay
 }
 
-# output delay constraints
-set IT_Tsu 1.0
+# output delay constraints as documented in the IT6613 datasheet
+# -- increased IT_Tsu from 1.0 to 1.5 due to #52
+set IT_Tsu 1.5
 set IT_Th -0.5
 set critoutputs_hdmi [get_ports {HDMI_TX_RD* HDMI_TX_GD* HDMI_TX_BD* HDMI_TX_DE HDMI_TX_HS HDMI_TX_VS}]
 foreach_in_collection c [get_clocks pclk_*_out] {
@@ -81,6 +82,10 @@ set_false_path -from [get_registers {scanconverter_inst|H_* scanconverter_inst|V
 # Ignore paths from registers which are updated only at leading edge of hsync
 #set_false_path -from [get_registers {scanconverter:scanconverter_inst|line_idx scanconverter:scanconverter_inst|line_out_idx* scanconverter:scanconverter_inst|hmax*}]
 
+# Ignore paths that cross clock domains from 3x to 2x and 5x to 4x, since they share a clock line, but cannot co-occur.
+set_false_path -from [get_clocks {pclk_3x*}] -to [get_registers {scanconverter:scanconverter_inst|*_2x*}]
+set_false_path -from [get_clocks {pclk_5x*}] -to [get_registers {scanconverter:scanconverter_inst|*_4x*}]
+
 # Ignore paths to latency tester sync regs
 set_false_path -to [get_registers {lat_tester:lt0|mode_synced* lat_tester:lt0|VSYNC_in_* lat_tester:lt0|trigger_*}]
 

ossc_rtl.project

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CodeLite_Project Name="ossc_rtl" InternalType="">
+<CodeLite_Project Name="ossc_rtl" InternalType="" Version="11000">
   <VirtualDirectory Name="ip">
     <VirtualDirectory Name="nios2_hw_crc">
       <VirtualDirectory Name="hdl">
@@ -24,6 +24,23 @@
   </VirtualDirectory>
   <Description/>
   <Dependencies/>
+  <VirtualDirectory Name="rtl">
+    <File Name="rtl/ir_rcv.v"/>
+    <File Name="rtl/ossc.v"/>
+    <File Name="rtl/pll_2x.v"/>
+    <File Name="rtl/pll_3x_lowfreq.v"/>
+    <File Name="rtl/pll_3x_lowfreq_bb.v"/>
+    <File Name="rtl/linebuf_inst.v"/>
+    <File Name="rtl/videogen.v"/>
+    <File Name="rtl/timescale.v"/>
+    <File Name="rtl/pll_2x_bb.v"/>
+    <File Name="rtl/linebuf.v"/>
+    <File Name="rtl/pll_3x.v"/>
+    <File Name="rtl/scanconverter.v"/>
+    <File Name="rtl/linebuf_bb.v"/>
+  </VirtualDirectory>
+  <Dependencies Name="Debug"/>
+  <Dependencies Name="Release"/>
   <Settings Type="Dynamic Library">
     <GlobalSettings>
       <Compiler Options="" C_Options="" Assembler="">
@@ -41,6 +58,7 @@
       <Linker Options="" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
       <General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
+      <BuildSystem Name="Default"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>
@@ -79,6 +97,7 @@
       <Linker Options="-O2" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
       <General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
+      <BuildSystem Name="Default"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>
@@ -111,21 +130,4 @@
       </Completion>
     </Configuration>
   </Settings>
-  <VirtualDirectory Name="rtl">
-    <File Name="rtl/ir_rcv.v"/>
-    <File Name="rtl/ossc.v"/>
-    <File Name="rtl/pll_2x.v"/>
-    <File Name="rtl/pll_3x_lowfreq.v"/>
-    <File Name="rtl/pll_3x_lowfreq_bb.v"/>
-    <File Name="rtl/linebuf_inst.v"/>
-    <File Name="rtl/videogen.v"/>
-    <File Name="rtl/timescale.v"/>
-    <File Name="rtl/pll_2x_bb.v"/>
-    <File Name="rtl/linebuf.v"/>
-    <File Name="rtl/pll_3x.v"/>
-    <File Name="rtl/scanconverter.v"/>
-    <File Name="rtl/linebuf_bb.v"/>
-  </VirtualDirectory>
-  <Dependencies Name="Debug"/>
-  <Dependencies Name="Release"/>
 </CodeLite_Project>

ossc_sw_bsp.project

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CodeLite_Project Name="ossc_sw_bsp" InternalType="" Version="10.0.0">
+<CodeLite_Project Name="ossc_sw_bsp" InternalType="" Version="11000">
   <Plugins>
     <Plugin Name="qmake">
       <![CDATA[00020001N0005Debug0000000000000001N0007Release000000000000]]>
@@ -39,6 +39,8 @@
     <VirtualDirectory Name="sys_controller_bsp">
       <VirtualDirectory Name="drivers">
         <VirtualDirectory Name="inc">
+          <File Name="software/sys_controller_bsp/drivers/inc/altera_epcq_controller2_regs.h"/>
+          <File Name="software/sys_controller_bsp/drivers/inc/altera_epcq_controller2.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/pll_reconfig_regs.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/osd_generator_regs.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/sc_config_regs.h"/>
@@ -48,19 +50,17 @@
           <File Name="software/sys_controller_bsp/drivers/inc/altera_avalon_jtag_uart_regs.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/ci_crc.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/crc.h"/>
-          <File Name="software/sys_controller_bsp/drivers/inc/altera_epcq_controller_mod_regs.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/altera_avalon_jtag_uart_fd.h"/>
-          <File Name="software/sys_controller_bsp/drivers/inc/altera_epcq_controller_mod.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/i2c_opencores_regs.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/i2c_opencores.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/Altera_UP_SD_Card_Avalon_Interface_mod.h"/>
           <File Name="software/sys_controller_bsp/drivers/inc/altera_avalon_pio_regs.h"/>
         </VirtualDirectory>
         <VirtualDirectory Name="src">
+          <File Name="software/sys_controller_bsp/drivers/src/altera_epcq_controller2.c"/>
           <File Name="software/sys_controller_bsp/drivers/src/altera_avalon_timer_vars.c"/>
           <File Name="software/sys_controller_bsp/drivers/src/altera_avalon_timer_ts.c"/>
           <File Name="software/sys_controller_bsp/drivers/src/altera_avalon_timer_sc.c"/>
-          <File Name="software/sys_controller_bsp/drivers/src/altera_epcq_controller_mod.c"/>
           <File Name="software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_read.c"/>
           <File Name="software/sys_controller_bsp/drivers/src/altera_avalon_jtag_uart_ioctl.c"/>
           <File Name="software/sys_controller_bsp/drivers/src/ci_crc.c"/>

rtl/char_array.qip

@@ -1,5 +1,5 @@
 set_global_assignment -name IP_TOOL_NAME "RAM: 2-PORT"
-set_global_assignment -name IP_TOOL_VERSION "17.1"
+set_global_assignment -name IP_TOOL_VERSION "20.1"
 set_global_assignment -name IP_GENERATED_DEVICE_FAMILY "{Cyclone IV E}"
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) "char_array.v"]
 set_global_assignment -name MISC_FILE [file join $::quartus(qip_path) "char_array_inst.v"]

rtl/char_array.v

@@ -14,13 +14,13 @@
 // ************************************************************
 // THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
 //
-// 17.1.0 Build 590 10/25/2017 SJ Lite Edition
+// 20.1.1 Build 720 11/11/2020 SJ Lite Edition
 // ************************************************************
 
 
-//Copyright (C) 2017  Intel Corporation. All rights reserved.
+//Copyright (C) 2020  Intel Corporation. All rights reserved.
 //Your use of Intel Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
+//and other software and tools, and any partner logic 
 //functions, and any output files from any of the foregoing 
 //(including device programming or simulation files), and any 
 //associated documentation or information are expressly subject 
@@ -30,7 +30,8 @@
 //agreement, including, without limitation, that your use is for
 //the sole purpose of programming logic devices manufactured by
 //Intel and sold by Intel or its authorized distributors.  Please
-//refer to the applicable agreement for further details.
+//refer to the applicable agreement for further details, at
+//https://fpgasoftware.intel.com/eula.
 
 
 // synopsys translate_off

rtl/char_rom.qip

@@ -1,5 +1,5 @@
 set_global_assignment -name IP_TOOL_NAME "ROM: 1-PORT"
-set_global_assignment -name IP_TOOL_VERSION "17.1"
+set_global_assignment -name IP_TOOL_VERSION "20.1"
 set_global_assignment -name IP_GENERATED_DEVICE_FAMILY "{Cyclone IV E}"
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) "char_rom.v"]
 set_global_assignment -name MISC_FILE [file join $::quartus(qip_path) "char_rom_inst.v"]

rtl/char_rom.v

@@ -14,13 +14,13 @@
 // ************************************************************
 // THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
 //
-// 17.1.0 Build 590 10/25/2017 SJ Lite Edition
+// 20.1.1 Build 720 11/11/2020 SJ Lite Edition
 // ************************************************************
 
 
-//Copyright (C) 2017  Intel Corporation. All rights reserved.
+//Copyright (C) 2020  Intel Corporation. All rights reserved.
 //Your use of Intel Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
+//and other software and tools, and any partner logic 
 //functions, and any output files from any of the foregoing 
 //(including device programming or simulation files), and any 
 //associated documentation or information are expressly subject 
@@ -30,7 +30,8 @@
 //agreement, including, without limitation, that your use is for
 //the sole purpose of programming logic devices manufactured by
 //Intel and sold by Intel or its authorized distributors.  Please
-//refer to the applicable agreement for further details.
+//refer to the applicable agreement for further details, at
+//https://fpgasoftware.intel.com/eula.
 
 
 // synopsys translate_off

rtl/lat_tester.v

@@ -34,6 +34,7 @@ module lat_tester (
     output reg [2:0] mode_synced,
     output reg [15:0] lat_result,
     output reg [11:0] stb_result,
+    output trig_waiting,
     output reg finished
 );
 
@@ -41,6 +42,8 @@ reg VSYNC_in_L, VSYNC_in_LL, trigger_L, trigger_LL;
 reg [8:0] clk27_ctr;
 reg [1:0] state;
 
+assign trig_waiting = (state == `LT_STATE_LAT_MEAS);
+
 always @(posedge pclk) begin
     VSYNC_in_L <= VSYNC_in;
     VSYNC_in_LL <= VSYNC_in_L;

rtl/linebuf.qip

@@ -1,5 +1,5 @@
 set_global_assignment -name IP_TOOL_NAME "RAM: 2-PORT"
-set_global_assignment -name IP_TOOL_VERSION "17.1"
+set_global_assignment -name IP_TOOL_VERSION "20.1"
 set_global_assignment -name IP_GENERATED_DEVICE_FAMILY "{Cyclone IV E}"
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) "linebuf.v"]
 set_global_assignment -name MISC_FILE [file join $::quartus(qip_path) "linebuf_inst.v"]

rtl/linebuf.v

@@ -14,13 +14,13 @@
 // ************************************************************
 // THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
 //
-// 17.1.0 Build 590 10/25/2017 SJ Lite Edition
+// 20.1.1 Build 720 11/11/2020 SJ Lite Edition
 // ************************************************************
 
 
-//Copyright (C) 2017  Intel Corporation. All rights reserved.
+//Copyright (C) 2020  Intel Corporation. All rights reserved.
 //Your use of Intel Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
+//and other software and tools, and any partner logic 
 //functions, and any output files from any of the foregoing 
 //(including device programming or simulation files), and any 
 //associated documentation or information are expressly subject 
@@ -30,7 +30,8 @@
 //agreement, including, without limitation, that your use is for
 //the sole purpose of programming logic devices manufactured by
 //Intel and sold by Intel or its authorized distributors.  Please
-//refer to the applicable agreement for further details.
+//refer to the applicable agreement for further details, at
+//https://fpgasoftware.intel.com/eula.
 
 
 // synopsys translate_off

rtl/lpm_mult_4_hybr_ref.qip

@@ -1,5 +1,5 @@
 set_global_assignment -name IP_TOOL_NAME "LPM_MULT"
-set_global_assignment -name IP_TOOL_VERSION "17.1"
+set_global_assignment -name IP_TOOL_VERSION "20.1"
 set_global_assignment -name IP_GENERATED_DEVICE_FAMILY "{Cyclone IV E}"
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) "lpm_mult_4_hybr_ref.v"]
 set_global_assignment -name MISC_FILE [file join $::quartus(qip_path) "lpm_mult_4_hybr_ref_bb.v"]

rtl/lpm_mult_4_hybr_ref.v

@@ -14,13 +14,13 @@
 // ************************************************************
 // THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
 //
-// 17.1.1 Internal Build 593 12/11/2017 SJ Lite Edition
+// 20.1.1 Build 720 11/11/2020 SJ Lite Edition
 // ************************************************************
 
 
-//Copyright (C) 2017  Intel Corporation. All rights reserved.
+//Copyright (C) 2020  Intel Corporation. All rights reserved.
 //Your use of Intel Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
+//and other software and tools, and any partner logic 
 //functions, and any output files from any of the foregoing 
 //(including device programming or simulation files), and any 
 //associated documentation or information are expressly subject 
@@ -30,7 +30,8 @@
 //agreement, including, without limitation, that your use is for
 //the sole purpose of programming logic devices manufactured by
 //Intel and sold by Intel or its authorized distributors.  Please
-//refer to the applicable agreement for further details.
+//refer to the applicable agreement for further details, at
+//https://fpgasoftware.intel.com/eula.
 
 
 // synopsys translate_off

rtl/lpm_mult_4_hybr_ref_pre.qip

@@ -1,5 +1,5 @@
 set_global_assignment -name IP_TOOL_NAME "LPM_MULT"
-set_global_assignment -name IP_TOOL_VERSION "17.1"
+set_global_assignment -name IP_TOOL_VERSION "20.1"
 set_global_assignment -name IP_GENERATED_DEVICE_FAMILY "{Cyclone IV E}"
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) "lpm_mult_4_hybr_ref_pre.v"]
 set_global_assignment -name MISC_FILE [file join $::quartus(qip_path) "lpm_mult_4_hybr_ref_pre_bb.v"]

rtl/lpm_mult_4_hybr_ref_pre.v

@@ -14,13 +14,13 @@
 // ************************************************************
 // THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
 //
-// 17.1.1 Internal Build 593 12/11/2017 SJ Lite Edition
+// 20.1.1 Build 720 11/11/2020 SJ Lite Edition
 // ************************************************************
 
 
-//Copyright (C) 2017  Intel Corporation. All rights reserved.
+//Copyright (C) 2020  Intel Corporation. All rights reserved.
 //Your use of Intel Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
+//and other software and tools, and any partner logic 
 //functions, and any output files from any of the foregoing 
 //(including device programming or simulation files), and any 
 //associated documentation or information are expressly subject 
@@ -30,7 +30,8 @@
 //agreement, including, without limitation, that your use is for
 //the sole purpose of programming logic devices manufactured by
 //Intel and sold by Intel or its authorized distributors.  Please
-//refer to the applicable agreement for further details.
+//refer to the applicable agreement for further details, at
+//https://fpgasoftware.intel.com/eula.
 
 
 // synopsys translate_off

rtl/lpm_mult_4_sl.qip

@@ -1,5 +1,5 @@
 set_global_assignment -name IP_TOOL_NAME "LPM_MULT"
-set_global_assignment -name IP_TOOL_VERSION "17.1"
+set_global_assignment -name IP_TOOL_VERSION "20.1"
 set_global_assignment -name IP_GENERATED_DEVICE_FAMILY "{Cyclone IV E}"
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) "lpm_mult_4_sl.v"]
 set_global_assignment -name MISC_FILE [file join $::quartus(qip_path) "lpm_mult_4_sl_bb.v"]

rtl/lpm_mult_4_sl.v

@@ -14,13 +14,13 @@
 // ************************************************************
 // THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
 //
-// 17.1.1 Internal Build 593 12/11/2017 SJ Lite Edition
+// 20.1.1 Build 720 11/11/2020 SJ Lite Edition
 // ************************************************************
 
 
-//Copyright (C) 2017  Intel Corporation. All rights reserved.
+//Copyright (C) 2020  Intel Corporation. All rights reserved.
 //Your use of Intel Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
+//and other software and tools, and any partner logic 
 //functions, and any output files from any of the foregoing 
 //(including device programming or simulation files), and any 
 //associated documentation or information are expressly subject 
@@ -30,7 +30,8 @@
 //agreement, including, without limitation, that your use is for
 //the sole purpose of programming logic devices manufactured by
 //Intel and sold by Intel or its authorized distributors.  Please
-//refer to the applicable agreement for further details.
+//refer to the applicable agreement for further details, at
+//https://fpgasoftware.intel.com/eula.
 
 
 // synopsys translate_off

rtl/ossc.v

@@ -88,12 +88,15 @@ reg HSYNC_in_L, VSYNC_in_L, FID_in_L;
 reg [1:0] btn_L, btn_LL;
 reg ir_rx_L, ir_rx_LL, HDMI_TX_INT_N_L, HDMI_TX_INT_N_LL, HDMI_TX_MODE_L, HDMI_TX_MODE_LL;
 
+wire lt_sensor = btn_LL[1];
 wire lt_active = sys_ctrl[15];
 wire lt_armed = sys_ctrl[14];
+wire lt_trigger = HDMI_TX_DE & HDMI_TX_GD[0];
 wire [1:0] lt_mode = sys_ctrl[13:12];
 wire [1:0] lt_mode_synced;
 wire [15:0] lt_lat_result;
 wire [11:0] lt_stb_result;
+wire lt_trig_waiting;
 wire lt_finished;
 
 wire remote_event = sys_ctrl[8];
@@ -101,7 +104,8 @@ reg remove_event_prev;
 reg [14:0] to_ctr, to_ctr_ms;
 wire lcd_bl_timeout;
 
-wire osd_color, osd_enable_pre;
+wire [1:0] osd_color;
+wire osd_enable_pre;
 wire osd_enable = osd_enable_pre & ~lt_active;
 wire [10:0] xpos, xpos_sc, xpos_vg;
 wire [10:0] ypos, ypos_sc, ypos_vg;
@@ -169,8 +173,8 @@ assign hw_reset_n = sys_ctrl[0];   //HDMI_TX_RST_N in v1.2 PCB
 assign LED_R = HSYNC_in_L;
 assign LED_G = VSYNC_in_L;
 `else
-assign LED_R = (pll_lock_lost|h_unstable);
-assign LED_G = (ir_code == 0);
+assign LED_R = lt_active ? lt_trig_waiting : (pll_lock_lost|h_unstable);
+assign LED_G = lt_active ? ~lt_sensor : (ir_code == 0);
 `endif
 
 assign SD_DAT[3] = sys_ctrl[7]; //SD_SPI_SS_N
@@ -186,9 +190,22 @@ assign ypos = enable_sc ? ypos_sc : ypos_vg;
 assign HDMI_TX_PCLK = PCLK_out;
 
 always @(posedge PCLK_out) begin
-    HDMI_TX_RD <= osd_enable ? {8{osd_color}} : (enable_sc ? R_out_sc : R_out_vg);
-    HDMI_TX_GD <= osd_enable ? {8{osd_color}} : (enable_sc ? G_out_sc : G_out_vg);
-    HDMI_TX_BD <= osd_enable ? 8'hff : (enable_sc ? B_out_sc : B_out_vg);
+    if (osd_enable) begin
+        if (osd_color == 2'h0) begin
+            {HDMI_TX_RD, HDMI_TX_GD, HDMI_TX_BD} <= 24'h000000;
+        end else if (osd_color == 2'h1) begin
+            {HDMI_TX_RD, HDMI_TX_GD, HDMI_TX_BD} <= 24'h0000ff;
+        end else if (osd_color == 2'h2) begin
+            {HDMI_TX_RD, HDMI_TX_GD, HDMI_TX_BD} <= 24'hffff00;
+        end else begin
+            {HDMI_TX_RD, HDMI_TX_GD, HDMI_TX_BD} <= 24'hffffff;
+        end
+    end else if (enable_sc) begin
+        {HDMI_TX_RD, HDMI_TX_GD, HDMI_TX_BD} <= {R_out_sc, G_out_sc, B_out_sc};
+    end else begin
+        {HDMI_TX_RD, HDMI_TX_GD, HDMI_TX_BD} <= {R_out_vg, G_out_vg, B_out_vg};
+    end
+
     HDMI_TX_HS <= enable_sc ? HSYNC_out_sc : HSYNC_out_vg;
     HDMI_TX_VS <= enable_sc ? VSYNC_out_sc : VSYNC_out_vg;
     HDMI_TX_DE <= enable_sc ? DE_out_sc : DE_out_vg;
@@ -318,13 +335,14 @@ lat_tester lt0 (
     .pclk           (PCLK_out),
     .active         (lt_active),
     .armed          (lt_armed),
-    .sensor         (btn_LL[1]),
-    .trigger        (HDMI_TX_DE & HDMI_TX_GD[0]),
+    .sensor         (lt_sensor),
+    .trigger        (lt_trigger),
     .VSYNC_in       (HDMI_TX_VS),
     .mode_in        (lt_mode),
     .mode_synced    (lt_mode_synced),
     .lat_result     (lt_lat_result),
     .stb_result     (lt_stb_result),
+    .trig_waiting   (lt_trig_waiting),
     .finished       (lt_finished)
 );
 

rtl/pll_2x.qip

@@ -1,5 +1,5 @@
 set_global_assignment -name IP_TOOL_NAME "ALTPLL"
-set_global_assignment -name IP_TOOL_VERSION "17.1"
+set_global_assignment -name IP_TOOL_VERSION "20.1"
 set_global_assignment -name IP_GENERATED_DEVICE_FAMILY "{Cyclone IV E}"
 set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) "pll_2x.v"]
 set_global_assignment -name MISC_FILE [file join $::quartus(qip_path) "pll_2x_inst.v"]

rtl/pll_2x.v

@@ -14,13 +14,13 @@
 // ************************************************************
 // THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
 //
-// 17.1.0 Build 590 10/25/2017 SJ Lite Edition
+// 20.1.1 Build 720 11/11/2020 SJ Lite Edition
 // ************************************************************
 
 
-//Copyright (C) 2017  Intel Corporation. All rights reserved.
+//Copyright (C) 2020  Intel Corporation. All rights reserved.
 //Your use of Intel Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
+//and other software and tools, and any partner logic 
 //functions, and any output files from any of the foregoing 
 //(including device programming or simulation files), and any 
 //associated documentation or information are expressly subject 
@@ -30,7 +30,8 @@
 //agreement, including, without limitation, that your use is for
 //the sole purpose of programming logic devices manufactured by
 //Intel and sold by Intel or its authorized distributors.  Please
-//refer to the applicable agreement for further details.
+//refer to the applicable agreement for further details, at
+//https://fpgasoftware.intel.com/eula.
 
 
 // synopsys translate_off

rtl/scanconverter.v

@@ -149,7 +149,7 @@ reg frame_change, frame_change_longpulse, line_change;
 reg [11:0] linebuf_hoffset_pp; //Offset for line (max. 2047 pixels), MSB indicates which line is read/written
 wire [11:0] linebuf_hoffset_act;
 wire [11:0] hcnt_act;
-reg [11:0] hcnt_1x, hcnt_2x, hcnt_3x, hcnt_4x, hcnt_5x, hcnt_4x_aspfix, hcnt_2x_opt, hcnt_3x_opt, hcnt_4x_opt, hcnt_5x_opt, hcnt_5x_hscomp;
+reg [11:0] hcnt_1x, hcnt_2x, hcnt_3x, hcnt_4x, hcnt_5x, hcnt_4x_aspfix, hcnt_2x_opt, hcnt_3x_opt, hcnt_3x_lace_ref, hcnt_4x_opt, hcnt_5x_opt, hcnt_5x_hscomp;
 reg [2:0] hcnt_2x_opt_ctr, hcnt_3x_opt_ctr, hcnt_4x_opt_ctr, hcnt_5x_opt_ctr;
 wire [10:0] vcnt_act;
 reg [10:0] vcnt_tvp, vcnt_1x, vcnt_2x, vcnt_3x, vcnt_4x, vcnt_5x; //max. 2047
@@ -157,6 +157,7 @@ reg [10:0] vcnt_tvp, vcnt_1x, vcnt_2x, vcnt_3x, vcnt_4x, vcnt_5x; //max. 2047
 //other counters
 wire [2:0] line_id_act, col_id_act;
 reg [11:0] hmax[0:1];
+reg [11:0] hmax_3x;
 reg line_idx;
 reg [1:0] line_out_idx_2x, line_out_idx_3x, line_out_idx_4x;
 reg [2:0] line_out_idx_5x;
@@ -189,7 +190,7 @@ reg [2:0] pclk_5x_cnt;
 reg [10:0] H_ACTIVE;    //max. 2047
 reg [9:0] H_AVIDSTART;  //max. 1023
 reg [10:0] V_ACTIVE;    //max. 2047
-reg [6:0] V_AVIDSTART;  //max. 127
+reg [7:0] V_AVIDSTART;  //max. 255
 reg [7:0] H_SYNCLEN;
 reg [2:0] V_SYNCLEN;
 reg [5:0] V_MASK;
@@ -202,7 +203,7 @@ reg [2:0] H_OPT_SAMPLE_MULT;
 reg [2:0] H_OPT_SAMPLE_SEL;
 reg [9:0] H_L5BORDER;
 reg [9:0] H_L3BORDER;
-reg [6:0] H_L3_OPT_SAMPLE_COMP;
+reg [11:0] H_L3_OPT_START;
 reg [3:0] X_MASK_BR;
 reg [2:0] X_MASK_COLOR;
 reg [5:0] X_REV_LPF_STR;
@@ -227,11 +228,11 @@ reg [7:0] V_AVIDMASK_START;
 reg [10:0] V_AVIDMASK_STOP;
 
 reg [11:0] LT_POS_TOPLEFT_BOX_H_STOP;
-reg [10:0] LT_POS_TOPLEFT_BOX_V_STOP;
+reg [11:0] LT_POS_TOPLEFT_BOX_V_STOP;
 reg [11:0] LT_POS_CENTER_BOX_H_START;
 reg [11:0] LT_POS_CENTER_BOX_H_STOP;
-reg [10:0] LT_POS_CENTER_BOX_V_START;
-reg [10:0] LT_POS_CENTER_BOX_V_STOP;
+reg [11:0] LT_POS_CENTER_BOX_V_START;
+reg [11:0] LT_POS_CENTER_BOX_V_STOP;
 reg [11:0] LT_POS_BOTTOMRIGHT_H_START;
 reg [10:0] LT_POS_BOTTOMRIGHT_V_START;
 
@@ -905,19 +906,19 @@ begin
             H_AVIDSTART <= h_config[19:11] + h_config[27:20];   // Horizontal sync+backporch length (0...1023)
             H_ACTIVE <= h_config[10:0];                       // Horizontal active length (0...2047)
 
-            V_SYNCLEN <= v_config[19:17];                     // Vertical sync length (0...7)
-            V_AVIDSTART <= v_config[16:11] + v_config[19:17];   // Vertical sync+backporch length (0...127)
+            V_SYNCLEN <= v_config[21:19];                     // Vertical sync length (0...7)
+            V_AVIDSTART <= v_config[18:11] + v_config[21:19];   // Vertical sync+backporch length (0...255)
             V_ACTIVE <= v_config[10:0];                       // Vertical active length (0...2047)
 
             H_MASK <= h_config2[29:19];
-            V_MASK <= v_config[25:20];
+            V_MASK <= v_config[27:22];
 
 //            H_L5BORDER <= h_config[29] ? (11'd1920-h_config[10:0])/2 : (11'd1600-h_config[10:0])/2;
             H_L5BORDER <= h_config[29] ? H_L5BORDER_1920_tmp[10:1] : H_L5BORDER_1600_tmp[10:1];
             // For Line3x 240x360
             H_L3BORDER <= h_config[28] ? H_L5BORDER_1920_tmp[10:1] : 10'd0;
 
-            H_L3_OPT_SAMPLE_COMP <= h_config[28] ? 7'd90 : 7'd0;
+            H_L3_OPT_START <= h_config2[15:13] + (h_config[28] ? 7'd90 : 7'd0);
 
             H_OPT_SCALE <= h_config2[18:16];
             H_OPT_SAMPLE_SEL <= h_config2[15:13];
@@ -1056,7 +1057,7 @@ begin
         if ((pclk_3x_cnt == 0) & (line_change | frame_change)) begin  //aligned with posedge of pclk_1x
             if (!(frame_change & (FID_cur == `FID_EVEN))) begin
                 hcnt_3x <= 0;
-                hcnt_3x_opt <= H_OPT_SAMPLE_SEL + H_L3_OPT_SAMPLE_COMP;
+                hcnt_3x_opt <= H_L3_OPT_START;
                 hcnt_3x_opt_ctr <= 0;
                 line_out_idx_3x <= 0;
             end
@@ -1064,10 +1065,10 @@ begin
                 vcnt_3x <= -11'b1-FID_cur;
             else if (line_change)
                 vcnt_3x <= vcnt_3x + 1'b1;
-        end else if (hcnt_3x == hmax[~line_idx]) begin
+        end else if (hcnt_3x == hmax_3x) begin
             hcnt_3x <= 0;
             line_out_idx_3x <= line_out_idx_3x + 1'b1;
-            hcnt_3x_opt <= H_OPT_SAMPLE_SEL + H_L3_OPT_SAMPLE_COMP;
+            hcnt_3x_opt <= H_L3_OPT_START;
             hcnt_3x_opt_ctr <= 0;
         end else begin
             hcnt_3x <= hcnt_3x + 1'b1;
@@ -1087,14 +1088,16 @@ begin
             pclk_3x_cnt <= pclk_3x_cnt + 1'b1;
 
         pclk_1x_prev3x <= pclk_1x;
+        hmax_3x <= hmax[~line_idx];
+        hcnt_3x_lace_ref <= (hmax_3x>>1)+1'b1;
 
         HSYNC_3x <= (hcnt_3x < H_SYNCLEN) ? `HSYNC_POL : ~`HSYNC_POL;
         if (FID_cur == `FID_ODD)
             VSYNC_3x <= (vcnt_3x < V_SYNCLEN) ? `VSYNC_POL : ~`VSYNC_POL;
         else begin
-            if ((vcnt_3x+1'b1 == 11'd0) & (line_out_idx_3x == 1) & (hcnt_3x == (hmax[~line_idx]>>1)+1'b1))
+            if ((vcnt_3x+1'b1 == 11'd0) & (line_out_idx_3x == 1) & (hcnt_3x == hcnt_3x_lace_ref))
                 VSYNC_3x <= `VSYNC_POL;
-            else if ((vcnt_3x+1'b1 == V_SYNCLEN) & (line_out_idx_3x == 1) & (hcnt_3x == (hmax[~line_idx]>>1)+1'b1))
+            else if ((vcnt_3x+1'b1 == V_SYNCLEN) & (line_out_idx_3x == 1) & (hcnt_3x == hcnt_3x_lace_ref))
                 VSYNC_3x <= ~`VSYNC_POL;
         end
         

scripts/reprogram.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+make rv-reprogram
+
+if [ $# -eq 1 ] && [ $1 = "jtag_uart" ] && [ $(pgrep -c nios2-terminal) = 0 ]; then
+    nios2-terminal
+fi

software/ossc_sw.project

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CodeLite_Project Name="ossc_sw" InternalType="" Version="10.0.0">
+<CodeLite_Project Name="ossc_sw" InternalType="" Version="11000">
   <Plugins>
     <Plugin Name="qmake">
       <![CDATA[00020001N0005Debug0000000000000001N0007Release000000000000]]>
@@ -31,9 +31,9 @@
     <Excludepaths/>
     <Ignorefiles/>
     <Extensions>
-      <![CDATA[cpp;c;h;hpp;xrc;wxcp;fbp]]>
+      <![CDATA[*.cpp;*.c;*.h;*.hpp;*.xrc;*.wxcp;*.fbp]]>
     </Extensions>
-    <Topleveldir>../software</Topleveldir>
+    <Topleveldir>/home/markus/Code/ossc/software</Topleveldir>
   </Reconciliation>
   <VirtualDirectory Name="sys_controller">
     <VirtualDirectory Name="ths7353">
@@ -74,6 +74,8 @@
       <File Name="sys_controller/memory/sdcard.c"/>
     </VirtualDirectory>
     <VirtualDirectory Name="ossc">
+      <File Name="sys_controller/ossc/utils.h"/>
+      <File Name="sys_controller/ossc/utils.c"/>
       <File Name="sys_controller/ossc/menu.c"/>
       <File Name="sys_controller/ossc/menu.h"/>
       <File Name="sys_controller/ossc/sysconfig.h"/>
@@ -121,7 +123,7 @@
       </Compiler>
       <Linker Options="" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Debug" Command="make rv-reprogram &amp;&amp; nios2-terminal" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(ProjectPath)/sys_controller" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
+      <General OutputFile="" IntermediateDirectory="./Debug" Command="../../scripts/reprogram.sh" CommandArguments="jtag_uart" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(ProjectPath)/sys_controller" PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
       <BuildSystem Name="Default"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
@@ -139,7 +141,7 @@
         <Target Name="Ack BSP update">cd ../sys_controller_bsp &amp;&amp; touch bsp_timestamp</Target>
         <RebuildCommand/>
         <CleanCommand>make clean</CleanCommand>
-        <BuildCommand>make APP_CFLAGS_DEBUG_LEVEL="-DDEBUG"</BuildCommand>
+        <BuildCommand>make ENABLE_AUDIO=y APP_CFLAGS_DEBUG_LEVEL="-DDEBUG" generate_hex</BuildCommand>
         <PreprocessFileCommand/>
         <SingleFileCommand/>
         <MakefileGenerationCommand/>
@@ -163,7 +165,7 @@
       </Compiler>
       <Linker Options="-O2" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Release" Command="make rv-reprogram" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(ProjectPath)/sys_controller" PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
+      <General OutputFile="" IntermediateDirectory="./Release" Command="../../scripts/reprogram.sh" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(ProjectPath)/sys_controller" PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
       <BuildSystem Name="Default"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
@@ -185,7 +187,7 @@
         <Target Name="Ack BSP update">cd ../sys_controller_bsp &amp;&amp; touch bsp_timestamp</Target>
         <RebuildCommand/>
         <CleanCommand>make clean</CleanCommand>
-        <BuildCommand>make</BuildCommand>
+        <BuildCommand>make ENABLE_AUDIO=y generate_hex</BuildCommand>
         <PreprocessFileCommand/>
         <SingleFileCommand/>
         <MakefileGenerationCommand/>

software/sys_controller/Makefile

@@ -159,12 +159,17 @@ C_SRCS += ossc/av_controller.c
 C_SRCS += ossc/avconfig.c
 C_SRCS += ossc/controls.c
 C_SRCS += ossc/firmware.c
+C_SRCS += ossc/fat16_export.c
 ifeq ($(OSDLANG),JP)
 C_SRCS += ossc/menu_sjis.c
 else
 C_SRCS += ossc/menu.c
 endif
+ifeq ($(OSDLANG),JP)
+C_SRCS += ossc/userdata_sjis.c
+else
 C_SRCS += ossc/userdata.c
+endif
 C_SRCS += ossc/utils.c
 C_SRCS += ulibSD/sd_io.c
 C_SRCS += ulibSD/spi_io.c
@@ -196,7 +201,7 @@ APP_CFLAGS_UNDEFINED_SYMBOLS :=
 APP_CFLAGS_OPTIMIZATION := -Os
 APP_CFLAGS_DEBUG_LEVEL :=
 APP_CFLAGS_WARNINGS := -Wall -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-function -Wno-packed-bitfield-compat
-APP_CFLAGS_USER_FLAGS := -fdata-sections -ffunction-sections -fshort-enums -fgnu89-inline
+APP_CFLAGS_USER_FLAGS := -fdata-sections -ffunction-sections -fshort-enums -fgnu89-inline -flto
 
 APP_ASFLAGS_USER :=
 APP_LDFLAGS_USER := -Wl,--gc-sections
@@ -970,7 +975,7 @@ clean : clean_elf_derived_files
 endif
 
 clean :
-	@$(RM) -r $(ELF) $(OBJDUMP_NAME) $(LINKER_MAP_NAME) $(OBJ_ROOT_DIR) $(RUNTIME_ROOT_DIR) $(FORCE_REBUILD_DEP_LIST) ossc/menu_sjis.c
+	@$(RM) -r $(ELF) $(OBJDUMP_NAME) $(LINKER_MAP_NAME) $(OBJ_ROOT_DIR) $(RUNTIME_ROOT_DIR) $(FORCE_REBUILD_DEP_LIST) ossc/menu_sjis.c ossc/userdata_sjis.c
 	@$(ECHO) [$(APP_NAME) clean complete]
 
 # Clean just the BSP.
@@ -1130,6 +1135,9 @@ print-elf-name:
 ossc/menu_sjis.c: ossc/menu.c
 	iconv -f UTF-8 -t SHIFT-JIS ossc/menu.c > ossc/menu_sjis.c
 
+ossc/userdata_sjis.c: ossc/userdata.c
+	iconv -f UTF-8 -t SHIFT-JIS ossc/userdata.c > ossc/userdata_sjis.c
+
 mem_init/sys_onchip_memory2_0.hex: sys_controller.elf
 	$(RV_OBJCOPY) --change-addresses -0x10000 -O binary --gap-fill 0 $< mem_init/sys_onchip_memory2_0.bin
 	../../tools/bin2hex 4 mem_init/sys_onchip_memory2_0.bin mem_init/sys_onchip_memory2_0.hex

software/sys_controller/memory/flash.c

@@ -23,88 +23,39 @@
 #include "flash.h"
 #include "utils.h"
 
-extern alt_epcq_controller_dev epcq_controller_0;
+// save some code space
+#define SINGLE_FLASH_INSTANCE
 
-alt_epcq_controller_dev *epcq_controller_dev;
+alt_flash_dev *epcq_dev;
 
 
-int check_flash()
+int init_flash()
 {
-    epcq_controller_dev = &epcq_controller_0;
+#ifdef SINGLE_FLASH_INSTANCE
+    extern alt_llist alt_flash_dev_list;
+    epcq_dev = (alt_flash_dev*)alt_flash_dev_list.next;
+#else
+    epcq_dev = alt_flash_open_dev(EPCQ_CONTROLLER2_0_AVL_MEM_NAME);
+#endif
 
-    if ((epcq_controller_dev == NULL) || !(epcq_controller_dev->is_epcs && (epcq_controller_dev->page_size == PAGESIZE)))
-        return -FLASH_DETECT_ERROR;
-
-    printf("Flash size in bytes: %lu\nSector size: %lu (%lu pages)\nPage size: %lu\n",
-            epcq_controller_dev->size_in_bytes, epcq_controller_dev->sector_size, epcq_controller_dev->sector_size/epcq_controller_dev->page_size, epcq_controller_dev->page_size);
-
-    return 0;
-}
-
-int read_flash(alt_u32 offset, alt_u32 length, alt_u8 *dstbuf)
-{
-    int retval, i;
-
-    retval = alt_epcq_controller_read(&epcq_controller_dev->dev, offset, dstbuf, length);
-    if (retval != 0)
-        return -FLASH_READ_ERROR;
-
-    return 0;
-}
-
-int write_flash_page(alt_u8 *pagedata, alt_u32 length, alt_u32 pagenum)
-{
-    int retval, i;
-
-    if ((pagenum % PAGES_PER_SECTOR) == 0) {
-        printf("Erasing sector %u\n", (unsigned)(pagenum/PAGES_PER_SECTOR));
-        retval = alt_epcq_controller_erase_block(&epcq_controller_dev->dev, pagenum*PAGESIZE);
-
-        if (retval != 0) {
-            printf("Flash erase error, sector %u\nRetval %d\n", (unsigned)(pagenum/PAGES_PER_SECTOR), retval);
-            return -FLASH_ERASE_ERROR;
-        }
-    }
-
-    retval = alt_epcq_controller_write_block(&epcq_controller_dev->dev, (pagenum/PAGES_PER_SECTOR)*PAGES_PER_SECTOR*PAGESIZE, pagenum*PAGESIZE, pagedata, length);
-
-    if (retval != 0) {
-        printf("Flash write error, page %u\nRetval %d\n", (unsigned)pagenum, retval);
-        return -FLASH_WRITE_ERROR;
-    }
-
-    return 0;
-}
-
-int write_flash(alt_u8 *buf, alt_u32 length, alt_u32 pagenum)
-{
-    int retval;
-    alt_u32 bytes_to_w;
-
-    while (length > 0) {
-        bytes_to_w = (length > PAGESIZE) ? PAGESIZE : length;
-
-        retval = write_flash_page(buf, bytes_to_w, pagenum);
-        if (retval != 0)
-            return retval;
-
-        buf += bytes_to_w;
-        length -= bytes_to_w;
-        ++pagenum;
-    }
+    if (epcq_dev == NULL)
+        return -1;
 
     return 0;
 }
 
 int verify_flash(alt_u32 offset, alt_u32 length, alt_u32 golden_crc, alt_u8 *tmpbuf)
 {
-    alt_u32 crcval=0, i, bytes_to_read;
+    alt_u32 crcval=0, i, j, bytes_to_read;
     int retval;
 
     for (i=0; i<length; i=i+PAGESIZE) {
         bytes_to_read = ((length-i < PAGESIZE) ? (length-i) : PAGESIZE);
 
-        retval = read_flash(i, bytes_to_read, tmpbuf);
+        //retval = read_flash(i, bytes_to_read, tmpbuf);
+        retval = alt_epcq_controller2_read(epcq_dev, offset+i, tmpbuf, bytes_to_read);
+        for (j=0; j<bytes_to_read; j++)
+            tmpbuf[j] = bitswap8(tmpbuf[j]);
         if (retval != 0)
             return retval;
 

software/sys_controller/memory/flash.h

@@ -22,7 +22,7 @@
 
 #include "alt_types.h"
 #include "sysconfig.h"
-#include "altera_epcq_controller_mod.h"
+#include "altera_epcq_controller2.h"
 
 // EPCS16 pagesize is 256 bytes
 // Flash is split 50-50 to FW and userdata, 1MB each
@@ -32,20 +32,10 @@
 #define USERDATA_OFFSET 0x100000
 #define MAX_USERDATA_ENTRY 15    // 16 sectors for userdata
 
-#define FLASH_DETECT_ERROR      200
-#define FLASH_READ_ERROR        201
-#define FLASH_ERASE_ERROR       202
-#define FLASH_WRITE_ERROR       203
 #define FLASH_VERIFY_ERROR      204
 
-int check_flash();
-
-int read_flash(alt_u32 offset, alt_u32 length, alt_u8 *dstbuf);
-
-int write_flash_page(alt_u8 *pagedata, alt_u32 length, alt_u32 pagenum);
-
-int write_flash(alt_u8 *buf, alt_u32 length, alt_u32 pagenum);
 
+int init_flash();
 int verify_flash(alt_u32 offset, alt_u32 length, alt_u32 golden_crc, alt_u8 *tmpbuf);
 
 #endif /* FLASH_H_ */

software/sys_controller/memory/sdcard.c

@@ -18,11 +18,12 @@
 //
 
 #include <io.h>
+#include <string.h>
 #include "sdcard.h"
 #include "flash.h"
-#include "lcd.h"
+#include "utils.h"
 
-extern char menu_row1[LCD_ROW_LEN+1], menu_row2[LCD_ROW_LEN+1];
+extern alt_flash_dev *epcq_dev;
 
 SD_DEV sdcard_dev;
 
@@ -32,26 +33,35 @@ int check_sdcard(alt_u8 *databuf)
 
     res = SD_Init(&sdcard_dev);
     printf("SD det status: %u\n", res);
-    if (res != SD_OK)
-        return res;
+    if (res == SD_OK)
+        res = SD_Read(&sdcard_dev, databuf, 0, 0, 512);
 
-    return SD_Read(&sdcard_dev, databuf, 0, 0, 512);
+    return -res;
 }
 
 int copy_sd_to_flash(alt_u32 sd_blknum, alt_u32 flash_pagenum, alt_u32 length, alt_u8 *tmpbuf)
 {
-    int retval;
+    SDRESULTS res;
+    int retval, i;
     alt_u32 bytes_to_rw;
 
     while (length > 0) {
         bytes_to_rw = (length < SD_BLK_SIZE) ? length : SD_BLK_SIZE;
-        retval = SD_Read(&sdcard_dev, tmpbuf, sd_blknum, 0, bytes_to_rw);
-        if (retval != 0) {
+        res = SD_Read(&sdcard_dev, tmpbuf, sd_blknum, 0, bytes_to_rw);
+        if (res != SD_OK) {
             printf("Failed to read SD card\n");
-            return -retval;
+            return -res;
         }
 
-        retval = write_flash(tmpbuf, bytes_to_rw, flash_pagenum);
+        if ((flash_pagenum % PAGES_PER_SECTOR) == 0) {
+            retval = alt_epcq_controller2_erase_block(epcq_dev, flash_pagenum*PAGESIZE);
+            if (retval != 0)
+                return retval;
+        }
+
+        for (i=0; i<bytes_to_rw; i++)
+            tmpbuf[i] = bitswap8(tmpbuf[i]);
+        retval = alt_epcq_controller2_write_block(epcq_dev, ((flash_pagenum/PAGES_PER_SECTOR)*SECTORSIZE), flash_pagenum*PAGESIZE, tmpbuf, bytes_to_rw);
         if (retval != 0)
             return retval;
 
@@ -62,3 +72,35 @@ int copy_sd_to_flash(alt_u32 sd_blknum, alt_u32 flash_pagenum, alt_u32 length, a
 
     return 0;
 }
+
+int copy_flash_to_sd(alt_u32 flash_pagenum, alt_u32 sd_blknum, alt_u32 length, alt_u8 *tmpbuf)
+{
+    SDRESULTS res;
+    int retval, i;
+    alt_u32 bytes_to_rw;
+
+    while (length > 0) {
+        bytes_to_rw = (length < SD_BLK_SIZE) ? length : SD_BLK_SIZE;
+        retval = alt_epcq_controller2_read(epcq_dev, flash_pagenum*PAGESIZE, tmpbuf, bytes_to_rw);
+        for (i=0; i<bytes_to_rw; i++)
+            tmpbuf[i] = bitswap8(tmpbuf[i]);
+        if (retval != 0)
+            return retval;
+
+        if (bytes_to_rw < SD_BLK_SIZE)
+            memset(tmpbuf+bytes_to_rw, 0, SD_BLK_SIZE-bytes_to_rw);
+
+        res = SD_Write(&sdcard_dev, tmpbuf, sd_blknum);
+        if (res != SD_OK) {
+            printf("Failed to write to SD card\n");
+            return -res;
+        }
+
+        ++sd_blknum;
+        flash_pagenum += bytes_to_rw/PAGESIZE;
+        length -= bytes_to_rw;
+    }
+
+    return 0;
+
+}

software/sys_controller/memory/sdcard.h

@@ -26,5 +26,6 @@
 
 int check_sdcard(alt_u8 *databuf);
 int copy_sd_to_flash(alt_u32 sd_blknum, alt_u32 flash_pagenum, alt_u32 length, alt_u8 *tmpbuf);
+int copy_flash_to_sd(alt_u32 flash_pagenum, alt_u32 sd_blknum, alt_u32 length, alt_u8 *tmpbuf);
 
 #endif /* SDCARD_H_ */

software/sys_controller/ossc/av_controller.c

@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2019  Markus Hiienkari <mhiienka@niksula.hut.fi>
+// Copyright (C) 2015-2022  Markus Hiienkari <mhiienka@niksula.hut.fi>
 //
 // This file is part of Open Source Scan Converter project.
 //
@@ -65,13 +65,14 @@ extern alt_u8 remote_rpt, remote_rpt_prev;
 extern avconfig_t tc, tc_default;
 extern alt_u8 vm_sel;
 
-alt_u8 target_typemask;
+tvp_input_t target_tvp;
+tvp_sync_input_t target_tvp_sync;
 alt_u8 target_type;
 alt_u8 stable_frames;
 alt_u8 update_cur_vm;
 
 alt_u8 profile_sel, profile_sel_menu, input_profiles[AV_LAST], lt_sel, def_input, profile_link, lcd_bl_timeout;
-alt_u8 osd_enable, osd_enable_pre=1, osd_status_timeout, osd_status_timeout_pre=1;
+alt_u8 osd_enable=1, osd_status_timeout=1;
 alt_u8 auto_input, auto_av1_ypbpr, auto_av2_ypbpr = 1, auto_av3_ypbpr;
 
 char row1[LCD_ROW_LEN+1], row2[LCD_ROW_LEN+1], menu_row1[LCD_ROW_LEN+1], menu_row2[LCD_ROW_LEN+1];
@@ -105,17 +106,38 @@ volatile sc_regs *sc = (volatile sc_regs*)SC_CONFIG_0_BASE;
 volatile osd_regs *osd = (volatile osd_regs*)OSD_GENERATOR_0_BASE;
 volatile pll_reconfig_regs *pll_reconfig = (volatile pll_reconfig_regs*)PLL_RECONFIG_0_BASE;
 
-inline void lcd_write_menu()
+void ui_disp_menu(alt_u8 osd_mode)
 {
-    strncpy((char*)osd->osd_chars.row1, menu_row1, LCD_ROW_LEN);
-    strncpy((char*)osd->osd_chars.row2, menu_row2, LCD_ROW_LEN);
+    alt_u8 menu_page;
+
+    if ((osd_mode == 1) || (osd_enable == 2)) {
+        strncpy((char*)osd->osd_array.data[0][0], menu_row1, OSD_CHAR_COLS);
+        strncpy((char*)osd->osd_array.data[1][0], menu_row2, OSD_CHAR_COLS);
+        osd->osd_row_color.mask = 0;
+        osd->osd_sec_enable[0].mask = 3;
+        osd->osd_sec_enable[1].mask = 0;
+    } else if (osd_mode == 2) {
+        menu_page = get_current_menunavi()->mp;
+        strncpy((char*)osd->osd_array.data[menu_page][1], menu_row2, OSD_CHAR_COLS);
+        osd->osd_sec_enable[1].mask |= (1<<menu_page);
+    }
+
     lcd_write((char*)&menu_row1, (char*)&menu_row2);
 }
 
-inline void lcd_write_status() {
-    strncpy((char*)osd->osd_chars.row1, row1, LCD_ROW_LEN);
-    strncpy((char*)osd->osd_chars.row2, row2, LCD_ROW_LEN);
-    lcd_write((char*)&row1, (char*)&row2);
+void ui_disp_status(alt_u8 refresh_osd_timer) {
+    if (!menu_active) {
+        if (refresh_osd_timer)
+            osd->osd_config.status_refresh = 1;
+
+        strncpy((char*)osd->osd_array.data[0][0], row1, OSD_CHAR_COLS);
+        strncpy((char*)osd->osd_array.data[1][0], row2, OSD_CHAR_COLS);
+        osd->osd_row_color.mask = 0;
+        osd->osd_sec_enable[0].mask = 3;
+        osd->osd_sec_enable[1].mask = 0;
+
+        lcd_write((char*)&row1, (char*)&row2);
+    }
 }
 
 #ifdef ENABLE_AUDIO
@@ -208,29 +230,35 @@ void set_lpf(alt_u8 lpf)
 
     //Auto
     if (lpf == 0) {
-        switch (target_type) {
-        case VIDEO_PC:
+        if (target_tvp == TVP_INPUT3) {
             tvp_set_lpf((pclk < 30000000) ? 0x0F : 0);
             ths_set_lpf(THS_LPF_BYPASS);
-            break;
-        case VIDEO_HDTV:
+        } else {
             tvp_set_lpf(0);
-            ths_set_lpf((pclk < 80000000) ? THS_LPF_35MHZ : THS_LPF_BYPASS);
-            break;
-        case VIDEO_EDTV:
-            tvp_set_lpf(0);
-            ths_set_lpf(THS_LPF_16MHZ);
-            break;
-        case VIDEO_SDTV:
-        case VIDEO_LDTV:
-        default:
-            tvp_set_lpf(0);
-            ths_set_lpf(THS_LPF_9MHZ);
-            break;
+
+            switch (target_type) {
+            case VIDEO_PC:
+            case VIDEO_HDTV:
+                ths_set_lpf((pclk < 80000000) ? THS_LPF_35MHZ : THS_LPF_BYPASS);
+                break;
+            case VIDEO_EDTV:
+                ths_set_lpf(THS_LPF_16MHZ);
+                break;
+            case VIDEO_SDTV:
+            case VIDEO_LDTV:
+            default:
+                ths_set_lpf(THS_LPF_9MHZ);
+                break;
+            }
         }
     } else {
-        tvp_set_lpf((tc.video_lpf == 2) ? 0x0F : 0);
-        ths_set_lpf((tc.video_lpf > 2) ? (VIDEO_LPF_MAX-tc.video_lpf) : THS_LPF_BYPASS);
+        if (target_tvp == TVP_INPUT3) {
+            tvp_set_lpf((lpf == 2) ? 0x0F : 0);
+            ths_set_lpf(THS_LPF_BYPASS);
+        } else {
+            tvp_set_lpf(0);
+            ths_set_lpf((lpf > 2) ? (VIDEO_LPF_MAX-lpf) : THS_LPF_BYPASS);
+        }
     }
 }
 
@@ -356,7 +384,8 @@ status_t get_status(tvp_sync_input_t syncinput)
             (tc.tvp_hpll2x != cm.cc.tvp_hpll2x) ||
             (tc.upsample2x != cm.cc.upsample2x) ||
             (tc.vga_ilace_fix != cm.cc.vga_ilace_fix) ||
-            (tc.default_vic != cm.cc.default_vic))
+            (tc.default_vic != cm.cc.default_vic) ||
+            (tc.clamp_offset != cm.cc.clamp_offset))
             status = (status < MODE_CHANGE) ? MODE_CHANGE : status;
 
         if ((tc.s480p_mode != cm.cc.s480p_mode) && (video_modes[cm.id].v_total == 525))
@@ -420,6 +449,12 @@ status_t get_status(tvp_sync_input_t syncinput)
     if (tc.sync_lpf != cm.cc.sync_lpf)
         tvp_set_sync_lpf(tc.sync_lpf);
 
+    if (tc.stc_lpf != cm.cc.stc_lpf)
+        tvp_set_clp_lpf(tc.stc_lpf);
+
+    if ((tc.alc_h_filter != cm.cc.alc_h_filter) || (tc.alc_v_filter != cm.cc.alc_v_filter))
+        tvp_set_alcfilt(tc.alc_v_filter, tc.alc_h_filter);
+
     if (memcmp(&tc.col, &cm.cc.col, sizeof(color_setup_t)))
         tvp_set_gain_offset(&tc.col);
 
@@ -635,15 +670,12 @@ void program_mode()
     v_syncinlen = tvp_readreg(TVP_VSINWIDTH);
     printf("Hswidth: %u  Vswidth: %u  Macrovision: %u\n", (unsigned)h_syncinlen, (unsigned)(v_syncinlen & 0x1F), (unsigned)cm.macrovis);
 
-    sniprintf(row1, LCD_ROW_LEN+1, "%s %u%c", avinput_str[cm.avinput], (unsigned)cm.totlines, cm.progressive ? 'p' : 'i');
+    sniprintf(row1, LCD_ROW_LEN+1, "%s %u-%c", avinput_str[cm.avinput], (unsigned)cm.totlines, cm.progressive ? 'p' : 'i');
     sniprintf(row2, LCD_ROW_LEN+1, "%u.%.2ukHz %u.%.2uHz", (unsigned)(h_hz/1000), (unsigned)((h_hz%1000)/10), (unsigned)(v_hz_x100/100), (unsigned)(v_hz_x100%100));
-    if (!menu_active) {
-        osd->osd_config.status_refresh = 1;
-        lcd_write_status();
-    }
+    ui_disp_status(1);
 
     //printf ("Get mode id with %u %u %f\n", totlines, progressive, hz);
-    cm.id = get_mode_id(cm.totlines, cm.progressive, v_hz_x100/100, target_typemask);
+    cm.id = get_mode_id(cm.totlines, cm.progressive, v_hz_x100/100, h_syncinlen);
 
     if (cm.id == -1) {
         printf ("Error: no suitable mode found, defaulting to 240p\n");
@@ -653,7 +685,12 @@ void program_mode()
 
     cm.h_mult_total = (video_modes[cm.id].h_total*cm.sample_mult) + ((cm.sample_mult*video_modes[cm.id].h_total_adj*5 + 50) / 100);
 
-    target_type = target_typemask & video_modes[cm.id].type;
+    // Trilevel sync is used with HDTV modes using composite sync
+    if (video_modes[cm.id].type & VIDEO_HDTV)
+        target_type = (target_tvp_sync <= TVP_SOG3) ? VIDEO_HDTV : VIDEO_PC;
+    else
+        target_type = video_modes[cm.id].type;
+
     h_synclen_px = ((alt_u32)h_syncinlen * (alt_u32)cm.h_mult_total) / cm.clkcnt;
 
     printf("Mode %s selected - hsync width: %upx\n", video_modes[cm.id].name, (unsigned)h_synclen_px);
@@ -662,7 +699,8 @@ void program_mode()
                      cm.h_mult_total,
                      cm.clkcnt,
                      cm.cc.tvp_hpll2x && (video_modes[cm.id].flags & MODE_PLLDIVBY2),
-                     (alt_u8)h_synclen_px);
+                     (alt_u8)h_synclen_px,
+                     (alt_8)(cm.cc.clamp_offset-SIGNED_NUMVAL_ZERO));
     set_lpf(cm.cc.video_lpf);
     set_csc(cm.cc.ypbpr_cs);
     cm.sample_sel = tvp_set_hpll_phase(video_modes[cm.id].sampler_phase, cm.sample_mult);
@@ -684,8 +722,8 @@ void program_mode()
     pll_reconfigure(cm.pll_config);
 
     if (cm.fpga_vmultmode == FPGA_V_MULTMODE_1X) {
-        osd_x_size = (video_modes[cm.id].v_active > 700) ? 1 : 0;
-        osd_y_size = osd_x_size;
+        osd_y_size = (video_modes[cm.id].v_active > 700) ? 1 : 0;
+        osd_x_size = osd_y_size + !!(video_modes[cm.id].flags & MODE_INTERLACED);
     } else {
         osd_x_size = 1 - cm.tx_pixelrep + (cm.fpga_hmultmode == FPGA_H_MULTMODE_OPTIMIZED_1X) + (cm.fpga_vmultmode > FPGA_V_MULTMODE_3X);
         osd_y_size = 0;
@@ -822,8 +860,8 @@ int init_hw()
     }
 #endif
 
-    if (check_flash() != 0) {
-        printf("Error: incorrect flash type detected\n");
+    if (init_flash() != 0) {
+        printf("Error: could not find flash\n");
         return -1;
     }
 
@@ -837,23 +875,22 @@ int init_hw()
     read_userdata(profile_sel, 0);
 
     // Setup OSD
-    osd_enable = osd_enable_pre;
-    osd_status_timeout = osd_status_timeout_pre;
     osd->osd_config.x_size = 0;
     osd->osd_config.y_size = 0;
     osd->osd_config.x_offset = 3;
     osd->osd_config.y_offset = 3;
-    osd->osd_config.enable = osd_enable;
+    osd->osd_config.enable = !!osd_enable;
     osd->osd_config.status_timeout = osd_status_timeout;
-
-    // Setup remote keymap
-    if (!(IORD_ALTERA_AVALON_PIO_DATA(PIO_1_BASE) & PB1_BIT))
-        setup_rc();
+    osd->osd_config.border_color = 1;
 
     // init always in HDMI mode (fixes yellow screen bug)
     cm.hdmitx_vic = HDMI_480p60;
     TX_enable(TX_HDMI_RGB);
 
+    // Setup remote keymap
+    if (!(IORD_ALTERA_AVALON_PIO_DATA(PIO_1_BASE) & PB1_BIT))
+        setup_rc();
+
     return 0;
 }
 
@@ -866,7 +903,7 @@ int latency_test() {
     sys_ctrl |= LT_ACTIVE|(position<<LT_MODE_OFFS);
     IOWR_ALTERA_AVALON_PIO_DATA(PIO_0_BASE, sys_ctrl);
     sniprintf(menu_row2, LCD_ROW_LEN+1, "OK to init");
-    lcd_write_menu();
+    ui_disp_menu(0);
 
     while (1) {
         btn_vec = IORD_ALTERA_AVALON_PIO_DATA(PIO_1_BASE) & RC_MASK;
@@ -876,7 +913,7 @@ int latency_test() {
                 sys_ctrl &= ~(3<<LT_MODE_OFFS);
                 IOWR_ALTERA_AVALON_PIO_DATA(PIO_0_BASE, sys_ctrl);
                 menu_row2[0] = 0;
-                lcd_write_menu();
+                ui_disp_menu(0);
                 usleep(400000);
                 sys_ctrl |= LT_ARMED|(position<<LT_MODE_OFFS);
                 IOWR_ALTERA_AVALON_PIO_DATA(PIO_0_BASE, sys_ctrl);
@@ -899,7 +936,7 @@ int latency_test() {
                     sniprintf(menu_row2, LCD_ROW_LEN+1, "%u.%.2ums", latency_ms_x100/100, latency_ms_x100%100);
                 else
                     sniprintf(menu_row2, LCD_ROW_LEN+1, "%u.%.2ums/%u.%.2ums", latency_ms_x100/100, latency_ms_x100%100, stb_ms_x100/100, stb_ms_x100%100);
-                lcd_write_menu();
+                ui_disp_menu(0);
             } else if (btn_vec == rc_keymap[RC_BACK]) {
                 break;
             }
@@ -932,8 +969,6 @@ void enable_outputs()
 
 int main()
 {
-    tvp_input_t target_tvp = 0;
-    tvp_sync_input_t target_tvp_sync = 0;
     ths_input_t target_ths = 0;
     pcm_input_t target_pcm = 0;
     video_format target_format = 0;
@@ -956,18 +991,16 @@ int main()
         printf("### DIY VIDEO DIGITIZER / SCANCONVERTER INIT OK ###\n\n");
         sniprintf(row1, LCD_ROW_LEN+1, "OSSC  fw. %u.%.2u" FW_SUFFIX1 FW_SUFFIX2, FW_VER_MAJOR, FW_VER_MINOR);
 #ifndef DEBUG
-        strncpy(row2, "2014-2019  marqs", LCD_ROW_LEN+1);
+        strncpy(row2, "2014-2022  marqs", LCD_ROW_LEN+1);
 #else
         strncpy(row2, "** DEBUG BUILD *", LCD_ROW_LEN+1);
 #endif
-        osd->osd_config.status_refresh = 1;
-        lcd_write_status();
+        ui_disp_status(1);
         usleep(500000);
     } else {
         sniprintf(row1, LCD_ROW_LEN+1, "Init error  %d", init_stat);
         strncpy(row2, "", LCD_ROW_LEN+1);
-        osd->osd_config.status_refresh = 1;
-        lcd_write_status();
+        ui_disp_status(1);
         while (1) {}
     }
 
@@ -1060,12 +1093,11 @@ int main()
 
             target_tvp = TVP_INPUT1;
             target_tvp_sync = TVP_SOG1;
-            target_typemask = VIDEO_LDTV|VIDEO_SDTV|VIDEO_EDTV|VIDEO_HDTV;
 
-            if ((target_input <= AV1_YPBPR) || (tc.av3_alt_rgb && ((target_input == AV3_RGBHV) || (target_input == AV3_RGBs)))) {
+            if ((target_input <= AV1_YPBPR) || (tc.av3_alt_rgb==1 && ((target_input == AV3_RGBHV) || (target_input == AV3_RGBs)))) {
                 target_ths = THS_INPUT_B;
                 target_pcm = PCM_INPUT4;
-            } else if (target_input <= AV2_RGsB) {
+            } else if ((target_input <= AV2_RGsB) || (tc.av3_alt_rgb==2 && ((target_input == AV3_RGBHV) || (target_input == AV3_RGBs)))) {
                 target_ths = THS_INPUT_A;
                 target_pcm = PCM_INPUT3;
             } else  { // if (target_input <= AV3_YPBPR) {
@@ -1091,8 +1123,6 @@ int main()
                 break;
             case AV3_RGBHV:
                 target_format = FORMAT_RGBHV;
-                if (!tc.av3_alt_rgb)
-                    target_typemask = VIDEO_PC;
                 break;
             default:
                 break;
@@ -1131,10 +1161,7 @@ int main()
             cm.clkcnt = 0; //TODO: proper invalidate
             strncpy(row1, avinput_str[cm.avinput], LCD_ROW_LEN+1);
             strncpy(row2, "    NO SYNC", LCD_ROW_LEN+1);
-            if (!menu_active) {
-                osd->osd_config.status_refresh = 1;
-                lcd_write_status();
-            }
+            ui_disp_status(1);
             if (man_input_change) {
                 // record last input if it was selected manually
                 if (def_input == AV_LAST)
@@ -1162,11 +1189,14 @@ int main()
             printf("Changing AV3 RGB source\n");
             cm.cc.av3_alt_rgb = tc.av3_alt_rgb;
         }
-        if ((osd_enable != osd_enable_pre) || (osd_status_timeout != osd_status_timeout_pre)) {
-            osd_enable = osd_enable_pre;
-            osd_status_timeout = osd_status_timeout_pre;
-            osd->osd_config.enable = osd_enable;
+        if ((!!osd_enable != osd->osd_config.enable) || (osd_status_timeout != osd->osd_config.status_timeout)) {
+            osd->osd_config.enable = !!osd_enable;
             osd->osd_config.status_timeout = osd_status_timeout;
+            if (menu_active) {
+                remote_code = 0;
+                render_osd_page();
+                display_menu(1);
+            }
         }
 
         if (cm.avinput != AV_TESTPAT) {
@@ -1186,10 +1216,7 @@ int main()
                     //ths_source_sel(THS_STANDBY, 0);
                     strncpy(row1, avinput_str[cm.avinput], LCD_ROW_LEN+1);
                     strncpy(row2, "    NO SYNC", LCD_ROW_LEN+1);
-                    if (!menu_active) {
-                        osd->osd_config.status_refresh = 1;
-                        lcd_write_status();
-                    }
+                    ui_disp_status(1);
                     alt_timestamp_start();// reset auto input timer
                     auto_input_ctr = 0;
                     auto_input_current_ctr = 0;

software/sys_controller/ossc/av_controller.h

@@ -115,8 +115,8 @@ typedef struct {
     avconfig_t cc;
 } avmode_t;
 
-inline void lcd_write_menu();
-inline void lcd_write_status();
+void ui_disp_menu(alt_u8 osd_mode);
+void ui_disp_status(alt_u8 refresh_osd_timer);
 
 int load_profile();
 int save_profile();

software/sys_controller/ossc/avconfig.c

@@ -62,6 +62,9 @@ const avconfig_t tc_default = {
         .c_gain = DEFAULT_COARSE_GAIN,
     },
     .link_av = AV_LAST,
+    .clamp_offset = SIGNED_NUMVAL_ZERO,
+    .alc_h_filter = DEFAULT_ALC_H_FILTER,
+    .alc_v_filter = DEFAULT_ALC_V_FILTER,
 };
 
 int set_default_avconfig()

software/sys_controller/ossc/avconfig.h

@@ -23,6 +23,8 @@
 #include "alt_types.h"
 #include "tvp7002.h"
 
+#define SIGNED_NUMVAL_ZERO  128
+
 #define SCANLINESTR_MAX     15
 #define SL_HYBRIDSTR_MAX    28
 #define H_MASK_MAX          255
@@ -37,6 +39,10 @@
 #define PLL_COAST_MAX       5
 #define REVERSE_LPF_MAX     31
 #define COARSE_GAIN_MAX     15
+#define ALC_H_FILTER_MAX    7
+#define ALC_V_FILTER_MAX    10
+#define CLAMP_OFFSET_MIN    (SIGNED_NUMVAL_ZERO-100)
+#define CLAMP_OFFSET_MAX    (SIGNED_NUMVAL_ZERO+100)
 
 #define SL_MODE_MAX         2
 #define SL_TYPE_MAX         2
@@ -50,7 +56,7 @@
 #define L5FMT_1600x1200     1
 #define L5FMT_1920x1200     2
 
-static const char *avinput_str[] = { "Test pattern", "AV1: RGBS", "AV1: RGsB", "AV1: YPbPr", "AV2: YPbPr", "AV2: RGsB", "AV3: RGBHV", "AV3: RGBS", "AV3: RGsB", "AV3: YPbPr", "Last used" };
+static const char *avinput_str[] = { "Test pattern", "AV1_RGBS", "AV1_RGsB", "AV1_YPbPr", "AV2_YPbPr", "AV2_RGsB", "AV3_RGBHV", "AV3_RGBS", "AV3_RGsB", "AV3_YPbPr", "Last used" };
 
 typedef enum {
     AV_TESTPAT      = 0,
@@ -104,6 +110,7 @@ typedef struct {
     alt_u8 linelen_tol;
     alt_u8 vsync_thold;
     alt_u8 sync_lpf;
+    alt_u8 stc_lpf;
     alt_u8 video_lpf;
     alt_u8 pre_coast;
     alt_u8 post_coast;
@@ -116,6 +123,9 @@ typedef struct {
     alt_u8 audio_swap_lr;
     alt_u8 audio_gain;
     alt_u8 default_vic;
+    alt_u8 clamp_offset;
+    alt_u8 alc_h_filter;
+    alt_u8 alc_v_filter;
     color_setup_t col;
     avinput_t link_av;
 } __attribute__((packed)) avconfig_t;

software/sys_controller/ossc/controls.c

@@ -25,6 +25,7 @@
 #include "av_controller.h"
 #include "video_modes.h"
 #include "userdata.h"
+#include "firmware.h"
 #include "lcd.h"
 #include "altera_avalon_pio_regs.h"
 
@@ -50,6 +51,9 @@ extern alt_u8 update_cur_vm, vm_edit;
 extern volatile sc_regs *sc;
 extern volatile osd_regs *osd;
 
+extern menu_t menu_scanlines, menu_advtiming;
+extern char target_profile_name[PROFILE_NAME_LEN+1];
+
 alt_u32 remote_code;
 alt_u8 remote_rpt, remote_rpt_prev;
 alt_u32 btn_code, btn_code_prev;
@@ -62,7 +66,8 @@ void setup_rc()
     for (i=0; i<REMOTE_MAX_KEYS; i++) {
         strncpy(menu_row1, "Press", LCD_ROW_LEN+1);
         strncpy(menu_row2, rc_keydesc[i], LCD_ROW_LEN+1);
-        lcd_write_menu();
+        osd->osd_config.menu_active = 1;
+        ui_disp_menu(1);
         confirm = 0;
 
         while (1) {
@@ -73,14 +78,14 @@ void setup_rc()
                 if (confirm == 0) {
                     rc_keymap[i] = remote_code;
                     strncpy(menu_row1, "Confirm", LCD_ROW_LEN+1);
-                    lcd_write_menu();
+                    ui_disp_menu(1);
                     confirm = 1;
                 } else {
                     if (remote_code == rc_keymap[i]) {
                         confirm = 2;
                     } else {
                         strncpy(menu_row1, "Mismatch, retry", LCD_ROW_LEN+1);
-                        lcd_write_menu();
+                        ui_disp_menu(1);
                         confirm = 0;
                     }
                 }
@@ -106,6 +111,8 @@ void setup_rc()
         }
     }
     write_userdata(INIT_CONFIG_SLOT);
+
+    osd->osd_config.menu_active = 0;
 }
 
 int parse_control()
@@ -153,43 +160,97 @@ int parse_control()
             osd->osd_config.menu_active = menu_active;
             profile_sel_menu = profile_sel;
 
-            if (menu_active)
+            if (menu_active) {
+                render_osd_page();
                 display_menu(1);
-            else
-                lcd_write_status();
+            } else {
+                ui_disp_status(0);
+            }
 
             break;
         case RC_INFO:
             sc_status = sc->sc_status;
             sc_status2 = sc->sc_status2;
-            sniprintf(menu_row1, LCD_ROW_LEN+1, "Prof.%u %9s", profile_sel, video_modes[cm.id].name);
-            if (cm.sync_active) {
-                //fpga_v_hz_x100 = (100*TVP_EXTCLK_HZ)/IORD_ALTERA_AVALON_PIO_DATA(PIO_8_BASE);
-                /*sniprintf(menu_row2, LCD_ROW_LEN+1, "%4lu%c%c  %3lu.%.2luHz", (((fpga_status & 0x7ff)+1)<<fpga_ilace)+fpga_ilace,
-                                                                              fpga_ilace ? 'i' : 'p',
-                                                                              ((fpga_status >> 16) & 0x3) ? '*' : ' ',
-                                                                              fpga_v_hz_x100/100,
-                                                                              fpga_v_hz_x100%100);*/
-                sniprintf(menu_row2, LCD_ROW_LEN+1, "%4lu%c%c  %lu", (unsigned long)((sc_status.vmax+1)<<sc_status.interlace_flag)+sc_status.interlace_flag,
-                                                                     sc_status.interlace_flag ? 'i' : 'p',
-                                                                     sc_status.fpga_vsyncgen ? '*' : ' ',
-                                                                     (unsigned long)sc_status2.pcnt_frame);
+            fpga_v_hz_x100 = (100*TVP_EXTCLK_HZ)/sc_status2.pcnt_frame;
+
+            if (!menu_active) {
+                memset((void*)osd->osd_array.data, 0, sizeof(osd_char_array));
+                read_userdata(profile_sel, 1);
+                sniprintf((char*)osd->osd_array.data[0][0], OSD_CHAR_COLS, "Profile:");
+                sniprintf((char*)osd->osd_array.data[0][1], OSD_CHAR_COLS, "%u: %s", profile_sel, (target_profile_name[0] == 0) ? "<empty>" : target_profile_name);
+                if (cm.sync_active) {
+                    sniprintf((char*)osd->osd_array.data[1][0], OSD_CHAR_COLS, "Mode preset:");
+                    sniprintf((char*)osd->osd_array.data[1][1], OSD_CHAR_COLS, "%s", video_modes[cm.id].name);
+                    sniprintf((char*)osd->osd_array.data[2][0], OSD_CHAR_COLS, "Imode (FPGA):");
+                    sniprintf((char*)osd->osd_array.data[2][1], OSD_CHAR_COLS, "%lu-%c%c %lu.%.2luHz", (unsigned long)((sc_status.vmax+1)<<sc_status.interlace_flag)+sc_status.interlace_flag,
+                                                                             sc_status.interlace_flag ? 'i' : 'p',
+                                                                             sc_status.fpga_vsyncgen ? '*' : ' ',
+                                                                             fpga_v_hz_x100/100,
+                                                                             fpga_v_hz_x100%100);
+                    sniprintf((char*)osd->osd_array.data[3][0], OSD_CHAR_COLS, "Ccnt / frame:");
+                    sniprintf((char*)osd->osd_array.data[3][1], OSD_CHAR_COLS, "%lu", (unsigned long)sc_status2.pcnt_frame);
+                }
+                sniprintf((char*)osd->osd_array.data[4][0], OSD_CHAR_COLS, "Firmware:");
+                sniprintf((char*)osd->osd_array.data[4][1], OSD_CHAR_COLS, "%u.%.2u" FW_SUFFIX1 FW_SUFFIX2, FW_VER_MAJOR, FW_VER_MINOR);
+                osd->osd_config.status_refresh = 1;
+                osd->osd_row_color.mask = 0;
+                osd->osd_sec_enable[0].mask = 0x1f;
+                osd->osd_sec_enable[1].mask = 0x1f;
             }
-            osd->osd_config.menu_active = 1;
-            lcd_write_menu();
             break;
         case RC_LCDBL:
             sys_ctrl ^= LCD_BL;
             break;
-        case RC_SL_MODE: tc.sl_mode = (tc.sl_mode < SL_MODE_MAX) ? (tc.sl_mode + 1) : 0; break;
-        case RC_SL_TYPE: tc.sl_type = (tc.sl_type < SL_TYPE_MAX) ? (tc.sl_type + 1) : 0; break;
-        case RC_SL_MINUS: tc.sl_str = tc.sl_str ? (tc.sl_str - 1) : 0; break;
-        case RC_SL_PLUS: tc.sl_str = (tc.sl_str < SCANLINESTR_MAX) ? (tc.sl_str + 1) : SCANLINESTR_MAX; break;
+        case RC_SL_MODE:
+            tc.sl_mode = (tc.sl_mode < SL_MODE_MAX) ? (tc.sl_mode + 1) : 0;
+            if (!menu_active) {
+                strncpy((char*)osd->osd_array.data[0][0], menu_scanlines.items[0].name, OSD_CHAR_COLS);
+                strncpy((char*)osd->osd_array.data[1][0], menu_scanlines.items[0].sel.setting_str[tc.sl_mode], OSD_CHAR_COLS);
+                osd->osd_config.status_refresh = 1;
+                osd->osd_row_color.mask = 0;
+                osd->osd_sec_enable[0].mask = 3;
+                osd->osd_sec_enable[1].mask = 0;
+            } else if (get_current_menunavi()->m == &menu_scanlines) {
+                render_osd_page();
+            }
+            break;
+        case RC_SL_TYPE:
+            tc.sl_type = (tc.sl_type < SL_TYPE_MAX) ? (tc.sl_type + 1) : 0;
+            if (!menu_active) {
+                strncpy((char*)osd->osd_array.data[0][0], menu_scanlines.items[7].name, OSD_CHAR_COLS);
+                strncpy((char*)osd->osd_array.data[1][0], menu_scanlines.items[7].sel.setting_str[tc.sl_type], OSD_CHAR_COLS);
+                osd->osd_config.status_refresh = 1;
+                osd->osd_row_color.mask = 0;
+                osd->osd_sec_enable[0].mask = 3;
+                osd->osd_sec_enable[1].mask = 0;
+            } else if (get_current_menunavi()->m == &menu_scanlines) {
+                render_osd_page();
+            }
+            break;
+        case RC_SL_MINUS:
+        case RC_SL_PLUS:
+            if (i == RC_SL_MINUS)
+                tc.sl_str = tc.sl_str ? (tc.sl_str - 1) : 0;
+            else
+                tc.sl_str = (tc.sl_str < SCANLINESTR_MAX) ? (tc.sl_str + 1) : SCANLINESTR_MAX;
+
+            if (!menu_active) {
+                strncpy((char*)osd->osd_array.data[0][0], menu_scanlines.items[1].name, OSD_CHAR_COLS);
+                menu_scanlines.items[1].num.df(tc.sl_str);
+                strncpy((char*)osd->osd_array.data[1][0], menu_row2, OSD_CHAR_COLS);
+                osd->osd_config.status_refresh = 1;
+                osd->osd_row_color.mask = 0;
+                osd->osd_sec_enable[0].mask = 3;
+                osd->osd_sec_enable[1].mask = 0;
+            } else if (get_current_menunavi()->m == &menu_scanlines) {
+                render_osd_page();
+            }
+            break;
         case RC_LM_MODE:
             strncpy(menu_row1, "Linemult mode:", LCD_ROW_LEN+1);
             strncpy(menu_row2, "press 1-5", LCD_ROW_LEN+1);
             osd->osd_config.menu_active = 1;
-            lcd_write_menu();
+            ui_disp_menu(1);
 
             while (1) {
                 btn_vec = IORD_ALTERA_AVALON_PIO_DATA(PIO_1_BASE) & RC_MASK;
@@ -208,7 +269,7 @@ int parse_control()
                         *pmcfg_ptr[video_modes[cm.id].group] = i;
                     } else {
                         sniprintf(menu_row2, LCD_ROW_LEN+1, "%ux unsupported", i+1);
-                        lcd_write_menu();
+                        ui_disp_menu(1);
                         usleep(500000);
                     }
                     break;
@@ -218,27 +279,39 @@ int parse_control()
 
                 usleep(WAITLOOP_SLEEP_US);
             }
-            osd->osd_config.menu_active = 0;
-            lcd_write_status();
             menu_active = 0;
+            osd->osd_config.menu_active = 0;
+            ui_disp_status(0);
             break;
+        case RC_PHASE_MINUS:
         case RC_PHASE_PLUS:
-            video_modes[cm.id].sampler_phase = (video_modes[cm.id].sampler_phase < SAMPLER_PHASE_MAX) ? (video_modes[cm.id].sampler_phase + 1) : 0;
-            update_cur_vm = 1;
-            if (cm.id == vm_edit)
-                tc_sampler_phase = video_modes[vm_edit].sampler_phase;
-            break;
-        case RC_PHASE_MINUS: video_modes[cm.id].sampler_phase = video_modes[cm.id].sampler_phase ? (video_modes[cm.id].sampler_phase - 1) : SAMPLER_PHASE_MAX;
+            if (i == RC_PHASE_MINUS)
+                video_modes[cm.id].sampler_phase = video_modes[cm.id].sampler_phase ? (video_modes[cm.id].sampler_phase - 1) : SAMPLER_PHASE_MAX;
+            else
+                video_modes[cm.id].sampler_phase = (video_modes[cm.id].sampler_phase < SAMPLER_PHASE_MAX) ? (video_modes[cm.id].sampler_phase + 1) : 0;
+
             update_cur_vm = 1;
             if (cm.id == vm_edit)
                 tc_sampler_phase = video_modes[vm_edit].sampler_phase;
+
+            if (!menu_active) {
+                strncpy((char*)osd->osd_array.data[0][0], menu_advtiming.items[8].name, OSD_CHAR_COLS);
+                sniprintf(menu_row2, LCD_ROW_LEN+1, "%d deg", (video_modes[cm.id].sampler_phase*1125)/100);
+                strncpy((char*)osd->osd_array.data[1][0], menu_row2, OSD_CHAR_COLS);
+                osd->osd_config.status_refresh = 1;
+                osd->osd_row_color.mask = 0;
+                osd->osd_sec_enable[0].mask = 3;
+                osd->osd_sec_enable[1].mask = 0;
+            } else if (get_current_menunavi()->m == &menu_advtiming) {
+                render_osd_page();
+            }
             break;
         case RC_PROF_HOTKEY:
 Prof_Hotkey_Prompt:
             strncpy(menu_row1, "Profile load:", LCD_ROW_LEN+1);
             sniprintf(menu_row2, LCD_ROW_LEN+1, "press %u-%u", prof_x10*10, ((prof_x10*10+9) > MAX_PROFILE) ? MAX_PROFILE : (prof_x10*10+9));
             osd->osd_config.menu_active = 1;
-            lcd_write_menu();
+            ui_disp_menu(1);
 
             while (1) {
                 btn_vec = IORD_ALTERA_AVALON_PIO_DATA(PIO_1_BASE) & RC_MASK;
@@ -253,7 +326,7 @@ Prof_Hotkey_Prompt:
                         profile_sel_menu = prof_x10*10 + ((i+1)%10);
                         retval = load_profile();
                         sniprintf(menu_row2, LCD_ROW_LEN+1, "%s", (retval==0) ? "Done" : "Failed");
-                        lcd_write_menu();
+                        ui_disp_menu(1);
                         usleep(500000);
                         break;
                     } else if (i == RC_PROF_HOTKEY) {
@@ -269,9 +342,9 @@ Prof_Hotkey_Prompt:
                 usleep(WAITLOOP_SLEEP_US);
             }
 
-            osd->osd_config.menu_active = 0;
-            lcd_write_status();
             menu_active = 0;
+            osd->osd_config.menu_active = 0;
+            ui_disp_status(0);
             break;
         case RC_RIGHT:
             if (!menu_active)

software/sys_controller/ossc/fat16_export.c

@@ -0,0 +1,133 @@
+//
+// Copyright (C) 2020 Ari Sundholm <megari@iki.fi>
+//
+// This file has been contributed to the Open Source Scan Converter project
+// developed by Markus Hiienkari Markus Hiienkari <mhiienka@niksula.hut.fi>
+// and other members of the retro gaming community.
+//
+// This 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.
+//
+// This 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <string.h>
+#include "fat16_export.h"
+
+/*
+ * The beginning of the boot sector, along with the BPB.
+ */
+static const alt_u8 bootsec_beg_bpb_16[27] = {
+    0xeb, 0x00, 0x90,                               /* 0x000: Code (x86 short jump + NOP) */
+    0x4d, 0x53, 0x57, 0x49, 0x4e, 0x34, 0x2e, 0x31, /* 0x003: OS Name */
+    0x00, 0x02, 0x04, 0x80, 0x00, 0x02, 0x00, 0x08, /* 0x00B: Bios Parameter Block */
+    0x00, 0x80, 0xf8, 0x20, 0x00, 0x3f, 0x00, 0xff,
+};
+
+/*
+ * The rest of the boot sector before the boot code and terminator.
+ * Offsets 0x024 to 0x03d, inclusive.
+ */
+static const alt_u8 bootsec_after_bpb_16[26] = {
+    /* Zeros             */ 0x80, 0x00, 0x29, 0xf4, /* 0x024...0x027 */
+    0xcf, 0xc6, 0x04, 0x4f, 0x53, 0x53, 0x43, 0x50, /* 0x028...0x02f */
+    0x52, 0x4f, 0x46, 0x49, 0x4c, 0x53, 0x46, 0x41, /* 0x030...0x037 */
+    0x54, 0x31, 0x36, 0x20, 0x20, 0x20, /* Zeros */ /* 0x038...0x03d */
+};
+
+/*
+ * After this, we have the boot code (448 bytes) and sector terminator
+ * (2 bytes). The former will be left zeroed-out and the latter will
+ * be generated.
+ */
+
+/* Generates a FAT16 boot sector.
+ * buf must be at least FAT16_SECTOR_SIZE bytes long,
+ * and is assumed to be pre-zeroed.
+ */
+void generate_boot_sector_16(alt_u8 *const buf) {
+    /* Initial FAT16 boot sector contents + the BPB. */
+    memcpy(buf, bootsec_beg_bpb_16, sizeof(bootsec_beg_bpb_16));
+
+    /*
+     * Then the rest of the boot sector.
+     *
+     * The boot code is supposed to be 448 bytes filled with 0xf4,
+     * but leave it zeroed out to keep the code smaller. This may
+     * be a deviation from the FAT16 spec, but should be harmless
+     * for our purposes.
+     */
+    memcpy(buf + 36, bootsec_after_bpb_16, sizeof(bootsec_after_bpb_16));
+
+    /* RISC-V is little-endian, so do a 16-bit write instead. */
+    *((alt_u16*)(buf + 510)) = 0xaa55U;
+}
+
+/* The fixed 'preamble' of a FAT on a FAT16 volume. */
+static const alt_u32 fat16_preamble = 0xfffffff8U;
+
+/*
+ * Generate a FAT.
+ * The buffer is assumed to be zeroed out and have a size of at least
+ * FAT16_SECTOR_SIZE bytes.
+ * The number of clusters already written is given as an argument.
+ * The function returns the total number of clusters written so far.
+ *
+ * The intention is to be able to generate and write the FAT in chunks
+ * that do not exhaust all the remaining RAM.
+ */
+alt_u16 generate_fat16(void *const buf, const alt_u16 written) {
+	alt_u16 cur_ofs = 0;
+    const alt_u16 start_cluster = 3U + written;
+    alt_u16 *const fat = buf;
+
+    /*
+     * The total number of FAT entries to write consists of:
+     * 1. The FAT "preamble" (2 entries),
+     * 2. The cluster chain of the file (512 entries).
+     *
+     * The latter needs to contain the chain terminator.
+     */
+    const alt_u16 clusters_remaining = PROF_16_CLUSTER_COUNT - written;
+    const alt_u16 preamble_compensation = written ? 0 : 2U;
+    const alt_u16 clusters_to_write =
+        ((clusters_remaining > FAT16_ENTRIES_PER_SECTOR)
+            ? FAT16_ENTRIES_PER_SECTOR
+            : clusters_remaining) - preamble_compensation;
+    const alt_u16 end_cluster = start_cluster + clusters_to_write;
+    const alt_u16 last_fat_cluster = PROF_16_CLUSTER_COUNT + 2U;
+
+    if (!written) {
+        *((alt_u32*)fat) = fat16_preamble;
+        cur_ofs += sizeof(fat16_preamble)/sizeof(alt_u16);
+    }
+
+    for (alt_u16 cluster = start_cluster; cluster < end_cluster; ++cluster) {
+        alt_u16 *const cur_entry = fat + cur_ofs;
+        /* FAT16 entries are 16-bit little-endian. */
+        if (cluster == last_fat_cluster) {
+            /* At the last cluster, write the chain terminator. */
+            *cur_entry = 0xffffU;
+        }
+        else {
+            *cur_entry = cluster;
+        }
+        ++cur_ofs;
+    }
+
+    return end_cluster - 3U;
+}
+
+const alt_u8 prof_dirent_16[PROF_DIRENT_16_SIZE] = {
+    0x4f, 0x53, 0x53, 0x43, 0x50, 0x52, 0x4f, 0x46, 0x42, 0x49, 0x4e, 0x20,
+    0x00, 0x8e, 0x04, 0xb5, 0x6f, 0x51, 0x6f, 0x51, 0x00, 0x00, 0x17, 0x89,
+    0x6f, 0x51, 0x02, 0x00, 0x00, 0x02, 0x10, 0x00,
+};

software/sys_controller/ossc/fat16_export.h

@@ -0,0 +1,83 @@
+//
+// Copyright (C) 2020 Ari Sundholm <megari@iki.fi>
+//
+// This file has been contributed to the Open Source Scan Converter project
+// developed by Markus Hiienkari Markus Hiienkari <mhiienka@niksula.hut.fi>
+// and other members of the retro gaming community.
+//
+// This 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.
+//
+// This 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef FAT16_EXPORT_H_
+#define FAT16_EXPORT_H_
+
+#include "alt_types.h"
+
+/* Use a sector size of 512 bytes. */
+#define FAT16_SECTOR_SIZE 512U
+
+/* This volume has 2048-byte clusters. */
+#define FAT16_CLUSTER_SIZE 2048U
+#define FAT16_SECTORS_PER_CLUSTER (FAT16_CLUSTER_SIZE/FAT16_SECTOR_SIZE)
+
+/* Offsets of the two File Allocation Tables. */
+#define FAT16_1_OFS 0x10000UL
+#define FAT16_2_OFS 0x14000UL
+
+/* Each FAT16 entry is a 16-bit little-endian integer. */
+#define FAT16_ENTRY_SIZE 2U
+#define FAT16_ENTRY_SHIFT 1U
+#define FAT16_ENTRIES_PER_SECTOR (FAT16_SECTOR_SIZE >> FAT16_ENTRY_SHIFT)
+
+/* On this volume, each FAT will be 16 kiB in size. */
+#define FAT16_SIZE 0x04000UL
+
+/* The first sector of the root directory. */
+#define FAT16_ROOT_DIR_FIRST_SECTOR 192U
+
+/* The length of the root directory in sectors. */
+#define FAT16_ROOT_DIR_SECTORS 128U
+
+/*
+ * Define the properties and contents of the directory entry for the
+ * settings file.
+ */
+#define PROF_DIRENT_16_OFS  0x18000UL
+#define PROF_DIRENT_16_SIZE 32U
+
+extern const alt_u8 prof_dirent_16[PROF_DIRENT_16_SIZE];
+
+#define PROF_16_DATA_OFS  0x028000UL
+#define PROF_16_DATA_SIZE 0x100200UL
+#define PROF_16_CLUSTER_COUNT ((PROF_16_DATA_SIZE/FAT16_CLUSTER_SIZE)+!!(PROF_16_DATA_SIZE%FAT16_CLUSTER_SIZE))
+/* Profile file data starts at offset 0x00028000 */
+/* Profile file data  ends  at offset 0x00128200 */
+/* Profile file data is 1049088 bytes long. */
+
+
+/* Generate a FAT16 boot sector.
+ * buf must be at least FAT16_BOOT_SECTOR_SIZE bytes long,
+ * and is assumed to be pre-zeroed.
+ */
+void generate_boot_sector_16(alt_u8 *buf);
+
+/*
+ * Generate a FAT of a FAT16 volume.
+ * The buffer is assumed to be zeroed out and have a size of at least 512 bytes.
+ * The number of clusters already written are given as an argument.
+ * The function returns the total number of clusters written so far.
+ */
+alt_u16 generate_fat16(void *buf, alt_u16 written);
+
+#endif // FAT16_EXPORT_H_

software/sys_controller/ossc/firmware.c

@@ -27,6 +27,7 @@
 #include "av_controller.h"
 #include "lcd.h"
 #include "utils.h"
+#include "menu.h"
 #include "altera_avalon_pio_regs.h"
 
 extern char menu_row1[LCD_ROW_LEN+1], menu_row2[LCD_ROW_LEN+1];
@@ -71,15 +72,14 @@ static int check_fw_header(alt_u8 *databuf, fw_hdr *hdr)
 static int check_fw_image(alt_u32 offset, alt_u32 size, alt_u32 golden_crc, alt_u8 *tmpbuf)
 {
     alt_u32 crcval=0, i, bytes_to_read;
-    int retval;
+    SDRESULTS res;
 
     for (i=0; i<size; i=i+SD_BLK_SIZE) {
         bytes_to_read = ((size-i < SD_BLK_SIZE) ? (size-i) : SD_BLK_SIZE);
-        retval = SD_Read(&sdcard_dev, tmpbuf, (offset+i)/SD_BLK_SIZE, 0, bytes_to_read);
-        //retval = read_sd_block(offset+i, bytes_to_read, tmpbuf);
+        res = SD_Read(&sdcard_dev, tmpbuf, (offset+i)/SD_BLK_SIZE, 0, bytes_to_read);
 
-        if (retval != SD_OK)
-            return retval;
+        if (res != SD_OK)
+            return -res;
 
         crcval = crc32(tmpbuf, bytes_to_read, (i==0));
     }
@@ -106,14 +106,16 @@ int fw_update()
     asm volatile("mov %0, sp" : "=r"(sp));
     sniprintf(menu_row1, LCD_ROW_LEN+1, "Stack size:");
     sniprintf(menu_row2, LCD_ROW_LEN+1, "%lu bytes", (ONCHIP_MEMORY2_0_BASE+ONCHIP_MEMORY2_0_SIZE_VALUE)-sp);
-    lcd_write_menu();
+    ui_disp_menu(1);
     usleep(1000000);
 #endif
 
     retval = check_sdcard(databuf);
     SPI_CS_High();
-    if (retval != 0)
+    if (retval != 0) {
+        retval = -retval;
         goto failure;
+    }
 
     retval = check_fw_header(databuf, &fw_header);
     if (retval != 0)
@@ -121,14 +123,14 @@ int fw_update()
 
     sniprintf(menu_row1, LCD_ROW_LEN+1, "Validating data");
     sniprintf(menu_row2, LCD_ROW_LEN+1, "%u bytes", (unsigned)fw_header.data_len);
-    lcd_write_menu();
+    ui_disp_menu(1);
     retval = check_fw_image(512, fw_header.data_len, fw_header.data_crc, databuf);
     if (retval != 0)
         goto failure;
 
     sniprintf(menu_row1, LCD_ROW_LEN+1, "%u.%.2u%s%s", fw_header.version_major, fw_header.version_minor, (fw_header.version_suffix[0] == 0) ? "" : "-", fw_header.version_suffix);
     strncpy(menu_row2, "Update? 1=Y, 2=N", LCD_ROW_LEN+1);
-    lcd_write_menu();
+    ui_disp_menu(1);
 
     while (1) {
         btn_vec = IORD_ALTERA_AVALON_PIO_DATA(PIO_1_BASE) & RC_MASK;
@@ -152,7 +154,7 @@ int fw_update()
     strncpy(menu_row1, "Updating FW", LCD_ROW_LEN+1);
 update_init:
     strncpy(menu_row2, "please wait...", LCD_ROW_LEN+1);
-    lcd_write_menu();
+    ui_disp_menu(1);
 
     retval = copy_sd_to_flash(512/SD_BLK_SIZE, 0, fw_header.data_len, databuf);
     if (retval != 0)
@@ -160,7 +162,7 @@ update_init:
 
     strncpy(menu_row1, "Verifying flash", LCD_ROW_LEN+1);
     strncpy(menu_row2, "please wait...", LCD_ROW_LEN+1);
-    lcd_write_menu();
+    ui_disp_menu(1);
     retval = verify_flash(0, fw_header.data_len, fw_header.data_crc, databuf);
     if (retval != 0)
         goto failure;
@@ -169,7 +171,7 @@ update_init:
 
     strncpy(menu_row1, "Firmware updated", LCD_ROW_LEN+1);
     strncpy(menu_row2, "please restart", LCD_ROW_LEN+1);
-    lcd_write_menu();
+    ui_disp_menu(1);
     while (1) {}
 
     return 0;
@@ -196,24 +198,15 @@ failure:
         case FW_UPD_CANCELLED:
             errmsg = "Update cancelled";
             break;
-        case -FLASH_READ_ERROR:
-            errmsg = "Flash read err";
-            break;
-        case -FLASH_ERASE_ERROR:
-            errmsg = "Flash erase err";
-            break;
-        case -FLASH_WRITE_ERROR:
-            errmsg = "Flash write err";
-            break;
         case -FLASH_VERIFY_ERROR:
             errmsg = "Flash verif fail";
             break;
         default:
-            errmsg = "Error";
+            errmsg = "SD/Flash error";
             break;
     }
     strncpy(menu_row2, errmsg, LCD_ROW_LEN+1);
-    lcd_write_menu();
+    ui_disp_menu(1);
     usleep(1000000);
 
     // Critical error, retry update
@@ -223,5 +216,6 @@ failure:
         goto update_init;
     }
 
+    render_osd_page();
     return -1;
 }

software/sys_controller/ossc/firmware.h

@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2015-2019  Markus Hiienkari <mhiienka@niksula.hut.fi>
+// Copyright (C) 2015-2022  Markus Hiienkari <mhiienka@niksula.hut.fi>
 //
 // This file is part of Open Source Scan Converter project.
 //
@@ -24,10 +24,10 @@
 #include "sysconfig.h"
 
 #define FW_VER_MAJOR            0
-#define FW_VER_MINOR            85
+#define FW_VER_MINOR            90
 
 #define PROFILE_VER_MAJOR       0
-#define PROFILE_VER_MINOR       85
+#define PROFILE_VER_MINOR       88
 
 #define INITCFG_VER_MAJOR       0
 #define INITCFG_VER_MINOR       85

software/sys_controller/ossc/menu.c

@@ -29,12 +29,6 @@
 #define OPT_NOWRAP  0
 #define OPT_WRAP    1
 
-#ifdef OSDLANG_JP
-#define LNG(e, j) j
-#else
-#define LNG(e, j) e
-#endif
-
 extern char row1[LCD_ROW_LEN+1], row2[LCD_ROW_LEN+1], menu_row1[LCD_ROW_LEN+1], menu_row2[LCD_ROW_LEN+1];
 extern avmode_t cm;
 extern avconfig_t tc;
@@ -44,7 +38,7 @@ extern alt_u16 rc_keymap[REMOTE_MAX_KEYS];
 extern alt_u8 vm_sel, profile_sel_menu, lt_sel, def_input, profile_link, lcd_bl_timeout;
 extern alt_u8 auto_input, auto_av1_ypbpr, auto_av2_ypbpr, auto_av3_ypbpr;
 extern alt_u8 update_cur_vm;
-extern alt_u8 osd_enable_pre, osd_status_timeout_pre;
+extern alt_u8 osd_enable, osd_status_timeout;
 extern char target_profile_name[PROFILE_NAME_LEN+1];
 extern volatile osd_regs *osd;
 
@@ -55,9 +49,10 @@ alt_u8 vm_sel, vm_edit;
 static const char *off_on_desc[] = { LNG("Off","ｵﾌ"), LNG("On","ｵﾝ") };
 static const char *video_lpf_desc[] = { LNG("Auto","ｵｰﾄ"), LNG("Off","ｵﾌ"), "95MHz (HDTV II)", "35MHz (HDTV I)", "16MHz (EDTV)", "9MHz (SDTV)" };
 static const char *ypbpr_cs_desc[] = { "Rec. 601", "Rec. 709", "Auto" };
-static const char *s480p_mode_desc[] = { LNG("Auto","ｵｰﾄ"), "DTV 480p", "VESA 640x480@60" };
+static const char *s480p_mode_desc[] = { LNG("Auto","ｵｰﾄ"), "DTV 480p", "VESA 640x480@60", "PSP 480x272" };
 static const char *s400p_mode_desc[] = { "VGA 640x400@70", "VGA 720x400@70" };
 static const char *sync_lpf_desc[] = { LNG("2.5MHz (max)","2.5MHz (ｻｲﾀﾞｲ)"), LNG("10MHz (med)","10MHz (ﾁｭｳｲ)"), LNG("33MHz (min)","33MHz (ｻｲｼｮｳ)"), LNG("Off","ｵﾌ") };
+static const char *stc_lpf_desc[] = { "4.8MHz (HDTV/PC)", "0.5MHz (SDTV)", "1.7MHz (EDTV)" };
 static const char *l3_mode_desc[] = { LNG("Generic 16:9","ｼﾞｪﾈﾘｯｸ 16:9"), LNG("Generic 4:3","ｼﾞｪﾈﾘｯｸ 4:3"), LNG("512x240 optim.","512x240 ｻｲﾃｷｶ."), LNG("384x240 optim.","384x240 ｻｲﾃｷｶ."), LNG("320x240 optim.","320x240 ｻｲﾃｷｶ."), LNG("256x240 optim.","256x240 ｻｲﾃｷｶ.") };
 static const char *l2l4l5_mode_desc[] = { LNG("Generic 4:3","ｼﾞｪﾈﾘｯｸ 4:3"), LNG("512x240 optim.","512x240 ｻｲﾃｷｶ."), LNG("384x240 optim.","384x240 ｻｲﾃｷｶ."), LNG("320x240 optim.","320x240 ｻｲﾃｷｶ."), LNG("256x240 optim.","256x240 ｻｲﾃｷｶ.") };
 static const char *l5_fmt_desc[] = { "1920x1080", "1600x1200", "1920x1200" };
@@ -66,7 +61,7 @@ static const char *pm_480i_desc[] = { LNG("Passthru","ﾊﾟｽｽﾙｰ"), "Lin
 static const char *pm_384p_desc[] = { LNG("Passthru","ﾊﾟｽｽﾙｰ"), "Line2x", "Line2x 240x360", "Line3x 240x360", "Line3x Generic" };
 static const char *pm_480p_desc[] = { LNG("Passthru","ﾊﾟｽｽﾙｰ"), "Line2x" };
 static const char *pm_1080i_desc[] = { LNG("Passthru","ﾊﾟｽｽﾙｰ"), "Line2x (bob)" };
-static const char *ar_256col_desc[] = { "4:3", "8:7" };
+static const char *ar_256col_desc[] = { "Pseudo 4:3 DAR", "1:1 PAR" };
 static const char *tx_mode_desc[] = { "HDMI (RGB)", "HDMI (YCbCr444)", "DVI" };
 static const char *sl_mode_desc[] = { LNG("Off","ｵﾌ"), LNG("Auto","ｵｰﾄ"), LNG("On","ｵﾝ") };
 static const char *sl_method_desc[] = { LNG("Multiplication","Multiplication"), LNG("Subtraction","Subtraction") };
@@ -75,10 +70,12 @@ static const char *sl_id_desc[] = { LNG("Top","ｳｴ"), LNG("Bottom","ｼﾀ")
 static const char *audio_dw_sampl_desc[] = { LNG("Off (fs = 96kHz)","ｵﾌ (fs = 96kHz)"), "2x  (fs = 48kHz)" };
 static const char *lt_desc[] = { "Top-left", "Center", "Bottom-right" };
 static const char *lcd_bl_timeout_desc[] = { "Off", "3s", "10s", "30s" };
+static const char *osd_enable_desc[] = { "Off", "Full", "Simple" };
 static const char *osd_status_desc[] = { "2s", "5s", "10s", "Off" };
 static const char *rgsb_ypbpr_desc[] = { "RGsB", "YPbPr" };
 static const char *auto_input_desc[] = { "Off", "Current input", "All inputs" };
 static const char *mask_color_desc[] = { "Black", "Blue", "Green", "Cyan", "Red", "Magenta", "Yellow", "White" };
+static const char *av3_alt_rgb_desc[] = { "Off", "AV1", "AV2" };
 
 static void sync_vth_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%d mV", (v*1127)/100); }
 static void intclks_to_time_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%u.%.2u us", (unsigned)(((1000000U*v)/(TVP_INTCLK_HZ/1000))/1000), (unsigned)((((1000000U*v)/(TVP_INTCLK_HZ/1000))%1000)/10)); }
@@ -88,12 +85,15 @@ static void sl_cust_str_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%u
 static void sl_hybr_str_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%u%%", (v*625)/100); }
 static void lines_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, LNG("%u lines","%u ﾗｲﾝ"), v); }
 static void pixels_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, LNG("%u pixels","%u ﾄﾞｯﾄ"), v); }
-static void value_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "    %u", v); }
+static void value_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%u", v); }
+static void signed_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%d", (alt_8)(v-SIGNED_NUMVAL_ZERO)); }
 static void lt_disp(alt_u8 v) { strncpy(menu_row2, lt_desc[v], LCD_ROW_LEN+1); }
 static void aud_db_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%d dB", ((alt_8)v-AUDIO_GAIN_0DB)); }
 static void vm_display_name (alt_u8 v) { strncpy(menu_row2, video_modes[v].name, LCD_ROW_LEN+1); }
 static void link_av_desc (avinput_t v) { strncpy(menu_row2, v == AV_LAST ? "No link" : avinput_str[v], LCD_ROW_LEN+1); }
 static void profile_disp(alt_u8 v) { read_userdata(v, 1); sniprintf(menu_row2, LCD_ROW_LEN+1, "%u: %s", v, (target_profile_name[0] == 0) ? "<empty>" : target_profile_name); }
+static void alc_v_filter_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, LNG("%u lines","%u ﾗｲﾝ"), (1<<v)); }
+static void alc_h_filter_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, LNG("%u pixels","%u ﾄﾞｯﾄ"), (1<<(v+1))); }
 //static void coarse_gain_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%u.%u", ((v*10)+50)/100, (((v*10)+50)%100)/10); }
 
 static const arg_info_t vm_arg_info = {&vm_sel, VIDEO_MODES_CNT-1, vm_display_name};
@@ -103,7 +103,7 @@ static const arg_info_t lt_arg_info = {&lt_sel, (sizeof(lt_desc)/sizeof(char*))-
 
 MENU(menu_advtiming, P99_PROTECT({ \
     { LNG("H. samplerate","H. ｻﾝﾌﾟﾙﾚｰﾄ"),        OPT_AVCONFIG_NUMVAL_U16,{ .num_u16 = { &tc_h_samplerate, H_TOTAL_MIN,   H_TOTAL_MAX, vm_tweak } } },
-    { "H. s.rate adj",                           OPT_AVCONFIG_NUMVAL_U16,{ .num_u16 = { &tc_h_samplerate_adj, 0,  H_TOTAL_ADJ_MAX, vm_tweak } } },
+    { "H. s.rate frac",                           OPT_AVCONFIG_NUMVAL_U16,{ .num_u16 = { &tc_h_samplerate_adj, 0,  H_TOTAL_ADJ_MAX, vm_tweak } } },
     { LNG("H. synclen","H. ﾄﾞｳｷﾅｶﾞｻ"),       OPT_AVCONFIG_NUMVAL_U16,{ .num_u16 = { &tc_h_synclen,    H_SYNCLEN_MIN, H_SYNCLEN_MAX, vm_tweak } } },
     { LNG("H. backporch","H. ﾊﾞｯｸﾎﾟｰﾁ"),        OPT_AVCONFIG_NUMVAL_U16,{ .num_u16 = { &tc_h_bporch,     H_BPORCH_MIN,  H_BPORCH_MAX, vm_tweak } } },
     { LNG("H. active","H. ｱｸﾃｨﾌﾞ"),             OPT_AVCONFIG_NUMVAL_U16,{ .num_u16 = { &tc_h_active,     H_ACTIVE_MIN,  H_ACTIVE_MAX, vm_tweak } } },
@@ -138,6 +138,9 @@ MENU(menu_vinputproc, P99_PROTECT({ \
     { LNG("G/Y gain","G/Y ｹﾞｲﾝ"),               OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.col.g_f_gain,  OPT_NOWRAP, 0, 0xFF, value_disp } } },
     { LNG("B/Pb gain","B/Pb ｹﾞｲﾝ"),             OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.col.b_f_gain,  OPT_NOWRAP, 0, 0xFF, value_disp } } },
     { LNG("Pre-ADC Gain","Pre-ADC Gain"),       OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.col.c_gain,    OPT_NOWRAP, 0, COARSE_GAIN_MAX, value_disp } } },
+    { "Clamp/ALC offset",                       OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.clamp_offset,  OPT_NOWRAP, CLAMP_OFFSET_MIN, CLAMP_OFFSET_MAX, signed_disp } } },
+    { "ALC V filter",                           OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.alc_v_filter,  OPT_NOWRAP, 0, ALC_V_FILTER_MAX, alc_v_filter_disp } } },
+    { "ALC H filter",                           OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.alc_h_filter,  OPT_NOWRAP, 0, ALC_H_FILTER_MAX, alc_h_filter_disp } } },
 }))
 
 MENU(menu_sampling, P99_PROTECT({ \
@@ -150,6 +153,7 @@ MENU(menu_sampling, P99_PROTECT({ \
 
 MENU(menu_sync, P99_PROTECT({ \
     { LNG("Analog sync LPF","ｱﾅﾛｸﾞﾄﾞｳｷ LPF"),    OPT_AVCONFIG_SELECTION, { .sel = { &tc.sync_lpf,    OPT_WRAP,   SETTING_ITEM(sync_lpf_desc) } } },
+    { "Analog STC LPF",                         OPT_AVCONFIG_SELECTION, { .sel = { &tc.stc_lpf,    OPT_WRAP,   SETTING_ITEM(stc_lpf_desc) } } },
     { LNG("Analog sync Vth","ｱﾅﾛｸﾞﾄﾞｳｷ Vth"),    OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.sync_vth,    OPT_NOWRAP, 0, SYNC_VTH_MAX, sync_vth_disp } } },
     { LNG("Hsync tolerance","Hsyncｺｳｻ"),        OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.linelen_tol, OPT_NOWRAP, 0, 0xFF, intclks_to_time_disp } } },
     { LNG("Vsync threshold","Vsyncｼｷｲﾁ"),       OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.vsync_thold, OPT_NOWRAP, VSYNC_THOLD_MIN, VSYNC_THOLD_MAX, intclks_to_time_disp } } },
@@ -197,7 +201,7 @@ MENU(menu_postproc, P99_PROTECT({ \
 MENU(menu_compatibility, P99_PROTECT({ \
     { LNG("Full TX setup","ﾌﾙTXｾｯﾄｱｯﾌﾟ"),         OPT_AVCONFIG_SELECTION, { .sel = { &tc.full_tx_setup,    OPT_WRAP, SETTING_ITEM(off_on_desc) } } },
     { LNG("AV3 interlacefix","AV3ｲﾝﾀｰﾚｰｽｼｭｳｾｲ"),  OPT_AVCONFIG_SELECTION, { .sel = { &tc.vga_ilace_fix,   OPT_WRAP, SETTING_ITEM(off_on_desc) } } },
-    { "AV3 use AV1 RGB",                        OPT_AVCONFIG_SELECTION, { .sel = { &tc.av3_alt_rgb,     OPT_WRAP, SETTING_ITEM(off_on_desc) } } },
+    { "AV3 use alt. RGB",                        OPT_AVCONFIG_SELECTION, { .sel = { &tc.av3_alt_rgb,     OPT_WRAP, SETTING_ITEM(av3_alt_rgb_desc) } } },
     { "Default HDMI VIC",                       OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.default_vic,     OPT_NOWRAP, 0, HDMI_1080p50, value_disp } } },
     { "Panasonic hack",                        OPT_AVCONFIG_SELECTION, { .sel = { &tc.panasonic_hack,   OPT_WRAP, SETTING_ITEM(off_on_desc) } } },
 }))
@@ -216,7 +220,7 @@ MENU(menu_audio, P99_PROTECT({ \
 MENU(menu_settings, P99_PROTECT({ \
     { LNG("<Load profile >","<ﾌﾟﾛﾌｧｲﾙﾛｰﾄﾞ    >"),   OPT_FUNC_CALL,         { .fun = { load_profile, &profile_arg_info } } },
     { LNG("<Save profile >","<ﾌﾟﾛﾌｧｲﾙｾｰﾌﾞ    >"),  OPT_FUNC_CALL,          { .fun = { save_profile, &profile_arg_info } } },
-    { LNG("<Reset settings>","<ｾｯﾃｲｵｼｮｷｶ    >"),  OPT_FUNC_CALL,          { .fun = { set_default_avconfig, NULL } } },
+    { LNG("<Reset settings>","<ｾｯﾃｲｦｼｮｷｶ    >"),  OPT_FUNC_CALL,          { .fun = { set_default_avconfig, NULL } } },
     { LNG("Link prof->input","Link prof->input"), OPT_AVCONFIG_NUMVALUE,  { .num = { &tc.link_av,  OPT_WRAP, AV1_RGBs, AV_LAST, link_av_desc } } },
     { LNG("Link input->prof","Link input->prof"),   OPT_AVCONFIG_SELECTION, { .sel = { &profile_link,  OPT_WRAP, SETTING_ITEM(off_on_desc) } } },
     { LNG("Initial input","ｼｮｷﾆｭｳﾘｮｸ"),          OPT_AVCONFIG_SELECTION, { .sel = { &def_input,       OPT_WRAP, SETTING_ITEM(avinput_str) } } },
@@ -225,11 +229,12 @@ MENU(menu_settings, P99_PROTECT({ \
     { "Auto AV2 Y/Gs",                          OPT_AVCONFIG_SELECTION, { .sel = { &auto_av2_ypbpr,     OPT_WRAP, SETTING_ITEM(rgsb_ypbpr_desc) } } },
     { "Auto AV3 Y/Gs",                          OPT_AVCONFIG_SELECTION, { .sel = { &auto_av3_ypbpr,     OPT_WRAP, SETTING_ITEM(rgsb_ypbpr_desc) } } },
     { "LCD BL timeout",                         OPT_AVCONFIG_SELECTION, { .sel = { &lcd_bl_timeout,  OPT_WRAP, SETTING_ITEM(lcd_bl_timeout_desc) } } },
-    { "OSD enable",                             OPT_AVCONFIG_SELECTION, { .sel = { &osd_enable_pre,   OPT_WRAP,   SETTING_ITEM(off_on_desc) } } },
-    { "OSD status disp.",                       OPT_AVCONFIG_SELECTION, { .sel = { &osd_status_timeout_pre,   OPT_WRAP,   SETTING_ITEM(osd_status_desc) } } },
+    { "OSD",                                    OPT_AVCONFIG_SELECTION, { .sel = { &osd_enable,   OPT_WRAP,   SETTING_ITEM(osd_enable_desc) } } },
+    { "OSD status disp.",                       OPT_AVCONFIG_SELECTION, { .sel = { &osd_status_timeout,   OPT_WRAP,   SETTING_ITEM(osd_status_desc) } } },
 #ifndef DEBUG
-    {     "<Import sett.  >",                     OPT_FUNC_CALL,        { .fun = { import_userdata, NULL } } },
-    { LNG("<Fw. update    >","<ﾌｧｰﾑｳｪｱｱｯﾌﾟﾃﾞｰﾄ>"), OPT_FUNC_CALL,          { .fun = { fw_update, NULL } } },
+    { LNG("<Import sett.  >","<ｾｯﾃｲﾖﾐｺﾐ      >"), OPT_FUNC_CALL,        { .fun = { import_userdata, NULL } } },
+    { LNG("<Export sett.  >","<ｾｯﾃｲｶｷｺﾐ      >"), OPT_FUNC_CALL,        { .fun = { export_userdata, NULL } } },
+    { LNG("<Fw. update    >","<ﾌｧｰﾑｳｪｱｱｯﾌﾟﾃﾞｰﾄ>"), OPT_FUNC_CALL,        { .fun = { fw_update, NULL } } },
 #endif
 }))
 
@@ -241,9 +246,9 @@ MENU(menu_main, P99_PROTECT({ \
     { LNG("Output opt.    >","ｼｭﾂﾘｮｸｵﾌﾟｼｮﾝ  >"),  OPT_SUBMENU,            { .sub = { &menu_output, NULL, NULL } } },
     { LNG("Scanline opt.  >","ｽｷｬﾝﾗｲﾝｵﾌﾟｼｮﾝ >"),  OPT_SUBMENU,            { .sub = { &menu_scanlines, NULL, NULL } } },
     { LNG("Post-proc.     >","ｱﾄｼｮﾘ         >"),  OPT_SUBMENU,            { .sub = { &menu_postproc, NULL, NULL } } },
-    { LNG("Compatibility  >","ｺﾞｶﾝｾｲ        >"), OPT_SUBMENU,             { .sub = { &menu_compatibility, NULL, NULL } } },
+    { LNG("Compatibility  >","ｺﾞｶﾝｾｲ        >"),  OPT_SUBMENU,            { .sub = { &menu_compatibility, NULL, NULL } } },
     AUDIO_MENU
-    { "Settings opt   >",                       OPT_SUBMENU,             { .sub = { &menu_settings, NULL, NULL } } },
+    { LNG("Settings opt   >","ｾｯﾃｲｶﾝﾘ       >"),  OPT_SUBMENU,            { .sub = { &menu_settings, NULL, NULL } } },
 }))
 
 // Max 3 levels currently
@@ -251,10 +256,73 @@ menunavi navi[] = {{&menu_main, 0}, {NULL, 0}, {NULL, 0}};
 alt_u8 navlvl = 0;
 
 
+menunavi* get_current_menunavi() {
+    return &navi[navlvl];
+}
+
+void write_option_value(menuitem_t *item, int func_called, int retval)
+{
+    switch (item->type) {
+        case OPT_AVCONFIG_SELECTION:
+            strncpy(menu_row2, item->sel.setting_str[*(item->sel.data)], LCD_ROW_LEN+1);
+            break;
+        case OPT_AVCONFIG_NUMVALUE:
+            item->num.df(*(item->num.data));
+            break;
+        case OPT_AVCONFIG_NUMVAL_U16:
+            item->num_u16.df(item->num_u16.data);
+            break;
+        case OPT_SUBMENU:
+            if (item->sub.arg_info)
+                item->sub.arg_info->df(*item->sub.arg_info->data);
+            else
+                menu_row2[0] = 0;
+            break;
+        case OPT_FUNC_CALL:
+            if (func_called) {
+                if (retval == 0)
+                    strncpy(menu_row2, "Done", LCD_ROW_LEN+1);
+                else if (retval < 0)
+                    sniprintf(menu_row2, LCD_ROW_LEN+1, "Failed (%d)", retval);
+            } else if (item->fun.arg_info) {
+                item->fun.arg_info->df(*item->fun.arg_info->data);
+            } else {
+                menu_row2[0] = 0;
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+void render_osd_page() {
+    int i;
+    menuitem_t *item;
+    uint32_t row_mask[2] = {0, 0};
+
+    if (!menu_active || (osd_enable != 1))
+        return;
+
+    for (i=0; i < navi[navlvl].m->num_items; i++) {
+        item = &navi[navlvl].m->items[i];
+        strncpy((char*)osd->osd_array.data[i][0], item->name, OSD_CHAR_COLS);
+        row_mask[0] |= (1<<i);
+
+        if ((item->type != OPT_SUBMENU) && (item->type != OPT_FUNC_CALL)) {
+            write_option_value(item, 0, 0);
+            strncpy((char*)osd->osd_array.data[i][1], menu_row2, OSD_CHAR_COLS);
+            row_mask[1] |= (1<<i);
+        }
+    }
+
+    osd->osd_sec_enable[0].mask = row_mask[0];
+    osd->osd_sec_enable[1].mask = row_mask[1];
+}
+
 void display_menu(alt_u8 forcedisp)
 {
     menucode_id code = NO_ACTION;
-    menuitem_type type;
+    menuitem_t *item;
     alt_u8 *val, val_wrap, val_min, val_max;
     alt_u16 *val_u16, val_u16_min, val_u16_max;
     int i, func_called = 0, retval = 0;
@@ -269,40 +337,46 @@ void display_menu(alt_u8 forcedisp)
     if (!forcedisp && !remote_code)
         return;
 
-    type = navi[navlvl].m->items[navi[navlvl].mp].type;
+    item = &navi[navlvl].m->items[navi[navlvl].mp];
 
     // Parse menu control
     switch (code) {
     case PREV_PAGE:
-        navi[navlvl].mp = (navi[navlvl].mp == 0) ? navi[navlvl].m->num_items-1 : (navi[navlvl].mp-1);
-        break;
     case NEXT_PAGE:
-        navi[navlvl].mp = (navi[navlvl].mp+1) % navi[navlvl].m->num_items;
+        if ((item->type == OPT_FUNC_CALL) || (item->type == OPT_SUBMENU))
+            osd->osd_sec_enable[1].mask &= ~(1<<navi[navlvl].mp);
+
+        if (code == PREV_PAGE)
+            navi[navlvl].mp = (navi[navlvl].mp == 0) ? navi[navlvl].m->num_items-1 : (navi[navlvl].mp-1);
+        else
+            navi[navlvl].mp = (navi[navlvl].mp+1) % navi[navlvl].m->num_items;
         break;
     case PREV_MENU:
         if (navlvl > 0) {
             navlvl--;
+            render_osd_page();
         } else {
             menu_active = 0;
             osd->osd_config.menu_active = 0;
-            lcd_write_status();
+            ui_disp_status(0);
             return;
         }
         break;
     case OPT_SELECT:
-        switch (navi[navlvl].m->items[navi[navlvl].mp].type) {
+        switch (item->type) {
             case OPT_SUBMENU:
-                if (navi[navlvl].m->items[navi[navlvl].mp].sub.arg_f)
-                    navi[navlvl].m->items[navi[navlvl].mp].sub.arg_f();
+                if (item->sub.arg_f)
+                    item->sub.arg_f();
 
-                if (navi[navlvl+1].m != navi[navlvl].m->items[navi[navlvl].mp].sub.menu)
+                if (navi[navlvl+1].m != item->sub.menu)
                     navi[navlvl+1].mp = 0;
-                navi[navlvl+1].m = navi[navlvl].m->items[navi[navlvl].mp].sub.menu;
+                navi[navlvl+1].m = item->sub.menu;
                 navlvl++;
+                render_osd_page();
 
                 break;
             case OPT_FUNC_CALL:
-                retval = navi[navlvl].m->items[navi[navlvl].mp].fun.f();
+                retval = item->fun.f();
                 func_called = 1;
                 break;
             default:
@@ -311,13 +385,13 @@ void display_menu(alt_u8 forcedisp)
         break;
     case VAL_MINUS:
     case VAL_PLUS:
-        switch (navi[navlvl].m->items[navi[navlvl].mp].type) {
+        switch (item->type) {
             case OPT_AVCONFIG_SELECTION:
             case OPT_AVCONFIG_NUMVALUE:
-                val = navi[navlvl].m->items[navi[navlvl].mp].sel.data;
-                val_wrap = navi[navlvl].m->items[navi[navlvl].mp].sel.wrap_cfg;
-                val_min = navi[navlvl].m->items[navi[navlvl].mp].sel.min;
-                val_max = navi[navlvl].m->items[navi[navlvl].mp].sel.max;
+                val = item->sel.data;
+                val_wrap = item->sel.wrap_cfg;
+                val_min = item->sel.min;
+                val_max = item->sel.max;
 
                 if (code == VAL_MINUS)
                     *val = (*val > val_min) ? (*val-1) : (val_wrap ? val_max : val_min);
@@ -325,9 +399,9 @@ void display_menu(alt_u8 forcedisp)
                     *val = (*val < val_max) ? (*val+1) : (val_wrap ? val_min : val_max);
                 break;
             case OPT_AVCONFIG_NUMVAL_U16:
-                val_u16 = navi[navlvl].m->items[navi[navlvl].mp].num_u16.data;
-                val_u16_min = navi[navlvl].m->items[navi[navlvl].mp].num_u16.min;
-                val_u16_max = navi[navlvl].m->items[navi[navlvl].mp].num_u16.max;
+                val_u16 = item->num_u16.data;
+                val_u16_min = item->num_u16.min;
+                val_u16_max = item->num_u16.max;
                 val_wrap = (val_u16_min == 0);
                 if (code == VAL_MINUS)
                     *val_u16 = (*val_u16 > val_u16_min) ? (*val_u16-1) : (val_wrap ? val_u16_max : val_u16_min);
@@ -335,10 +409,10 @@ void display_menu(alt_u8 forcedisp)
                     *val_u16 = (*val_u16 < val_u16_max) ? (*val_u16+1) : (val_wrap ? val_u16_min : val_u16_max);
                 break;
             case OPT_SUBMENU:
-                val = navi[navlvl].m->items[navi[navlvl].mp].sub.arg_info->data;
-                val_max = navi[navlvl].m->items[navi[navlvl].mp].sub.arg_info->max;
+                val = item->sub.arg_info->data;
+                val_max = item->sub.arg_info->max;
 
-                if (navi[navlvl].m->items[navi[navlvl].mp].sub.arg_info) {
+                if (item->sub.arg_info) {
                     if (code == VAL_MINUS)
                         *val = (*val > 0) ? (*val-1) : 0;
                     else
@@ -346,10 +420,10 @@ void display_menu(alt_u8 forcedisp)
                 }
                 break;
             case OPT_FUNC_CALL:
-                val = navi[navlvl].m->items[navi[navlvl].mp].fun.arg_info->data;
-                val_max = navi[navlvl].m->items[navi[navlvl].mp].fun.arg_info->max;
+                val = item->fun.arg_info->data;
+                val_max = item->fun.arg_info->max;
 
-                if (navi[navlvl].m->items[navi[navlvl].mp].fun.arg_info) {
+                if (item->fun.arg_info) {
                     if (code == VAL_MINUS)
                         *val = (*val > 0) ? (*val-1) : 0;
                     else
@@ -365,37 +439,15 @@ void display_menu(alt_u8 forcedisp)
     }
 
     // Generate menu text
-    type = navi[navlvl].m->items[navi[navlvl].mp].type;
-    strncpy(menu_row1, navi[navlvl].m->items[navi[navlvl].mp].name, LCD_ROW_LEN+1);
-    switch (navi[navlvl].m->items[navi[navlvl].mp].type) {
-        case OPT_AVCONFIG_SELECTION:
-            strncpy(menu_row2, navi[navlvl].m->items[navi[navlvl].mp].sel.setting_str[*(navi[navlvl].m->items[navi[navlvl].mp].sel.data)], LCD_ROW_LEN+1);
-            break;
-        case OPT_AVCONFIG_NUMVALUE:
-            navi[navlvl].m->items[navi[navlvl].mp].num.df(*(navi[navlvl].m->items[navi[navlvl].mp].num.data));
-            break;
-        case OPT_AVCONFIG_NUMVAL_U16:
-            navi[navlvl].m->items[navi[navlvl].mp].num_u16.df(navi[navlvl].m->items[navi[navlvl].mp].num_u16.data);
-            break;
-        case OPT_SUBMENU:
-            if (navi[navlvl].m->items[navi[navlvl].mp].sub.arg_info)
-                navi[navlvl].m->items[navi[navlvl].mp].sub.arg_info->df(*navi[navlvl].m->items[navi[navlvl].mp].sub.arg_info->data);
-            else
-                menu_row2[0] = 0;
-            break;
-        case OPT_FUNC_CALL:
-            if (func_called)
-                sniprintf(menu_row2, LCD_ROW_LEN+1, "%s", (retval==0) ? "Done" : "Failed");
-            else if (navi[navlvl].m->items[navi[navlvl].mp].fun.arg_info)
-                navi[navlvl].m->items[navi[navlvl].mp].fun.arg_info->df(*navi[navlvl].m->items[navi[navlvl].mp].fun.arg_info->data);
-            else
-                menu_row2[0] = 0;
-            break;
-        default:
-            break;
-    }
+    item = &navi[navlvl].m->items[navi[navlvl].mp];
+    strncpy(menu_row1, item->name, LCD_ROW_LEN+1);
+    write_option_value(item, func_called, retval);
+    strncpy((char*)osd->osd_array.data[navi[navlvl].mp][1], menu_row2, OSD_CHAR_COLS);
+    osd->osd_row_color.mask = (1<<navi[navlvl].mp);
+    if (func_called || ((item->type == OPT_FUNC_CALL) && item->fun.arg_info != NULL) || ((item->type == OPT_SUBMENU) && item->sub.arg_info != NULL))
+        osd->osd_sec_enable[1].mask |= (1<<navi[navlvl].mp);
 
-    lcd_write_menu();
+    ui_disp_menu(0);
 }
 
 static void vm_select() {
@@ -436,8 +488,10 @@ static void vm_tweak(alt_u16 *v) {
 
     if (v == &tc_sampler_phase)
         sniprintf(menu_row2, LCD_ROW_LEN+1, LNG("%d deg","%d ﾄﾞ"), ((*v)*1125)/100);
-    else if ((v == &tc_h_samplerate) || (v == &tc_h_samplerate_adj))
-        sniprintf(menu_row2, LCD_ROW_LEN+1, "%u.%.2u", video_modes[vm_edit].h_total, video_modes[vm_edit].h_total_adj*5);
+    else if (v == &tc_h_samplerate)
+        sniprintf(menu_row2, LCD_ROW_LEN+1, "%u", video_modes[vm_edit].h_total);
+    else if (v == &tc_h_samplerate_adj)
+        sniprintf(menu_row2, LCD_ROW_LEN+1, ".%.2u", video_modes[vm_edit].h_total_adj*5);
     else
         sniprintf(menu_row2, LCD_ROW_LEN+1, "%u", *v);
 }

software/sys_controller/ossc/menu.h

@@ -23,6 +23,12 @@
 #include "alt_types.h"
 #include "controls.h"
 
+#ifdef OSDLANG_JP
+#define LNG(e, j) j
+#else
+#define LNG(e, j) e
+#endif
+
 typedef enum {
     OPT_AVCONFIG_SELECTION,
     OPT_AVCONFIG_NUMVALUE,
@@ -114,6 +120,8 @@ typedef struct {
     alt_u8 mp;
 } menunavi;
 
+menunavi* get_current_menunavi();
+void render_osd_page();
 void display_menu(alt_u8 forcedisp);
 static void vm_select();
 static void vm_tweak(alt_u16 *v);

software/sys_controller/ossc/userdata.c

@@ -17,15 +17,19 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+#include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include "userdata.h"
+#include "fat16_export.h"
 #include "flash.h"
 #include "sdcard.h"
 #include "firmware.h"
 #include "lcd.h"
 #include "controls.h"
 #include "av_controller.h"
+#include "menu.h"
+#include "utils.h"
 #include "altera_avalon_pio_regs.h"
 
 extern alt_u16 rc_keymap[REMOTE_MAX_KEYS];
@@ -39,8 +43,9 @@ extern alt_u8 profile_sel;
 extern alt_u8 def_input, profile_link;
 extern alt_u8 lcd_bl_timeout;
 extern alt_u8 auto_input, auto_av1_ypbpr, auto_av2_ypbpr, auto_av3_ypbpr;
-extern alt_u8 osd_enable_pre, osd_status_timeout_pre;
+extern alt_u8 osd_enable, osd_status_timeout;
 extern SD_DEV sdcard_dev;
+extern alt_flash_dev *epcq_dev;
 extern char menu_row1[LCD_ROW_LEN+1], menu_row2[LCD_ROW_LEN+1];
 
 char target_profile_name[PROFILE_NAME_LEN+1];
@@ -52,7 +57,7 @@ int write_userdata(alt_u8 entry)
     alt_u16 pageoffset, srcoffset;
     alt_u8 pageno;
     alt_u32 bytes_to_w;
-    int retval;
+    int retval, i;
 
     if (entry > MAX_USERDATA_ENTRY) {
         printf("invalid entry\n");
@@ -76,12 +81,14 @@ int write_userdata(alt_u8 entry)
         ((ude_initcfg*)databuf)->auto_av1_ypbpr = auto_av1_ypbpr;
         ((ude_initcfg*)databuf)->auto_av2_ypbpr = auto_av2_ypbpr;
         ((ude_initcfg*)databuf)->auto_av3_ypbpr = auto_av3_ypbpr;
-        ((ude_initcfg*)databuf)->osd_enable = osd_enable_pre;
-        ((ude_initcfg*)databuf)->osd_status_timeout = osd_status_timeout_pre;
+        ((ude_initcfg*)databuf)->osd_enable = osd_enable;
+        ((ude_initcfg*)databuf)->osd_status_timeout = osd_status_timeout;
         memcpy(((ude_initcfg*)databuf)->keys, rc_keymap, sizeof(rc_keymap));
-        retval = write_flash_page(databuf, sizeof(ude_initcfg), (USERDATA_OFFSET+entry*SECTORSIZE)/PAGESIZE);
+        for (i=0; i<sizeof(ude_initcfg); i++)
+            databuf[i] = bitswap8(databuf[i]);
+        retval = alt_epcq_controller2_write(epcq_dev, (USERDATA_OFFSET+entry*SECTORSIZE), databuf, sizeof(ude_initcfg));
         if (retval != 0)
-            return -1;
+            return retval;
 
         printf("Initconfig data written (%u bytes)\n", sizeof(ude_initcfg) - offsetof(ude_initcfg, last_profile));
         break;
@@ -103,15 +110,30 @@ int write_userdata(alt_u8 entry)
         memcpy(databuf+pageoffset, &tc, sizeof(avconfig_t));
         pageoffset += sizeof(avconfig_t);
 
-        // write a full page first
+        // erase sector and write a full page first, assume sizeof(video_modes) >> PAGESIZE
         memcpy(databuf+pageoffset, (char*)video_modes, PAGESIZE-pageoffset);
         srcoffset = PAGESIZE-pageoffset;
         vm_to_write -= PAGESIZE-pageoffset;
-        write_flash_page(databuf, PAGESIZE, ((USERDATA_OFFSET+entry*SECTORSIZE)/PAGESIZE));
+        for (i=0; i<PAGESIZE; i++)
+            databuf[i] = bitswap8(databuf[i]);
+        retval = alt_epcq_controller2_write(epcq_dev, (USERDATA_OFFSET+entry*SECTORSIZE), databuf, PAGESIZE);
+        if (retval != 0)
+            return retval;
 
-        // then write the rest
-        if (vm_to_write > 0)
-            write_flash((alt_u8*)video_modes+srcoffset, vm_to_write, ((USERDATA_OFFSET+entry*SECTORSIZE)/PAGESIZE) + 1);
+        // then write the rest page by page
+        pageno = 1;
+        while (vm_to_write > 0) {
+            memcpy(databuf, (char*)video_modes+srcoffset, (vm_to_write > PAGESIZE) ? PAGESIZE : vm_to_write);
+            for (i=0; i<PAGESIZE; i++)
+                databuf[i] = bitswap8(databuf[i]);
+            retval = alt_epcq_controller2_write_block(epcq_dev, (USERDATA_OFFSET+entry*SECTORSIZE), (USERDATA_OFFSET+entry*SECTORSIZE+pageno*PAGESIZE), databuf, (vm_to_write > PAGESIZE) ? PAGESIZE : vm_to_write);
+            if (retval != 0)
+                return retval;
+
+            srcoffset += PAGESIZE;
+            vm_to_write = (vm_to_write < PAGESIZE) ? 0 : (vm_to_write - PAGESIZE);
+            pageno++;
+        }
 
         printf("Profile %u data written (%u bytes)\n", entry, sizeof(avconfig_t)+VIDEO_MODES_SIZE);
         break;
@@ -137,11 +159,11 @@ int read_userdata(alt_u8 entry, int dry_run)
         return -1;
     }
 
-    retval = read_flash(USERDATA_OFFSET+(entry*SECTORSIZE), PAGESIZE, databuf);
-    if (retval != 0) {
-        printf("Flash read error\n");
-        return -1;
-    }
+    retval = alt_epcq_controller2_read(epcq_dev, (USERDATA_OFFSET+entry*SECTORSIZE), databuf, PAGESIZE);
+    for (i=0; i<PAGESIZE; i++)
+        databuf[i] = bitswap8(databuf[i]);
+    if (retval != 0)
+        return retval;
 
     if (strncmp(((ude_hdr*)databuf)->userdata_key, "USRDATA", 8)) {
         printf("No userdata found on entry %u\n", entry);
@@ -170,8 +192,8 @@ int read_userdata(alt_u8 entry, int dry_run)
             auto_av1_ypbpr = ((ude_initcfg*)databuf)->auto_av1_ypbpr;
             auto_av2_ypbpr = ((ude_initcfg*)databuf)->auto_av2_ypbpr;
             auto_av3_ypbpr = ((ude_initcfg*)databuf)->auto_av3_ypbpr;
-            osd_enable_pre = ((ude_initcfg*)databuf)->osd_enable;
-            osd_status_timeout_pre = ((ude_initcfg*)databuf)->osd_status_timeout;
+            osd_enable = ((ude_initcfg*)databuf)->osd_enable;
+            osd_status_timeout = ((ude_initcfg*)databuf)->osd_status_timeout;
             profile_link = ((ude_initcfg*)databuf)->profile_link;
             profile_sel = input_profiles[AV_TESTPAT]; // Global profile
             lcd_bl_timeout = ((ude_initcfg*)databuf)->lcd_bl_timeout;
@@ -207,7 +229,11 @@ int read_userdata(alt_u8 entry, int dry_run)
                     pageoffset = 0;
                     pageno++;
                     // check
-                    read_flash(USERDATA_OFFSET+(entry*SECTORSIZE)+pageno*PAGESIZE, PAGESIZE, databuf);
+                    retval = alt_epcq_controller2_read(epcq_dev, (USERDATA_OFFSET+entry*SECTORSIZE+pageno*PAGESIZE), databuf, PAGESIZE);
+                    for (i=0; i<PAGESIZE; i++)
+                        databuf[i] = bitswap8(databuf[i]);
+                    if (retval != 0)
+                        return retval;
                 } else {
                     memcpy((char*)video_modes+dstoffset, databuf+pageoffset, vm_to_read);
                     pageoffset += vm_to_read;
@@ -229,6 +255,7 @@ int read_userdata(alt_u8 entry, int dry_run)
 
 int import_userdata()
 {
+    SDRESULTS res;
     int retval;
     int n, entries_imported=0;
     char *errmsg;
@@ -239,11 +266,10 @@ int import_userdata()
     retval = check_sdcard(databuf);
     SPI_CS_High();
     if (retval != 0)
-        goto failure;
+        goto sd_disable;
 
-    strncpy(menu_row1, "Import? 1=Y, 2=N", LCD_ROW_LEN+1);
-    *menu_row2 = '\0';
-    lcd_write_menu();
+    strncpy(menu_row2, "Import? 1=Y, 2=N", LCD_ROW_LEN+1);
+    ui_disp_menu(2);
 
     while (1) {
         btn_vec = IORD_ALTERA_AVALON_PIO_DATA(PIO_1_BASE) & RC_MASK;
@@ -252,23 +278,23 @@ int import_userdata()
             break;
         } else if (btn_vec == rc_keymap[RC_BTN2]) {
             retval = UDATA_IMPT_CANCELLED;
-            goto failure;
+            strncpy(menu_row2, "Cancelled", LCD_ROW_LEN+1);
+            goto sd_disable;
         }
 
         usleep(WAITLOOP_SLEEP_US);
     }
 
-    strncpy(menu_row1, "Loading settings", LCD_ROW_LEN+1);
-    strncpy(menu_row2, "please wait...", LCD_ROW_LEN+1);
-    lcd_write_menu();
+    strncpy(menu_row2, "Loading...", LCD_ROW_LEN+1);
+    ui_disp_menu(2);
 
     // Import the userdata
     for (n=0; n<=MAX_USERDATA_ENTRY; ++n) {
-        retval = SD_Read(&sdcard_dev, &header, (512+n*SECTORSIZE)/SD_BLK_SIZE, 0, sizeof(header));
-        if (retval != 0) {
+        res = SD_Read(&sdcard_dev, &header, (512+n*SECTORSIZE)/SD_BLK_SIZE, 0, sizeof(header));
+        if (res != SD_OK) {
             printf("Failed to read SD card\n");
-            retval = -retval;
-            goto failure;
+            retval = -res;
+            goto sd_disable;
         }
 
         if (strncmp(header.userdata_key, "USRDATA", 8)) {
@@ -276,12 +302,13 @@ int import_userdata()
             continue;
         }
 
-        if ((header.version_major != FW_VER_MAJOR) || (header.version_minor != FW_VER_MINOR)) {
-            printf("Data version %u.%u does not match fw\n", header.version_major, header.version_minor);
+        if ((header.type == UDE_PROFILE) && ((header.version_major != PROFILE_VER_MAJOR) || (header.version_minor != PROFILE_VER_MINOR))) {
+            printf("Profile version %u.%u does not match current one\n", header.version_major, header.version_minor);
             continue;
-        }
-
-        if (header.type > UDE_PROFILE) {
+        } else if ((header.type == UDE_INITCFG) && ((header.version_major != INITCFG_VER_MAJOR) || (header.version_minor != INITCFG_VER_MINOR))) {
+            printf("Initconfig version %u.%u does not match current one\n", header.version_major, header.version_minor);
+            continue;
+        } else if (header.type > UDE_PROFILE) {
             printf("Unknown userdata entry type %u\n", header.type);
             continue;
         }
@@ -291,27 +318,213 @@ int import_userdata()
             (header.type == UDE_PROFILE) ? sizeof(ude_profile) : sizeof(ude_initcfg), databuf);
         if (retval != 0) {
             printf("Copy from SD to flash failed (error %d)\n", retval);
-            goto failure;
+            goto sd_disable;
         }
 
         entries_imported++;
     }
 
-    SPI_CS_High();
+    // flash read immediately after write might fail, add some delay
+    usleep(1000);
 
     read_userdata(INIT_CONFIG_SLOT, 0);
     profile_sel = input_profiles[target_input];
     read_userdata(profile_sel, 0);
 
-    sniprintf(menu_row1, LCD_ROW_LEN+1, "%d entries", entries_imported);
-    strncpy(menu_row2, "imported", LCD_ROW_LEN+1);
-    lcd_write_menu();
-    usleep(1000000);
+    sniprintf(menu_row2, LCD_ROW_LEN+1, "%d slots loaded", entries_imported);
+    retval = 1;
 
-    return 0;
-
-failure:
+sd_disable:
     SPI_CS_High();
 
-    return -1;
+    return retval;
+}
+
+static alt_u8 poll_yesno(const useconds_t useconds, alt_u32 *const btn_vec_out)
+{
+    alt_u32 btn_vec;
+    alt_u8 ret = 0U;
+
+    for (alt_u32 i = 0; i < (useconds/WAITLOOP_SLEEP_US); ++i) {
+        btn_vec = IORD_ALTERA_AVALON_PIO_DATA(PIO_1_BASE) & RC_MASK;
+
+        for (alt_u32 j = RC_BTN1; j < (REMOTE_MAX_KEYS - 1); ++j) {
+            if (btn_vec == rc_keymap[j]) {
+                ret = 1U;
+                break;
+            }
+        }
+
+        if (ret)
+            break;
+
+        usleep(WAITLOOP_SLEEP_US);
+    }
+
+    if (ret)
+        *btn_vec_out = btn_vec;
+
+    return ret;
+}
+
+int export_userdata()
+{
+    int retval;
+    const char *msg;
+    alt_u8 databuf[SD_BLK_SIZE];
+    alt_u8 prompt_state = 0;
+    useconds_t prompt_delay;
+    const alt_u8 prompt_transitions[] = { 1, 2, 0, 0, };
+    const alt_u8 prompt_ofs[] = { 0, 16, 31, LNG(48, 47), };
+    const char *prompt_msgs =
+        LNG(
+        "SD CARD WILL BE" "\0" // [ 0..15]
+        "OVERWRITTEN!!!"  "\0" // [16..30]
+        "Export? 1=Y, 2=N""\0" // [31..47]
+        "Press 1 or 2",        // [48..60]
+        "SDｶｰﾄﾞｦｳﾜｶﾞｷｼﾏｽ" "\0" // [ 0..15]
+        "ｺﾞﾁｭｳｲｸﾀﾞｻｲ!!!"  "\0" // [16..30]
+        "1=ｼﾞｯｺｳｽﾙ 2=ﾔﾒﾙ" "\0" // [31..46]
+        "ﾄﾞﾁﾗｶｴﾗﾝﾃﾞｸﾀﾞｻｲ"      // [47..60]
+        );
+    alt_u32 btn_vec, sd_block_offset;
+
+    _Static_assert(SD_BLK_SIZE == FAT16_SECTOR_SIZE, "Sector size mismatch");
+
+    retval = check_sdcard(databuf);
+    SPI_CS_High();
+    if (retval != 0) {
+        retval = -retval;
+        goto out;
+    }
+
+    usleep(100000U);
+    while (1) {
+        msg = &prompt_msgs[prompt_ofs[prompt_state]];
+        prompt_delay = (prompt_state == 2) ? 2000000U
+            : ((prompt_state == 3) ? 300000U : 1000000U);
+        prompt_state = prompt_transitions[prompt_state];
+
+        strncpy(menu_row2, msg, LCD_ROW_LEN+1);
+        ui_disp_menu(2);
+        if (poll_yesno(prompt_delay, &btn_vec))
+            goto eval_button;
+
+        continue;
+eval_button:
+        if (btn_vec == rc_keymap[RC_BTN1]) {
+            break;
+        } else if (btn_vec == rc_keymap[RC_BTN2] ||
+            btn_vec == rc_keymap[RC_BACK])
+        {
+            retval = UDATA_EXPT_CANCELLED;
+            goto out;
+        }
+        prompt_state = 3;
+    }
+
+    usleep(100000U);
+    strncpy(menu_row1,"SD Format", LCD_ROW_LEN+1);
+    strncpy(menu_row2,"1=FAT16, 2=RAW", LCD_ROW_LEN+1);
+    ui_disp_menu(2);
+    if ((!poll_yesno(5000000U, &btn_vec)) || ((btn_vec != rc_keymap[RC_BTN1]) && (btn_vec != rc_keymap[RC_BTN2])))  {
+        retval = UDATA_EXPT_CANCELLED;
+        goto out;
+    }
+    sd_block_offset = (btn_vec == rc_keymap[RC_BTN1]) ? (PROF_16_DATA_OFS/SD_BLK_SIZE) : 0;
+
+    strncpy(menu_row2, LNG("Exporting...", "ｵﾏﾁｸﾀﾞｻｲ"), LCD_ROW_LEN+1);
+    ui_disp_menu(2);
+
+    // RAW copy
+    if (btn_vec == rc_keymap[RC_BTN2])
+        goto copy_start;
+
+    /* Zero out the boot sector, FATs and root directory. */
+    memset(databuf, 0, SD_BLK_SIZE);
+    for (alt_u32 sector = 0;
+        sector < (FAT16_ROOT_DIR_FIRST_SECTOR + FAT16_ROOT_DIR_SECTORS);
+        ++sector)
+    {
+        retval = SD_Write(&sdcard_dev, databuf, sector);
+        if (retval)
+            goto out;
+    }
+
+    /* Generate and write the boot sector. */
+    generate_boot_sector_16(databuf);
+    retval = SD_Write(&sdcard_dev, databuf, 0);
+    if (retval)
+        goto out;
+
+    /* Generate and write the file allocation tables. */
+    for (alt_u16 clusters_written = 0, sd_blk_idx = 0;
+        clusters_written < (PROF_16_DATA_SIZE/FAT16_CLUSTER_SIZE);)
+    {
+        memset(databuf, 0, SD_BLK_SIZE);
+        clusters_written = generate_fat16(databuf, clusters_written);
+        retval = SD_Write(&sdcard_dev, databuf,
+            (FAT16_1_OFS/SD_BLK_SIZE) + sd_blk_idx);
+        if (retval)
+            goto out;
+
+        retval = SD_Write(&sdcard_dev, databuf,
+            (FAT16_2_OFS/SD_BLK_SIZE) + sd_blk_idx);
+        if (retval)
+            goto out;
+
+        ++sd_blk_idx;
+    }
+
+    /* Write the directory entry of the settings file. */
+    memset(databuf, 0, SD_BLK_SIZE);
+    memcpy(databuf, prof_dirent_16, PROF_DIRENT_16_SIZE);
+    retval = SD_Write(&sdcard_dev, databuf, PROF_DIRENT_16_OFS/SD_BLK_SIZE);
+    if (retval)
+        goto out;
+
+copy_start:
+    // Zero out first 512 bytes (1 SD block) of the file
+    memset(databuf, 0, SD_BLK_SIZE);
+    retval = SD_Write(&sdcard_dev, databuf, sd_block_offset++);
+    if (retval)
+        goto out;
+
+    /* This may wear the SD card a bit more than necessary... */
+    retval = copy_flash_to_sd(USERDATA_OFFSET/PAGESIZE,
+        sd_block_offset,
+        (MAX_USERDATA_ENTRY + 1) * SECTORSIZE,
+        databuf);
+
+out:
+    SPI_CS_High();
+
+    switch (retval) {
+        case 0:
+            msg = LNG("Success", "ｶﾝﾘｮｳｼﾏｼﾀ"); // Alternative: "ｶﾝﾘｮｳｲﾀｼﾏｼﾀ"
+            break;
+        case SD_NOINIT:
+            msg = LNG("No SD card det.", "SDｶｰﾄﾞｶﾞﾐﾂｶﾘﾏｾﾝ");
+            break;
+        case -EINVAL:
+            msg = LNG("Invalid params.", "ﾊﾟﾗﾒｰﾀｶﾞﾑｺｳﾃﾞｽ");
+            break;
+        case UDATA_EXPT_CANCELLED:
+            msg = LNG("Cancelled", "ｷｬﾝｾﾙｻﾚﾏｼﾀ"); // Alternative: "ｷｬﾝｾﾙｻｾﾃｲﾀﾀﾞｷﾏｽ"
+            break;
+        default:
+            msg = LNG("SD/Flash error", "SDｶFLASHﾉｴﾗｰ"); // ﾌﾗｯｼｭ would be NG.
+            break;
+    }
+    strncpy(menu_row2, msg, LCD_ROW_LEN+1);
+
+    if (!retval) {
+        return 1;
+    } else {
+        /*
+         * We want the message above to remain on screen, so return a
+         * positive value which nevertheless stands out when debugging.
+         */
+        return 0x0dead;
+    }
 }

software/sys_controller/ossc/userdata.h

@@ -34,6 +34,7 @@
 #define INIT_CONFIG_SLOT MAX_USERDATA_ENTRY
 
 #define UDATA_IMPT_CANCELLED 104
+#define UDATA_EXPT_CANCELLED 105
 
 typedef enum {
     UDE_INITCFG  = 0,
@@ -76,5 +77,6 @@ typedef struct {
 int write_userdata(alt_u8 entry);
 int read_userdata(alt_u8 entry, int dry_run);
 int import_userdata();
+int export_userdata();
 
 #endif

software/sys_controller/ossc/utils.c

@@ -25,6 +25,12 @@
 #include "sysconfig.h"
 #include "io.h"
 
+inline unsigned char bitswap8(unsigned char v)
+{
+    return ((v * 0x0802LU & 0x22110LU) |
+            (v * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16;
+}
+
 alt_u32 bswap32(alt_u32 w)
 {
     return (((w << 24) & 0xff000000) |

software/sys_controller/ossc/utils.h

@@ -24,7 +24,7 @@
 
 #define PRINTF_BUFSIZE 512
 
-unsigned char bitswap8(unsigned char v);
+inline unsigned char bitswap8(unsigned char v);
 
 alt_u32 bswap32(alt_u32 w);
 

software/sys_controller/pcm1862/pcm1862.c

@@ -44,8 +44,8 @@ inline void pcm1862_writereg(alt_u8 regaddr, alt_u8 data)
 void pcm_source_sel(pcm_input_t input) {
     alt_u8 adc_ch = 1<<input;
 
-    pcm1862_writereg(PCM1862_ADC1L, adc_ch);
-    pcm1862_writereg(PCM1862_ADC1R, adc_ch);
+    pcm1862_writereg(PCM1862_ADC1L, (1<<6)|adc_ch);
+    pcm1862_writereg(PCM1862_ADC1R, (1<<6)|adc_ch);
 }
 
 void pcm_set_gain(alt_8 db_gain) {
@@ -60,6 +60,8 @@ int pcm1862_init()
     if (pcm1862_readreg(0x05) != 0x86)
         return 0;
 
+    pcm1862_writereg(PCM1862_PWR_CTRL, 0x75);
+
     //pcm1862_writereg(0x00, 0xff);
     pcm1862_writereg(PCM1862_CLKCONFIG, 0x90);
 
@@ -67,7 +69,9 @@ int pcm1862_init()
     pcm1862_writereg(PCM1862_DSP2_CLKDIV, 0x00);
     pcm1862_writereg(PCM1862_ADC_CLKDIV,  0x03);
     pcm1862_writereg(PCM1862_PLLCONFIG, 0x00);
-    pcm1862_writereg(PCM1862_DSP_CTRL, 0x30);
+    pcm1862_writereg(PCM1862_DSP_CTRL, 0xB0);
+
+    pcm1862_writereg(PCM1862_PWR_CTRL, 0x70);
 
     return 1;
 }

software/sys_controller/pcm1862/pcm1862_regs.h

@@ -53,6 +53,7 @@
 
 #define PCM1862_PLLCONFIG       0x28
 
+#define PCM1862_PWR_CTRL        0x70
 #define PCM1862_DSP_CTRL        0x71
 
 #endif /* PCM1862_REGS_H_ */

software/sys_controller/spi_charlcd/lcd.c

@@ -67,6 +67,7 @@ void lcd_write(char *row1, char *row2)
     IOWR_ALTERA_AVALON_PIO_DATA(PIO_0_BASE, sys_ctrl);
 
     lcd_cmd(0x01,CLEARDELAY); // clear display
+    usleep(400); // additional delay for copycat lcd module
 
     // Set RS to enter data write mode
     sys_ctrl |= LCD_RS;

software/sys_controller/tvp7002/tvp7002.c

@@ -25,7 +25,6 @@
 #include "tvp7002.h"
 
 //#define SYNCBYPASS    // Bypass VGA syncs (for debug - needed for interlace?)
-//#define EXTADCCLK     // Use external ADC clock (external osc)
 //#define ADCPOWERDOWN  // Power-down ADCs
 //#define PLLPOSTDIV    // Double-rate PLL with div-by-2 (decrease jitter?)
 
@@ -41,7 +40,7 @@ const ypbpr_to_rgb_csc_t csc_coeffs[] = {
 static const alt_u8 Kvco[] = {75, 85, 150, 200};
 static const char *Kvco_str[] = { "Ultra low", "Low", "Medium", "High" };
 
-static void tvp_set_clamp(video_format fmt)
+static void tvp_set_clamp_type(video_format fmt)
 {
     alt_u8 status = tvp_readreg(TVP_SOGTHOLD) & 0xF8;
 
@@ -60,25 +59,64 @@ static void tvp_set_clamp(video_format fmt)
     tvp_writereg(TVP_SOGTHOLD, status);
 }
 
-static void tvp_set_clamp_position(video_type type, alt_u8 h_syncinlen)
+static void tvp_set_clamp_alc(video_type type, alt_u8 clamp_ref_offset, alt_8 clamp_user_offset, alt_u8 en_alc)
 {
+    alt_16 clamp_pos = clamp_ref_offset + clamp_user_offset;
+    alt_u8 clamp_width, alc_offset;
+
     switch (type) {
     case VIDEO_LDTV:
-        tvp_writereg(TVP_CLAMPSTART, h_syncinlen+0x2);
-        tvp_writereg(TVP_CLAMPWIDTH, 0x6);
+        clamp_pos += 2;
+        clamp_width = 6;
+        alc_offset = 1;
         break;
     case VIDEO_HDTV:
-        tvp_writereg(TVP_CLAMPSTART, h_syncinlen+0x32);
-        tvp_writereg(TVP_CLAMPWIDTH, 0x20);
+        clamp_pos += 50;
+        clamp_width = 32;
+        alc_offset = 8;
         break;
     case VIDEO_SDTV:
     case VIDEO_EDTV:
     case VIDEO_PC:
     default:
-        tvp_writereg(TVP_CLAMPSTART, h_syncinlen+0x6);
-        tvp_writereg(TVP_CLAMPWIDTH, 0x10);
+        clamp_pos += 6;
+        clamp_width = 16;
+        alc_offset = 2;
         break;
     }
+
+    // Make sure clamp and ALC positions are within 8bit range
+    if (clamp_pos < 0)
+        clamp_pos = 0;
+    else if (clamp_pos + clamp_width + alc_offset > 255)
+        clamp_pos = 255 - alc_offset - clamp_width;
+
+    tvp_writereg(TVP_CLAMPSTART, (alt_u8)clamp_pos);
+    tvp_writereg(TVP_CLAMPWIDTH, clamp_width);
+
+    if (en_alc) {
+        tvp_writereg(TVP_ALCEN, 0x80); //enable ALC
+        tvp_writereg(TVP_ALCPLACE, clamp_pos+clamp_width+alc_offset);
+    } else {
+        tvp_writereg(TVP_ALCEN, 0x00); //disable ALC
+    }
+}
+
+static void tvp_sel_clk(tvp_refclk_t refclk, alt_u8 ext_pclk)
+{
+    alt_u8 status = tvp_readreg(TVP_INPMUX2) & 0xF5;
+
+    //TODO: set SOG and CLP LPF based on mode
+    if (refclk == REFCLK_EXT27) {
+        status |= 0x8;
+
+        if (!ext_pclk)
+            status |= 0x2;
+    } else {
+        status |= 0x2;
+    }
+
+    tvp_writereg(TVP_INPMUX2, status);
 }
 
 inline alt_u32 tvp_readreg(alt_u32 regaddr)
@@ -159,8 +197,8 @@ void tvp_init()
 
     // Set default configuration (skip those which match register reset values)
 
-    // Configure external refclk
-    tvp_sel_clk(REFCLK_EXT27);
+    // Configure external refclk, HPLL generated pclk
+    tvp_sel_clk(REFCLK_EXT27, 0);
 
     // Hsync input->output delay (horizontal shift)
     // Default is 13, which maintains alignment of RGB and hsync at output
@@ -261,22 +299,6 @@ void tvp_setup_hpll(alt_u16 h_samplerate, alt_u16 refclks_per_line, alt_u8 plldi
     tvp_writereg(TVP_HPLLCTRL, ((vco_range << 6) | (cp_current << 3)));
 }
 
-void tvp_sel_clk(tvp_refclk_t refclk)
-{
-    alt_u8 status = tvp_readreg(TVP_INPMUX2) & 0xFA;
-
-    //TODO: set SOG and CLP LPF based on mode
-    if (refclk == REFCLK_INTCLK) {
-        tvp_writereg(TVP_INPMUX2, status|0x2);
-    } else {
-#ifdef EXTADCCLK
-        tvp_writereg(TVP_INPMUX2, status|0x8);
-#else
-        tvp_writereg(TVP_INPMUX2, status|0xA);
-#endif
-    }
-}
-
 void tvp_sel_csc(const ypbpr_to_rgb_csc_t *csc)
 {
     tvp_writereg(TVP_CSC1HI, (csc->G_Y >> 8));
@@ -315,6 +337,13 @@ void tvp_set_sync_lpf(alt_u8 val)
     printf("Sync LPF value set to 0x%x\n", val);
 }
 
+void tvp_set_clp_lpf(alt_u8 val)
+{
+    alt_u8 status = tvp_readreg(TVP_INPMUX2) & 0xCF;
+    tvp_writereg(TVP_INPMUX2, status|(val<<4));
+    printf("CLP LPF value set to 0x%x\n", val);
+}
+
 alt_u8 tvp_set_hpll_phase(alt_u8 val, alt_u8 sample_mult)
 {
     alt_u8 sample_sel;
@@ -335,36 +364,17 @@ void tvp_set_sog_thold(alt_u8 val)
     printf("SOG thold set to 0x%x\n", val);
 }
 
-void tvp_set_alc(alt_u8 en_alc, video_type type, alt_u8 h_syncinlen)
-{
-    if (en_alc) {
-        tvp_writereg(TVP_ALCEN, 0x80); //enable ALC
-
-        //select ALC placement
-        switch (type) {
-        case VIDEO_LDTV:
-            tvp_writereg(TVP_ALCPLACE, h_syncinlen+0x9);
-            break;
-        case VIDEO_HDTV:
-            tvp_writereg(TVP_ALCPLACE, h_syncinlen+0x5A);
-            break;
-        case VIDEO_SDTV:
-        case VIDEO_EDTV:
-        case VIDEO_PC:
-        default:
-            tvp_writereg(TVP_ALCPLACE, h_syncinlen+0x18);
-            break;
-        }
-    } else {
-        tvp_writereg(TVP_ALCEN, 0x00); //disable ALC
-    }
+void tvp_set_alcfilt(alt_u8 nsv, alt_u8 nsh) {
+    tvp_writereg(TVP_ALCFILT, (nsv<<3)|nsh);
 }
 
-void tvp_source_setup(video_type type, alt_u16 h_samplerate, alt_u16 refclks_per_line, alt_u8 plldivby2, alt_u8 h_syncinlen)
+void tvp_source_setup(video_type type, alt_u16 h_samplerate, alt_u16 refclks_per_line, alt_u8 plldivby2, alt_u8 h_synclen_px, alt_8 clamp_user_offset)
 {
-    // Clamp position and ALC
-    tvp_set_clamp_position(type, h_syncinlen);
-    tvp_set_alc(1, type, h_syncinlen);
+    // Due to short MVS width, clamp reference starts prematurely (at the end of MVS window). Adjust offset so that reference moves back to hsync trailing edge.
+    alt_u8 clamp_ref_offset = h_synclen_px - (((30*h_samplerate)/refclks_per_line)+5)/10;
+
+    // Clamp and ALC
+    tvp_set_clamp_alc(type, clamp_ref_offset, clamp_user_offset, 1);
 
     // Setup Macrovision stripper and H-PLL coast signal.
     // Coast needs to be enabled when HSYNC is missing during VSYNC. RGBHV mode cannot use it, so turn off the internal signal for this mode.
@@ -393,7 +403,7 @@ void tvp_source_sel(tvp_input_t input, tvp_sync_input_t syncinput, video_format
     tvp_writereg(TVP_INPMUX1, (((syncinput <= TVP_SOG3) ? syncinput : 0)<<6) | (input<<4) | (input<<2) | input);
 
     // Clamp setup
-    tvp_set_clamp(fmt);
+    tvp_set_clamp_type(fmt);
 
     // HV/SOG sync select
     if (syncinput > TVP_SOG3) {

software/sys_controller/tvp7002/tvp7002.h

@@ -34,6 +34,8 @@
 #define DEFAULT_FINE_GAIN       26
 #define DEFAULT_FINE_OFFSET     0x80
 #define DEFAULT_COARSE_GAIN     0x8
+#define DEFAULT_ALC_H_FILTER    0x3
+#define DEFAULT_ALC_V_FILTER    0x9
 
 #define TVP_INTCLK_HZ           6500000UL
 #define TVP_EXTCLK_HZ           27000000UL
@@ -105,21 +107,21 @@ void tvp_set_gain_offset(color_setup_t *col);
 
 void tvp_setup_hpll(alt_u16 h_samplerate, alt_u16 refclks_per_line, alt_u8 plldivby2);
 
-void tvp_sel_clk(tvp_refclk_t refclk);
-
 void tvp_sel_csc(const ypbpr_to_rgb_csc_t *csc);
 
 void tvp_set_lpf(alt_u8 val);
 
 void tvp_set_sync_lpf(alt_u8 val);
 
+void tvp_set_clp_lpf(alt_u8 val);
+
 alt_u8 tvp_set_hpll_phase(alt_u8 val, alt_u8 sample_mult);
 
 void tvp_set_sog_thold(alt_u8 val);
 
-void tvp_set_alc(alt_u8 en_alc, video_type type, alt_u8 h_syncinlen);
+void tvp_set_alcfilt(alt_u8 nsv, alt_u8 nsh);
 
-void tvp_source_setup(video_type type, alt_u16 h_samplerate, alt_u16 refclks_per_line, alt_u8 plldivby2, alt_u8 h_syncinlen);
+void tvp_source_setup(video_type type, alt_u16 h_samplerate, alt_u16 refclks_per_line, alt_u8 plldivby2, alt_u8 h_synclen_px, alt_8 clamp_user_offset);
 
 void tvp_source_sel(tvp_input_t input, tvp_sync_input_t syncinput, video_format fmt);
 

software/sys_controller/tvp7002/video_modes.c

@@ -32,11 +32,10 @@ const mode_data_t video_modes_default[] = VIDEO_MODES_DEF;
 mode_data_t video_modes[VIDEO_MODES_CNT];
 
 /* TODO: rewrite, check hz etc. */
-alt_8 get_mode_id(alt_u32 totlines, alt_u8 progressive, alt_u32 hz, video_type typemask)
+alt_8 get_mode_id(alt_u32 totlines, alt_u8 progressive, alt_u32 hz, alt_u8 h_syncinlen)
 {
     alt_8 i;
     alt_u8 num_modes = sizeof(video_modes)/sizeof(mode_data_t);
-    video_type mode_type;
     mode_flags valid_lm[] = { MODE_PT, (MODE_L2 | (MODE_L2<<cm.cc.l2_mode)), (MODE_L3_GEN_16_9<<cm.cc.l3_mode), (MODE_L4_GEN_4_3<<cm.cc.l4_mode), (MODE_L5_GEN_4_3<<cm.cc.l5_mode) };
     mode_flags target_lm;
     alt_u8 pt_only = 0;
@@ -45,12 +44,7 @@ alt_8 get_mode_id(alt_u32 totlines, alt_u8 progressive, alt_u32 hz, video_type t
     alt_u8* group_ptr[] = { &pt_only, &cm.cc.pm_240p, &cm.cc.pm_384p, &cm.cc.pm_480i, &cm.cc.pm_480p, &cm.cc.pm_1080i };
 
     for (i=0; i<num_modes; i++) {
-        mode_type = video_modes[i].type;
-
         switch (video_modes[i].group) {
-            case GROUP_NONE:
-            case GROUP_240P:
-                break;
             case GROUP_384P:
                 //fixed Line2x/3x mode for 240x360p
                 valid_lm[2] = MODE_L2_240x360;
@@ -72,31 +66,53 @@ alt_8 get_mode_id(alt_u32 totlines, alt_u8 progressive, alt_u32 hz, video_type t
                 valid_lm[3] = MODE_L4_GEN_4_3;
                 break;
             case GROUP_480P:
-                if (video_modes[i].v_total == 525) {
-                    if (video_modes[i-1].group == GROUP_480I) { // hit "480p" on the list
-                        if (cm.cc.s480p_mode == 0) // Auto
-                            mode_type &= ~VIDEO_PC;
-                        else if (cm.cc.s480p_mode == 2) // VESA 640x480@60
+                if (video_modes[i].vic == HDMI_480p60) {
+                    switch (cm.cc.s480p_mode) {
+                        case 0: // Auto
+                            if (h_syncinlen > 82)
+                                continue;
+                            break;
+                        case 1: // DTV 480p
+                            break;
+                        default:
                             continue;
-                    } else { // "640x480" on the list
-                        if (cm.cc.s480p_mode == 0) // Auto
-                            mode_type &= ~VIDEO_EDTV;
-                        else if (cm.cc.s480p_mode == 1) // DTV 480p
+                    }
+                } else if (video_modes[i].flags & MODE_L2_480x272) { // hit "480x272" on the list
+                    switch (cm.cc.s480p_mode) {
+                        case 3: // PSP 480x272
+                            // force optimized Line2x mode for 480x272
+                            valid_lm[1] = MODE_L2_480x272;
+                            break;
+                        default:
+                            continue;
+                    }
+                } else if (video_modes[i].vic == HDMI_640x480p60) {
+                    switch (cm.cc.s480p_mode) {
+                        case 0: // Auto
+                        case 2: // VESA 640x480@60
+                            break;
+                        default:
                             continue;
                     }
                 }
                 break;
-            case GROUP_1080I:
-                break;
             default:
-                printf("WARNING: Corrupted mode (id %d)\n", i);
-                continue;
                 break;
         }
 
+        // Skip potentially conflicting 50Hz presets if refresh rate is much higher
+        if ((video_modes[i].vic == HDMI_576p50) ||
+            (video_modes[i].vic == HDMI_720p50) ||
+            (video_modes[i].vic == HDMI_1080i50) ||
+            (video_modes[i].vic == HDMI_1080p50))
+        {
+            if (hz >= 55)
+                continue;
+        }
+
         target_lm = valid_lm[*group_ptr[video_modes[i].group]];
 
-        if ((typemask & mode_type) && (target_lm & video_modes[i].flags) && (progressive == !(video_modes[i].flags & MODE_INTERLACED)) && (totlines <= (video_modes[i].v_total+LINECNT_MAX_TOLERANCE))) {
+        if ((target_lm & video_modes[i].flags) && (progressive == !(video_modes[i].flags & MODE_INTERLACED)) && (totlines <= (video_modes[i].v_total+LINECNT_MAX_TOLERANCE))) {
 
             // defaults
             cm.tx_pixelrep = TX_PIXELREP_DISABLE;
@@ -111,8 +127,8 @@ alt_8 get_mode_id(alt_u32 totlines, alt_u8 progressive, alt_u32 hz, video_type t
                     cm.fpga_vmultmode = FPGA_V_MULTMODE_1X;
                     cm.fpga_hmultmode = FPGA_H_MULTMODE_FULLWIDTH;
                     cm.hdmitx_vic = video_modes[i].vic;
-                    // Upsample / pixel-repeat horizontal resolution of 240p/480i modes to fulfill min. 25MHz TMDS clock requirement
-                    if ((video_modes[i].group == GROUP_240P) || (video_modes[i].group == GROUP_480I)) {
+                    // Upsample / pixel-repeat horizontal resolution of 240p/480i/384p modes to fulfill min. 25MHz TMDS clock requirement
+                    if ((video_modes[i].group == GROUP_240P) || (video_modes[i].group == GROUP_480I) || ((video_modes[i].group == GROUP_384P) && (video_modes[i].flags & MODE_PLLDIVBY2))) {
                         if (cm.cc.upsample2x)
                             cm.sample_mult = 2;
                         else
@@ -140,6 +156,7 @@ alt_8 get_mode_id(alt_u32 totlines, alt_u8 progressive, alt_u32 hz, video_type t
                     }
                     break;
                 case MODE_L2_512_COL:
+                case MODE_L2_480x272:
                     cm.fpga_vmultmode = FPGA_V_MULTMODE_2X;
                     cm.fpga_hmultmode = FPGA_H_MULTMODE_OPTIMIZED;
                     cm.sample_mult = 2;

software/sys_controller/tvp7002/video_modes.h

@@ -36,7 +36,7 @@
 #define V_SYNCLEN_MIN 1
 #define V_SYNCLEN_MAX 7
 #define V_BPORCH_MIN 1
-#define V_BPORCH_MAX 63
+#define V_BPORCH_MAX 236  // 255 - 12 for L5FMT_1920x1080 - 7 for V_SYNCLEN_MAX
 #define V_ACTIVE_MIN 160
 #define V_ACTIVE_MAX 1200
 
@@ -75,23 +75,24 @@ typedef enum {
     MODE_L2_320_COL     = (1<<6),
     MODE_L2_256_COL     = (1<<7),
     MODE_L2_240x360     = (1<<8),
-    MODE_L3_GEN_16_9    = (1<<9),
-    MODE_L3_GEN_4_3     = (1<<10),
-    MODE_L3_512_COL     = (1<<11),
-    MODE_L3_384_COL     = (1<<12),
-    MODE_L3_320_COL     = (1<<13),
-    MODE_L3_256_COL     = (1<<14),
-    MODE_L3_240x360     = (1<<15),
-    MODE_L4_GEN_4_3     = (1<<16),
-    MODE_L4_512_COL     = (1<<17),
-    MODE_L4_384_COL     = (1<<18),
-    MODE_L4_320_COL     = (1<<19),
-    MODE_L4_256_COL     = (1<<20),
-    MODE_L5_GEN_4_3     = (1<<21),
-    MODE_L5_512_COL     = (1<<22),
-    MODE_L5_384_COL     = (1<<23),
-    MODE_L5_320_COL     = (1<<24),
-    MODE_L5_256_COL     = (1<<25),
+    MODE_L2_480x272     = (1<<9),
+    MODE_L3_GEN_16_9    = (1<<10),
+    MODE_L3_GEN_4_3     = (1<<11),
+    MODE_L3_512_COL     = (1<<12),
+    MODE_L3_384_COL     = (1<<13),
+    MODE_L3_320_COL     = (1<<14),
+    MODE_L3_256_COL     = (1<<15),
+    MODE_L3_240x360     = (1<<16),
+    MODE_L4_GEN_4_3     = (1<<17),
+    MODE_L4_512_COL     = (1<<18),
+    MODE_L4_384_COL     = (1<<19),
+    MODE_L4_320_COL     = (1<<20),
+    MODE_L4_256_COL     = (1<<21),
+    MODE_L5_GEN_4_3     = (1<<22),
+    MODE_L5_512_COL     = (1<<23),
+    MODE_L5_384_COL     = (1<<24),
+    MODE_L5_320_COL     = (1<<25),
+    MODE_L5_256_COL     = (1<<26),
 } mode_flags;
 
 typedef struct {
@@ -115,63 +116,68 @@ typedef struct {
 
 #define VIDEO_MODES_DEF { \
     /* 240p modes */ \
-    { "1600x240",  HDMI_Unknown,     1600,  240,  2046, 0, 262,  202, 15,  150, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L5_GEN_4_3 | MODE_PLLDIVBY2) },                                                           \
-    { "1280x240",  HDMI_Unknown,     1280,  240,  1560, 0, 262,  170, 15,   72, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2) },                                        \
-    { "960x240",   HDMI_Unknown,      960,  240,  1170, 0, 262,  128, 15,   54, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L3_GEN_4_3 | MODE_PLLDIVBY2) },                                                           \
-    { "512x240",   HDMI_Unknown,      512,  240,   682, 0, 262,   77, 14,   50, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L2_512_COL | MODE_L3_512_COL | MODE_L4_512_COL | MODE_L5_512_COL) },                      \
-    { "384x240",   HDMI_Unknown,      384,  240,   512, 0, 262,   59, 14,   37, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L2_384_COL | MODE_L3_384_COL | MODE_L4_384_COL | MODE_L5_384_COL) },                      \
-    { "320x240",   HDMI_Unknown,      320,  240,   426, 0, 262,   49, 14,   31, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L2_320_COL | MODE_L3_320_COL | MODE_L4_320_COL | MODE_L5_320_COL) },                      \
-    { "256x240",   HDMI_Unknown,      256,  240,   341, 0, 262,   39, 14,   25, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L2_256_COL | MODE_L3_256_COL | MODE_L4_256_COL | MODE_L5_256_COL) },                      \
-    { "240p",      HDMI_240p60,       720,  240,   858, 0, 262,   57, 15,   62, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
+    { "1600x240",  HDMI_Unknown,     1600,  240,  2046, 0,  262,  202, 15,  150, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L5_GEN_4_3 | MODE_PLLDIVBY2) },                                                           \
+    { "1280x240",  HDMI_Unknown,     1280,  240,  1560, 0,  262,  170, 15,   72, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2) },                                        \
+    { "960x240",   HDMI_Unknown,      960,  240,  1170, 0,  262,  128, 15,   54, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L3_GEN_4_3 | MODE_PLLDIVBY2) },                                                           \
+    { "512x240",   HDMI_Unknown,      512,  240,   682, 0,  262,   77, 14,   50, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L2_512_COL | MODE_L3_512_COL | MODE_L4_512_COL | MODE_L5_512_COL) },                      \
+    { "384x240",   HDMI_Unknown,      384,  240,   512, 0,  262,   59, 14,   37, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L2_384_COL | MODE_L3_384_COL | MODE_L4_384_COL | MODE_L5_384_COL) },                      \
+    { "320x240",   HDMI_Unknown,      320,  240,   426, 0,  262,   49, 14,   31, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L2_320_COL | MODE_L3_320_COL | MODE_L4_320_COL | MODE_L5_320_COL) },                      \
+    { "256x240",   HDMI_Unknown,      256,  240,   341, 0,  262,   39, 14,   25, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L2_256_COL | MODE_L3_256_COL | MODE_L4_256_COL | MODE_L5_256_COL) },                      \
+    { "240p",      HDMI_240p60,       720,  240,   858, 0,  262,   57, 15,   62, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
     /* 288p modes */ \
-    { "1600x240L", HDMI_Unknown,     1600,  240,  2046, 0, 312,  202, 41,  150, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L5_GEN_4_3 | MODE_PLLDIVBY2) },                                                           \
-    { "1280x288",  HDMI_Unknown,     1280,  288,  1560, 0, 312,  170, 15,   72, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2) },                                        \
-    { "960x288",   HDMI_Unknown,      960,  288,  1170, 0, 312,  128, 15,   54, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L3_GEN_4_3 | MODE_PLLDIVBY2) },                                                           \
-    { "512x240LB", HDMI_Unknown,      512,  240,   682, 0, 312,   77, 41,   50, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L2_512_COL | MODE_L3_512_COL | MODE_L4_512_COL | MODE_L5_512_COL) },                      \
-    { "384x240LB", HDMI_Unknown,      384,  240,   512, 0, 312,   59, 41,   37, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L2_384_COL | MODE_L3_384_COL | MODE_L4_384_COL | MODE_L5_384_COL) },                      \
-    { "320x240LB", HDMI_Unknown,      320,  240,   426, 0, 312,   49, 41,   31, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L2_320_COL | MODE_L3_320_COL | MODE_L4_320_COL | MODE_L5_320_COL) },                      \
-    { "256x240LB", HDMI_Unknown,      256,  240,   341, 0, 312,   39, 41,   25, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_L2_256_COL | MODE_L3_256_COL | MODE_L4_256_COL | MODE_L5_256_COL) },                      \
-    { "288p",      HDMI_288p50,       720,  288,   864, 0, 312,   69, 19,   63, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_240P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
+    { "1600x240L", HDMI_Unknown,     1600,  240,  2046, 0,  312,  202, 41,  150, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L5_GEN_4_3 | MODE_PLLDIVBY2) },                                                           \
+    { "1280x288",  HDMI_Unknown,     1280,  288,  1560, 0,  312,  170, 15,   72, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2) },                                        \
+    { "960x288",   HDMI_Unknown,      960,  288,  1170, 0,  312,  128, 15,   54, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L3_GEN_4_3 | MODE_PLLDIVBY2) },                                                           \
+    { "512x240LB", HDMI_Unknown,      512,  240,   682, 0,  312,   77, 41,   50, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L2_512_COL | MODE_L3_512_COL | MODE_L4_512_COL | MODE_L5_512_COL) },                      \
+    { "384x240LB", HDMI_Unknown,      384,  240,   512, 0,  312,   59, 41,   37, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L2_384_COL | MODE_L3_384_COL | MODE_L4_384_COL | MODE_L5_384_COL) },                      \
+    { "320x240LB", HDMI_Unknown,      320,  240,   426, 0,  312,   49, 41,   31, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L2_320_COL | MODE_L3_320_COL | MODE_L4_320_COL | MODE_L5_320_COL) },                      \
+    { "256x240LB", HDMI_Unknown,      256,  240,   341, 0,  312,   39, 41,   25, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_L2_256_COL | MODE_L3_256_COL | MODE_L4_256_COL | MODE_L5_256_COL) },                      \
+    { "288p",      HDMI_288p50,       720,  288,   864, 0,  312,   69, 19,   63, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_240P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
     /* 360p: GBI */ \
-    { "480x360",   HDMI_Unknown,      480,  360,   600, 0, 375,   63, 10,   38, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_EDTV),              GROUP_384P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
-    { "240x360",   HDMI_Unknown,      256,  360,   300, 0, 375,   24, 10,   18, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_EDTV),              GROUP_384P,     (MODE_L2_240x360 | MODE_L3_240x360) },                                                          \
-    /* 384p: Sega Model 2 */ \
-    { "384p",      HDMI_Unknown,      496,  384,   640, 0, 423,   50, 29,   62, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_EDTV),              GROUP_384P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
+    { "480x360",   HDMI_Unknown,      480,  360,   600, 0,  375,   63, 10,   38, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_EDTV,                 GROUP_384P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
+    { "240x360",   HDMI_Unknown,      256,  360,   300, 0,  375,   24, 10,   18, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_EDTV,                 GROUP_384P,     (MODE_L2_240x360 | MODE_L3_240x360) },                                                          \
+    /* 384p: Sega Model 2 (real vtotal=423, avoid collision with PC88/98 and VGA400p) */ \
+    { "384p",      HDMI_Unknown,      496,  384,   640, 0,  408,   50, 29,   62, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_EDTV,                 GROUP_384P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
     /* 400p line3x */ \
-    { "1600x400",  HDMI_Unknown,     1600,  400,  2000, 0, 449,  120, 34,  240, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                  GROUP_384P,     (MODE_L3_GEN_16_9) },                                                                          \
+    { "1600x400",  HDMI_Unknown,     1600,  400,  2000, 0,  449,  120, 34,  240, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_384P,     (MODE_L3_GEN_16_9) },                                                                           \
     /* 720x400@70Hz, VGA Mode 3+/7+ */ \
-    { "720x400",   HDMI_Unknown,      720,  400,   900, 0, 449,   64, 34,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                  GROUP_384P,     (MODE_PT | MODE_L2) },                                                                          \
+    { "720x400",   HDMI_Unknown,      720,  400,   900, 0,  449,   64, 34,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_384P,     (MODE_PT | MODE_L2) },                                                                          \
     /* 640x400@70Hz, VGA Mode 13h */ \
-    { "640x400",   HDMI_Unknown,      640,  400,   800, 0, 449,   48, 34,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                  GROUP_384P,     (MODE_PT | MODE_L2) },                                                                          \
+    { "640x400",   HDMI_Unknown,      640,  400,   800, 0,  449,   48, 34,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_384P,     (MODE_PT | MODE_L2) },                                                                          \
     /* 384p: X68k @ 24kHz */ \
-    { "640x384",   HDMI_Unknown,      640,  384,   800, 0, 492,   48, 63,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                  GROUP_384P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
+    { "640x384",   HDMI_Unknown,      640,  384,   800, 0,  492,   48, 63,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_384P,     (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) },                                                         \
     /* ~525-line modes */ \
-    { "480i",      HDMI_480i60,       720,  240,   858, 0, 525,   57, 15,   62, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_480I,     (MODE_PT | MODE_L2 | MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2 | MODE_INTERLACED) },  \
-    { "480p",      HDMI_480p60,       720,  480,   858, 0, 525,   60, 30,   62, 6,  DEFAULT_SAMPLER_PHASE, (VIDEO_EDTV | VIDEO_PC),   GROUP_480P,     (MODE_PT | MODE_L2) },                                                                          \
-    { "640x480",   HDMI_640x480p60,   640,  480,   800, 0, 525,   48, 33,   96, 2,  DEFAULT_SAMPLER_PHASE, (VIDEO_PC | VIDEO_EDTV),   GROUP_480P,     (MODE_PT | MODE_L2) },                                                                          \
+    { "480i",      HDMI_480i60,       720,  240,   858, 0,  525,   57, 15,   62, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_480I,     (MODE_PT | MODE_L2 | MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2 | MODE_INTERLACED) },  \
+    { "480p",      HDMI_480p60,       720,  480,   858, 0,  525,   60, 30,   62, 6,  DEFAULT_SAMPLER_PHASE, VIDEO_EDTV,                 GROUP_480P,     (MODE_PT | MODE_L2) },                                                                          \
+    /* 480p PSP in-game */ \
+    { "480x272",   HDMI_480p60_16x9,  480,  272,   858, 0,  525,  177,134,   62, 6,  DEFAULT_SAMPLER_PHASE, VIDEO_EDTV,                 GROUP_480P,     (MODE_PT | MODE_L2_480x272) },                                                                  \
+    { "640x480",   HDMI_640x480p60,   640,  480,   800, 0,  525,   48, 33,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_480P,     (MODE_PT | MODE_L2) },                                                                          \
     /* X68k @ 31kHz */ \
-    { "640x512",   HDMI_Unknown,      640,  512,   800, 0, 568,   48, 28,   96, 2,  DEFAULT_SAMPLER_PHASE, (VIDEO_PC | VIDEO_EDTV),   GROUP_480P,     (MODE_PT | MODE_L2) },                                                                          \
+    { "640x512",   HDMI_Unknown,      640,  512,   800, 0,  568,   48, 28,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_480P,     (MODE_PT | MODE_L2) },                                                                          \
     /* ~625-line modes */ \
-    { "576i",      HDMI_576i50,       720,  288,   864, 0, 625,   69, 19,   63, 3,  DEFAULT_SAMPLER_PHASE, (VIDEO_SDTV | VIDEO_PC),   GROUP_480I,     (MODE_PT | MODE_L2 | MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2 | MODE_INTERLACED) },  \
-    { "576p",      HDMI_576p50,       720,  576,   864, 0, 625,   68, 39,   64, 5,  DEFAULT_SAMPLER_PHASE, VIDEO_EDTV,                GROUP_480P,     (MODE_PT | MODE_L2) },                                                                          \
-    { "800x600",   HDMI_Unknown,      800,  600,  1056, 0, 628,   88, 23,  128, 4,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                  GROUP_NONE,     MODE_PT },                                                                                      \
+    { "576i",      HDMI_576i50,       720,  288,   864, 0,  625,   69, 19,   63, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_SDTV,                 GROUP_480I,     (MODE_PT | MODE_L2 | MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2 | MODE_INTERLACED) },  \
+    { "576p",      HDMI_576p50,       720,  576,   864, 0,  625,   68, 39,   64, 5,  DEFAULT_SAMPLER_PHASE, VIDEO_EDTV,                 GROUP_480P,     (MODE_PT | MODE_L2) },                                                                          \
+    { "800x600",   HDMI_Unknown,      800,  600,  1056, 0,  628,   88, 23,  128, 4,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_NONE,     MODE_PT },                                                                                      \
     /* 720p modes */ \
-    { "720p",      HDMI_720p60,      1280,  720,  1650, 0, 750,  220, 20,   40, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),   GROUP_NONE,     MODE_PT },                                                                                      \
+    { "720p_50",   HDMI_720p50,      1280,  720,  1980, 0,  750,  220, 20,   40, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),    GROUP_NONE,     MODE_PT },                                                                                      \
+    { "720p_60",   HDMI_720p60,      1280,  720,  1650, 0,  750,  220, 20,   40, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),    GROUP_NONE,     MODE_PT },                                                                                      \
     /* VESA XGA and SXGA modes */ \
-    { "1024x768",  HDMI_Unknown,     1024,  768,  1344, 0,  806,  160, 29,  136, 6,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                  GROUP_NONE,     MODE_PT },                                                                                      \
-    { "1280x1024", HDMI_Unknown,     1280, 1024,  1688, 0, 1066,  248, 38,  112, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                  GROUP_NONE,     MODE_PT },                                                                                      \
+    { "1024x768",  HDMI_Unknown,     1024,  768,  1344, 0,  806,  160, 29,  136, 6,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_NONE,     MODE_PT },                                                                                      \
+    { "1280x1024", HDMI_Unknown,     1280, 1024,  1688, 0, 1066,  248, 38,  112, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_NONE,     MODE_PT },                                                                                      \
     /* PS2 GSM 960i mode */ \
-    { "640x960i",  HDMI_Unknown,      640,  480,   800, 0, 1050,   48, 33,   96, 2,  DEFAULT_SAMPLER_PHASE, (VIDEO_EDTV | VIDEO_PC),   GROUP_1080I,    (MODE_PT | MODE_L2 | MODE_INTERLACED) },                                                        \
+    { "640x960i",  HDMI_Unknown,      640,  480,   800, 0, 1050,   48, 33,   96, 2,  DEFAULT_SAMPLER_PHASE, VIDEO_EDTV,                 GROUP_1080I,    (MODE_PT | MODE_L2 | MODE_INTERLACED) },                                                        \
     /* 1080i/p modes */ \
-    { "1080i",     HDMI_1080i60,     1920,  540,  2200, 0, 1125,  148, 16,   44, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),   GROUP_1080I,    (MODE_PT | MODE_L2 | MODE_INTERLACED) },                                                        \
-    { "1080p",     HDMI_1080p60,     1920, 1080,  2200, 0, 1125,  148, 36,   44, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),   GROUP_NONE,     MODE_PT },                                                                                      \
+    { "1080i_50",  HDMI_1080i50,     1920,  540,  2640, 0, 1125,  148, 15,   44, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),    GROUP_1080I,    (MODE_PT | MODE_L2 | MODE_INTERLACED) },                                                        \
+    { "1080i_60",  HDMI_1080i60,     1920,  540,  2200, 0, 1125,  148, 16,   44, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),    GROUP_1080I,    (MODE_PT | MODE_L2 | MODE_INTERLACED) },                                                        \
+    { "1080p_50",  HDMI_1080p50,     1920, 1080,  2640, 0, 1125,  148, 36,   44, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),    GROUP_NONE,     MODE_PT },                                                                                      \
+    { "1080p_60",  HDMI_1080p60,     1920, 1080,  2200, 0, 1125,  148, 36,   44, 5,  DEFAULT_SAMPLER_PHASE, (VIDEO_HDTV | VIDEO_PC),    GROUP_NONE,     MODE_PT },                                                                                      \
     /* VESA UXGA with 49 H.backporch cycles exchanged for H.synclen */ \
-    { "1600x1200", HDMI_Unknown,     1600, 1200,  2160, 0, 1250,  255, 46,  241, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                  GROUP_NONE,     MODE_PT },                                                                                      \
+    { "1600x1200", HDMI_Unknown,     1600, 1200,  2160, 0, 1250,  255, 46,  241, 3,  DEFAULT_SAMPLER_PHASE, VIDEO_PC,                   GROUP_NONE,     MODE_PT },                                                                                      \
 }
 
 #define VIDEO_MODES_SIZE (sizeof((mode_data_t[])VIDEO_MODES_DEF))
 #define VIDEO_MODES_CNT (sizeof((mode_data_t[])VIDEO_MODES_DEF)/sizeof(mode_data_t))
 
-alt_8 get_mode_id(alt_u32 totlines, alt_u8 progressive, alt_u32 hz, video_type typemask);
+alt_8 get_mode_id(alt_u32 totlines, alt_u8 progressive, alt_u32 hz, alt_u8 h_syncinlen);
 
 #endif /* VIDEO_MODES_H_ */

software/sys_controller/ulibSD/sd_io.c

@@ -32,7 +32,7 @@ DWORD __SD_Sectors (SD_DEV *dev)
         return (((DWORD)(ftell(dev->fp)))/((DWORD)512)-1);
     }
 }
-#else   // For use with uControllers   
+#else   // For use with uControllers
 /******************************************************************************
  Private Methods Prototypes - Direct work with SD card
 ******************************************************************************/
@@ -160,15 +160,15 @@ SDRESULTS __SD_Write_Block(SD_DEV *dev, void *dat, BYTE token)
     WORD idx;
     BYTE line;
     // Send token (single or multiple)
-    SPI_RW(token);
+    SPI_WW(token);
     // Single block write?
     if(token != 0xFD)
     {
         // Send block data
-        for(idx=0; idx!=SD_BLK_SIZE; idx++) SPI_RW(*((BYTE*)dat + idx));
+        for(idx=0; idx!=SD_BLK_SIZE; idx++) SPI_WW(*((BYTE*)dat + idx));
         /* Dummy CRC */
-        SPI_RW(0xFF);
-        SPI_RW(0xFF);
+        SPI_WW(0xFF);
+        SPI_WW(0xFF);
         // If not accepted, returns the reject error
         if((SPI_RW(0xFF) & 0x1F) != 0x05) return(SD_REJECT);
     }
@@ -201,7 +201,7 @@ DWORD __SD_Sectors (SD_DEV *dev)
     BYTE READ_BL_LEN = 0;
     int timer_set;
 
-    if(__SD_Send_Cmd(CMD9, 0)==0) 
+    if(__SD_Send_Cmd(CMD9, 0)==0)
     {
         // Wait for response
         timer_set = SPI_Timer_On(5);  // Wait for data packet (timeout of 5ms)
@@ -262,7 +262,7 @@ DWORD __SD_Sectors (SD_DEV *dev)
 SDRESULTS SD_Init(SD_DEV *dev)
 {
     BYTE initdata[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-#if defined(_M_IX86)    // x86 
+#if defined(_M_IX86)    // x86
     dev->fp = fopen(dev->fn, "r+");
     if (dev->fp == NULL)
         return (SD_ERROR);
@@ -400,7 +400,7 @@ SDRESULTS SD_Read(SD_DEV *dev, void *dat, DWORD sector, WORD ofs, WORD cnt)
         } while((tkn==0xFF)&&(SPI_Timer_Status()==TRUE));
         SPI_Timer_Off();
         // Token of single block?
-        if(tkn==0xFE) { 
+        if(tkn==0xFE) {
             // Size block (512 bytes) + CRC (2 bytes) - offset - bytes to count
             remaining = SD_BLK_SIZE + 2 - ofs - cnt;
             // Skip offset
@@ -447,9 +447,13 @@ SDRESULTS SD_Write(SD_DEV *dev, void *dat, DWORD sector)
 #else   // uControllers
     // Query ok?
     if(sector > dev->last_sector) return(SD_PARERR);
+    // Convert sector number to byte address (sector * SD_BLK_SIZE) for SDC1
+    if (!(dev->cardtype & SDCT_BLOCK))
+        sector *= SD_BLK_SIZE;
+
     // Single block write (token <- 0xFE)
     // Convert sector number to bytes address (sector * SD_BLK_SIZE)
-    if(__SD_Send_Cmd(CMD24, sector * SD_BLK_SIZE)==0)
+    if(__SD_Send_Cmd(CMD24, sector)==0)
         return(__SD_Write_Block(dev, dat, 0xFE));
     else
         return(SD_ERROR);

software/sys_controller/ulibSD/spi_io.c

@@ -15,7 +15,7 @@ void SPI_Init (void) {
     I2C_init(SD_SPI_BASE,ALT_CPU_FREQ,400000);
 }
 
-void SPI_W(BYTE *wd, int len) {
+void SPI_W(const BYTE *wd, int len) {
     SPI_write(SD_SPI_BASE, wd, len);
 }
 
@@ -23,6 +23,10 @@ void SPI_R(BYTE *rd, int len) {
     SPI_read(SD_SPI_BASE, rd, len);
 }
 
+void SPI_WW(BYTE d) {
+    SPI_W(&d, 1);
+}
+
 BYTE SPI_RW (BYTE d) {
     BYTE w;
     SPI_R(&w, 1);

software/sys_controller/ulibSD/spi_io.h

@@ -33,15 +33,21 @@ void SPI_R (BYTE *rd, int len);
     \param *wd Pointer to array which holds the bytes.
     \param len Length of the array.
  */
-void SPI_W (BYTE *wd, int len);
+void SPI_W (const BYTE *wd, int len);
 
 /**
-    \brief Read/Write a single byte.
-    \param d Byte to send.
+    \brief Read a single byte.
+    \param d Byte. Ignored.
     \return Byte that arrived.
  */
 BYTE SPI_RW (BYTE d);
 
+/**
+    \brief Write a single byte.
+    \param d Byte to write.
+ */
+void SPI_WW(BYTE d);
+
 /**
     \brief Flush of SPI buffer.
  */

software/sys_controller_bsp/Makefile

@@ -225,12 +225,12 @@ altera_avalon_timer_driver_C_LIB_SRCS := \
 	$(altera_avalon_timer_driver_SRCS_ROOT)/src/altera_avalon_timer_ts.c \
 	$(altera_avalon_timer_driver_SRCS_ROOT)/src/altera_avalon_timer_vars.c
 
-# altera_epcq_controller_mod_driver sources root 
-altera_epcq_controller_mod_driver_SRCS_ROOT := drivers
+# altera_epcq_controller2_driver sources root
+altera_epcq_controller2_driver_SRCS_ROOT := drivers
 
-# altera_epcq_controller_mod_driver sources 
-altera_epcq_controller_mod_driver_C_LIB_SRCS := \
-	$(altera_epcq_controller_mod_driver_SRCS_ROOT)/src/altera_epcq_controller_mod.c
+# altera_epcq_controller2_driver sources
+altera_epcq_controller2_driver_C_LIB_SRCS := \
+	$(altera_epcq_controller2_driver_SRCS_ROOT)/src/altera_epcq_controller2.c
 
 # altera_nios2_gen2_hal_driver sources root 
 altera_nios2_gen2_hal_driver_SRCS_ROOT := HAL
@@ -276,7 +276,7 @@ nios2_hw_crc32_driver_SRCS_ROOT := drivers
 COMPONENT_C_LIB_SRCS += \
 	$(altera_avalon_jtag_uart_driver_C_LIB_SRCS) \
 	$(altera_avalon_timer_driver_C_LIB_SRCS) \
-	$(altera_epcq_controller_mod_driver_C_LIB_SRCS) \
+	$(altera_epcq_controller2_driver_C_LIB_SRCS) \
 	$(altera_nios2_gen2_hal_driver_C_LIB_SRCS) \
 	$(hal_C_LIB_SRCS) \
 	$(i2c_opencores_driver_C_LIB_SRCS) \

software/sys_controller_bsp/alt_sys_init.c

@@ -61,7 +61,7 @@
 //#include "altera_nios2_gen2_irq.h"
 #include "altera_avalon_jtag_uart.h"
 #include "altera_avalon_timer.h"
-#include "altera_epcq_controller_mod.h"
+#include "altera_epcq_controller2.h"
 #include "i2c_opencores.h"
 
 /*
@@ -71,7 +71,7 @@
 //ALTERA_NIOS2_GEN2_IRQ_INSTANCE ( NIOS2_QSYS_0, nios2_qsys_0);
 ALTERA_AVALON_JTAG_UART_INSTANCE ( JTAG_UART_0, jtag_uart_0);
 ALTERA_AVALON_TIMER_INSTANCE ( TIMER_0, timer_0);
-ALTERA_EPCQ_CONTROLLER_MOD_AVL_MEM_AVL_CSR_INSTANCE ( EPCQ_CONTROLLER_0, EPCQ_CONTROLLER_0_AVL_MEM, EPCQ_CONTROLLER_0_AVL_CSR, epcq_controller_0);
+ALTERA_EPCQ_CONTROLLER2_AVL_MEM_AVL_CSR_INSTANCE ( EPCQ_CONTROLLER2_0, EPCQ_CONTROLLER2_0_AVL_MEM, EPCQ_CONTROLLER2_0_AVL_CSR, epcq_controller2_0);
 I2C_OPENCORES_INSTANCE ( I2C_OPENCORES_0, i2c_opencores_0);
 I2C_OPENCORES_INSTANCE ( I2C_OPENCORES_1, i2c_opencores_1);
 
@@ -98,7 +98,7 @@ void alt_sys_init( void )
 {
     ALTERA_AVALON_TIMER_INIT ( TIMER_0, timer_0);
     ALTERA_AVALON_JTAG_UART_INIT ( JTAG_UART_0, jtag_uart_0);
-    ALTERA_EPCQ_CONTROLLER_MOD_INIT ( EPCQ_CONTROLLER_0, epcq_controller_0);
+    ALTERA_EPCQ_CONTROLLER2_INIT ( EPCQ_CONTROLLER2_0, epcq_controller2_0);
     I2C_OPENCORES_INIT ( I2C_OPENCORES_0, i2c_opencores_0);
     I2C_OPENCORES_INIT ( I2C_OPENCORES_1, i2c_opencores_1);
 }

software/sys_controller_bsp/drivers/inc/altera_epcq_controller2.h

@@ -28,8 +28,8 @@
 *                                                                             *
 ******************************************************************************/
 
-#ifndef __ALT_EPCQ_CONTROLLER_H__
-#define __ALT_EPCQ_CONTROLLER_H__
+#ifndef __ALT_EPCQ_CONTROLLER2_H__
+#define __ALT_EPCQ_CONTROLLER2_H__
 
 #include "alt_types.h"
 #include "sys/alt_flash_dev.h"
@@ -43,7 +43,7 @@ extern "C"
 /**
  *  Description of the EPCQ controller
  */
-typedef struct alt_epcq_controller_dev
+typedef struct alt_epcq_controller2_dev
 {
     alt_flash_dev dev;
 
@@ -56,25 +56,25 @@ typedef struct alt_epcq_controller_dev
     alt_u32 sector_size; /** size of each flash sector */
     alt_u32 page_size; /** page size */
     alt_u32 silicon_id; /** ID of silicon used with EPCQ IP */
-} alt_epcq_controller_dev;
+} alt_epcq_controller2_dev;
 
 /**
 *   Macros used by alt_sys_init.c to create data storage for driver instance
 */
-#define ALTERA_EPCQ_CONTROLLER_MOD_AVL_MEM_AVL_CSR_INSTANCE(epcq_name, avl_mem, avl_csr, epcq_dev) \
-alt_epcq_controller_dev epcq_dev =                                                       \
+#define ALTERA_EPCQ_CONTROLLER2_AVL_MEM_AVL_CSR_INSTANCE(epcq_name, avl_mem, avl_csr, epcq_dev) \
+static alt_epcq_controller2_dev epcq_dev =                                                       \
 {                                                                                               \
   .dev = {                                                                                      \
             .llist = ALT_LLIST_ENTRY,                                                           \
             .name = avl_mem##_NAME,                                                             \
-            .write = alt_epcq_controller_write,                                                 \
-            .read = alt_epcq_controller_read,                                                   \
-            .get_info = alt_epcq_controller_get_info,                                           \
-            .erase_block = alt_epcq_controller_erase_block,                                     \
-            .write_block = alt_epcq_controller_write_block,                                     \
+            .write = alt_epcq_controller2_write,                                                 \
+            .read = alt_epcq_controller2_read,                                                   \
+            .get_info = alt_epcq_controller2_get_info,                                           \
+            .erase_block = alt_epcq_controller2_erase_block,                                     \
+            .write_block = alt_epcq_controller2_write_block,                                     \
             .base_addr = ((void*)(avl_mem##_BASE)),                                             \
             .length = ((int)(avl_mem##_SPAN)),                                                  \
-            .lock = alt_epcq_controller_lock ,                                                  \
+            .lock = alt_epcq_controller2_lock ,                                                  \
          },                                                                                     \
   .data_base = ((alt_u32)(avl_mem##_BASE)),   							\
   .data_end = ((alt_u32)(avl_mem##_BASE) + (alt_u32)(avl_mem##_SPAN)),	                        \
@@ -94,33 +94,33 @@ alt_epcq_controller_dev epcq_dev =
     of the Nios II Software Developer's Handbook.
 
 */
-int alt_epcq_controller_read(alt_flash_dev *flash_info, int offset, void *dest_addr, int length);
+int alt_epcq_controller2_read(alt_flash_dev *flash_info, int offset, void *dest_addr, int length);
 
-int alt_epcq_controller_get_info(alt_flash_fd *fd, flash_region **info, int *number_of_regions);
+int alt_epcq_controller2_get_info(alt_flash_fd *fd, flash_region **info, int *number_of_regions);
 
-int alt_epcq_controller_erase_block(alt_flash_dev *flash_info, int block_offset);
+int alt_epcq_controller2_erase_block(alt_flash_dev *flash_info, int block_offset);
 
-int alt_epcq_controller_write_block(alt_flash_dev *flash_info, int block_offset, int data_offset, const void *data, int length);
+int alt_epcq_controller2_write_block(alt_flash_dev *flash_info, int block_offset, int data_offset, const void *data, int length);
 
-int alt_epcq_controller_write(alt_flash_dev *flash_info, int offset, const void *src_addr, int length);
+int alt_epcq_controller2_write(alt_flash_dev *flash_info, int offset, const void *src_addr, int length);
 
-int alt_epcq_controller_lock(alt_flash_dev *flash_info, alt_u32 sectors_to_lock);
+int alt_epcq_controller2_lock(alt_flash_dev *flash_info, alt_u32 sectors_to_lock);
 
 
 /*
  * Initialization function
  */
-extern alt_32 altera_epcq_controller_init(alt_epcq_controller_dev *dev);
+extern alt_32 altera_epcq_controller2_init(alt_epcq_controller2_dev *dev);
 
 /*
  * alt_sys_init.c will call this macro automatically initialize the driver instance
  */
-#define ALTERA_EPCQ_CONTROLLER_MOD_INIT(name, dev) 	\
-		altera_epcq_controller_init(&dev);
+#define ALTERA_EPCQ_CONTROLLER2_INIT(name, dev) 	\
+		altera_epcq_controller2_init(&dev);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __ALT_EPCQ_CONTROLLER_H__ */
+#endif /* __ALT_EPCQ_CONTROLLER2_H__ */

software/sys_controller_bsp/drivers/inc/altera_epcq_controller2_regs.h

@@ -28,8 +28,8 @@
 *                                                                             *
 ******************************************************************************/
 
-#ifndef __ALTERA_EPCQ_CONTROLLER_REGS_H__
-#define __ALTERA_EPCQ_CONTROLLER_REGS_H__
+#ifndef __ALTERA_EPCQ_CONTROLLER2_REGS_H__
+#define __ALTERA_EPCQ_CONTROLLER2_REGS_H__
 
 #include <io.h>
 
@@ -41,31 +41,31 @@
  * data sheet,
  *
  */
-#define ALTERA_EPCQ_CONTROLLER_STATUS_REG                       (0x0)
+#define ALTERA_EPCQ_CONTROLLER2_STATUS_REG                       (0x0)
 
 /*
  * EPCQ_RD_STATUS register access macros
  */
-#define IOADDR_ALTERA_EPCQ_CONTROLLER_STATUS(base) \
-    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER_STATUS_REG)
+#define IOADDR_ALTERA_EPCQ_CONTROLLER2_STATUS(base) \
+    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER2_STATUS_REG)
 
-#define IORD_ALTERA_EPCQ_CONTROLLER_STATUS(base) \
-    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_STATUS_REG)
+#define IORD_ALTERA_EPCQ_CONTROLLER2_STATUS(base) \
+    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_STATUS_REG)
 
-#define IOWR_ALTERA_EPCQ_CONTROLLER_STATUS(base, data) \
-    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_STATUS_REG, data)
+#define IOWR_ALTERA_EPCQ_CONTROLLER2_STATUS(base, data) \
+    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_STATUS_REG, data)
 
 /*
  * EPCQ_RD_STATUS register description macros
  */
 
 /** Write in progress bit */
-#define ALTERA_EPCQ_CONTROLLER_STATUS_WIP_MASK                  (0x00000001)
-#define ALTERA_EPCQ_CONTROLLER_STATUS_WIP_AVAILABLE             (0x00000000)
-#define ALTERA_EPCQ_CONTROLLER_STATUS_WIP_BUSY                  (0x00000001)
+#define ALTERA_EPCQ_CONTROLLER2_STATUS_WIP_MASK                  (0x00000001)
+#define ALTERA_EPCQ_CONTROLLER2_STATUS_WIP_AVAILABLE             (0x00000000)
+#define ALTERA_EPCQ_CONTROLLER2_STATUS_WIP_BUSY                  (0x00000001)
 /** When to time out a poll of the write in progress bit */
 /* 0.7 sec time out */
-#define ALTERA_EPCQ_CONTROLLER_1US_TIMEOUT_VALUE    		    700000 
+#define ALTERA_EPCQ_CONTROLLER2_1US_TIMEOUT_VALUE                700000 
 
 /*
  * EPCQ_RD_SID register offset
@@ -77,19 +77,19 @@
  * This register is valid only if the device is an EPCS.
  *
  */
-#define ALTERA_EPCQ_CONTROLLER_SID_REG                          (0x4)
+#define ALTERA_EPCQ_CONTROLLER2_SID_REG                          (0x4)
 
 /*
  * EPCQ_RD_SID register access macros
  */
-#define IOADDR_ALTERA_EPCQ_CONTROLLER_SID(base) \
-    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER_SID_REG)
+#define IOADDR_ALTERA_EPCQ_CONTROLLER2_SID(base) \
+    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER2_SID_REG)
 
-#define IORD_ALTERA_EPCQ_CONTROLLER_SID(base) \
-    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_SID_REG)
+#define IORD_ALTERA_EPCQ_CONTROLLER2_SID(base) \
+    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_SID_REG)
 
-#define IOWR_ALTERA_EPCQ_CONTROLLER_SID(base, data) \
-    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_SID_REG, data)
+#define IOWR_ALTERA_EPCQ_CONTROLLER2_SID(base, data) \
+    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_SID_REG, data)
 
 /*
  * EPCQ_RD_SID register description macros
@@ -97,10 +97,10 @@
  * Specific device values obtained from Table 14 of: 
  * "Serial Configuration (EPCS) Devices Datasheet"
  */
-#define ALTERA_EPCQ_CONTROLLER_SID_MASK                         (0x000000FF)
-#define ALTERA_EPCQ_CONTROLLER_SID_EPCS16                       (0x00000014)
-#define ALTERA_EPCQ_CONTROLLER_SID_EPCS64                       (0x00000016)
-#define ALTERA_EPCQ_CONTROLLER_SID_EPCS128                      (0x00000018)
+#define ALTERA_EPCQ_CONTROLLER2_SID_MASK                         (0x000000FF)
+#define ALTERA_EPCQ_CONTROLLER2_SID_EPCS16                       (0x00000014)
+#define ALTERA_EPCQ_CONTROLLER2_SID_EPCS64                       (0x00000016)
+#define ALTERA_EPCQ_CONTROLLER2_SID_EPCS128                      (0x00000018)
 
 /*
  * EPCQ_RD_RDID register offset
@@ -112,19 +112,19 @@
  * This register is only valid if the device is an EPCQ.
  *
  */
-#define ALTERA_EPCQ_CONTROLLER_RDID_REG                         (0x8)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_REG                         (0x8)
 
 /*
  * EPCQ_RD_RDID register access macros
  */
-#define IOADDR_ALTERA_EPCQ_CONTROLLER_RDID(base) \
-    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER_RDID_REG)
+#define IOADDR_ALTERA_EPCQ_CONTROLLER2_RDID(base) \
+    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER2_RDID_REG)
 
-#define IORD_ALTERA_EPCQ_CONTROLLER_RDID(base) \
-    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_RDID_REG)
+#define IORD_ALTERA_EPCQ_CONTROLLER2_RDID(base) \
+    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_RDID_REG)
 
-#define IOWR_ALTERA_EPCQ_CONTROLLER_RDID(base, data) \
-    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_RDID_REG, data)
+#define IOWR_ALTERA_EPCQ_CONTROLLER2_RDID(base, data) \
+    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_RDID_REG, data)
 
 /*
  * EPCQ_RD_RDID register description macros
@@ -133,14 +133,14 @@
  *  "Quad-Serial Configuration (EPCQ (www.altera.com/literature/hb/cfg/cfg_cf52012.pdf))
  *  Devices Datasheet"
  */
-#define ALTERA_EPCQ_CONTROLLER_RDID_MASK                         (0x000000FF)
-#define ALTERA_EPCQ_CONTROLLER_RDID_EPCQ16                       (0x00000015)
-#define ALTERA_EPCQ_CONTROLLER_RDID_EPCQ32                       (0x00000016)
-#define ALTERA_EPCQ_CONTROLLER_RDID_EPCQ64                       (0x00000017)
-#define ALTERA_EPCQ_CONTROLLER_RDID_EPCQ128                      (0x00000018)
-#define ALTERA_EPCQ_CONTROLLER_RDID_EPCQ256                      (0x00000019)
-#define ALTERA_EPCQ_CONTROLLER_RDID_EPCQ512                      (0x00000020)
-#define ALTERA_EPCQ_CONTROLLER_RDID_EPCQ1024                     (0x00000021)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_MASK                         (0x000000FF)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ16                       (0x00000015)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ32                       (0x00000016)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ64                       (0x00000017)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ128                      (0x00000018)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ256                      (0x00000019)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ512                      (0x00000020)
+#define ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ1024                     (0x00000021)
 
 /*
  * EPCQ_MEM_OP register offset
@@ -148,30 +148,31 @@
  * The EPCQ_MEM_OP register is used to do memory protect and erase operations
  *
  */
-#define ALTERA_EPCQ_CONTROLLER_MEM_OP_REG                       (0xC)
+#define ALTERA_EPCQ_CONTROLLER2_MEM_OP_REG                       (0xC)
 
 /*
  * EPCQ_MEM_OP register access macros
  */
-#define IOADDR_ALTERA_EPCQ_CONTROLLER_MEM_OP(base) \
-    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER_MEM_OP_REG)
+#define IOADDR_ALTERA_EPCQ_CONTROLLER2_MEM_OP(base) \
+    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER2_MEM_OP_REG)
 
-#define IORD_ALTERA_EPCQ_CONTROLLER_MEM_OP(base) \
-    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_MEM_OP_REG)
+#define IORD_ALTERA_EPCQ_CONTROLLER2_MEM_OP(base) \
+    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_MEM_OP_REG)
 
-#define IOWR_ALTERA_EPCQ_CONTROLLER_MEM_OP(base, data) \
-    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_MEM_OP_REG, data)
+#define IOWR_ALTERA_EPCQ_CONTROLLER2_MEM_OP(base, data) \
+    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_MEM_OP_REG, data)
 
 /*
  * EPCQ_MEM_OP register description macros
  */
-#define ALTERA_EPCQ_CONTROLLER_MEM_OP_CMD_MASK                  (0x00000003)
-#define ALTERA_EPCQ_CONTROLLER_MEM_OP_BULK_ERASE_CMD            (0x00000001)
-#define ALTERA_EPCQ_CONTROLLER_MEM_OP_SECTOR_ERASE_CMD          (0x00000002)
-#define ALTERA_EPCQ_CONTROLLER_MEM_OP_SECTOR_PROTECT_CMD        (0x00000003)
+#define ALTERA_EPCQ_CONTROLLER2_MEM_OP_CMD_MASK                  (0x00000003)
+#define ALTERA_EPCQ_CONTROLLER2_MEM_OP_BULK_ERASE_CMD            (0x00000001)
+#define ALTERA_EPCQ_CONTROLLER2_MEM_OP_SECTOR_ERASE_CMD          (0x00000002)
+#define ALTERA_EPCQ_CONTROLLER2_MEM_OP_SECTOR_PROTECT_CMD        (0x00000003)
+#define ALTERA_EPCQ_CONTROLLER2_MEM_OP_WRITE_ENABLE_CMD          (0x00000004)
 
 /** see datasheet for sector values */
-#define ALTERA_EPCQ_CONTROLLER_MEM_OP_SECTOR_VALUE_MASK         (0x00FFFF00)
+#define ALTERA_EPCQ_CONTROLLER2_MEM_OP_SECTOR_VALUE_MASK         (0x00FFFF00)
 
 /*
  * EPCQ_ISR register offset
@@ -180,28 +181,28 @@
  * operation triggered an interrupt
  *
  */
-#define ALTERA_EPCQ_CONTROLLER_ISR_REG                          (0x10)
+#define ALTERA_EPCQ_CONTROLLER2_ISR_REG                          (0x10)
 
 /*
  * EPCQ_ISR register access macros
  */
-#define IOADDR_ALTERA_EPCQ_CONTROLLER_ISR(base) \
-    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER_ISR_REG)
+#define IOADDR_ALTERA_EPCQ_CONTROLLER2_ISR(base) \
+    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER2_ISR_REG)
 
-#define IORD_ALTERA_EPCQ_CONTROLLER_ISR(base) \
-    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_ISR_REG)
+#define IORD_ALTERA_EPCQ_CONTROLLER2_ISR(base) \
+    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_ISR_REG)
 
-#define IOWR_ALTERA_EPCQ_CONTROLLER_ISR(base, data) \
-    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_ISR_REG, data)
+#define IOWR_ALTERA_EPCQ_CONTROLLER2_ISR(base, data) \
+    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_ISR_REG, data)
 
 /*
  * EPCQ_ISR register description macros
  */
-#define ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_ERASE_MASK           (0x00000001)
-#define ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_ERASE_ACTIVE         (0x00000001)
+#define ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_ERASE_MASK           (0x00000001)
+#define ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_ERASE_ACTIVE         (0x00000001)
 
-#define ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_WRITE_MASK           (0x00000002)
-#define ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_WRITE_ACTIVE         (0x00000002)
+#define ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_WRITE_MASK           (0x00000002)
+#define ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_WRITE_ACTIVE         (0x00000002)
 
 
 /*
@@ -211,28 +212,28 @@
  * interrupts.
  *
  */
-#define ALTERA_EPCQ_CONTROLLER_IMR_REG                          (0x14)
+#define ALTERA_EPCQ_CONTROLLER2_IMR_REG                          (0x14)
 
 /*
  * EPCQ_IMR register access macros
  */
-#define IOADDR_ALTERA_EPCQ_CONTROLLER_IMR(base) \
-    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER_IMR_REG)
+#define IOADDR_ALTERA_EPCQ_CONTROLLER2_IMR(base) \
+    __IO_CALC_ADDRESS_DYNAMIC(base, ALTERA_EPCQ_CONTROLLER2_IMR_REG)
 
-#define IORD_ALTERA_EPCQ_CONTROLLER_IMR(base) \
-    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_IMR_REG)
+#define IORD_ALTERA_EPCQ_CONTROLLER2_IMR(base) \
+    IORD_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_IMR_REG)
 
-#define IOWR_ALTERA_EPCQ_CONTROLLER_IMR(base, data) \
-    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER_IMR_REG, data)
+#define IOWR_ALTERA_EPCQ_CONTROLLER2_IMR(base, data) \
+    IOWR_32DIRECT(base, ALTERA_EPCQ_CONTROLLER2_IMR_REG, data)
 
 /*
  * EPCQ_IMR register description macros
  */
-#define ALTERA_EPCQ_CONTROLLER_IMR_ILLEGAL_ERASE_MASK           (0x00000001)
-#define ALTERA_EPCQ_CONTROLLER_IMR_ILLEGAL_ERASE_ENABLED        (0x00000001)
+#define ALTERA_EPCQ_CONTROLLER2_IMR_ILLEGAL_ERASE_MASK           (0x00000001)
+#define ALTERA_EPCQ_CONTROLLER2_IMR_ILLEGAL_ERASE_ENABLED        (0x00000001)
 
-#define ALTERA_EPCQ_CONTROLLER_IMR_ILLEGAL_WRITE_MASK           (0x00000002)
-#define ALTERA_EPCQ_CONTROLLER_IMR_ILLEGAL_WRITE_ENABLED        (0x00000002)
+#define ALTERA_EPCQ_CONTROLLER2_IMR_ILLEGAL_WRITE_MASK           (0x00000002)
+#define ALTERA_EPCQ_CONTROLLER2_IMR_ILLEGAL_WRITE_ENABLED        (0x00000002)
 
 /*
  * EPCQ_CHIP_SELECT register offset
@@ -257,4 +258,4 @@
 #define ALTERA_EPCQ_CHIP2_SELECT        (0x00000002)
 #define ALTERA_EPCQ_CHIP3_SELECT        (0x00000003)
 
-#endif /* __ALTERA_EPCQ_CONTROLLER_REGS_H__ */
+#endif /* __ALTERA_EPCQ_CONTROLLER2_REGS_H__ */

software/sys_controller_bsp/drivers/inc/altera_epcq_controller_mod.h

@@ -1 +0,0 @@
-../../../../ip/altera_epcq_controller_mod/HAL/inc/altera_epcq_controller_mod.h

software/sys_controller_bsp/drivers/inc/altera_epcq_controller_mod_regs.h

@@ -1 +0,0 @@
-../../../../ip/altera_epcq_controller_mod/inc/altera_epcq_controller_mod_regs.h

software/sys_controller_bsp/drivers/src/altera_epcq_controller2.c

@@ -34,16 +34,15 @@
 #include <stddef.h>
 #include "sys/param.h"
 #include "alt_types.h"
-#include "altera_epcq_controller_mod_regs.h"
-#include "altera_epcq_controller_mod.h"
+#include "altera_epcq_controller2_regs.h"
+#include "altera_epcq_controller2.h"
 #include "priv/alt_busy_sleep.h"
 #include "sys/alt_debug.h"
 #include "sys/alt_cache.h"
 
 
-ALT_INLINE alt_32 static alt_epcq_validate_read_write_arguments(alt_epcq_controller_dev *flash_info,alt_u32 offset, alt_u32 length);
-alt_32 static alt_epcq_poll_for_write_in_progress(alt_epcq_controller_dev* epcq_flash_info);
-ALT_INLINE unsigned char static bitswap8(unsigned char v);
+ALT_INLINE alt_32 static alt_epcq_validate_read_write_arguments(alt_epcq_controller2_dev *flash_info,alt_u32 offset, alt_u32 length);
+alt_32 static alt_epcq_poll_for_write_in_progress(alt_epcq_controller2_dev* epcq_flash_info);
 
 /*
  *  Public API
@@ -55,7 +54,7 @@ ALT_INLINE unsigned char static bitswap8(unsigned char v);
 
 
  /**
-  * alt_epcq_controller_lock
+  * alt_epcq_controller2_lock
   *
   *  Locks the range of the memory sectors, which 
   *  protected from write and erase.
@@ -72,52 +71,52 @@ ALT_INLINE unsigned char static bitswap8(unsigned char v);
   * -ETIME  -> Time out and skipping the looping after 0.7 sec.
   * -ENOLCK -> Sectors lock failed.
 **/
-int alt_epcq_controller_lock(alt_flash_dev *flash_info, alt_u32 sectors_to_lock)
+int alt_epcq_controller2_lock(alt_flash_dev *flash_info, alt_u32 sectors_to_lock)
 {
     alt_u32 mem_op_value = 0; /* value to write to EPCQ_MEM_OP register */
-    alt_epcq_controller_dev* epcq_flash_info = NULL;
+    alt_epcq_controller2_dev* epcq_flash_info = NULL;
     alt_u32 result = 0;
     alt_32 status = 0;
 
     /* return -EINVAL if flash_info is NULL */
     if(NULL == flash_info || 0 > sectors_to_lock)
     {
-    	return -EINVAL;
+        return -EINVAL;
     }
-	
-    epcq_flash_info = (alt_epcq_controller_dev*)flash_info;
+    
+    epcq_flash_info = (alt_epcq_controller2_dev*)flash_info;
 
     /* sector value should occupy bits 17:8 */
     mem_op_value = sectors_to_lock << 8;
 
     /* sector protect commands 0b11 occupies lower 2 bits */
-    mem_op_value |= ALTERA_EPCQ_CONTROLLER_MEM_OP_SECTOR_PROTECT_CMD;
+    mem_op_value |= ALTERA_EPCQ_CONTROLLER2_MEM_OP_SECTOR_PROTECT_CMD;
 
     /* write sector protect command to EPCQ_MEM_OP register to protect sectors */
-    IOWR_ALTERA_EPCQ_CONTROLLER_MEM_OP(epcq_flash_info->csr_base, mem_op_value);
+    IOWR_ALTERA_EPCQ_CONTROLLER2_MEM_OP(epcq_flash_info->csr_base, mem_op_value);
     
     /* poll write in progress to make sure no operation is in progress */
     status = alt_epcq_poll_for_write_in_progress(epcq_flash_info);
     if(status != 0)
     {
-    	return status;
+        return status;
     }
-	
-	status = IORD_ALTERA_EPCQ_CONTROLLER_STATUS(epcq_flash_info->csr_base);
-	result |= (status >> 2) & 0x07; /* extract out BP3 - BP0 */
-	result |= (status >> 3) & 0x08; /* extract out BP4 */
+    
+    status = IORD_ALTERA_EPCQ_CONTROLLER2_STATUS(epcq_flash_info->csr_base);
+    result |= (status >> 2) & 0x07; /* extract out BP3 - BP0 */
+    result |= (status >> 3) & 0x08; /* extract out BP4 */
     result |= (status >> 1) & 0x10; /* extract out TOP/BOTTOM bit */
 
-	if(result != sectors_to_lock)
-	{
-		return -ENOLCK;
-	}
+    if(result != sectors_to_lock)
+    {
+        /*return -ENOLCK;*/
+    }
 
     return 0;
 }
 
 /**
- * alt_epcq_controller_get_info
+ * alt_epcq_controller2_get_info
  *
  * Pass the table of erase blocks to the user. This flash will return a single
  * flash_region that gives the number and size of sectors for the device used.
@@ -134,19 +133,19 @@ int alt_epcq_controller_lock(alt_flash_dev *flash_info, alt_u32 sectors_to_lock)
  * -EINVAL -> Invalid arguments
  * -EIO -> Could be hardware problem.
 **/
-int alt_epcq_controller_get_info
+int alt_epcq_controller2_get_info
 (
     alt_flash_fd *fd, /** flash device descriptor */
     flash_region **info, /** pointer to flash_region will be stored here */
     int *number_of_regions /** number of regions will be stored here */
 )
 {
-	alt_flash_dev* flash = NULL;
-	
-	/* return -EINVAL if fd,info and number_of_regions are NULL */
-	if(NULL == fd || NULL == info || NULL == number_of_regions)
+    alt_flash_dev* flash = NULL;
+    
+    /* return -EINVAL if fd,info and number_of_regions are NULL */
+    if(NULL == fd || NULL == info || NULL == number_of_regions)
     {
-    	return -EINVAL;
+        return -EINVAL;
     }
 
     flash = (alt_flash_dev*)fd;
@@ -166,7 +165,7 @@ int alt_epcq_controller_get_info
 }
 
 /**
-  * alt_epcq_controller_erase_block
+  * alt_epcq_controller2_erase_block
   *
   * This function erases a single flash sector.
   *
@@ -179,20 +178,20 @@ int alt_epcq_controller_get_info
   * -EINVAL -> Invalid arguments
   * -EIO -> write failed, sector might be protected 
 **/
-int alt_epcq_controller_erase_block(alt_flash_dev *flash_info, int block_offset)
+int alt_epcq_controller2_erase_block(alt_flash_dev *flash_info, int block_offset)
 {
     alt_32 ret_code = 0;
     alt_u32 mem_op_value = 0; /* value to write to EPCQ_MEM_OP register */
-    alt_epcq_controller_dev* epcq_flash_info = NULL;
+    alt_epcq_controller2_dev* epcq_flash_info = NULL;
     alt_u32 sector_number = 0; 
 
     /* return -EINVAL if flash_info is NULL */
     if(NULL == flash_info)
     {
-    	return -EINVAL;
+        return -EINVAL;
     }
-	
-    epcq_flash_info = (alt_epcq_controller_dev*)flash_info;
+    
+    epcq_flash_info = (alt_epcq_controller2_dev*)flash_info;
 
     /* 
      * Sanity checks that block_offset is within the flash memory span and that the 
@@ -203,38 +202,47 @@ int alt_epcq_controller_erase_block(alt_flash_dev *flash_info, int block_offset)
         || (block_offset >= epcq_flash_info->size_in_bytes)
         || (block_offset & (epcq_flash_info->sector_size - 1)) != 0)
     {
-    	return -EINVAL;
+        return -EINVAL;
     }
 
     /* calculate current sector/block number */
     sector_number = (block_offset/(epcq_flash_info->sector_size));
 
     /* sector value should occupy bits 23:8 */
-    mem_op_value = (sector_number << 8) & ALTERA_EPCQ_CONTROLLER_MEM_OP_SECTOR_VALUE_MASK;
-
-    /* sector erase commands 0b10 occupies lower 2 bits */
-    mem_op_value |= ALTERA_EPCQ_CONTROLLER_MEM_OP_SECTOR_ERASE_CMD;
+    mem_op_value = (sector_number << 8) & ALTERA_EPCQ_CONTROLLER2_MEM_OP_SECTOR_VALUE_MASK;
+    
+     /* write enable command */
+    mem_op_value |= ALTERA_EPCQ_CONTROLLER2_MEM_OP_WRITE_ENABLE_CMD;
 
     /* write sector erase command to EPCQ_MEM_OP register to erase sector "sector_number" */
-    IOWR_ALTERA_EPCQ_CONTROLLER_MEM_OP(epcq_flash_info->csr_base, mem_op_value);
-	
+    IOWR_ALTERA_EPCQ_CONTROLLER2_MEM_OP(epcq_flash_info->csr_base, mem_op_value);
+
+    /* sector value should occupy bits 23:8 */
+    mem_op_value = (sector_number << 8) & ALTERA_EPCQ_CONTROLLER2_MEM_OP_SECTOR_VALUE_MASK;
+
+    /* sector erase commands 0b10 occupies lower 2 bits */
+    mem_op_value |= ALTERA_EPCQ_CONTROLLER2_MEM_OP_SECTOR_ERASE_CMD;
+
+    /* write sector erase command to EPCQ_MEM_OP register to erase sector "sector_number" */
+    IOWR_ALTERA_EPCQ_CONTROLLER2_MEM_OP(epcq_flash_info->csr_base, mem_op_value);
+    
     /* check whether erase triggered a illegal erase interrupt  */
-    if((IORD_ALTERA_EPCQ_CONTROLLER_ISR(epcq_flash_info->csr_base) &
-            		ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_ERASE_MASK) ==
-            				ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_ERASE_ACTIVE)
+    if((IORD_ALTERA_EPCQ_CONTROLLER2_ISR(epcq_flash_info->csr_base) &
+                    ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_ERASE_MASK) ==
+                            ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_ERASE_ACTIVE)
     {
-	    /* clear register */
-	    /* EPCQ_ISR access is write one to clear (W1C) */
-    	IOWR_ALTERA_EPCQ_CONTROLLER_ISR(epcq_flash_info->csr_base,
-    		ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_ERASE_MASK );
-    	return -EIO; /* erase failed, sector might be protected */
+        /* clear register */
+        /* EPCQ_ISR access is write one to clear (W1C) */
+        IOWR_ALTERA_EPCQ_CONTROLLER2_ISR(epcq_flash_info->csr_base,
+            ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_ERASE_MASK );
+        return -EIO; /* erase failed, sector might be protected */
     }
 
     return ret_code;
 }
 
 /**
- * alt_epcq_controller_write_block
+ * alt_epcq_controller2_write_block
  *
  * This function writes one block/sector of data to flash. The length of the write can NOT 
  * spill into the adjacent sector.
@@ -254,7 +262,7 @@ int alt_epcq_controller_erase_block(alt_flash_dev *flash_info, int block_offset)
  * -EINVAL -> Invalid arguments
  * -EIO -> write failed, sector might be protected 
 **/
-int alt_epcq_controller_write_block
+int alt_epcq_controller2_write_block
 (
     alt_flash_dev *flash_info, /** flash device info */
     int block_offset, /** sector/block offset in byte addressing */
@@ -267,8 +275,8 @@ int alt_epcq_controller_write_block
     alt_u32 remaining_length = length; /** length left to write */
     alt_u32 write_offset = data_offset; /** offset into flash to write too */
 
-    alt_epcq_controller_dev *epcq_flash_info = (alt_epcq_controller_dev*)flash_info;
-	
+    alt_epcq_controller2_dev *epcq_flash_info = (alt_epcq_controller2_dev*)flash_info;
+    
     /* 
      * Sanity checks that data offset is not larger then a sector, that block offset is 
      * sector aligned and within the valid flash memory range and a write doesn't spill into 
@@ -284,7 +292,7 @@ int alt_epcq_controller_write_block
         || length < 0
         || (block_offset & (epcq_flash_info->sector_size - 1)) != 0) 
     {
-    	return -EINVAL;
+        return -EINVAL;
     }
 
     /*
@@ -294,20 +302,20 @@ int alt_epcq_controller_write_block
      */
     while (remaining_length > 0)
     {
-    	alt_u32 word_to_write = 0xFFFFFFFF; /** initialize word to write to blank word */
-    	alt_u32 padding = 0; /** bytes to pad the next word that is written */
-    	alt_u32 bytes_to_copy = sizeof(alt_u32); /** number of bytes from source to copy */
+        alt_u32 word_to_write = 0xFFFFFFFF; /** initialize word to write to blank word */
+        alt_u32 padding = 0; /** bytes to pad the next word that is written */
+        alt_u32 bytes_to_copy = sizeof(alt_u32); /** number of bytes from source to copy */
 
         /*
          * we need to make sure the write is word aligned
-    	 * this should only be true at most 1 time
-    	 */
+         * this should only be true at most 1 time
+         */
         if (0 != (write_offset & (sizeof(alt_u32) - 1)))
         {
-        	/*
-        	 * data is not word aligned
-        	 * calculate padding bytes need to add before start of a data offset
-        	 */
+            /*
+             * data is not word aligned
+             * calculate padding bytes need to add before start of a data offset
+             */
             padding = write_offset & (sizeof(alt_u32) - 1);
 
             /* update variables to account for padding being added */
@@ -315,46 +323,46 @@ int alt_epcq_controller_write_block
 
             if(bytes_to_copy > remaining_length)
             {
-            	bytes_to_copy = remaining_length;
+                bytes_to_copy = remaining_length;
             }
 
             write_offset = write_offset - padding;
             if(0 != (write_offset & (sizeof(alt_u32) - 1)))
             {
-            	return -EINVAL;
+                return -EINVAL;
             }
         }
         else
         {
             if(bytes_to_copy > remaining_length)
             {
-            	bytes_to_copy = remaining_length;
+                bytes_to_copy = remaining_length;
             }
         }
 
         /* prepare the word to be written */
         memcpy((((void*)&word_to_write)) + padding, ((void*)data) + buffer_offset, bytes_to_copy);
 
-        // Bit-reverse bytes for flash
-        for (int i=0; i<bytes_to_copy; i++)
-            *((unsigned char*)&word_to_write+i) = bitswap8(*((unsigned char*)&word_to_write+i));
-
         /* update offset and length variables */
         buffer_offset += bytes_to_copy;
         remaining_length -= bytes_to_copy;
-
+       
         /* write to flash 32 bits at a time */
         IOWR_32DIRECT(epcq_flash_info->data_base, write_offset, word_to_write);
-
-        /* check whether write triggered a illegal write interrupt */
-        if((IORD_ALTERA_EPCQ_CONTROLLER_ISR(epcq_flash_info->csr_base) &
-        		ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_WRITE_MASK) ==
-        				ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_WRITE_ACTIVE)
+        if (IORD_32DIRECT(epcq_flash_info->data_base, write_offset) != word_to_write)
         {
-		    /* clear register */
-        	IOWR_ALTERA_EPCQ_CONTROLLER_ISR(epcq_flash_info->csr_base,
-			ALTERA_EPCQ_CONTROLLER_ISR_ILLEGAL_WRITE_MASK );
-        	return -EIO; /** write failed, sector might be protected */
+            IOWR_32DIRECT(epcq_flash_info->data_base, write_offset, word_to_write);
+        }
+            
+        /* check whether write triggered a illegal write interrupt */
+        if((IORD_ALTERA_EPCQ_CONTROLLER2_ISR(epcq_flash_info->csr_base) &
+                ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_WRITE_MASK) ==
+                        ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_WRITE_ACTIVE)
+        {
+            /* clear register */
+            IOWR_ALTERA_EPCQ_CONTROLLER2_ISR(epcq_flash_info->csr_base,
+            ALTERA_EPCQ_CONTROLLER2_ISR_ILLEGAL_WRITE_MASK );
+            return -EIO; /** write failed, sector might be protected */
         }
 
         /* update current offset */
@@ -365,12 +373,12 @@ int alt_epcq_controller_write_block
 }
 
 /**
- * alt_epcq_controller_write
+ * alt_epcq_controller2_write
  *
  * Program the data into the flash at the selected address.
  *
- * The different between this function and alt_epcq_controller_write_block function
- * is that this function (alt_epcq_controller_write) will automatically erase a block as needed
+ * The different between this function and alt_epcq_controller2_write_block function
+ * is that this function (alt_epcq_controller2_write) will automatically erase a block as needed
  * Arguments:
  * - *flash_info: Pointer to EPCQ flash device structure.
  * - offset: Byte offset (unaligned access) of write to flash memory. For best performance, 
@@ -384,7 +392,7 @@ int alt_epcq_controller_write_block
  * -EIO -> write failed, sector might be protected 
  *
 **/
-int alt_epcq_controller_write(
+int alt_epcq_controller2_write(
     alt_flash_dev *flash_info, /** device info */
     int offset, /** offset of write from base address */
     const void *src_addr, /** source buffer */
@@ -393,7 +401,7 @@ int alt_epcq_controller_write(
 {
     alt_32 ret_code = 0;
 
-    alt_epcq_controller_dev *epcq_flash_info = NULL;
+    alt_epcq_controller2_dev *epcq_flash_info = NULL;
 
     alt_u32 write_offset = offset; /** address of next byte to write */
     alt_u32 remaining_length = length; /** length of write data left to be written */
@@ -401,20 +409,20 @@ int alt_epcq_controller_write(
     alt_u32 i = 0;
 
     /* return -EINVAL if flash_info and src_addr are NULL */
-	if(NULL == flash_info || NULL == src_addr)
+    if(NULL == flash_info || NULL == src_addr)
     {
-    	return -EINVAL;
+        return -EINVAL;
     }
-	
-	epcq_flash_info = (alt_epcq_controller_dev*)flash_info;
-	
+    
+    epcq_flash_info = (alt_epcq_controller2_dev*)flash_info;
+    
     /* make sure the write parameters are within the bounds of the flash */
     ret_code = alt_epcq_validate_read_write_arguments(epcq_flash_info, offset, length);
 
-	if(0 != ret_code)
-	{
-		return ret_code;
-	}
+    if(0 != ret_code)
+    {
+        return ret_code;
+    }
 
     /*
      * This loop erases and writes data one sector at a time. We check for write completion 
@@ -423,13 +431,13 @@ int alt_epcq_controller_write(
     for(i = offset/epcq_flash_info->sector_size ; i < epcq_flash_info->number_of_sectors; i++)
     {
         alt_u32 block_offset = 0; /** block offset in byte addressing */
-    	alt_u32 offset_within_current_sector = 0; /** offset into current sector to write */
+        alt_u32 offset_within_current_sector = 0; /** offset into current sector to write */
         alt_u32 length_to_write = 0; /** length to write to current sector */
 
-    	if(0 >= remaining_length)
-    	{
-    		break; /* out of data to write */
-    	}
+        if(0 >= remaining_length)
+        {
+            break; /* out of data to write */
+        }
 
         /* calculate current sector/block offset in byte addressing */
         block_offset = write_offset & ~(epcq_flash_info->sector_size - 1);
@@ -441,7 +449,7 @@ int alt_epcq_controller_write(
         }
 
         /* erase sector */
-        ret_code = alt_epcq_controller_erase_block(flash_info, block_offset);
+        ret_code = alt_epcq_controller2_erase_block(flash_info, block_offset);
 
         if(0 != ret_code)
         {
@@ -453,7 +461,7 @@ int alt_epcq_controller_write(
                 remaining_length);
 
         /* write data to erased block */
-        ret_code = alt_epcq_controller_write_block(flash_info, block_offset, write_offset,
+        ret_code = alt_epcq_controller2_write_block(flash_info, block_offset, write_offset,
             src_addr + buffer_offset, length_to_write);
 
 
@@ -472,7 +480,7 @@ int alt_epcq_controller_write(
 }
 
 /**
- * alt_epcq_controller_read
+ * alt_epcq_controller2_read
  *
  * There's no real need to use this function as opposed to using memcpy directly. It does
  * do some sanity checks on the bounds of the read.
@@ -487,7 +495,7 @@ int alt_epcq_controller_write(
  * 0 -> success
  * -EINVAL -> Invalid arguments
 **/
-int alt_epcq_controller_read
+int alt_epcq_controller2_read
 (
     alt_flash_dev *flash_info, /** device info */
     int offset, /** offset of read from base address */
@@ -496,34 +504,30 @@ int alt_epcq_controller_read
 )
 {
     alt_32 ret_code = 0;
-	alt_epcq_controller_dev *epcq_flash_info = NULL;
-	
-	/* return -EINVAL if flash_info and dest_addr are NULL */
-	if(NULL == flash_info || NULL == dest_addr)
+    alt_epcq_controller2_dev *epcq_flash_info = NULL;
+    
+    /* return -EINVAL if flash_info and dest_addr are NULL */
+    if(NULL == flash_info || NULL == dest_addr)
     {
-    	return -EINVAL;
+        return -EINVAL;
     }
-	
-    epcq_flash_info = (alt_epcq_controller_dev*)flash_info;
+    
+    epcq_flash_info = (alt_epcq_controller2_dev*)flash_info;
 
-	/* validate arguments */
-	ret_code = alt_epcq_validate_read_write_arguments(epcq_flash_info, offset, length);
+    /* validate arguments */
+    ret_code = alt_epcq_validate_read_write_arguments(epcq_flash_info, offset, length);
 
-	/* copy data from flash to destination address */
-	if(0 == ret_code)
-	{
-		memcpy(dest_addr, (alt_u8*)epcq_flash_info->data_base + offset, length);
-
-        // Bit-reverse bytes read from flash
-        for (int i=0; i<length; i++)
-            *((unsigned char*)dest_addr+i) = bitswap8(*((unsigned char*)dest_addr+i));
-	}
+    /* copy data from flash to destination address */
+    if(0 == ret_code)
+    {
+        memcpy(dest_addr, (alt_u8*)epcq_flash_info->data_base + offset, length);
+    }
 
     return ret_code;
 }
 
 /**
- * altera_epcq_controller_init
+ * altera_epcq_controller2_init
  *
  * alt_sys_init.c will call this function automatically through macro
  *
@@ -539,147 +543,147 @@ int alt_epcq_controller_read
  * -EINVAL -> Invalid arguments.
  * -ENODEV -> System is configured incorrectly.
 **/
-alt_32 altera_epcq_controller_init(alt_epcq_controller_dev *flash)
+alt_32 altera_epcq_controller2_init(alt_epcq_controller2_dev *flash)
 {
-	alt_u32 silicon_id = 0;
-	alt_u32 size_in_bytes = 0;
-	alt_u32 number_of_sectors = 0;
+    alt_u32 silicon_id = 0;
+    alt_u32 size_in_bytes = 0;
+    alt_u32 number_of_sectors = 0;
 
     /* return -EINVAL if flash is NULL */
-	if(NULL == flash)
+    if(NULL == flash)
     {
-    	return -EINVAL;
+        return -EINVAL;
+    }
+    
+    /* return -ENODEV if CSR slave is not attached */
+    if(NULL == (void *)flash->csr_base)
+    {
+        return -ENODEV;
     }
-	
-	/* return -ENODEV if CSR slave is not attached */
-	if(NULL == (void *)flash->csr_base)
-	{
-		return -ENODEV;
-	}
 
 
-	/*
-	 * If flash is an EPCQ device, we read the EPCQ_RD_RDID register for the ID
-	 * If flash is an EPCS device, we read the EPCQ_RD_SID register for the ID
-	 *
-	 * Whether or not the flash is a EPCQ or EPCS is indicated in the system.h. The system.h gets
-	 * this value from the hw.tcl of the IP. If this value is set incorrectly, then things will go
-	 * badly.
-	 *
-	 * In both cases, we can determine the number of sectors, which we can use
-	 * to calculate a size. We compare that size to the system.h value to make sure
-	 * the EPCQ soft IP was configured correctly.
-	 */
-	if(0 == flash->is_epcs)
-	{
-		/* If we're an EPCQ, we read EPCQ_RD_RDID for the silicon ID */
-		silicon_id = IORD_ALTERA_EPCQ_CONTROLLER_RDID(flash->csr_base);
-		silicon_id &= ALTERA_EPCQ_CONTROLLER_RDID_MASK;
+    /*
+     * If flash is an EPCQ device, we read the EPCQ_RD_RDID register for the ID
+     * If flash is an EPCS device, we read the EPCQ_RD_SID register for the ID
+     *
+     * Whether or not the flash is a EPCQ or EPCS is indicated in the system.h. The system.h gets
+     * this value from the hw.tcl of the IP. If this value is set incorrectly, then things will go
+     * badly.
+     *
+     * In both cases, we can determine the number of sectors, which we can use
+     * to calculate a size. We compare that size to the system.h value to make sure
+     * the EPCQ soft IP was configured correctly.
+     */
+    if(0 == flash->is_epcs)
+    {
+        /* If we're an EPCQ, we read EPCQ_RD_RDID for the silicon ID */
+        silicon_id = IORD_ALTERA_EPCQ_CONTROLLER2_RDID(flash->csr_base);
+        silicon_id &= ALTERA_EPCQ_CONTROLLER2_RDID_MASK;
 
-		/* Determine which EPCQ device so we can figure out the number of sectors */
-		/* EPCQ share the same ID for the same capacity*/
-		switch(silicon_id)
-		{
-			case ALTERA_EPCQ_CONTROLLER_RDID_EPCQ16:
-			{
-				number_of_sectors = 32;
-				break;
-			}
-			case ALTERA_EPCQ_CONTROLLER_RDID_EPCQ32:
-			{
-				number_of_sectors = 64;
-				break;
-			}
-			case ALTERA_EPCQ_CONTROLLER_RDID_EPCQ64:
-			{
-				number_of_sectors = 128;
-				break;
-			}
-			case ALTERA_EPCQ_CONTROLLER_RDID_EPCQ128:
-			{
-				number_of_sectors = 256;
-				break;
-			}
-			case ALTERA_EPCQ_CONTROLLER_RDID_EPCQ256:
-			{
-				number_of_sectors = 512;
-				break;
-			}
-			case ALTERA_EPCQ_CONTROLLER_RDID_EPCQ512:
-			{
-				number_of_sectors = 1024;
-				break;
-			}
-			case ALTERA_EPCQ_CONTROLLER_RDID_EPCQ1024:
-			{
-				number_of_sectors = 2048;
-				break;
-			}
-			default:
-			{
-				return -ENODEV;
-			}
-		}
-	}
-	else {
-		/* If we're an EPCS, we read EPCQ_RD_SID for the silicon ID */
-		silicon_id = IORD_ALTERA_EPCQ_CONTROLLER_SID(flash->csr_base);
-		silicon_id &= ALTERA_EPCQ_CONTROLLER_SID_MASK;
+        /* Determine which EPCQ device so we can figure out the number of sectors */
+        /* EPCQ share the same ID for the same capacity*/
+        switch(silicon_id)
+        {
+            case ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ16:
+            {
+                number_of_sectors = 32;
+                break;
+            }
+            case ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ32:
+            {
+                number_of_sectors = 64;
+                break;
+            }
+            case ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ64:
+            {
+                number_of_sectors = 128;
+                break;
+            }
+            case ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ128:
+            {
+                number_of_sectors = 256;
+                break;
+            }
+            case ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ256:
+            {
+                number_of_sectors = 512;
+                break;
+            }
+            case ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ512:
+            {
+                number_of_sectors = 1024;
+                break;
+            }
+            case ALTERA_EPCQ_CONTROLLER2_RDID_EPCQ1024:
+            {
+                number_of_sectors = 2048;
+                break;
+            }
+            default:
+            {
+                return -ENODEV;
+            }
+        }
+    }
+    else {
+        /* If we're an EPCS, we read EPCQ_RD_SID for the silicon ID */
+        silicon_id = IORD_ALTERA_EPCQ_CONTROLLER2_SID(flash->csr_base);
+        silicon_id &= ALTERA_EPCQ_CONTROLLER2_SID_MASK;
 
-		/* Determine which EPCS device so we can figure out various properties */
-		switch(silicon_id)
-		{
-			case ALTERA_EPCQ_CONTROLLER_SID_EPCS16:
-			{
-				number_of_sectors = 32;
-				break;
-			}
-			case ALTERA_EPCQ_CONTROLLER_SID_EPCS64:
-			{
-				number_of_sectors = 128;
-				break;
-			}
-			case ALTERA_EPCQ_CONTROLLER_SID_EPCS128:
-			{
-				number_of_sectors = 256;
-				break;
-			}
-			default:
-			{
-				return -ENODEV;
-			}
-		}
-	}
+        /* Determine which EPCS device so we can figure out various properties */
+        switch(silicon_id)
+        {
+            case ALTERA_EPCQ_CONTROLLER2_SID_EPCS16:
+            {
+                number_of_sectors = 32;
+                break;
+            }
+            case ALTERA_EPCQ_CONTROLLER2_SID_EPCS64:
+            {
+                number_of_sectors = 128;
+                break;
+            }
+            case ALTERA_EPCQ_CONTROLLER2_SID_EPCS128:
+            {
+                number_of_sectors = 256;
+                break;
+            }
+            default:
+            {
+                return -ENODEV;
+            }
+        }
+    }
 
-	/* Calculate size of flash based on number of sectors */
-	size_in_bytes = number_of_sectors * flash->sector_size;
+    /* Calculate size of flash based on number of sectors */
+    size_in_bytes = number_of_sectors * flash->sector_size;
 
-	/*
-	 * Make sure calculated size is the same size given in system.h
-	 * Also check number of sectors is the same number given in system.h
-	 * Otherwise the EPCQ IP was not configured correctly
-	 */
-	if(	size_in_bytes != flash->size_in_bytes ||
-			number_of_sectors != flash->number_of_sectors)
-	{
-		flash->dev.number_of_regions = 0;
-		return -ENODEV;
-	}
-	else
-	{
-		flash->silicon_id = silicon_id;
-		flash->number_of_sectors = number_of_sectors;
+    /*
+     * Make sure calculated size is the same size given in system.h
+     * Also check number of sectors is the same number given in system.h
+     * Otherwise the EPCQ IP was not configured correctly
+     */
+    if(    size_in_bytes != flash->size_in_bytes ||
+            number_of_sectors != flash->number_of_sectors)
+    {
+        flash->dev.number_of_regions = 0;
+        return -ENODEV;
+    }
+    else
+    {
+        flash->silicon_id = silicon_id;
+        flash->number_of_sectors = number_of_sectors;
 
-		/*
-		 * populate fields of region_info required to conform to HAL API
-		 * create 1 region that composed of "number_of_sectors" blocks
-		 */
-		flash->dev.number_of_regions = 1;
-		flash->dev.region_info[0].offset = 0;
-		flash->dev.region_info[0].region_size = size_in_bytes;
-		flash->dev.region_info[0].number_of_blocks = number_of_sectors;
-		flash->dev.region_info[0].block_size = flash->sector_size;
-	}
+        /*
+         * populate fields of region_info required to conform to HAL API
+         * create 1 region that composed of "number_of_sectors" blocks
+         */
+        flash->dev.number_of_regions = 1;
+        flash->dev.region_info[0].offset = 0;
+        flash->dev.region_info[0].region_size = size_in_bytes;
+        flash->dev.region_info[0].number_of_blocks = number_of_sectors;
+        flash->dev.region_info[0].block_size = flash->sector_size;
+    }
 
 
     /*
@@ -687,7 +691,7 @@ alt_32 altera_epcq_controller_init(alt_epcq_controller_dev *flash)
      *
      * Only register the device if it's configured correctly.
      */
-		alt_flash_device_register(&(flash->dev));
+        alt_flash_device_register(&(flash->dev));
 
 
     return 0;
@@ -695,9 +699,9 @@ alt_32 altera_epcq_controller_init(alt_epcq_controller_dev *flash)
 
 
 /*
- *	Private API
+ *    Private API
  *
- *	Helper functions used by Public API functions.
+ *    Helper functions used by Public API functions.
  *  
  * Arguments:
  * - *flash_info: Pointer to EPCQ flash device structure.
@@ -713,35 +717,35 @@ alt_32 altera_epcq_controller_init(alt_epcq_controller_dev *flash)
  */
 ALT_INLINE alt_32 static alt_epcq_validate_read_write_arguments
 (
-		alt_epcq_controller_dev *flash_info, /** device info */
-		alt_u32 offset, /** offset of read/write */
-		alt_u32 length /** length of read/write */
+        alt_epcq_controller2_dev *flash_info, /** device info */
+        alt_u32 offset, /** offset of read/write */
+        alt_u32 length /** length of read/write */
 )
 {
-    alt_epcq_controller_dev *epcq_flash_info = NULL;
+    alt_epcq_controller2_dev *epcq_flash_info = NULL;
     alt_u32 start_address = 0;
     alt_32 end_address = 0;
-	
+    
   /* return -EINVAL if flash_info is NULL */
    if(NULL == flash_info)
    {
-    	return -EINVAL;
+        return -EINVAL;
    }
-	
-  epcq_flash_info = (alt_epcq_controller_dev*)flash_info;
+    
+  epcq_flash_info = (alt_epcq_controller2_dev*)flash_info;
 
   start_address = epcq_flash_info->data_base + offset; /** first address of read or write */
   end_address = start_address + length; /** last address of read or write (not inclusive) */
 
   /* make sure start and end address is less then the end address of the flash */
   if(
-		  start_address >= epcq_flash_info->data_end ||
-		  end_address >= epcq_flash_info->data_end ||
-		  offset < 0 ||
-		  length < 0
+          start_address >= epcq_flash_info->data_end ||
+          end_address > epcq_flash_info->data_end ||
+          offset < 0 ||
+          length < 0
   )
   {
-	  return -EINVAL;
+      return -EINVAL;
   }
 
   return 0;
@@ -751,14 +755,14 @@ ALT_INLINE alt_32 static alt_epcq_validate_read_write_arguments
  * Private function that polls write in progress bit EPCQ_RD_STATUS.
  *
  * Write in progress will be set if any of the following operations are in progress:
- * 	-WRITE STATUS REGISTER
- * 	-WRITE NONVOLATILE CONFIGURATION REGISTER
- * 	-PROGRAM
- * 	-ERASE
+ *     -WRITE STATUS REGISTER
+ *     -WRITE NONVOLATILE CONFIGURATION REGISTER
+ *     -PROGRAM
+ *     -ERASE
  *
  * Assumes EPCQ was configured correctly.
  *
- * If ALTERA_EPCQ_CONTROLLER_1US_TIMEOUT_VALUE is set, the function will time out after
+ * If ALTERA_EPCQ_CONTROLLER2_1US_TIMEOUT_VALUE is set, the function will time out after
  * a period of time determined by that value.
  *
  * Arguments:
@@ -769,44 +773,38 @@ ALT_INLINE alt_32 static alt_epcq_validate_read_write_arguments
  * -EINVAL -> Invalid arguments
  * -ETIME  -> Time out and skipping the looping after 0.7 sec.
  */
-alt_32 static alt_epcq_poll_for_write_in_progress(alt_epcq_controller_dev* epcq_flash_info)
+alt_32 static alt_epcq_poll_for_write_in_progress(alt_epcq_controller2_dev* epcq_flash_info)
 {  
     /* we'll want to implement timeout if a timeout value is specified */
-#if ALTERA_EPCQ_CONTROLLER_1US_TIMEOUT_VALUE > 0
-	alt_u32 timeout = ALTERA_EPCQ_CONTROLLER_1US_TIMEOUT_VALUE;
-	alt_u16 counter = 0;
+#if ALTERA_EPCQ_CONTROLLER2_1US_TIMEOUT_VALUE > 0
+    alt_u32 timeout = ALTERA_EPCQ_CONTROLLER2_1US_TIMEOUT_VALUE;
+    alt_u16 counter = 0;
 #endif
 
     /* return -EINVAL if epcq_flash_info is NULL */
-	if(NULL == epcq_flash_info)
+    if(NULL == epcq_flash_info)
     {
-    	return -EINVAL;
+        return -EINVAL;
     }
 
-	/* while Write in Progress bit is set, we wait */
-	while((IORD_ALTERA_EPCQ_CONTROLLER_STATUS(epcq_flash_info->csr_base) &
-			ALTERA_EPCQ_CONTROLLER_STATUS_WIP_MASK) ==
-			ALTERA_EPCQ_CONTROLLER_STATUS_WIP_BUSY)
-	{
+    /* while Write in Progress bit is set, we wait */
+    while((IORD_ALTERA_EPCQ_CONTROLLER2_STATUS(epcq_flash_info->csr_base) &
+            ALTERA_EPCQ_CONTROLLER2_STATUS_WIP_MASK) ==
+            ALTERA_EPCQ_CONTROLLER2_STATUS_WIP_BUSY)
+    {
         alt_busy_sleep(1); /* delay 1us */
-#if ALTERA_EPCQ_CONTROLLER_1US_TIMEOUT_VALUE > 0
-		if(timeout <= counter )
-		{
-			return -ETIME;
-		}
-		
-		counter++;
+#if ALTERA_EPCQ_CONTROLLER2_1US_TIMEOUT_VALUE > 0
+        if(timeout <= counter )
+        {
+            return -ETIME;
+        }
+        
+        counter++;
 #endif
 
-	}
+    }
 
-	return 0;
-}
-
-ALT_INLINE unsigned char static bitswap8(unsigned char v)
-{
-    return ((v * 0x0802LU & 0x22110LU) |
-            (v * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16;
+    return 0;
 }
 
 

software/sys_controller_bsp/drivers/src/altera_epcq_controller_mod.c

@@ -1 +0,0 @@
-../../../../ip/altera_epcq_controller_mod/HAL/src/altera_epcq_controller_mod.c

software/sys_controller_bsp/system.h

@@ -151,7 +151,7 @@
 #define __ALTERA_AVALON_ONCHIP_MEMORY2
 #define __ALTERA_AVALON_PIO
 #define __ALTERA_AVALON_TIMER
-#define __ALTERA_EPCQ_CONTROLLER_MOD
+#define __ALTERA_EPCQ_CONTROLLER2
 #define __ALTERA_NIOS2_GEN2
 #define __ALTERA_NIOS_CUSTOM_INSTR_BITSWAP
 #define __ALTERA_NIOS_CUSTOM_INSTR_ENDIANCONVERTER
@@ -196,43 +196,43 @@
 
 
 /*
- * epcq_controller_0_avl_csr configuration
+ * epcq_controller2_0_avl_csr configuration
  *
  */
 
-#define ALT_MODULE_CLASS_epcq_controller_0_avl_csr altera_epcq_controller_mod
-#define EPCQ_CONTROLLER_0_AVL_CSR_BASE 0x20100
-#define EPCQ_CONTROLLER_0_AVL_CSR_FLASH_TYPE "EPCS64"
-#define EPCQ_CONTROLLER_0_AVL_CSR_IRQ 2
-#define EPCQ_CONTROLLER_0_AVL_CSR_IRQ_INTERRUPT_CONTROLLER_ID 0
-#define EPCQ_CONTROLLER_0_AVL_CSR_IS_EPCS 1
-#define EPCQ_CONTROLLER_0_AVL_CSR_NAME "/dev/epcq_controller_0_avl_csr"
-#define EPCQ_CONTROLLER_0_AVL_CSR_NUMBER_OF_SECTORS 128
-#define EPCQ_CONTROLLER_0_AVL_CSR_PAGE_SIZE 256
-#define EPCQ_CONTROLLER_0_AVL_CSR_SECTOR_SIZE 65536
-#define EPCQ_CONTROLLER_0_AVL_CSR_SPAN 32
-#define EPCQ_CONTROLLER_0_AVL_CSR_SUBSECTOR_SIZE 4096
-#define EPCQ_CONTROLLER_0_AVL_CSR_TYPE "altera_epcq_controller_mod"
+#define ALT_MODULE_CLASS_epcq_controller2_0_avl_csr altera_epcq_controller2
+#define EPCQ_CONTROLLER2_0_AVL_CSR_BASE 0x20100
+#define EPCQ_CONTROLLER2_0_AVL_CSR_FLASH_TYPE "EPCQ16"
+#define EPCQ_CONTROLLER2_0_AVL_CSR_IRQ 2
+#define EPCQ_CONTROLLER2_0_AVL_CSR_IRQ_INTERRUPT_CONTROLLER_ID 0
+#define EPCQ_CONTROLLER2_0_AVL_CSR_IS_EPCS 0
+#define EPCQ_CONTROLLER2_0_AVL_CSR_NAME "/dev/epcq_controller2_0_avl_csr"
+#define EPCQ_CONTROLLER2_0_AVL_CSR_NUMBER_OF_SECTORS 32
+#define EPCQ_CONTROLLER2_0_AVL_CSR_PAGE_SIZE 256
+#define EPCQ_CONTROLLER2_0_AVL_CSR_SECTOR_SIZE 65536
+#define EPCQ_CONTROLLER2_0_AVL_CSR_SPAN 64
+#define EPCQ_CONTROLLER2_0_AVL_CSR_SUBSECTOR_SIZE 4096
+#define EPCQ_CONTROLLER2_0_AVL_CSR_TYPE "altera_epcq_controller2"
 
 
 /*
- * epcq_controller_0_avl_mem configuration
+ * epcq_controller2_0_avl_mem configuration
  *
  */
 
-#define ALT_MODULE_CLASS_epcq_controller_0_avl_mem altera_epcq_controller_mod
-#define EPCQ_CONTROLLER_0_AVL_MEM_BASE 0x800000
-#define EPCQ_CONTROLLER_0_AVL_MEM_FLASH_TYPE "EPCS64"
-#define EPCQ_CONTROLLER_0_AVL_MEM_IRQ -1
-#define EPCQ_CONTROLLER_0_AVL_MEM_IRQ_INTERRUPT_CONTROLLER_ID -1
-#define EPCQ_CONTROLLER_0_AVL_MEM_IS_EPCS 1
-#define EPCQ_CONTROLLER_0_AVL_MEM_NAME "/dev/epcq_controller_0_avl_mem"
-#define EPCQ_CONTROLLER_0_AVL_MEM_NUMBER_OF_SECTORS 128
-#define EPCQ_CONTROLLER_0_AVL_MEM_PAGE_SIZE 256
-#define EPCQ_CONTROLLER_0_AVL_MEM_SECTOR_SIZE 65536
-#define EPCQ_CONTROLLER_0_AVL_MEM_SPAN 8388608
-#define EPCQ_CONTROLLER_0_AVL_MEM_SUBSECTOR_SIZE 4096
-#define EPCQ_CONTROLLER_0_AVL_MEM_TYPE "altera_epcq_controller_mod"
+#define ALT_MODULE_CLASS_epcq_controller2_0_avl_mem altera_epcq_controller2
+#define EPCQ_CONTROLLER2_0_AVL_MEM_BASE 0x800000
+#define EPCQ_CONTROLLER2_0_AVL_MEM_FLASH_TYPE "EPCQ16"
+#define EPCQ_CONTROLLER2_0_AVL_MEM_IRQ -1
+#define EPCQ_CONTROLLER2_0_AVL_MEM_IRQ_INTERRUPT_CONTROLLER_ID -1
+#define EPCQ_CONTROLLER2_0_AVL_MEM_IS_EPCS 0
+#define EPCQ_CONTROLLER2_0_AVL_MEM_NAME "/dev/epcq_controller2_0_avl_mem"
+#define EPCQ_CONTROLLER2_0_AVL_MEM_NUMBER_OF_SECTORS 32
+#define EPCQ_CONTROLLER2_0_AVL_MEM_PAGE_SIZE 256
+#define EPCQ_CONTROLLER2_0_AVL_MEM_SECTOR_SIZE 65536
+#define EPCQ_CONTROLLER2_0_AVL_MEM_SPAN 2097152
+#define EPCQ_CONTROLLER2_0_AVL_MEM_SUBSECTOR_SIZE 4096
+#define EPCQ_CONTROLLER2_0_AVL_MEM_TYPE "altera_epcq_controller_mod"
 
 
 /*
@@ -397,7 +397,7 @@
 
 #define ALT_MODULE_CLASS_osd_generator_0 osd_generator
 #define OSD_GENERATOR_0_BASE 0x24000
-#define OSD_GENERATOR_0_SPAN 16
+#define OSD_GENERATOR_0_SPAN 1024
 
 /*
  * pll_reconfig configuration

tools.project

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CodeLite_Project Name="tools" InternalType="">
+<CodeLite_Project Name="tools" InternalType="" Version="11000">
   <Plugins>
+    <Plugin Name="qmake">
+      <![CDATA[00010001N0007Release000000000000]]>
+    </Plugin>
     <Plugin Name="CMakePlugin">
       <![CDATA[[{
   "name": "Release",
@@ -13,9 +16,6 @@
   "parentProject": ""
  }]]]>
     </Plugin>
-    <Plugin Name="qmake">
-      <![CDATA[00010001N0007Release000000000000]]>
-    </Plugin>
   </Plugins>
   <Description/>
   <Dependencies/>
@@ -39,6 +39,7 @@
       <Linker Options="" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
       <General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
+      <BuildSystem Name="Default"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>
@@ -77,6 +78,7 @@
       <Linker Options="-O2" Required="yes"/>
       <ResourceCompiler Options="" Required="no"/>
       <General OutputFile="$(IntermediateDirectory)/fw2" IntermediateDirectory="tools" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
+      <BuildSystem Name="Default"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>

tools/Makefile

@@ -0,0 +1,23 @@
+.PHONY: generate_hex update_mif generate_firmware assemble_ossc
+
+all: generate_firmware
+
+generate_hex: bin2hex
+	$(MAKE) -C ../software/sys_controller generate_hex
+
+update_mif: generate_hex
+	cd .. && quartus_cdb ossc --update_mif
+
+assemble_ossc: update_mif
+	cd .. && quartus_asm ossc
+
+generate_firmware: assemble_ossc create_fw_img
+	./create_fw_img ../output_files/ossc.rbf 0.86 aud-psp
+
+bin2hex: bin2hex.c
+	$(CC) bin2hex.c -o bin2hex
+
+create_fw_img: create_fw_img.c
+	gcc create_fw_img.c -o create_fw_img
+
+# vim: set noet ts=2 sw=2 sts=2