diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-01-06 19:09:40 +0000 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2010-01-06 19:09:40 +0000 |
| commit | 3b6237dbce5149c565a134394c6184118629464d (patch) | |
| tree | ec6d0b820d2d153b32743d1d466ead3196fd677d /buspirate_spi.c | |
| parent | efa151eb10a11796bd36cf0f32c8202e60d9de01 (diff) | |
| download | ast2050-flashrom-3b6237dbce5149c565a134394c6184118629464d.zip ast2050-flashrom-3b6237dbce5149c565a134394c6184118629464d.tar.gz | |
Multiple unrelated changes
- 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>
Diffstat (limited to 'buspirate_spi.c')
| -rw-r--r-- | buspirate_spi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/buspirate_spi.c b/buspirate_spi.c index 62433d4..3006aa1 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -40,7 +40,7 @@ int buspirate_serialport_setup(char *dev) #define serialport_shutdown(...) 0 #define serialport_write(...) 0 #define serialport_read(...) 0 -#define serialport_discard_read(...) 0 +#define sp_flush_incoming(...) 0 #endif int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt) @@ -144,9 +144,7 @@ int buspirate_spi_init(void) if (ret) return ret; /* Read any response and discard it. */ - ret = serialport_discard_read(); - if (ret) - return ret; + sp_flush_incoming(); } /* Enter raw bitbang mode */ buf[0] = 0x00; |
