openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 07:23:43 +02:00
Code Issues Releases Wiki Activity

Multiple unrelated changes

Browse Source 
- replace the hand written serial input flush routine with the termios one.
- serialport_discard_read isn't necessary anymore - it just wrapped
  sp_flush_incoming with no extra value.
- serialport_read and serialport_write would misbehave if read or write
  didn't process everything in one go.
- sp_flush_incoming should be #define'd out for FAKE_COMMUNICATION like
  serialport_discard_read was

Corresponding to flashrom svn r831.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Sean Nelson <audiohacked@gmail.com>
This commit is contained in:
Patrick Georgi 2010-01-06 19:09:40 +00:00 committed by Patrick Georgi
parent efa151eb10
commit 3b6237dbce
3 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buspirate_spi.c
View File

@ -40,7 +40,7 @@ int buspirate_serialport_setup(char *dev)
#define serialport_shutdown(...) 0 #define serialport_shutdown(...) 0
#define serialport_write(...) 0 #define serialport_write(...) 0
#define serialport_read(...) 0 #define serialport_read(...) 0
#define serialport_discard_read(...) 0 #define sp_flush_incoming(...) 0
#endif #endif
int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt) int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt)
@ -144,9 +144,7 @@ int buspirate_spi_init(void)
if (ret) if (ret)
return ret; return ret;
/* Read any response and discard it. */ /* Read any response and discard it. */
ret = serialport_discard_read(); sp_flush_incoming();
if (ret)
return ret;
} }
/* Enter raw bitbang mode */ /* Enter raw bitbang mode */
buf[0] = 0x00; buf[0] = 0x00;

1
flash.h
View File

@ -598,7 +598,6 @@ extern int sp_fd;
int serialport_shutdown(void); int serialport_shutdown(void);
int serialport_write(unsigned char *buf, unsigned int writecnt); int serialport_write(unsigned char *buf, unsigned int writecnt);
int serialport_read(unsigned char *buf, unsigned int readcnt); int serialport_read(unsigned char *buf, unsigned int readcnt);
int serialport_discard_read(void);
#include "chipdrivers.h" #include "chipdrivers.h"

38
serial.c
View File

@ -129,16 +129,7 @@ int sp_openserport(char *dev, unsigned int baud)
void sp_flush_incoming(void) void sp_flush_incoming(void)
{ {
int i; tcflush(sp_fd, TCIFLUSH);
for (i=0;i<100;i++) { /* In case the device doesnt do EAGAIN, just read 0 */
unsigned char flush[16];
ssize_t rv;
rv = read(sp_fd, flush, sizeof(flush));
if ((rv == -1) && (errno == EAGAIN))
break;
if (rv == -1)
sp_die("flush read");
}
return; return;
} }
@ -152,12 +143,14 @@ int serialport_write(unsigned char *buf, unsigned int writecnt)
{ {
int tmp = 0; int tmp = 0;
while (tmp != writecnt) { while (writecnt > 0) {
tmp = write(sp_fd, buf + tmp, writecnt - tmp); tmp = write(sp_fd, buf, writecnt);
if (tmp == -1) if (tmp == -1)
return 1; return 1;
if (!tmp) if (!tmp)
printf_debug("Empty write\n"); printf_debug("Empty write\n");
writecnt -= tmp;
buf += tmp;
} }
return 0; return 0;
@ -167,28 +160,15 @@ int serialport_read(unsigned char *buf, unsigned int readcnt)
{ {
int tmp = 0; int tmp = 0;
while (tmp != readcnt) { while (readcnt > 0) {
tmp = read(sp_fd, buf + tmp, readcnt - tmp); tmp = read(sp_fd, buf, readcnt);
if (tmp == -1) if (tmp == -1)
return 1; return 1;
if (!tmp) if (!tmp)
printf_debug("Empty read\n"); printf_debug("Empty read\n");
readcnt -= tmp;
buf += tmp;
} }
return 0; return 0;
} }
int serialport_discard_read(void)
{
int flags;
printf_debug("%s\n", __func__);
flags = fcntl(sp_fd, F_GETFL);
flags |= O_NONBLOCK;
fcntl(sp_fd, F_SETFL, flags);
sp_flush_incoming();
flags &= ~O_NONBLOCK;
fcntl(sp_fd, F_SETFL, flags);
return 0;
}