sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hex2bin: Various bugfixes

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-16 07:31:30 -06:00
parent 0487f8fbf4
commit 6445ddbceb
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
system/hex2bin/hex2bin.c
View File

@ -1,10 +1,14 @@
/**************************************************************************** /****************************************************************************
* apps/system/hex2bin.c * apps/system/hex2bin.c
* Reference: http://en.wikipedia.org/wiki/Intel_HEX
* *
* Copyright (C) 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* References:
* - http://en.wikipedia.org/wiki/Intel_HEX
* - Hexadecimal Object File Format Specification, Revision A January 6,
* 1988, Intel
*
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -93,8 +97,8 @@
#define TRAILER_BINSIZE CHECKSUM_BINSIZE #define TRAILER_BINSIZE CHECKSUM_BINSIZE
#define RECORD_BINSIZE(n) (HEADER_BINSIZE + TRAILER_BINSIZE + (n)) #define RECORD_BINSIZE(n) (HEADER_BINSIZE + TRAILER_BINSIZE + (n))
#define MAXRECORD_BINSIZE RECORD_ASCSIZE(MAXDATA_BINSIZE) #define MAXRECORD_BINSIZE RECORD_BINSIZE(MAXDATA_BINSIZE)
#define MINRECORD_BKINSIZE RECORD_ASCSIZE(0) #define MINRECORD_BKINSIZE RECORD_BINSIZE(0)
#define BIN_ALLOC MAXRECORD_BINSIZE #define BIN_ALLOC MAXRECORD_BINSIZE
/* Record start code */ /* Record start code */
@ -208,13 +212,13 @@ static int word2bin(FAR const char *ascii)
* Name: data2bin * Name: data2bin
****************************************************************************/ ****************************************************************************/
int data2bin(FAR uint8_t* dest, FAR const uint8_t *src, int nbytes) int data2bin(FAR uint8_t* dest, FAR const uint8_t *src, int nsrcbytes)
{ {
int byte; int byte;
/* An even number of source bytes is expected */ /* An even number of source bytes is expected */
if ((nbytes & 1) != 0) if ((nsrcbytes & 1) != 0)
{ {
return -EINVAL; return -EINVAL;
} }
@ -222,7 +226,7 @@ int data2bin(FAR uint8_t* dest, FAR const uint8_t *src, int nbytes)
/* Convert src bytes in groups of 2, writing one byte to the output on each /* Convert src bytes in groups of 2, writing one byte to the output on each
* pass through the loop. */ * pass through the loop. */
while (nbytes-- > 0) while (nsrcbytes > 0)
{ {
/* Get the MS nibble (big endian order) */ /* Get the MS nibble (big endian order) */
@ -237,6 +241,7 @@ int data2bin(FAR uint8_t* dest, FAR const uint8_t *src, int nbytes)
/* And write the byte to the destination */ /* And write the byte to the destination */
*dest++ = byte; *dest++ = byte;
nsrcbytes -= 2;
} }
return OK; return OK;
@ -308,7 +313,7 @@ static int readstream(FAR struct lib_instream_s *instream,
*line++ = ch; *line++ = ch;
nbytes++; nbytes++;
} }
else else if (!isspace(ch)) /* Not expected */
{ {
hex2bin_debug("Line %u ERROR: Unexpected character %c[%02x] in stream\n", hex2bin_debug("Line %u ERROR: Unexpected character %c[%02x] in stream\n",
lineno, isprint(ch) ? ch : '.', ch); lineno, isprint(ch) ? ch : '.', ch);
@ -491,7 +496,7 @@ int hex2bin(FAR struct lib_instream_s *instream,
* the start code and the checksum at the end of the line itself) * the start code and the checksum at the end of the line itself)
*/ */
ret = data2bin(line, bin, nbytes); ret = data2bin(bin, line, nbytes);
if (ret < 0) if (ret < 0)
{ {
hex2bin_debug("Line %u ERROR: Failed to convert line to binary: %d\n", hex2bin_debug("Line %u ERROR: Failed to convert line to binary: %d\n",
@ -501,8 +506,10 @@ int hex2bin(FAR struct lib_instream_s *instream,
/* Calculate and verify the checksum over all of the data */ /* Calculate and verify the checksum over all of the data */
nbytes >>= 1; /* Number of bytes in bin[] */
checksum = 0; checksum = 0;
for (i = 0; i < bytecount; i++)
for (i = 0; i < nbytes; i++)
{ {
checksum += bin[i]; checksum += bin[i];
} }
@ -691,7 +698,7 @@ errout_with_einval:
errout_with_buffers: errout_with_buffers:
exit_with_buffers: exit_with_buffers:
free(alloc); free(alloc);
return -ret; return ret;
} }
#endif /* CONFIG_SYSTEM_HEX2BIN */ #endif /* CONFIG_SYSTEM_HEX2BIN */