diff options
| author | (no author) <(no author)@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2006-09-09 17:20:40 +0000 |
|---|---|---|
| committer | (no author) <(no author)@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2006-09-09 17:20:40 +0000 |
| commit | 29d8974fe20c8d9d35adbcced625d661e51a6c26 (patch) | |
| tree | 5812fef4d0d297f2767ea98427efdb92544b8643 /openpcd/firmware/src/picc/decoder_miller.c | |
| parent | 48fbcc6bff88cddfee7288489c96b93bb1436875 (diff) | |
- tons of compile fixes for untested PICC code
git-svn-id: https://svn.openpcd.org:2342/trunk@160 6dc7ffe9-61d6-0310-9af1-9938baff3ed1
Diffstat (limited to 'openpcd/firmware/src/picc/decoder_miller.c')
| -rw-r--r-- | openpcd/firmware/src/picc/decoder_miller.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openpcd/firmware/src/picc/decoder_miller.c b/openpcd/firmware/src/picc/decoder_miller.c index 4036511..1394a17 100644 --- a/openpcd/firmware/src/picc/decoder_miller.c +++ b/openpcd/firmware/src/picc/decoder_miller.c @@ -25,7 +25,9 @@ */ #include <sys/types.h> -#include "decoder.h" + +#include <os/dbgu.h> +#include <picc/decoder.h> #define OVERSAMPLING_RATE 4 @@ -47,7 +49,7 @@ static u_int8_t miller_decode_sampled_bit(u_int32_t sampled_bit) return 0; break; default: - DEBUGP("unknown sequence sample `%x' ", bit_sample); + DEBUGP("unknown sequence sample `%x' ", sampled_bit); return 2; break; } @@ -57,7 +59,7 @@ static u_int8_t miller_decode_sampled_bit(u_int32_t sampled_bit) static int miller_decode_sample(u_int32_t sample, u_int8_t *data) { u_int8_t ret = 0; - int err, i; + unsigned int i; for (i = 0; i < sizeof(sample)/OVERSAMPLING_RATE; i++) { u_int8_t bit = miller_decode_sampled_bit(sample & 0xf); @@ -83,7 +85,6 @@ static u_int32_t get_next_bytesample(struct decoder_state *ms, u_int8_t *parity_sample) { u_int32_t ret = 0; - u_int8_t parity_sample; /* get remaining bits from the current word */ ret = *(ms->buf32) >> ms->bit_ofs; @@ -91,7 +92,7 @@ static u_int32_t get_next_bytesample(struct decoder_state *ms, ms->buf32++; /* if required, get remaining bits from next word */ - if (bit_ofs) + if (ms->bit_ofs) ret |= *(ms->buf32) << (32 - ms->bit_ofs); *parity_sample = (*(ms->buf32) >> ms->bit_ofs & 0xf); |