From bfe963155c001b7e68dd5150da760cfe42c3bbd5 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Tue, 1 Nov 2022 16:11:47 +0100 Subject: [PATCH] add flash settings to OEP, and a bit of cleanup --- OEP/config.vhd | 9 --------- OEP/mdcoep.prj | 2 +- OEP/mdcoep.vhd | 4 +++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/OEP/config.vhd b/OEP/config.vhd index 96b8026..caf101e 100644 --- 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 1bdf659..1921f81 100644 --- 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 546e60c..4c5c8b9 100644 --- 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, -- 2.43.0