FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the bin/hex conversion functions to a common file.

Browse Source
This commit is contained in:
Jef Driesen 2013-01-15 09:34:24 +01:00
parent 8fa25ea9f3
commit 1e4d051b1e
3 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/array.c
View File

@ -93,6 +93,60 @@ array_search_backward (const unsigned char *data, unsigned int size,
}
int
array_convert_bin2hex (const unsigned char input[], unsigned int isize, unsigned char output[], unsigned int osize)
{
if (osize != 2 * isize)
return -1;
const unsigned char ascii[] = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
for (unsigned int i = 0; i < isize; ++i) {
// Set the most-significant nibble.
unsigned char msn = (input[i] >> 4) & 0x0F;
output[i * 2 + 0] = ascii[msn];
// Set the least-significant nibble.
unsigned char lsn = input[i] & 0x0F;
output[i * 2 + 1] = ascii[lsn];
}
return 0;
}
int
array_convert_hex2bin (const unsigned char input[], unsigned int isize, unsigned char output[], unsigned int osize)
{
if (isize != 2 * osize)
return -1;
for (unsigned int i = 0; i < osize; ++i) {
unsigned char value = 0;
for (unsigned int j = 0; j < 2; ++j) {
unsigned char number = 0;
unsigned char ascii = input[i * 2 + j];
if (ascii >= '0' && ascii <= '9')
number = ascii - '0';
else if (ascii >= 'A' && ascii <= 'F')
number = 10 + ascii - 'A';
else if (ascii >= 'a' && ascii <= 'f')
number = 10 + ascii - 'a';
else
return -1; /* Invalid character */
value <<= 4;
value += number;
}
output[i] = value;
}
return 0;
}
unsigned int
array_uint32_be (const unsigned char data[])
{

6
src/array.h
View File

@ -43,6 +43,12 @@ const unsigned char *
array_search_backward (const unsigned char *data, unsigned int size,
const unsigned char *marker, unsigned int msize);
int
array_convert_bin2hex (const unsigned char input[], unsigned int isize, unsigned char output[], unsigned int osize);
int
array_convert_hex2bin (const unsigned char input[], unsigned int isize, unsigned char output[], unsigned int osize);
unsigned int
array_uint32_be (const unsigned char data[]);

60
src/mares_common.c
View File

@ -53,58 +53,6 @@ mares_common_device_init (mares_common_device_t *device, dc_context_t *context,
}
static int
mares_common_convert_binary_to_ascii (const unsigned char input[], unsigned int isize, unsigned char output[], unsigned int osize)
{
assert (osize == 2 * isize);
const unsigned char ascii[] = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
for (unsigned int i = 0; i < isize; ++i) {
// Set the most-significant nibble.
unsigned char msn = (input[i] >> 4) & 0x0F;
output[i * 2 + 0] = ascii[msn];
// Set the least-significant nibble.
unsigned char lsn = input[i] & 0x0F;
output[i * 2 + 1] = ascii[lsn];
}
return 0;
}
static int
mares_common_convert_ascii_to_binary (const unsigned char input[], unsigned int isize, unsigned char output[], unsigned int osize)
{
assert (isize == 2 * osize);
for (unsigned int i = 0; i < osize; ++i) {
unsigned char value = 0;
for (unsigned int j = 0; j < 2; ++j) {
unsigned char number = 0;
unsigned char ascii = input[i * 2 + j];
if (ascii >= '0' && ascii <= '9')
number = ascii - '0';
else if (ascii >= 'A' && ascii <= 'F')
number = 10 + ascii - 'A';
else if (ascii >= 'a' && ascii <= 'f')
number = 10 + ascii - 'a';
else
return -1; /* Invalid character */
value <<= 4;
value += number;
}
output[i] = value;
}
return 0;
}
static void
mares_common_make_ascii (const unsigned char raw[], unsigned int rsize, unsigned char ascii[], unsigned int asize)
{
@ -114,11 +62,11 @@ mares_common_make_ascii (const unsigned char raw[], unsigned int rsize, unsigned
ascii[0] = '<';
// Data
mares_common_convert_binary_to_ascii (raw, rsize, ascii + 1, 2 * rsize);
array_convert_bin2hex (raw, rsize, ascii + 1, 2 * rsize);
// Checksum
unsigned char checksum = checksum_add_uint8 (ascii + 1, 2 * rsize, 0x00);
mares_common_convert_binary_to_ascii (&checksum, 1, ascii + 1 + 2 * rsize, 2);
array_convert_bin2hex (&checksum, 1, ascii + 1 + 2 * rsize, 2);
// Trailer
ascii[asize - 1] = '>';
@ -175,7 +123,7 @@ mares_common_packet (mares_common_device_t *device, const unsigned char command[
// Verify the checksum of the packet.
unsigned char crc = 0;
unsigned char ccrc = checksum_add_uint8 (answer + 1, asize - 4, 0x00);
mares_common_convert_ascii_to_binary (answer + asize - 3, 2, &crc, 1);
array_convert_hex2bin (answer + asize - 3, 2, &crc, 1);
if (crc != ccrc) {
ERROR (abstract->context, "Unexpected answer checksum.");
return DC_STATUS_PROTOCOL;
@ -237,7 +185,7 @@ mares_common_device_read (dc_device_t *abstract, unsigned int address, unsigned
return rc;
// Extract the raw data from the packet.
mares_common_convert_ascii_to_binary (answer + 1, 2 * len, data, len);
array_convert_hex2bin (answer + 1, 2 * len, data, len);
nbytes += len;
address += len;