Author: stefanct Date: Sat Sep 1 23:47:19 2012 New Revision: 1591 URL: http://flashrom.org/trac/flashrom/changeset/1591
Log: Fix compilation with MinGW. This was broken since r1557 when we got rid of some exit calls, but returned -1 instead which is not a valid HANDLE value. Signed-off-by: Stefan Tauner <[email protected]> Acked-by: Idwer Vollering <[email protected]> Modified: trunk/programmer.h trunk/serial.c Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sat Sep 1 23:32:04 2012 (r1590) +++ trunk/programmer.h Sat Sep 1 23:47:19 2012 (r1591) @@ -636,8 +636,10 @@ /* serial.c */ #ifdef _WIN32 typedef HANDLE fdtype; +#define SER_INV_FD INVALID_HANDLE_VALUE #else typedef int fdtype; +#define SER_INV_FD -1 #endif void sp_flush_incoming(void); Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Sat Sep 1 23:32:04 2012 (r1590) +++ trunk/serial.c Sat Sep 1 23:47:19 2012 (r1591) @@ -115,7 +115,7 @@ dev2 = malloc(strlen(dev) + 5); if (!dev2) { msg_perr("Error: Out of memory: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev); @@ -126,12 +126,12 @@ free(dev2); if (fd == INVALID_HANDLE_VALUE) { msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } DCB dcb; if (!GetCommState(fd, &dcb)) { msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } switch (baud) { case 9600: dcb.BaudRate = CBR_9600; break; @@ -140,14 +140,14 @@ case 57600: dcb.BaudRate = CBR_57600; break; case 115200: dcb.BaudRate = CBR_115200; break; default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } return fd; #else @@ -156,7 +156,7 @@ fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); if (fd < 0) { msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } fcntl(fd, F_SETFL, 0); tcgetattr(fd, &options); @@ -164,7 +164,7 @@ if (sp_baudtable[i].baud == 0) { close(fd); msg_perr("Error: cannot configure for baudrate %d\n", baud); - return -1; + return SER_INV_FD; } if (sp_baudtable[i].baud == baud) { cfsetispeed(&options, sp_baudtable[i].flag); _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
