All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] img2srec: use standard types
Date: Wed,  4 Nov 2009 16:13:19 -0500	[thread overview]
Message-ID: <1257369199-5765-1-git-send-email-vapier@gentoo.org> (raw)

The img2srec code creates a lot of typedefs with common names.  These
easily clash with system headers that include these typedefs (like mingw).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 tools/img2srec.c |  164 ++++++++++++++++++++---------------------------------
 1 files changed, 62 insertions(+), 102 deletions(-)

diff --git a/tools/img2srec.c b/tools/img2srec.c
index f10379f..ec76964 100644
--- a/tools/img2srec.c
+++ b/tools/img2srec.c
@@ -53,6 +53,7 @@
 |*************************************************************************/
 
 #include "os_support.h"
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -63,63 +64,22 @@
 #include <errno.h>
 
 /*************************************************************************
-|  DEFINES
-|*************************************************************************/
-
-#define FALSE           0
-#define TRUE            1
-
-/*************************************************************************
-|  MACROS
-|*************************************************************************/
-
-/*************************************************************************
-|  TYPEDEFS
-|*************************************************************************/
-
-typedef uint8_t   CHAR;
-typedef uint8_t   BYTE;
-typedef uint16_t  WORD;
-typedef uint32_t  DWORD;
-typedef int       BOOL;
-
-/*************************************************************************
-|  LOCALS
-|*************************************************************************/
-
-/*************************************************************************
-|  PROTOTYPES
-|*************************************************************************/
-
-static char *ExtractHex(DWORD *value, char *getPtr);
-static char *ExtractDecimal(DWORD *value, char *getPtr);
-static void ExtractNumber(DWORD *value, char *getPtr);
-static BYTE *ExtractWord(WORD *value, BYTE *buffer);
-static BYTE *ExtractLong(DWORD *value, BYTE *buffer);
-static BYTE *ExtractBlock(WORD count, BYTE *data, BYTE *buffer);
-static char *WriteHex(char *pa, BYTE value, WORD *pCheckSum);
-static char *BuildSRecord(char *pa, WORD sType, DWORD addr,
-			  const BYTE *data, int nCount);
-static void ConvertELF(char *fileName, DWORD loadOffset);
-int main(int argc, char *argv[]);
-
-/*************************************************************************
 |  FUNCTIONS
 |*************************************************************************/
 
-static char* ExtractHex (DWORD* value,  char* getPtr)
+static char* ExtractHex (uint32_t* value,  char* getPtr)
 {
-  DWORD num;
-  DWORD digit;
-  BYTE  c;
+  uint32_t num;
+  uint32_t digit;
+  uint8_t  c;
 
   while (*getPtr == ' ') getPtr++;
   num = 0;
   for (;;) {
     c = *getPtr;
-    if      ((c >= '0') && (c <= '9')) digit = (DWORD)(c - '0');
-    else if ((c >= 'A') && (c <= 'F')) digit = (DWORD)(c - 'A' + 10);
-    else if ((c >= 'a') && (c <= 'f')) digit = (DWORD)(c - 'a' + 10);
+    if      ((c >= '0') && (c <= '9')) digit = (uint32_t)(c - '0');
+    else if ((c >= 'A') && (c <= 'F')) digit = (uint32_t)(c - 'A' + 10);
+    else if ((c >= 'a') && (c <= 'f')) digit = (uint32_t)(c - 'a' + 10);
     else break;
     num <<= 4;
     num += digit;
@@ -129,17 +89,17 @@ static char* ExtractHex (DWORD* value,  char* getPtr)
   return getPtr;
 } /* ExtractHex */
 
-static char* ExtractDecimal (DWORD* value,  char* getPtr)
+static char* ExtractDecimal (uint32_t* value,  char* getPtr)
 {
-  DWORD num;
-  DWORD digit;
-  BYTE  c;
+  uint32_t num;
+  uint32_t digit;
+  uint8_t  c;
 
   while (*getPtr == ' ') getPtr++;
   num = 0;
   for (;;) {
     c = *getPtr;
-    if      ((c >= '0') && (c <= '9')) digit = (DWORD)(c - '0');
+    if      ((c >= '0') && (c <= '9')) digit = (uint32_t)(c - '0');
     else break;
     num *= 10;
     num += digit;
@@ -150,13 +110,13 @@ static char* ExtractDecimal (DWORD* value,  char* getPtr)
 } /* ExtractDecimal */
 
 
-static void ExtractNumber (DWORD* value,  char* getPtr)
+static void ExtractNumber (uint32_t* value,  char* getPtr)
 {
-  BOOL  neg = FALSE;;
+  bool  neg = false;;
 
   while (*getPtr == ' ') getPtr++;
   if (*getPtr == '-') {
-    neg = TRUE;
+    neg = true;
     getPtr++;
   } /* if */
   if ((*getPtr == '0') && ((*(getPtr+1) == 'x') || (*(getPtr+1) == 'X'))) {
@@ -170,38 +130,38 @@ static void ExtractNumber (DWORD* value,  char* getPtr)
 } /* ExtractNumber */
 
 
-static BYTE* ExtractWord(WORD* value, BYTE* buffer)
+static uint8_t* ExtractWord(uint16_t* value, uint8_t* buffer)
 {
-  WORD x;
-  x = (WORD)*buffer++;
-  x = (x<<8) + (WORD)*buffer++;
+  uint16_t x;
+  x = (uint16_t)*buffer++;
+  x = (x<<8) + (uint16_t)*buffer++;
   *value = x;
   return buffer;
 } /* ExtractWord */
 
 
-static BYTE* ExtractLong(DWORD* value, BYTE* buffer)
+static uint8_t* ExtractLong(uint32_t* value, uint8_t* buffer)
 {
-  DWORD x;
-  x = (DWORD)*buffer++;
-  x = (x<<8) + (DWORD)*buffer++;
-  x = (x<<8) + (DWORD)*buffer++;
-  x = (x<<8) + (DWORD)*buffer++;
+  uint32_t x;
+  x = (uint32_t)*buffer++;
+  x = (x<<8) + (uint32_t)*buffer++;
+  x = (x<<8) + (uint32_t)*buffer++;
+  x = (x<<8) + (uint32_t)*buffer++;
   *value = x;
   return buffer;
 } /* ExtractLong */
 
 
-static BYTE* ExtractBlock(WORD count, BYTE* data, BYTE* buffer)
+static uint8_t* ExtractBlock(uint16_t count, uint8_t* data, uint8_t* buffer)
 {
   while (count--) *data++ = *buffer++;
   return buffer;
 } /* ExtractBlock */
 
 
-static char* WriteHex(char* pa, BYTE value, WORD* pCheckSum)
+static char* WriteHex(char* pa, uint8_t value, uint16_t* pCheckSum)
 {
-  WORD  temp;
+  uint16_t  temp;
 
   static  char ByteToHex[] = "0123456789ABCDEF";
 
@@ -214,13 +174,13 @@ static char* WriteHex(char* pa, BYTE value, WORD* pCheckSum)
 }
 
 
-static char* BuildSRecord(char* pa, WORD sType, DWORD addr,
-			  const BYTE* data, int nCount)
+static char* BuildSRecord(char* pa, uint16_t sType, uint32_t addr,
+			  const uint8_t* data, int nCount)
 {
-  WORD  addrLen;
-  WORD  sRLen;
-  WORD  checkSum;
-  WORD  i;
+  uint16_t  addrLen;
+  uint16_t  sRLen;
+  uint16_t  checkSum;
+  uint16_t  i;
 
   switch (sType) {
   case 0:
@@ -244,11 +204,11 @@ static char* BuildSRecord(char* pa, WORD sType, DWORD addr,
   *pa++ = (char)(sType + '0');
   sRLen = addrLen + nCount + 1;
   checkSum = 0;
-  pa = WriteHex(pa, (BYTE)sRLen, &checkSum);
+  pa = WriteHex(pa, (uint8_t)sRLen, &checkSum);
 
   /* Write address field */
   for (i = 1; i <= addrLen; i++) {
-    pa = WriteHex(pa, (BYTE)(addr >> (8 * (addrLen - i))), &checkSum);
+    pa = WriteHex(pa, (uint8_t)(addr >> (8 * (addrLen - i))), &checkSum);
   } /* for */
 
   /* Write code/data fields */
@@ -258,25 +218,25 @@ static char* BuildSRecord(char* pa, WORD sType, DWORD addr,
 
   /* Write checksum field */
   checkSum = ~checkSum;
-  pa = WriteHex(pa, (BYTE)checkSum, &checkSum);
+  pa = WriteHex(pa, (uint8_t)checkSum, &checkSum);
   *pa++ = '\0';
   return pa;
 }
 
 
-static void ConvertELF(char* fileName, DWORD loadOffset)
+static void ConvertELF(char* fileName, uint32_t loadOffset)
 {
   FILE*         file;
   int           i;
   int           rxCount;
-  BYTE          rxBlock[1024];
-  DWORD         loadSize;
-  DWORD         firstAddr;
-  DWORD         loadAddr;
-  DWORD         loadDiff = 0;
+  uint8_t          rxBlock[1024];
+  uint32_t         loadSize;
+  uint32_t         firstAddr;
+  uint32_t         loadAddr;
+  uint32_t         loadDiff = 0;
   Elf32_Ehdr    elfHeader;
   Elf32_Shdr    sectHeader[32];
-  BYTE*         getPtr;
+  uint8_t*         getPtr;
   char          srecLine[128];
   char		*hdr_name;
 
@@ -292,11 +252,11 @@ static void ConvertELF(char* fileName, DWORD loadOffset)
   getPtr = ExtractBlock(sizeof elfHeader.e_ident, elfHeader.e_ident, rxBlock);
   getPtr = ExtractWord(&elfHeader.e_type, getPtr);
   getPtr = ExtractWord(&elfHeader.e_machine, getPtr);
-  getPtr = ExtractLong((DWORD *)&elfHeader.e_version, getPtr);
-  getPtr = ExtractLong((DWORD *)&elfHeader.e_entry, getPtr);
-  getPtr = ExtractLong((DWORD *)&elfHeader.e_phoff, getPtr);
-  getPtr = ExtractLong((DWORD *)&elfHeader.e_shoff, getPtr);
-  getPtr = ExtractLong((DWORD *)&elfHeader.e_flags, getPtr);
+  getPtr = ExtractLong((uint32_t *)&elfHeader.e_version, getPtr);
+  getPtr = ExtractLong((uint32_t *)&elfHeader.e_entry, getPtr);
+  getPtr = ExtractLong((uint32_t *)&elfHeader.e_phoff, getPtr);
+  getPtr = ExtractLong((uint32_t *)&elfHeader.e_shoff, getPtr);
+  getPtr = ExtractLong((uint32_t *)&elfHeader.e_flags, getPtr);
   getPtr = ExtractWord(&elfHeader.e_ehsize, getPtr);
   getPtr = ExtractWord(&elfHeader.e_phentsize, getPtr);
   getPtr = ExtractWord(&elfHeader.e_phnum, getPtr);
@@ -319,16 +279,16 @@ static void ConvertELF(char* fileName, DWORD loadOffset)
   fseek(file, elfHeader.e_shoff, SEEK_SET);
   for (i = 0; i < elfHeader.e_shnum; i++) {
     rxCount = fread(rxBlock, 1, sizeof sectHeader[0], file);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_name, rxBlock);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_type, getPtr);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_flags, getPtr);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_addr, getPtr);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_offset, getPtr);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_size, getPtr);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_link, getPtr);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_info, getPtr);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_addralign, getPtr);
-    getPtr = ExtractLong((DWORD *)&sectHeader[i].sh_entsize, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_name, rxBlock);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_type, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_flags, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_addr, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_offset, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_size, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_link, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_info, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_addralign, getPtr);
+    getPtr = ExtractLong((uint32_t *)&sectHeader[i].sh_entsize, getPtr);
     if (rxCount != sizeof sectHeader[0]) {
       fclose(file);
       fprintf (stderr, "*** illegal file format\n");
@@ -342,7 +302,7 @@ static void ConvertELF(char* fileName, DWORD loadOffset)
     ++hdr_name;
   }
   /* write start record */
-  (void)BuildSRecord(srecLine, 0, 0, (BYTE *)hdr_name, strlen(hdr_name));
+  (void)BuildSRecord(srecLine, 0, 0, (uint8_t *)hdr_name, strlen(hdr_name));
   printf("%s\r\n",srecLine);
 
   /* write data records */
@@ -395,7 +355,7 @@ static void ConvertELF(char* fileName, DWORD loadOffset)
 
 int main( int argc, char *argv[ ])
 {
-  DWORD offset;
+  uint32_t offset;
 
   if (argc == 2) {
     ConvertELF(argv[1], 0);
-- 
1.6.5.2

             reply	other threads:[~2009-11-04 21:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-04 21:13 Mike Frysinger [this message]
2009-11-24 22:43 ` [U-Boot] [PATCH] img2srec: use standard types Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1257369199-5765-1-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.