Skip to content

Commit 7522a90

Browse files
authored
Merge pull request #395 from sy-c/master
v0.39.1
2 parents 273b4c6 + 3329180 commit 7522a90

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/Crorc/CrorcDmaChannel.cxx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ void CrorcDmaChannel::deviceStopDma()
149149
getBar()->flushSuperpages();
150150
getBar()->stopDataReceiver();
151151

152-
153152
// handling of last superpage pushed, being it ready or not
154153
while (!mIntermediateQueue.isEmpty()) {
155154
auto superpage = mIntermediateQueue.frontPtr();
@@ -162,18 +161,17 @@ void CrorcDmaChannel::deviceStopDma()
162161
}
163162
mReadyQueue.write(*superpage);
164163
mIntermediateQueue.popFront();
165-
//printf("\n*** %04d *** final pop 0x%p : intermediate -> ready (size %d)\n\n", __LINE__, (void*)(superpage->getOffset()), (int)superpage->getReceived());
164+
// printf("\n*** %04d *** final pop 0x%p : intermediate -> ready (size %d)\n\n", __LINE__, (void*)(superpage->getOffset()), (int)superpage->getReceived());
166165
}
167166

168-
169167
// Return any superpages that have been pushed up in the meantime but won't get filled
170168
while (mTransferQueue.sizeGuess()) {
171169
auto superpage = mTransferQueue.frontPtr();
172170
superpage->setReceived(0);
173171
superpage->setReady(false);
174172
mReadyQueue.write(*superpage);
175173
mTransferQueue.popFront();
176-
//printf("\n*** %04d *** final pop 0x%p : transfer -> ready\n\n", __LINE__, (void*)(superpage->getOffset()));
174+
// printf("\n*** %04d *** final pop 0x%p : transfer -> ready\n\n", __LINE__, (void*)(superpage->getOffset()));
177175
}
178176
}
179177

@@ -279,7 +277,7 @@ void CrorcDmaChannel::fillSuperpages()
279277
superpage->setReady(true);
280278
mReadyQueue.write(*superpage);
281279
mIntermediateQueue.popFront();
282-
//printf("\n*** %04d *** pop 0x%p : intermediate -> ready (size %d)\n\n", __LINE__, (void*)(superpage->getOffset()), (int)superpage->getReceived());
280+
// printf("\n*** %04d *** pop 0x%p : intermediate -> ready (size %d)\n\n", __LINE__, (void*)(superpage->getOffset()), (int)superpage->getReceived());
283281
}
284282

285283
// Push single Superpage to the firmware when available
@@ -291,7 +289,7 @@ void CrorcDmaChannel::fillSuperpages()
291289
getBar()->pushSuperpageAddressAndSize(busAddress, inSuperpage->getSize());
292290

293291
mIntermediateQueue.write(*inSuperpage);
294-
//printf("\n*** %04d *** push 0x%p : transfer -> intermediate\n\n", __LINE__, (void*)(inSuperpage->getOffset()));
292+
// printf("\n*** %04d *** push 0x%p : transfer -> intermediate\n\n", __LINE__, (void*)(inSuperpage->getOffset()));
295293
}
296294
}
297295

0 commit comments

Comments
 (0)