Skip to content
This repository has been archived by the owner on Jan 31, 2022. It is now read-only.

Hw access optimization #327

Merged
merged 15 commits into from
Apr 6, 2020
Merged

Hw access optimization #327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fd13d33
Refactoring FSM transitions, still temporary
mexanick Feb 27, 2020
c71e77c
Another drop of obsolete FW support
mexanick Mar 18, 2020
2e97321
Removing obsolete legacy (GLIB) support and fixing minor typos
mexanick Mar 18, 2020
e05fd00
Implementing readReg, readBlock and writeReg
mexanick Mar 19, 2020
b5ddc08
Techincal: fixing makefiles to include CTP7 headers where needed, int…
mexanick Mar 23, 2020
ede0eb6
Removing device monitors. The parameter DisableMonitoring is still pl…
mexanick Mar 23, 2020
3b2e2f5
Dropping uhal support from hardware devices with exception of AMC13, …
mexanick Mar 23, 2020
b293658
Converting all RPC calls to templated RPC calls under gemhardware sub…
mexanick Mar 25, 2020
02665dc
Removing obsolete scan functionality
mexanick Mar 31, 2020
86b1979
Fixing remaining leftovers from uhal
mexanick Mar 31, 2020
ba93668
Added read/write exceptions logging
mexanick Mar 31, 2020
4fecfa0
Changing interface of configGBT. As this function is not yet used on …
mexanick Apr 1, 2020
c5d3a93
Adding missing change in configGBT interface
mexanick Apr 1, 2020
d0fab37
Fixing missed function implementations in hardware managers web inter…
mexanick Apr 2, 2020
17a39f7
Removing uhal dependency from gemhardware/devices Makefile, fixing in…
mexanick Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions gemhardware/devices/include/gem/hw/devices/optohybrid/HwOptoHybrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,7 @@ namespace gem {
* @param gbtcfg is an array of 92 32-bit words
*/

void configureGBT(uint8_t const& gbtID, uint32_t const* gbtcfg); // FIXME, make private
void configureGBT(uint8_t const& gbtID, std::array<const uint32_t, 92> const& gbtcfg);
void configureGBT(uint8_t const& gbtID, std::array<const uint8_t, ::gbt::CONFIG_SIZE> const& gbtcfg);

/**
* @brief Sends a write request for all configuration registers on all GBTx chips
Expand Down
12 changes: 3 additions & 9 deletions gemhardware/devices/src/common/optohybrid/HwOptoHybrid.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,19 +228,13 @@ void gem::hw::optohybrid::HwOptoHybrid::configureVFATs(std::map<std::string, uin
//} GEM_CATCH_RPC_ERROR("HwOptoHybrid::configureVFATs", gem::hw::devices::exception::Exception);
}


void gem::hw::optohybrid::HwOptoHybrid::configureGBT(uint8_t const& gbtID, uint32_t const* gbtcfg)
void gem::hw::optohybrid::HwOptoHybrid::configureGBT(uint8_t const& gbtID, std::array<const uint8_t, ::gbt::CONFIG_SIZE> const& gbtcfg)
{
gbt::config_t t_gbtconfig = {*(uint8_t*) gbtcfg};
configureGBT(gbtID, gbtcfg.data());
try {
xhal::common::rpc::call<::gbt::writeGBTConfig>(rpc, static_cast<uint32_t>(m_link), static_cast<uint32_t>(gbtID), t_gbtconfig);
lpetre-ulb marked this conversation as resolved.
Show resolved Hide resolved
} GEM_CATCH_RPC_ERROR("HwOptoHybrid::configureAllGBTs", gem::hw::devices::exception::Exception);
}
} GEM_CATCH_RPC_ERROR("HwOptoHybrid::configureGBT", gem::hw::devices::exception::Exception);


void gem::hw::optohybrid::HwOptoHybrid::configureGBT(uint8_t const& gbtID, std::array<const uint32_t, 92> const& gbtcfg)
{
configureGBT(gbtID, gbtcfg.data());
}


Expand Down