rusefi
/
wideband
mirror of https://github.com/rusefi/wideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Crc bootloader (#88) 

* more code reuse

* more code reuse

* more code reuse

* more code reuse

* more code reuse

* more code reuse

* make it compile and actually include all the functions

Co-authored-by: rusefillc <sdfsdfqsf2334234234>
Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
rusefillc 2022-06-30 13:07:33 -04:00 committed by GitHub
parent 1b0145d104
commit fad49f553f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/Makefile
View File

@ -163,6 +163,7 @@ INCDIR = $(CONFDIR) \
util/math/ \ util/math/ \
console/binary/ \ console/binary/ \
boards/ \ boards/ \
shared/ \
$(BOARDDIR)/io/ $(BOARDDIR)/io/
# Define C warning options here. # Define C warning options here.

2
firmware/boards/f0_module/bootloader/bootloader.cpp
View File

@ -2,6 +2,7 @@
#include "port_shared.h" #include "port_shared.h"
#include "flash.h" #include "flash.h"
#include "io_pins.h" #include "io_pins.h"
#include "crc.h"
#include <cstring> #include <cstring>
@ -12,7 +13,6 @@ extern uint32_t __ram_vectors_start__[64];
extern uint32_t __ram_vectors_size__; extern uint32_t __ram_vectors_size__;
#define SWAP_UINT32(x) ((((x) >> 24) & 0xff) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) | (((x) << 24) & 0xff000000)) #define SWAP_UINT32(x) ((((x) >> 24) & 0xff) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) | (((x) << 24) & 0xff000000))
uint32_t crc32(const uint8_t *buf, uint32_t size);
bool isAppValid() { bool isAppValid() {
const uint32_t* appFlash = const uint32_t* appFlash =

12
firmware/shared/crc.cpp
View File

@ -1,4 +1,4 @@
#include <cstdint> #include "crc.h"
static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
@ -44,12 +44,14 @@ static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x9909
0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
uint32_t crc32(const void *buf, uint32_t size) {
return crc32inc(buf, 0, size);
}
uint32_t crc32(const uint8_t *buf, uint32_t size) { uint32_t crc32inc(const void *buf, uint32_t crc, uint32_t size) {
const uint8_t *p; auto p = reinterpret_cast<const uint8_t*>(buf);
p = buf; crc = crc ^ 0xFFFFFFFF;
uint32_t crc = 0xFFFFFFFF;
while (size--) { while (size--) {
crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);

11
firmware/util/math/crc.h → firmware/shared/crc.h
View File

@ -7,16 +7,7 @@
#pragma once #pragma once
#include "stdint.h" #include <cstdint>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
uint8_t crc8(const uint8_t * buf, uint8_t len);
uint32_t crc32(const void *buf, uint32_t size); uint32_t crc32(const void *buf, uint32_t size);
uint32_t crc32inc(const void *buf, uint32_t crc, uint32_t size); uint32_t crc32inc(const void *buf, uint32_t crc, uint32_t size);
#ifdef __cplusplus
}
#endif /* __cplusplus */