X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=contrib%2Ffirmware%2Fangie%2Fhdl%2Fsrc%2Fangie_bitstream.vhd;fp=contrib%2Ffirmware%2Fangie%2Fhdl%2Fsrc%2Fangie_openocd.vhd;h=21ddb844afa9d99c482d950819281a0b66af577f;hp=d79c0fecef9b5d12244f803b3589025f136e7ed8;hb=aee495e7859d0f19b52ba12cafaad2628d84f8e1;hpb=aa0056d27355d7719a120cdc4292215acae40819

diff --git a/contrib/firmware/angie/hdl/src/angie_openocd.vhd b/contrib/firmware/angie/hdl/src/angie_bitstream.vhd
similarity index 55%
rename from contrib/firmware/angie/hdl/src/angie_openocd.vhd
rename to contrib/firmware/angie/hdl/src/angie_bitstream.vhd
index d79c0fecef..21ddb844af 100644
--- a/contrib/firmware/angie/hdl/src/angie_openocd.vhd
+++ b/contrib/firmware/angie/hdl/src/angie_bitstream.vhd
@@ -16,22 +16,35 @@ library UNISIM;
 use UNISIM.VComponents.all;
 
 entity S609 is port(
-  TRST   : in std_logic;
-  TMS    : in std_logic;
-  TCK    : in std_logic;
-  TDI    : in std_logic;
-  TDO    : out std_logic;
-  SRST   : in std_logic;
-  FTP    : out std_logic_vector(7 downto 0); -- Test points
+  TRST : in std_logic;
+  TMS : in std_logic;
+  TCK : in std_logic;
+  TDI : in std_logic;
+  TDO : out std_logic;
+  SRST : in std_logic;
+
+  SDA : inout std_logic;
+  SDA_DIR : in std_logic;
+  SCL : in std_logic;
+
+  FTP : out std_logic_vector(7 downto 0):=(others => '1'); -- Test points
   SI_TDO : in  std_logic;
-  ST_0   : out std_logic;
-  ST_1   : out std_logic;
-  ST_2   : out std_logic;
+  ST_0 : out std_logic;
+  ST_1 : out std_logic;
+  ST_2 : out std_logic;
+
+  ST_4 : out std_logic;
+  ST_5 : out std_logic;
+
+  SO_SDA_OUT : out std_logic;
+  SO_SDA_IN : in std_logic;
+  SO_SCL : out std_logic;
+
   SO_TRST : out std_logic;
-  SO_TMS  : out std_logic;
-  SO_TCK  : out std_logic;
+  SO_TMS : out std_logic;
+  SO_TCK : out std_logic;
   SO_TDI : out std_logic;
-  SO_SRST :out std_logic
+  SO_SRST : out std_logic
 );
 end S609;
 
@@ -42,6 +55,8 @@ begin
 ST_0 <= '0';
 ST_1 <= '1';
 
+ST_4 <= '0';
+
 --TDO:
 TDO <= not SI_TDO;
 
@@ -53,11 +68,26 @@ SO_TDI <= TDI;
 ST_2 <= SRST;
 SO_SRST <= '0';
 
+SO_SCL <= SCL;
+
+SDA <= not(SO_SDA_IN) when (SDA_DIR = '1') else 'Z';
+SO_SDA_OUT <= SDA;
+
+process(SDA_DIR)
+begin
+	if(SDA_DIR = '1') then
+		ST_5 <= '1';
+	else
+		ST_5 <= '0';
+	end if;
+end process;
+
+
 --Points de test:
-FTP(0) <= TRST;
-FTP(1) <= TMS;
-FTP(2) <= TCK;
-FTP(3) <= TDI;
+FTP(0) <= SDA;
+FTP(1) <= SCL;
+FTP(2) <= not(SO_SDA_IN);
+FTP(3) <= SDA_DIR;
 FTP(5) <= SRST;
 FTP(4) <= SI_TDO;
 FTP(6) <= '1';