[flashrom] [commit] r768 - trunk
svn at flashrom.org
svn at flashrom.org
Sat Nov 21 12:02:49 CET 2009
Author: hailfinger
Date: 2009-11-21 12:02:48 +0100 (Sat, 21 Nov 2009)
New Revision: 768
Modified:
trunk/flash.h
trunk/serprog.c
Log:
Bus Pirate support needs serial communication. Serprog already has such
functionality, so it makes sense to share that.
TODO: Factor out serial communication into a separate file, have that
code be available even if serprog is not selected and make it portable
(it is very Linux-centric right now).
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified: trunk/flash.h
===================================================================
--- trunk/flash.h 2009-11-20 01:12:45 UTC (rev 767)
+++ trunk/flash.h 2009-11-21 11:02:48 UTC (rev 768)
@@ -736,5 +736,8 @@
uint8_t serprog_chip_readb(const chipaddr addr);
void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len);
void serprog_delay(int delay);
+void sp_flush_incoming(void);
+int sp_openserport(char *dev, unsigned int baud);
+extern int sp_fd;
#endif /* !__FLASH_H__ */
Modified: trunk/serprog.c
===================================================================
--- trunk/serprog.c 2009-11-20 01:12:45 UTC (rev 767)
+++ trunk/serprog.c 2009-11-21 11:02:48 UTC (rev 768)
@@ -61,7 +61,7 @@
#define S_CMD_Q_RDNMAXLEN 0x11 /* Query read-n maximum length */
#define S_CMD_S_BUSTYPE 0x12 /* Set used bustype(s). */
-static int sp_fd;
+int sp_fd;
static uint16_t sp_device_serbuf_size = 16;
static uint16_t sp_device_opbuf_size = 300;
@@ -185,7 +185,7 @@
{0, 0} /* Terminator */
};
-static int sp_openserport(char *dev, unsigned int baud)
+int sp_openserport(char *dev, unsigned int baud)
{
struct termios options;
int fd, i;
@@ -208,20 +208,16 @@
break;
}
}
- options.c_cflag &= ~PARENB;
- options.c_cflag &= ~CSTOPB;
- options.c_cflag &= ~CSIZE;
- options.c_cflag |= CS8;
- options.c_cflag &= ~CRTSCTS;
+ options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS);
+ options.c_cflag |= (CS8 | CLOCAL | CREAD);
options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
options.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR);
options.c_oflag &= ~OPOST;
- options.c_cflag |= (CLOCAL | CREAD);
tcsetattr(fd, TCSANOW, &options);
return fd;
}
-static void sp_flush_incoming(void)
+void sp_flush_incoming(void)
{
int i;
for (i=0;i<100;i++) { /* In case the device doesnt do EAGAIN, just read 0 */
More information about the flashrom
mailing list