summaryrefslogtreecommitdiffstats
path: root/serprog.c
diff options
context:
space:
mode:
authorCristian Măgherușan-Stanciu <cristi.magherusan@gmail.com>2011-07-07 19:56:58 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2011-07-07 19:56:58 +0000
commit9932c7bebfe3b1500edd31d478ede058f8c5b096 (patch)
tree956be8456c22c23e69fdc69b49fb645079678fb8 /serprog.c
parent91199a1edd56e2a277c43c3d28000bb75e4d3525 (diff)
downloadast2050-flashrom-9932c7bebfe3b1500edd31d478ede058f8c5b096.zip
ast2050-flashrom-9932c7bebfe3b1500edd31d478ede058f8c5b096.tar.gz
Add a bunch of new/tested stuff and various small changes 4
- add Asus E35M1-I DELUXE to boards_known http://www.flashrom.org/pipermail/flashrom/2011-June/006918.html - add Asus M3A to boards_known http://www.flashrom.org/pipermail/flashrom/2011-July/007085.html - add Freetech P6F91i to boards_known http://www.flashrom.org/pipermail/flashrom/2011-June/006800.html - add GA-M720-US3 to boards_known http://www.flashrom.org/pipermail/flashrom/2011-July/007096.html - add GA-MA770-UD3 (rev. 2.1) to boards_known http://www.flashrom.org/pipermail/flashrom/2011-June/006879.html - add GA-965GM-S2 to boards_known http://www.flashrom.org/pipermail/flashrom/2011-June/006746.html - add HP xw4400 (0A68h) to boards_known http://paste.flashrom.org/view.php?id=686 - add MSI MS-6566 (845 Ultra-C) to boards_known http://www.flashrom.org/pipermail/flashrom/2011-June/006908.html - add MSI MS-7698 (E350IA-E45) to boards_known http://www.flashrom.org/pipermail/flashrom/2011-June/007003.html - add PCCHIPS M863G (V5.1A) to boards_known http://www.flashrom.org/pipermail/flashrom/2011-July/007084.html - modify the X8SIE entry in boards_known with the information from "fuzzy" http://paste.flashrom.org/view.php?id=669 - mark W29C020(C)/W29C022 as fully tested http://www.flashrom.org/pipermail/flashrom/2011-June/006800.html - mark W49V002A as fully tested http://www.flashrom.org/pipermail/flashrom/2011-July/007084.html - mark M25P128 as fully tested http://www.flashrom.org/pipermail/flashrom/2011-June/006843.html - mark SST39SF010A as fully tested http://www.flashrom.org/pipermail/flashrom/2011-July/007115.html - correct entries for GA-K8NS Pro-939 (was ultra before. thanks uwe!) - another tiny fix for "a small fix"/r1321 Without this you will get broken bus names "Unknow" and "Non-SP". Note to self: don't self-ack even fairly trivial patches. - fix spew output of spi_rems in spi25.c - add URL to ASUS M3A76-CM - rename all Winbond W25x chips to W25X - fixes some common misspellings/typos in comments: lenght->length 2 ocassional->occasional 1 unsucessfull->unsuccessful 1 upto->up to 5 Corresponding to flashrom svn r1367. the patch for M25P128 is Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan@gmail.com> the typos are Signed-off-by: Peter Huewe <peterhuewe@gmx.de> everything else is Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'serprog.c')
-rw-r--r--serprog.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/serprog.c b/serprog.c
index b91e376..e8a4402 100644
--- a/serprog.c
+++ b/serprog.c
@@ -56,7 +56,7 @@ static int serprog_shutdown(void *data);
#define S_CMD_Q_BUSTYPE 0x05 /* Query supported bustypes */
#define S_CMD_Q_CHIPSIZE 0x06 /* Query supported chipsize (2^n format) */
#define S_CMD_Q_OPBUF 0x07 /* Query operation buffer size */
-#define S_CMD_Q_WRNMAXLEN 0x08 /* Query opbuf-write-N maximum lenght */
+#define S_CMD_Q_WRNMAXLEN 0x08 /* Query opbuf-write-N maximum length */
#define S_CMD_R_BYTE 0x09 /* Read a single byte */
#define S_CMD_R_NBYTES 0x0A /* Read n bytes */
#define S_CMD_O_INIT 0x0B /* Initialize operation buffer */
@@ -168,10 +168,10 @@ static void sp_synchronize(void)
usleep(1000 * 1000);
sp_flush_incoming();
- /* Then try upto 8 times to send syncnop and get the correct special *
- * return of NAK+ACK. Timing note: upto 10 characters, 10*50ms = *
- * upto 500ms per try, 8*0.5s = 4s; +1s (above) = upto 5s sync *
- * attempt, ~1s if immediate success. */
+ /* Then try up to 8 times to send syncnop and get the correct special *
+ * return of NAK+ACK. Timing note: up to 10 characters, 10*50ms = *
+ * up to 500ms per try, 8*0.5s = 4s; +1s (above) = up to 5s sync *
+ * attempt, ~1s if immediate success. */
for (i = 0; i < 8; i++) {
int n;
unsigned char c = S_CMD_SYNCNOP;
@@ -180,7 +180,7 @@ static void sp_synchronize(void)
msg_pdbg(".");
fflush(stdout);
for (n = 0; n < 10; n++) {
- c = sp_sync_read_timeout(5); /* wait upto 50ms */
+ c = sp_sync_read_timeout(5); /* wait up to 50ms */
if (c != S_NAK)
continue;
c = sp_sync_read_timeout(2);
OpenPOWER on IntegriCloud