Small clean-up in gc_i2c_slave module and the instantiating wb_i2c_bridge module

Signed-off-by: Theodor Stana <t.stana@cern.ch> Signed-off-by: Tomasz Włostowski <tomasz.wlostowski@cern.ch>

Small clean-up in gc_i2c_slave module and the instantiating wb_i2c_bridge module
Signed-off-by: Theodor Stana <t.stana@cern.ch> Signed-off-by: Tomasz Włostowski <tomasz.wlostowski@cern.ch>
b7786ef6 · Theodor-Adrian Stana · Tomasz Wlostowski · ff660239 · b7786ef6 · b7786ef6
Commit b7786ef6 authored Dec 19, 2013 by Theodor-Adrian Stana Committed by Tomasz Wlostowski Jan 09, 2014
Showing with 49 additions and 58 deletions

gc_i2c_slave.vhd modules/common/gc_i2c_slave.vhd +43 -52

gencores_pkg.vhd modules/common/gencores_pkg.vhd +3 -3

wb_i2c_bridge.vhd modules/wishbone/wb_i2c_bridge/wb_i2c_bridge.vhd +3 -3

No files found.
--- a/modules/common/gc_i2c_slave.vhd
+++ b/modules/common/gc_i2c_slave.vhd
--- a/modules/common/gencores_pkg.vhd
+++ b/modules/common/gencores_pkg.vhd
@@ -292,7 +292,7 @@ package gencores_pkg is
      sda_en_o      : out std_logic;

      -- Slave address
-      addr_i        : in  std_logic_vector(6 downto 0);
+      i2c_addr_i    : in  std_logic_vector(6 downto 0);

      -- ACK input, should be set after done_p_o = '1'
      -- (note that the bit is reversed wrt I2C ACK bit)
@@ -308,8 +308,8 @@ package gencores_pkg is

      -- Pulse outputs signaling various I2C actions
      -- Start and stop conditions
-      sta_p_o       : out std_logic;
-      sto_p_o       : out std_logic;
+      i2c_sta_p_o   : out std_logic;
+      i2c_sto_p_o   : out std_logic;
      -- Received address corresponds addr_i
      addr_good_p_o : out std_logic;
      -- Read and write done

--- a/modules/wishbone/wb_i2c_bridge/wb_i2c_bridge.vhd
+++ b/modules/wishbone/wb_i2c_bridge/wb_i2c_bridge.vhd
@@ -182,15 +182,15 @@ begin
      sda_o         => sda_o,
      sda_en_o      => sda_en_o,

-      addr_i        => i2c_addr_i,
+      i2c_addr_i    => i2c_addr_i,

      ack_i         => slv_ack,

      tx_byte_i     => tx_byte,
      rx_byte_o     => rx_byte,

-      sta_p_o       => open,
-      sto_p_o       => slv_sto_p,
+      i2c_sta_p_o   => open,
+      i2c_sto_p_o   => slv_sto_p,
      addr_good_p_o => slv_addr_good_p,
      r_done_p_o    => slv_r_done_p,
      w_done_p_o    => slv_w_done_p,