DECA: updated mist_io.sdc, added HDMI video output, USB keyboard opti…

…onal

target/deca/common.yaml

@@ -5,6 +5,7 @@ here:
  - jtframe_mist_clocks.v
  - jtframe_mist.sv
  - jtframe_mist_base.v 
+ - mist_io.sdc
  - pll6000/jtframe_pll6000.qip
  - pll6144/jtframe_pll6144.qip
  - pll6293/jtframe_pll6293.qip
@@ -42,7 +43,6 @@ target:
  - from: mist
  unless: POCKET
  get:
- - mist_io.sdc
  - osd.sv
  - rgb2ypbpr.v
  - from: neptuno

target/deca/demistify_config_pkg.vhd

@@ -68,11 +68,19 @@ constant demistify_serialdebug : std_logic := '0';
  VGA_G : OUT STD_LOGIC_VECTOR(5 DOWNTO 0);
  VGA_B : OUT STD_LOGIC_VECTOR(5 DOWNTO 0);
 
- AUDIO_L : OUT std_logic;
- AUDIO_R : OUT std_logic;
-
- DAC_L : OUT signed(15 downto 0);
- DAC_R : OUT signed(15 downto 0);
+ RED_x : OUT STD_LOGIC_VECTOR(5 DOWNTO 0);
+ GREEN_x : OUT STD_LOGIC_VECTOR(5 DOWNTO 0);
+ BLUE_x : OUT STD_LOGIC_VECTOR(5 DOWNTO 0);
+ HS_x : OUT STD_LOGIC;
+ VS_x : OUT STD_LOGIC;
+ VGA_DE : OUT STD_LOGIC;
+ VGA_CLK : OUT STD_LOGIC;
+
+ AUDIO_L : OUT STD_LOGIC;
+ AUDIO_R : OUT STD_LOGIC;
+
+ DAC_L : OUT SIGNED(15 downto 0);
+ DAC_R : OUT SIGNED(15 downto 0);
 
  JOY1 : IN STD_LOGIC_VECTOR(5 DOWNTO 0) := "111111";
  JOY2 : IN STD_LOGIC_VECTOR(5 DOWNTO 0) := "111111";

target/deca/jtframe_deca_top.vhd

@@ -8,6 +8,9 @@ use work.demistify_config_pkg.all;
 -------------------------------------------------------------------------
 
 entity jtframe_deca_top is
+ generic (
+ DECA_KEYB: natural := 1 -- 1=PS2 INOUT, 2= USB LOW SPEED (BETA)
+ );
  port (
  ADC_CLK_10 : in std_logic;
  MAX10_CLK1_50 : in std_logic;
@@ -97,8 +100,18 @@ entity jtframe_deca_top is
  I2S_D : out std_logic;
 
  --Switches 
- SW : in std_logic_vector(1 downto 0)
-
+ SW : in std_logic_vector(1 downto 0);
+ -- Toggle leds in USB keyboard SW[0] LedCaps SW[1] LedNum
+
+ --TUSB1210
+ USB_CLKIN : in std_logic; --60MHz from ULPI
+ USB_FAULT_n : in std_logic; --Overcurrent
+ USB_DATA : inout std_logic_vector(7 downto 0);
+ USB_NXT : in std_logic;
+ USB_DIR : in std_logic;
+ USB_STP : out std_logic;
+ USB_RESET_n : out std_logic; --Fixed to High
+ USB_CS : out std_logic --Fixed to High
  );
 END entity;
 
@@ -207,26 +220,62 @@ architecture RTL of jtframe_deca_top is
  );
  end component;
 
- component pll2
- port (
- inclk0 : in std_logic;
- c0 : out std_logic;
- locked : out std_logic
- );
- end component;
+ -- component pll2
+ -- port (
+ -- inclk0 : in std_logic;
+ -- c0 : out std_logic;
+ -- c1 : out std_logic;
+ -- locked : out std_logic
+ -- );
+ -- end component;
 
  -- VIDEO signals
  signal vga_clk : std_logic;
- signal vga_blank : std_logic;
+ signal vga_de  : std_logic;
  signal vga_x_r : std_logic_vector(5 downto 0);
  signal vga_x_g : std_logic_vector(5 downto 0);
  signal vga_x_b : std_logic_vector(5 downto 0);
  signal vga_x_hs : std_logic;
  signal vga_x_vs : std_logic;
 
- signal act_led : std_logic;
+ -- USB ULPI KEYBOARD
+ signal USB_CLK_PHASE : std_logic;
+ signal USB_PLL_LOCKED : std_logic;
+ signal PS2_KEYBOARD_CLK_USB : std_logic := '1';
+ signal PS2_KEYBOARD_DAT_USB : std_logic := '1';
 
- signal osd_en : std_logic;
+ component PLL_PHASE90
+ port (
+ inclk0 : in std_logic;
+ c0 : out std_logic;
+ locked : out std_logic
+ );
+ end component;
+
+ -- https://github.com/TheSonders/USBKeyboard/blob/main/ULPI_PS2_PUBLIC.v
+ component ULPI_PS2
+ port (
+ clk : in std_logic;
+ LedNum : in std_logic;
+ LedCaps : in std_logic;
+ LedScroll : in std_logic;
+ PS2data : out std_logic;
+ PS2clock : out std_logic;
+ FAULT_n : in std_logic;
+ DATA : inout std_logic_vector (7 downto 0);
+ NXT : in std_logic;
+ DIR : in std_logic;
+ STP : out std_logic;
+ RESET_n : out std_logic;
+ CS : out std_logic
+ );
+ end component;
+
+
+ --
+
+ signal act_led : std_logic;
+ signal osd_en : std_logic;
 
  -- DECA target guest_top template signals
  alias clock_input : std_logic is MAX10_CLK1_50;
@@ -249,10 +298,48 @@ begin
  ps2_mouse_clk_in <= PS2_MOUSE_CLK;
  PS2_MOUSE_CLK <= '0' when ps2_mouse_clk_out = '0' else 'Z';
 
- ps2_keyboard_dat_in <= PS2_KEYBOARD_DAT;
- PS2_KEYBOARD_DAT <= '0' when ps2_keyboard_dat_out = '0' else 'Z';
- ps2_keyboard_clk_in <= PS2_KEYBOARD_CLK;
- PS2_KEYBOARD_CLK <= '0' when ps2_keyboard_clk_out = '0' else 'Z';
+ -- DECA_KEYB: 1=PS2 INOUT, 2= PS2 & USB LOW SPEED
+ KEYBOARD_1 : if DECA_KEYB = 1 generate -- KEYB PS2 INOUT
+ ps2_keyboard_dat_in <= PS2_KEYBOARD_DAT;
+ PS2_KEYBOARD_DAT <= '0' when ps2_keyboard_dat_out = '0' else 'Z';
+ ps2_keyboard_clk_in <= PS2_KEYBOARD_CLK;
+ PS2_KEYBOARD_CLK <= '0' when ps2_keyboard_clk_out = '0' else 'Z';
+ USB_PLL_LOCKED <= '1';
+ end generate KEYBOARD_1;
+
+ KEYBOARD_2 : if DECA_KEYB = 2 generate -- KEYB USB LOW SPEED 
+ ps2_keyboard_dat_in <= PS2_KEYBOARD_DAT_USB;
+-- PS2_KEYBOARD_DAT <= '0' when ps2_keyboard_dat_out = '0' else 'Z';
+ ps2_keyboard_clk_in <= PS2_KEYBOARD_CLK_USB;
+-- PS2_KEYBOARD_CLK <= '0' when ps2_keyboard_clk_out = '0' else 'Z';
+
+ -- PLL ULPI_PS2
+ PLL_PHASE90_inst : PLL_PHASE90
+ port map (
+ inclk0 => USB_CLKIN,
+ c0 => USB_CLK_PHASE, 
+ locked => USB_PLL_LOCKED
+ );
+
+ -- ULPI_PS2
+ ULPI_PS2_inst : ULPI_PS2
+ port map (
+ clk => USB_CLK_PHASE,
+ LedNum => SW(1),
+ LedCaps => SW(0),
+ LedScroll => '0',
+ PS2data => PS2_KEYBOARD_DAT_USB,
+ PS2clock => PS2_KEYBOARD_CLK_USB,
+ FAULT_n => USB_FAULT_n,
+ DATA => USB_DATA,
+ NXT => USB_NXT,
+ DIR => USB_DIR,
+ STP => USB_STP,
+ RESET_n => USB_RESET_n,
+ CS => USB_CS
+ );
+ end generate KEYBOARD_2;
+
 
  -- OSD joystick
  -- JOYX_SEL_O <= '1';
@@ -315,41 +402,45 @@ begin
 
  -- DECA HDMI
 
- -- -- HDMI CONFIG 
- -- I2C_HDMI_Config_inst : I2C_HDMI_Config
- -- port map(
- --  iCLK => MAX10_CLK1_50,
- --  iRST_N => reset_n, --reset_n, KEY(0)
- --  I2C_SCLK => HDMI_I2C_SCL,
- --  I2C_SDAT => HDMI_I2C_SDA,
- --  HDMI_TX_INT => HDMI_TX_INT
- -- );
+ -- HDMI CONFIG 
+ I2C_HDMI_Config_inst : I2C_HDMI_Config
+ port map(
+ iCLK => MAX10_CLK1_50,
+ iRST_N => reset_n, --reset_n, KEY(0)
+ I2C_SCLK => HDMI_I2C_SCL,
+ I2C_SDAT => HDMI_I2C_SDA,
+ HDMI_TX_INT => HDMI_TX_INT
+ );
 
  -- -- PLL2
  -- pll2_inst : pll2
  -- port map (
- -- inclk0 => MAX10_CLK1_50,
- -- c0 => vga_clk, 
- -- locked => open
+ -- inclk0 => MAX10_CLK1_50,
+ -- c0 => vga_clk, 
+ -- --c1 => vga_clk, 
+ -- locked => open
  -- );
 
- -- -- HDMI VIDEO 
- -- HDMI_TX_CLK <= vga_clk;
- -- HDMI_TX_DE <= not vga_blank; -- vga_de;
- -- HDMI_TX_HS <= vga_x_hs;
- -- HDMI_TX_VS <= vga_x_vs;
- -- HDMI_TX_D <= vga_x_r & vga_x_r(4 downto 3) & vga_x_g & vga_x_g(4 downto 3) & vga_x_b & vga_x_b(4 downto 3);
- -- --HDMI_TX_HS <= vga_hsync;
- -- --HDMI_TX_VS <= vga_vsync;
- -- --HDMI_TX_D <= vga_red(7 downto 2)&vga_red(7 downto 6)&vga_green(7 downto 2)&vga_green(7 downto 6)&vga_blue(7 downto 2)&vga_blue(7 downto 6);
+ -- HDMI VIDEO 
+ HDMI_TX_CLK <= vga_clk;
+ HDMI_TX_DE <= vga_de;
+
+ HDMI_TX_HS <= vga_x_hs;
+ HDMI_TX_VS <= vga_x_vs;
+ HDMI_TX_D <= vga_x_r & vga_x_r(4 downto 3) & vga_x_g & vga_x_g(4 downto 3) & vga_x_b & vga_x_b(4 downto 3);
 
- -- -- HDMI AUDIO 
- -- HDMI_MCLK <= i2s_Mck_o;
- -- HDMI_SCLK <= i2s_Sck_o; -- lr*2*16
- -- HDMI_LRCLK <= i2s_Lr_o;
- -- HDMI_I2S(0) <= i2s_D_o;
+ -- HDMI_TX_HS <= vga_hsync; 
+ -- HDMI_TX_VS <= vga_vsync;
+ -- HDMI_TX_D <= vga_red(7 downto 2) & vga_red(7 downto 6) & vga_green(7 downto 2) & vga_green(7 downto 6) & vga_blue(7 downto 2) & vga_blue(7 downto 6);
 
+ -- HDMI AUDIO 
+ HDMI_MCLK <= i2s_Mck_o;
+ HDMI_SCLK <= i2s_Sck_o; -- lr*2*16
+ HDMI_LRCLK <= i2s_Lr_o;
+ HDMI_I2S(0) <= i2s_D_o;
 
+
+ -- Joystick intercept signal
  process(clock_input)
  begin
  if (intercept = '1') then
@@ -401,6 +492,15 @@ begin
  VGA_G => vga_green(7 downto 2),
  VGA_B => vga_blue(7 downto 2),
 
+ --HDMI
+ RED_x => vga_x_r,
+ GREEN_x => vga_x_g,
+ BLUE_x => vga_x_b,
+ HS_x => vga_x_hs,
+ VS_x => vga_x_vs,
+ VGA_DE => vga_de,
+ VGA_CLK => vga_clk,
+
  --JOYSTICKS
  JOY1 => joy1 or intercept_joy, -- Block joystick when OSD is active
  JOY2 => joy2 or intercept_joy, -- Block joystick when OSD is active
@@ -437,7 +537,7 @@ begin
  )
  port map (
  clk => MAX10_CLK1_50,
- reset_in => KEY(0),  --reset_in when 0
+ reset_in => KEY(0) and USB_PLL_LOCKED, --reset_in when 0
  reset_out => reset_n, --reset_out when 0
 
  -- SPI signals