openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

Fix compilation with MinGW

Browse Source 
This was broken since r1557 when we got rid of some exit calls, but returned
-1 instead which is not a valid HANDLE value.

Corresponding to flashrom svn r1591.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Idwer Vollering <vidwer@gmail.com>
This commit is contained in:
Stefan Tauner 2012-09-01 21:47:19 +00:00
parent dabca20a1d
commit bb4fed74b6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programmer.h
View File

@ -636,8 +636,10 @@ void serprog_delay(int usecs);
/* serial.c */ /* serial.c */
#ifdef _WIN32 #ifdef _WIN32
typedef HANDLE fdtype; typedef HANDLE fdtype;
#define SER_INV_FD INVALID_HANDLE_VALUE
#else #else
typedef int fdtype; typedef int fdtype;
#define SER_INV_FD -1
#endif #endif
void sp_flush_incoming(void); void sp_flush_incoming(void);

14
serial.c
View File

@ -115,7 +115,7 @@ fdtype sp_openserport(char *dev, unsigned int baud)
dev2 = malloc(strlen(dev) + 5); dev2 = malloc(strlen(dev) + 5);
if (!dev2) { if (!dev2) {
msg_perr("Error: Out of memory: %s\n", strerror(errno)); msg_perr("Error: Out of memory: %s\n", strerror(errno));
return -1; return SER_INV_FD;
} }
strcpy(dev2, "\\\\.\\"); strcpy(dev2, "\\\\.\\");
strcpy(dev2 + 4, dev); strcpy(dev2 + 4, dev);
@ -126,12 +126,12 @@ fdtype sp_openserport(char *dev, unsigned int baud)
free(dev2); free(dev2);
if (fd == INVALID_HANDLE_VALUE) { if (fd == INVALID_HANDLE_VALUE) {
msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); msg_perr("Error: cannot open serial port: %s\n", strerror(errno));
return -1; return SER_INV_FD;
} }
DCB dcb; DCB dcb;
if (!GetCommState(fd, &dcb)) { if (!GetCommState(fd, &dcb)) {
msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno)); msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno));
return -1; return SER_INV_FD;
} }
switch (baud) { switch (baud) {
case 9600: dcb.BaudRate = CBR_9600; break; case 9600: dcb.BaudRate = CBR_9600; break;
@ -140,14 +140,14 @@ fdtype sp_openserport(char *dev, unsigned int baud)
case 57600: dcb.BaudRate = CBR_57600; break; case 57600: dcb.BaudRate = CBR_57600; break;
case 115200: dcb.BaudRate = CBR_115200; break; case 115200: dcb.BaudRate = CBR_115200; break;
default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno)); default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno));
return -1; return SER_INV_FD;
} }
dcb.ByteSize = 8; dcb.ByteSize = 8;
dcb.Parity = NOPARITY; dcb.Parity = NOPARITY;
dcb.StopBits = ONESTOPBIT; dcb.StopBits = ONESTOPBIT;
if (!SetCommState(fd, &dcb)) { if (!SetCommState(fd, &dcb)) {
msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno)); msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno));
return -1; return SER_INV_FD;
} }
return fd; return fd;
#else #else
@ -156,7 +156,7 @@ fdtype sp_openserport(char *dev, unsigned int baud)
fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY);
if (fd < 0) { if (fd < 0) {
msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); msg_perr("Error: cannot open serial port: %s\n", strerror(errno));
return -1; return SER_INV_FD;
} }
fcntl(fd, F_SETFL, 0); fcntl(fd, F_SETFL, 0);
tcgetattr(fd, &options); tcgetattr(fd, &options);
@ -164,7 +164,7 @@ fdtype sp_openserport(char *dev, unsigned int baud)
if (sp_baudtable[i].baud == 0) { if (sp_baudtable[i].baud == 0) {
close(fd); close(fd);
msg_perr("Error: cannot configure for baudrate %d\n", baud); msg_perr("Error: cannot configure for baudrate %d\n", baud);
return -1; return SER_INV_FD;
} }
if (sp_baudtable[i].baud == baud) { if (sp_baudtable[i].baud == baud) {
cfsetispeed(&options, sp_baudtable[i].flag); cfsetispeed(&options, sp_baudtable[i].flag);