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

serial.c: be more pedantic

Browse Source 
Check more return codes and close the file handle in case of errors in
sp_openserport().

Corresponding to flashrom svn r1664.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner 2013-04-01 00:45:57 +00:00
parent 79587f565f
commit f966cc4810
1 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
serial.c
View File

@ -185,8 +185,8 @@ fdtype sp_openserport(char *dev, unsigned int baud)
} }
DCB dcb; DCB dcb;
if (!GetCommState(fd, &dcb)) { if (!GetCommState(fd, &dcb)) {
msg_perr_strerror("Could not fetch serial port configuration: "); msg_perr_strerror("Could not fetch original serial port configuration: ");
return SER_INV_FD; goto out_close;
} }
const struct baudentry *entry = round_baud(baud); const struct baudentry *entry = round_baud(baud);
dcb.BaudRate = entry->baud; dcb.BaudRate = entry->baud;
@ -195,16 +195,19 @@ fdtype sp_openserport(char *dev, unsigned int baud)
dcb.StopBits = ONESTOPBIT; dcb.StopBits = ONESTOPBIT;
if (!SetCommState(fd, &dcb)) { if (!SetCommState(fd, &dcb)) {
msg_perr_strerror("Could not change serial port configuration: "); msg_perr_strerror("Could not change serial port configuration: ");
return SER_INV_FD; goto out_close;
} }
if (!GetCommState(fd, &dcb)) { if (!GetCommState(fd, &dcb)) {
msg_perr_strerror("Could not fetch serial port configuration: "); msg_perr_strerror("Could not fetch new serial port configuration: ");
return SER_INV_FD; goto out_close;
} }
msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate); msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate);
return fd; return fd;
out_close:
CloseHandle(sp_fd);
return SER_INV_FD;
#else #else
struct termios options; struct termios wanted, observed;
int fd; int fd;
fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY);
if (fd < 0) { if (fd < 0) {
@ -212,18 +215,43 @@ fdtype sp_openserport(char *dev, unsigned int baud)
return SER_INV_FD; return SER_INV_FD;
} }
fcntl(fd, F_SETFL, 0); fcntl(fd, F_SETFL, 0);
tcgetattr(fd, &options); if (tcgetattr(fd, &observed) != 0) {
msg_perr_strerror("Could not fetch original serial port configuration: ");
goto out_close;
}
wanted = observed;
const struct baudentry *entry = round_baud(baud); const struct baudentry *entry = round_baud(baud);
cfsetispeed(&options, entry->flag); if (cfsetispeed(&wanted, entry->flag) != 0 || cfsetospeed(&wanted, entry->flag) != 0) {
cfsetospeed(&options, entry->flag); msg_perr_strerror("Could not set serial baud rate: ");
msg_pdbg("Setting baud rate to %d.\n", entry->baud); goto out_close;
options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); }
options.c_cflag |= (CS8 | CLOCAL | CREAD); wanted.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS);
options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); wanted.c_cflag |= (CS8 | CLOCAL | CREAD);
options.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR); wanted.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
options.c_oflag &= ~OPOST; wanted.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR);
tcsetattr(fd, TCSANOW, &options); wanted.c_oflag &= ~OPOST;
if (tcsetattr(fd, TCSANOW, &wanted) != 0) {
msg_perr_strerror("Could not change serial port configuration: ");
goto out_close;
}
if (tcgetattr(fd, &observed) != 0) {
msg_perr_strerror("Could not fetch new serial port configuration: ");
goto out_close;
}
if (observed.c_cflag != wanted.c_cflag ||
observed.c_lflag != wanted.c_lflag ||
observed.c_iflag != wanted.c_iflag ||
observed.c_oflag != wanted.c_oflag ||
cfgetispeed(&observed) != cfgetispeed(&wanted)) {
msg_perr("%s: Some requested options did not stick.\n", __func__);
goto out_close;
}
msg_pdbg("Baud rate is %d.\n", entry->baud);
return fd; return fd;
out_close:
close(sp_fd);
return SER_INV_FD;
#endif #endif
} }