Update vme-bridge

And minor cleanup

Update vme-bridge
And minor cleanup
71c61ae0 · Tristan Gingold · 55589ae5 · e529102a · 71c61ae0 · 71c61ae0
Commit 71c61ae0 authored Jan 24, 2024 by Tristan Gingold
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

vme-bridge dependencies/vme-bridge +1 -1

A25_top.vhd hdl/top/A25_top.vhd +0 -2

wb_bus.vhd hdl/top/wb_bus.vhd +1 -0

wb_pkg.vhd hdl/top/wb_pkg.vhd +0 -2

No files found.
--- a/vme-bridge @ e529102a
+++ b/vme-bridge @ e529102a
-Subproject commit e7a564562672859b5552dcf0973ec44cb6030370
+Subproject commit e529102a1c05540a68588ebd74f8dd8e9ff4722a
--- a/hdl/top/A25_top.vhd
+++ b/hdl/top/A25_top.vhd
@@ -295,8 +295,6 @@ BEGIN
   startup_rst <= pll_locked_inv; 
   
   wbso_4.err <= '0';
-   wbmo_0.bte <= "00";
-   wbmo_2.bte <= "00";

   fpga_test(1) <= 'Z';
   fpga_test(2) <= 'Z';

--- a/hdl/top/wb_bus.vhd
+++ b/hdl/top/wb_bus.vhd
@@ -242,6 +242,7 @@ BEGIN
   );
   
   -- sf for slave #4:
+   -- TODO: fix freeze when switch_fab_2 is used
   sf_4: entity work.switch_fab_3
   GENERIC MAP (
      registered => FALSE

--- a/hdl/top/wb_pkg.vhd
+++ b/hdl/top/wb_pkg.vhd
@@ -109,7 +109,6 @@ PACKAGE wb_pkg IS
 		dat	: std_logic_vector(31 DOWNTO 0);
 		tga	: std_logic_vector(8 DOWNTO 0);
 		cti	: std_logic_vector(2 DOWNTO 0);
-		bte	: std_logic_vector(1 DOWNTO 0);
 	END record;
 	
 	TYPE wbi_type IS record
@@ -1285,7 +1284,6 @@ PACKAGE BODY wb_pkg IS
 		wbi_slave.sel 	<= wbo_0.sel;
 		wbi_slave.we	<= wbo_0.we;
 		wbi_slave.cti 	<= wbo_0.cti;
-		wbi_slave.bte	<= wbo_0.bte;
 		wbi_slave.tga	<= wbo_0.tga;

 	END switch_fab;