add flash settings to OEP, and a bit of cleanup

diff --git a/OEP/config.vhd b/OEP/config.vhd
index 96b80266234a055ec8fa9326fb2167f0d3a15b90..caf101e7150cdb2816b0e96d52b24bb27d543d70 100644 (file)
--- a/OEP/config.vhd
+++ b/OEP/config.vhd
@@ -40,12 +40,6 @@ package config is
     
     
     constant use_120_mhz : integer := 0;
---TDC settings
-  constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 33;  -- number of tdc channels per module
-  constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 5;  --the nearest power of two, for convenience reasons 
-
-  constant EVENT_BUFFER_SIZE        : integer range 9 to 13 := 10; -- size of the event buffer, 2**N
-  constant EVENT_MAX_SIZE           : integer := 400;             --maximum event size. Must not exceed EVENT_BUFFER_SIZE/2
 
         
 ------------------------------------------------------------------------------
@@ -53,9 +47,6 @@ package config is
 ------------------------------------------------------------------------------
 
 
-  type data_t is array (0 to 1023) of std_logic_vector(7 downto 0);
-  constant LCD_DATA : data_t := (others => x"00");
-
 ------------------------------------------------------------------------------
 --Select settings by configuration 
 ------------------------------------------------------------------------------

diff --git a/OEP/mdcoep.prj b/OEP/mdcoep.prj
index 1bdf65947f8d20f038b2e0fe86a0326c0a6b861c..1921f81b9d6661763e0ec94c292faa123170f7f4 100644 (file)
--- a/OEP/mdcoep.prj
+++ b/OEP/mdcoep.prj
@@ -103,7 +103,7 @@ add_file -vhdl -lib work "../../trbnet/special/spi_slim.vhd"
 add_file -vhdl -lib work "../../trbnet/special/spi_databus_memory.vhd"
 add_file -vhdl -lib work "../../trbnet/special/fpga_reboot.vhd"
 add_file -vhdl -lib work "../../trb3sc/code/trb3sc_tools.vhd"
-add_file -vhdl -lib work "../../trb3sc/code/lcd.vhd"
+
 add_file -vhdl -lib work "../../trb3sc/code/debuguart.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart_rec.vhd"

diff --git a/OEP/mdcoep.vhd b/OEP/mdcoep.vhd
index 546e60c900193fd4dae1da9d96883cae775e9028..4c5c8b963a6817e0506514e666970d3e74d7f1eb 100644 (file)
--- a/OEP/mdcoep.vhd
+++ b/OEP/mdcoep.vhd
@@ -260,7 +260,9 @@ begin
       REGIO_WRITE_ACK_IN        => wrack,
       REGIO_UNKNOWN_ADDR_IN     => ctrlbus_tx.unknown,
       REGIO_TIMEOUT_OUT         => ctrlbus_rx.timeout,
-      
+      BUS_MASTER_IN             => bus_master_in,
+      BUS_MASTER_OUT            => bus_master_out,
+      BUS_MASTER_ACTIVE         => bus_master_active,      
       ONEWIRE                         => open,
       ONEWIRE_MONITOR_OUT             => open,
       I2C_SCL       => I2C_SCL,