Skip to content

Commit 18d8689

Browse files
committed
[crorc] Further fortify link assertion
1 parent 9c25c52 commit 18d8689

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/Crorc/CrorcBar.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ void CrorcBar::assertLinkUp()
166166
}
167167
}
168168

169-
std::this_thread::sleep_for(500ms);
170169
if (!checkLinkUp()) {
171170
BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message("Link was not up"));
172171
}

src/Crorc/CrorcDmaChannel.cxx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ CrorcDmaChannel::CrorcDmaChannel(const Parameters& parameters)
9393

9494
getReadyFifoUser()->reset();
9595
mDmaBufferUserspace = getBufferProvider().getAddress();
96+
97+
if (mDataSource == DataSource::Fee || mDataSource == DataSource::Siu) {
98+
deviceResetChannel(ResetLevel::InternalSiu);
99+
} else {
100+
deviceResetChannel(ResetLevel::Internal);
101+
}
96102
}
97103

98104
auto CrorcDmaChannel::allowedChannels() -> AllowedChannels
@@ -106,11 +112,7 @@ CrorcDmaChannel::~CrorcDmaChannel()
106112

107113
void CrorcDmaChannel::deviceStartDma()
108114
{
109-
if (mDataSource == DataSource::Fee || mDataSource == DataSource::Siu) {
110-
deviceResetChannel(ResetLevel::InternalSiu);
111-
} else {
112-
deviceResetChannel(ResetLevel::Internal);
113-
}
115+
deviceResetChannel(ResetLevel::Internal);
114116

115117
startDataReceiving();
116118

0 commit comments

Comments
 (0)