diff options
Diffstat (limited to 'fw')
| -rw-r--r-- | fw/signal.c | 6 | ||||
| -rw-r--r-- | fw/signal_utestable.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fw/signal.c b/fw/signal.c index 2bbb716..d724091 100644 --- a/fw/signal.c +++ b/fw/signal.c @@ -9,7 +9,7 @@ // Extract a little-endian value from a frame. // Assumes signal is within the frame's DATA FIELD. -Status +void pluckLE(const SigFmt *sig, const CanFrame *frame, U32 *raw) { U8 i, end, mask, byte; @@ -20,7 +20,7 @@ pluckLE(const SigFmt *sig, const CanFrame *frame, U32 *raw) { // Subsequent iterations start at bit 0 of each byte. for (i = sig->start; i < end; i += 8u-(i%8u)) { - mask = 0xFF << (i%8u); + mask = (U8)(0xFF << (i%8u)); if (i/8u == end/8u) { // if end in this byte mask &= 0xFF >> (8u - (end%8u)); // ignore top bits } @@ -42,7 +42,7 @@ pluckBE(const SigFmt *sig, const CanFrame *frame, U32 *raw) { // Subsequent iterations start at bit 0 of each byte. for (i = sig->start; i < end; i += 8u-(i%8u)) { - mask = 0xFF << (i%8u); + mask = (U8)(0xFF << (i%8u)); if (i/8u == end/8u) { // if end in this byte mask &= 0xFF >> (8u - (end%8u)); // ignore top bits *raw <<= (end%8u) - (i%8u); // include bits between i and end diff --git a/fw/signal_utestable.h b/fw/signal_utestable.h index 6ab802b..71ee589 100644 --- a/fw/signal_utestable.h +++ b/fw/signal_utestable.h @@ -1,2 +1,2 @@ -Status pluckLE(const SigFmt *sig, const CanFrame *frame, U32 *raw); +void pluckLE(const SigFmt *sig, const CanFrame *frame, U32 *raw); void pluckBE(const SigFmt *sig, const CanFrame *frame, U32 *raw); |