firmware_common: add shared flash routines

This commit is contained in:
Robert Ghilduta 2018-12-17 19:51:09 -08:00
commit 99087acb6e
3 changed files with 50 additions and 0 deletions

45
firmware_common/misc.h Normal file
View file

@ -0,0 +1,45 @@
/*
* Copyright (c) 2018 Nuand LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MISC_LIB
#define MISC_LIB
#include <stdint.h>
uint16_t zcrc(uint8_t *data, size_t len){
uint16_t ret = 0;
int b, msb;
unsigned i;
for (i = 0; i < len; i++) {
ret ^= data[i] << 8;
for (b = 0; b < 8; b++) {
msb = ret & 0x8000;
ret <<= 1;
if (msb) {
ret ^= 0x1021;
}
}
}
return ret;
}
#endif

View file

@ -25,6 +25,7 @@
#include "bladeRF.h"
#include "spi_flash_lib.h"
#include "flash.h"
#include "misc.h"
#define THIS_FILE LOGGER_ID_FLASH_C
@ -247,6 +248,7 @@ int NuandExtractField(char *ptr, int len, char *field,
break;
a1 = *(unsigned short *)(&ub[c+1]); // read checksum
a2 = zcrc(ub, c+1); // calculate checksum
if (a1 == a2 || 1) {
if (!strncmp((char *)ub + 1, field, flen)) {

View file

@ -3,6 +3,7 @@
#include "log.h"
#include "minmax.h"
#include "misc.h"
#include "conversions.h"
#include "bladeRF.h"
@ -408,6 +409,7 @@ int binkv_decode_field(char *ptr, int len, char *field,
break;
a1 = LE16_TO_HOST(*(unsigned short *)(&ub[c+1])); // read checksum
a2 = zcrc(ub, c+1); // calculate checksum
if (a1 == a2) {
if (!strncmp((char *)ub + 1, field, flen)) {
@ -439,6 +441,7 @@ int binkv_encode_field(char *ptr, int len, int *idx,
ptr[*idx] = flen + vlen;
strcpy(&ptr[*idx + 1], field);
strcpy(&ptr[*idx + 1 + flen], val);
*(unsigned short *)(&ptr[*idx + tlen ]) = HOST_TO_LE16(zcrc((uint8_t *)&ptr[*idx ], tlen));
*idx += tlen + 2;
return 0;
}