From 3c99fefb6b2c02ce3f1150a716a400bc2cdea720 Mon Sep 17 00:00:00 2001 From: dev-zzo Date: Sun, 16 Oct 2016 13:40:50 +0200 Subject: [PATCH] make CRCA checking const-correct --- Firmware/Chameleon-Mini/Application/ISO14443-3A.c | 8 ++++---- Firmware/Chameleon-Mini/Application/ISO14443-3A.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/Chameleon-Mini/Application/ISO14443-3A.c b/Firmware/Chameleon-Mini/Application/ISO14443-3A.c index 4818be2..25abdc7 100644 --- a/Firmware/Chameleon-Mini/Application/ISO14443-3A.c +++ b/Firmware/Chameleon-Mini/Application/ISO14443-3A.c @@ -52,9 +52,9 @@ void ISO14443AAppendCRCA(void* Buffer, uint16_t ByteCount) #endif #ifdef USE_HW_CRC -bool ISO14443ACheckCRCA(void* Buffer, uint16_t ByteCount) +bool ISO14443ACheckCRCA(const void* Buffer, uint16_t ByteCount) { - uint8_t* DataPtr = (uint8_t*) Buffer; + const uint8_t* DataPtr = (const uint8_t*) Buffer; CRC.CTRL = CRC_RESET0_bm; CRC.CHECKSUM1 = (CRC_INIT_R >> 8) & 0xFF; @@ -76,10 +76,10 @@ bool ISO14443ACheckCRCA(void* Buffer, uint16_t ByteCount) } #else #include -bool ISO14443ACheckCRCA(void* Buffer, uint16_t ByteCount) +bool ISO14443ACheckCRCA(const void* Buffer, uint16_t ByteCount) { uint16_t Checksum = CRC_INIT; - uint8_t* DataPtr = (uint8_t*) Buffer; + const uint8_t* DataPtr = (const uint8_t*) Buffer; while(ByteCount--) { uint8_t Byte = *DataPtr++; diff --git a/Firmware/Chameleon-Mini/Application/ISO14443-3A.h b/Firmware/Chameleon-Mini/Application/ISO14443-3A.h index 87f6ff2..fb136db 100644 --- a/Firmware/Chameleon-Mini/Application/ISO14443-3A.h +++ b/Firmware/Chameleon-Mini/Application/ISO14443-3A.h @@ -45,7 +45,7 @@ ( ByteBuffer[0] ^ ByteBuffer[1] ^ ByteBuffer[2] ^ ByteBuffer[3] ) void ISO14443AAppendCRCA(void* Buffer, uint16_t ByteCount); -bool ISO14443ACheckCRCA(void* Buffer, uint16_t ByteCount); +bool ISO14443ACheckCRCA(const void* Buffer, uint16_t ByteCount); INLINE bool ISO14443ASelect(void* Buffer, uint16_t* BitCount, uint8_t* UidCL, uint8_t SAKValue); INLINE bool ISO14443AWakeUp(void* Buffer, uint16_t* BitCount, uint16_t ATQAValue);