Code tidy and added/exposed minor utility functions

This commit is contained in:
Martin Budden 2017-08-31 07:35:44 +01:00
parent 0c7126a9fe
commit 6ab6ec377c
5 changed files with 17 additions and 2 deletions

View File

@ -20,6 +20,13 @@
#include "streambuf.h"
sbuf_t *sbufInit(sbuf_t *sbuf, uint8_t *ptr, uint8_t *end)
{
sbuf->ptr = ptr;
sbuf->end = end;
return sbuf;
}
void sbufWriteU8(sbuf_t *dst, uint8_t val)
{
*dst->ptr++ = val;
@ -65,6 +72,11 @@ void sbufWriteString(sbuf_t *dst, const char *string)
sbufWriteData(dst, string, strlen(string));
}
void sbufWriteStringWithZeroTerminator(sbuf_t *dst, const char *string)
{
sbufWriteData(dst, string, strlen(string) + 1);
}
uint8_t sbufReadU8(sbuf_t *src)
{
return *src->ptr++;

View File

@ -27,6 +27,7 @@ typedef struct sbuf_s {
uint8_t *end;
} sbuf_t;
sbuf_t *sbufInit(sbuf_t *sbuf, uint8_t *ptr, uint8_t *end);
void sbufWriteU8(sbuf_t *dst, uint8_t val);
void sbufWriteU16(sbuf_t *dst, uint16_t val);
void sbufWriteU32(sbuf_t *dst, uint32_t val);
@ -34,6 +35,7 @@ void sbufWriteU16BigEndian(sbuf_t *dst, uint16_t val);
void sbufWriteU32BigEndian(sbuf_t *dst, uint32_t val);
void sbufWriteData(sbuf_t *dst, const void *data, int len);
void sbufWriteString(sbuf_t *dst, const char *string);
void sbufWriteStringWithZeroTerminator(sbuf_t *dst, const char *string);
uint8_t sbufReadU8(sbuf_t *src);
uint16_t sbufReadU16(sbuf_t *src);

View File

@ -39,7 +39,7 @@ static uint8_t *pgOffset(const pgRegistry_t* reg)
return reg->address;
}
static void pgResetInstance(const pgRegistry_t *reg, uint8_t *base)
void pgResetInstance(const pgRegistry_t *reg, uint8_t *base)
{
const uint16_t regSize = pgSize(reg);

View File

@ -187,5 +187,6 @@ const pgRegistry_t* pgFind(pgn_t pgn);
void pgLoad(const pgRegistry_t* reg, const void *from, int size, int version);
int pgStore(const pgRegistry_t* reg, void *to, int size);
void pgResetAll();
void pgResetInstance(const pgRegistry_t *reg, uint8_t *base);
bool pgResetCopy(void *copy, pgn_t pgn);
void pgReset(const pgRegistry_t* reg);

View File

@ -119,7 +119,7 @@ typedef union {
cliArrayLengthConfig_t array;
} cliValueConfig_t;
typedef struct {
typedef struct clivalue_s {
const char *name;
const uint8_t type; // see cliValueFlag_e
const cliValueConfig_t config;