openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-10-31 05:10:41 +01:00
Code Issues Releases Wiki Activity

Replace native calls in serprog with wrapper calls

Browse Source 
Read(), write(), usleep() are replaced.

Corresponding to flashrom svn r1663.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Signed-off-by: Idwer Vollering <vidwer@gmail.com>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner
2013-04-01 00:45:51 +00:00
parent ae3d83765c
commit 79587f565f
2 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
serial.c
View File

@@ -354,7 +354,7 @@ int serialport_read(unsigned char *buf, unsigned int readcnt)
return 1; return 1;
} }
if (!tmp) if (!tmp)
msg_pdbg("Empty read\n"); msg_pdbg2("Empty read\n");
readcnt -= tmp; readcnt -= tmp;
buf += tmp; buf += tmp;
} }

35
serprog.c
View File

@@ -133,7 +133,7 @@ static int sp_synchronize(void)
goto err_out; goto err_out;
} }
/* A second should be enough to get all the answers to the buffer */ /* A second should be enough to get all the answers to the buffer */
usleep(1000 * 1000); internal_delay(1000 * 1000);
sp_flush_incoming(); sp_flush_incoming();
/* Then try up to 8 times to send syncnop and get the correct special * /* Then try up to 8 times to send syncnop and get the correct special *
@@ -206,15 +206,15 @@ static int sp_docommand(uint8_t command, uint32_t parmlen,
unsigned char c; unsigned char c;
if (sp_automatic_cmdcheck(command)) if (sp_automatic_cmdcheck(command))
return 1; return 1;
if (write(sp_fd, &command, 1) != 1) { if (serialport_write(&command, 1) != 0) {
msg_perr("Error: cannot write op code: %s\n", strerror(errno)); msg_perr("Error: cannot write op code: %s\n", strerror(errno));
return 1; return 1;
} }
if (write(sp_fd, params, parmlen) != (parmlen)) { if (serialport_write(params, parmlen) != 0) {
msg_perr("Error: cannot write parameters: %s\n", strerror(errno)); msg_perr("Error: cannot write parameters: %s\n", strerror(errno));
return 1; return 1;
} }
if (read(sp_fd, &c, 1) != 1) { if (serialport_read(&c, 1) != 0) {
msg_perr("Error: cannot read from device: %s\n", strerror(errno)); msg_perr("Error: cannot read from device: %s\n", strerror(errno));
return 1; return 1;
} }
@@ -225,17 +225,10 @@ static int sp_docommand(uint8_t command, uint32_t parmlen,
return 1; return 1;
} }
if (retlen) { if (retlen) {
int rd_bytes = 0; if (serialport_read(retparms, retlen) != 0) {
do {
int r;
r = read(sp_fd, retparms + rd_bytes,
retlen - rd_bytes);
if (r <= 0) {
msg_perr("Error: cannot read return parameters: %s\n", strerror(errno)); msg_perr("Error: cannot read return parameters: %s\n", strerror(errno));
return 1; return 1;
} }
rd_bytes += r;
} while (rd_bytes != retlen);
} }
return 0; return 0;
} }
@@ -245,7 +238,7 @@ static void sp_flush_stream(void)
if (sp_streamed_transmit_ops) if (sp_streamed_transmit_ops)
do { do {
unsigned char c; unsigned char c;
if (read(sp_fd, &c, 1) != 1) { if (serialport_read(&c, 1) != 0) {
sp_die("Error: cannot read from device (flushing stream)"); sp_die("Error: cannot read from device (flushing stream)");
} }
if (c == S_NAK) { if (c == S_NAK) {
@@ -272,7 +265,7 @@ static int sp_stream_buffer_op(uint8_t cmd, uint32_t parmlen, uint8_t * parms)
memcpy(&(sp[1]), parms, parmlen); memcpy(&(sp[1]), parms, parmlen);
if (sp_streamed_transmit_bytes >= (1 + parmlen + sp_device_serbuf_size)) if (sp_streamed_transmit_bytes >= (1 + parmlen + sp_device_serbuf_size))
sp_flush_stream(); sp_flush_stream();
if (write(sp_fd, sp, 1 + parmlen) != (1 + parmlen)) if (serialport_write(sp, 1 + parmlen) != 0)
sp_die("Error: cannot write command"); sp_die("Error: cannot write command");
free(sp); free(sp);
sp_streamed_transmit_ops += 1; sp_streamed_transmit_ops += 1;
@@ -685,10 +678,9 @@ static void sp_pass_writen(void)
header[4] = (sp_write_n_addr >> 0) & 0xFF; header[4] = (sp_write_n_addr >> 0) & 0xFF;
header[5] = (sp_write_n_addr >> 8) & 0xFF; header[5] = (sp_write_n_addr >> 8) & 0xFF;
header[6] = (sp_write_n_addr >> 16) & 0xFF; header[6] = (sp_write_n_addr >> 16) & 0xFF;
if (write(sp_fd, header, 7) != 7) if (serialport_write(header, 7) != 0)
sp_die("Error: cannot write write-n command\n"); sp_die("Error: cannot write write-n command\n");
if (write(sp_fd, sp_write_n_buf, sp_write_n_bytes) != if (serialport_write(sp_write_n_buf, sp_write_n_bytes) != 0)
sp_write_n_bytes)
sp_die("Error: cannot write write-n data"); sp_die("Error: cannot write write-n data");
sp_streamed_transmit_bytes += 7 + sp_write_n_bytes; sp_streamed_transmit_bytes += 7 + sp_write_n_bytes;
sp_streamed_transmit_ops += 1; sp_streamed_transmit_ops += 1;
@@ -789,7 +781,7 @@ static uint8_t serprog_chip_readb(const struct flashctx *flash,
buf[2] = ((addr >> 16) & 0xFF); buf[2] = ((addr >> 16) & 0xFF);
sp_stream_buffer_op(S_CMD_R_BYTE, 3, buf); sp_stream_buffer_op(S_CMD_R_BYTE, 3, buf);
sp_flush_stream(); sp_flush_stream();
if (read(sp_fd, &c, 1) != 1) if (serialport_read(&c, 1) != 0)
sp_die("readb byteread"); sp_die("readb byteread");
msg_pspew("%s addr=0x%lx returning 0x%02X\n", __func__, addr, c); msg_pspew("%s addr=0x%lx returning 0x%02X\n", __func__, addr, c);
return c; return c;
@@ -798,7 +790,6 @@ static uint8_t serprog_chip_readb(const struct flashctx *flash,
/* Local version that really does the job, doesn't care of max_read_n. */ /* Local version that really does the job, doesn't care of max_read_n. */
static void sp_do_read_n(uint8_t * buf, const chipaddr addr, size_t len) static void sp_do_read_n(uint8_t * buf, const chipaddr addr, size_t len)
{ {
int rd_bytes = 0;
unsigned char sbuf[6]; unsigned char sbuf[6];
msg_pspew("%s: addr=0x%lx len=%lu\n", __func__, addr, (unsigned long)len); msg_pspew("%s: addr=0x%lx len=%lu\n", __func__, addr, (unsigned long)len);
/* Stream the read-n -- as above. */ /* Stream the read-n -- as above. */
@@ -812,12 +803,8 @@ static void sp_do_read_n(uint8_t * buf, const chipaddr addr, size_t len)
sbuf[5] = ((len >> 16) & 0xFF); sbuf[5] = ((len >> 16) & 0xFF);
sp_stream_buffer_op(S_CMD_R_NBYTES, 6, sbuf); sp_stream_buffer_op(S_CMD_R_NBYTES, 6, sbuf);
sp_flush_stream(); sp_flush_stream();
do { if (serialport_read(buf, len) != 0)
int r = read(sp_fd, buf + rd_bytes, len - rd_bytes);
if (r <= 0)
sp_die("Error: cannot read read-n data"); sp_die("Error: cannot read read-n data");
rd_bytes += r;
} while (rd_bytes != len);
return; return;
} }