Project

General

Profile

User story #1179

Fixed PrepareNextState of NI9157CircularFifoReader

Added by Giuseppe Ferro almost 3 years ago. Updated almost 3 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Start date:
27.06.2022
Due date:
% Done:

0%

Estimated time:
Git branch (link):
Git merge to develop (link):
SVN commit (link/?p=rev):

Description

--- Source/Components/DataSources/NI9157/NI9157CircularFifoReader.cpp 2022-02-02 09:32:48.000000000 0000
++ Source/Components/DataSources/NI9157/NI9157CircularFifoReader.cpp 2022-04-22 10:31:35.685722943 0000
@ -131,7 +131,7 @
acqTimeout = 0xFFFFFFFFu;
}
if (!data.Read("NonBlockSleepT", nonBlockSleepT)) {
- acqTimeout = 0xFFFFFFFFu;
 nonBlockSleepT = 0.F;
}
if (checkFrame > 0u) {
ret = false;
@ -235,8 +235,7 @
numberOfReadWriteCurrent = numberOfConsumersCurrentState;
numberOfReadWriteNext += numberOfConsumersNextState;
}
- prepare = ((numberOfReadWriteNext > 0u) && (numberOfReadWriteCurrent 0u)) ||
- ((numberOfReadWriteNext numberOfReadWriteCurrent) && (numberOfReadWriteCurrent > 0u));
 prepare = ((numberOfReadWriteNext > 0u) && (numberOfReadWriteCurrent == 0u));
if (prepare){
ret = eventSem.Post();
for (uint32 i = 0u; (i < numberOfSignals); i++) {

History

#1 Updated by Giuseppe Ferro almost 3 years ago

  • Status changed from New to Code: Impl

#2 Updated by Giuseppe Ferro almost 3 years ago

  • Assignee changed from Giuseppe Ferro to André Neto
  • Status changed from Code: Impl to Unit: Rev

Fixed in
#1179_NI9157CircularFifoReader_PrepareNextState_fix

#3 Updated by Giuseppe Ferro almost 3 years ago

Giuseppe Ferro wrote:

> --- Source/Components/DataSources/NI9157/NI9157CircularFifoReader.cpp   2022-02-02 09:32:48.000000000 +0000
> +++ Source/Components/DataSources/NI9157/NI9157CircularFifoReader.cpp   2022-04-22 10:31:35.685722943 +0000
> @@ -131,7 +131,7 @@
>              acqTimeout = 0xFFFFFFFFu;
>          }
>          if (!data.Read("NonBlockSleepT", nonBlockSleepT)) {
> -            acqTimeout = 0xFFFFFFFFu;
> +            nonBlockSleepT = 0.F;
>          }
>          if (checkFrame > 0u) {
>              ret = false;
> @@ -235,8 +235,7 @@
>          numberOfReadWriteCurrent += numberOfConsumersCurrentState;
>          numberOfReadWriteNext += numberOfConsumersNextState;
>      }
> -    prepare = ((numberOfReadWriteNext > 0u) && (numberOfReadWriteCurrent == 0u)) ||
> -            ((numberOfReadWriteNext == numberOfReadWriteCurrent) && (numberOfReadWriteCurrent > 0u));
> +    prepare = ((numberOfReadWriteNext > 0u) && (numberOfReadWriteCurrent == 0u));
>      if (prepare){
>          ret = eventSem.Post();
>          for (uint32 i = 0u; (i < numberOfSignals); i++) {

#4 Updated by André Neto almost 3 years ago

  • Assignee deleted (André Neto)
  • Status changed from Unit: Rev to Closed

Merged at 8b04dac47855d38f34146a6271e27915e3a0f116

Also available in: Atom PDF