flashrom

flashrom@flashrom.org

3 participants
9188 discussions

[PATCH] remove exit calls from sp_opensocket
by Niklas Söderlund 30 Jul '12

30 Jul '12

Replace with return statements and adopt the only upstream caller which in turn all plumbing is place for Signed-off-by: Niklas Söderlund <niso(a)kth.se> --- serprog.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/serprog.c b/serprog.c index d06fb0b..02996ea 100644 --- a/serprog.c +++ b/serprog.c @@ -110,20 +110,25 @@ static int sp_opensocket(char *ip, unsigned int port) int sock; msg_pdbg(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock < 0) - sp_die("Error: serprog cannot open socket"); + if (sock < 0) { + msg_perr("Error: serprog cannot open socket: %s\n", strerror(errno)); + return -1; + } hostPtr = gethostbyname(ip); if (NULL == hostPtr) { hostPtr = gethostbyaddr(ip, strlen(ip), AF_INET); - if (NULL == hostPtr) - sp_die("Error: cannot resolve"); + if (NULL == hostPtr) { + msg_perr("Error: cannot resolve: %s\n", strerror(errno)); + return -1; + } } sp.si.sin_family = AF_INET; sp.si.sin_port = htons(port); (void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length); if (connect(sock, &sp.s, sizeof(sp.si)) < 0) { close(sock); - sp_die("Error: serprog cannot connect"); + msg_perr("Error: serprog cannot connect: %s\n", strerror(errno)); + return -1; } /* We are latency limited, and sometimes do write-write-read * * (write-n) - so enable TCP_NODELAY. */ @@ -398,6 +403,10 @@ int serprog_init(void) } if (strlen(device)) { sp_fd = sp_opensocket(device, atoi(baudport)); + if (sp_fd < 0) { + free(device); + return 1; + } have_device++; } } -- 1.7.10.3

2 1

Re: [flashrom] [PATCH] remove exit call from internal_init
by Stefan Tauner 30 Jul '12

30 Jul '12

On Wed, 30 May 2012 12:24:19 -0700 David Hendricks <dhendrix(a)google.com> wrote: > This seems trivial, as internal_init() already does the right thing when a > return value is used here. indeed. thanks niklas! i have applied it in r1557. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1557 - trunk
by repository service 30 Jul '12

30 Jul '12

Author: stefanct Date: Mon Jul 30 21:42:33 2012 New Revision: 1557 URL: http://flashrom.org/trac/flashrom/changeset/1557 Log: Remove more exit calls. This patch removes the remaining exit calls from - sp_openserport - sp_opensocket - sp_docommand - internal_init Almost all of this was done by Niklas. Signed-off-by: Niklas Söderlund <niso(a)kth.se> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/buspirate_spi.c trunk/internal.c trunk/pony_spi.c trunk/serial.c trunk/serprog.c Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/buspirate_spi.c Mon Jul 30 21:42:33 2012 (r1557) @@ -39,7 +39,8 @@ { /* 115200bps, 8 databits, no parity, 1 stopbit */ sp_fd = sp_openserport(dev, 115200); - /* FIXME: Error checking */ + if (sp_fd < 0) + return 1; return 0; } #else Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/internal.c Mon Jul 30 21:42:33 2012 (r1557) @@ -299,7 +299,7 @@ msg_perr("Proceeding anyway because user forced us to.\n"); } else { msg_perr("Aborting.\n"); - exit(1); + return 1; } } Modified: trunk/pony_spi.c ============================================================================== --- trunk/pony_spi.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/pony_spi.c Mon Jul 30 21:42:33 2012 (r1557) @@ -99,6 +99,10 @@ if (arg && strlen(arg)) { sp_fd = sp_openserport( arg, 9600 ); + if (sp_fd < 0) { + free(arg); + return 1; + } have_device++; } free(arg); Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/serial.c Mon Jul 30 21:42:33 2012 (r1557) @@ -113,8 +113,10 @@ (tolower((unsigned char)dev[1]) == 'o') && (tolower((unsigned char)dev[2]) == 'm')) { dev2 = malloc(strlen(dev) + 5); - if (!dev2) - sp_die("Error: Out of memory"); + if (!dev2) { + msg_perr("Error: Out of memory: %s\n", strerror(errno)); + return -1; + } strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev); } @@ -123,11 +125,13 @@ if (dev2 != dev) free(dev2); if (fd == INVALID_HANDLE_VALUE) { - sp_die("Error: cannot open serial port"); + msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); + return -1; } DCB dcb; if (!GetCommState(fd, &dcb)) { - sp_die("Error: Could not fetch serial port configuration"); + msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno)); + return -1; } switch (baud) { case 9600: dcb.BaudRate = CBR_9600; break; @@ -135,29 +139,32 @@ case 38400: dcb.BaudRate = CBR_38400; break; case 57600: dcb.BaudRate = CBR_57600; break; case 115200: dcb.BaudRate = CBR_115200; break; - default: sp_die("Error: Could not set baud rate"); + default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno)); + return -1; } dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { - sp_die("Error: Could not change serial port configuration"); + msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno)); + return -1; } return fd; #else struct termios options; int fd, i; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); - if (fd < 0) - sp_die("Error: cannot open serial port"); + if (fd < 0) { + msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); + return -1; + } fcntl(fd, F_SETFL, 0); tcgetattr(fd, &options); for (i = 0;; i++) { if (sp_baudtable[i].baud == 0) { close(fd); - msg_perr("Error: cannot configure for baudrate %d\n", - baud); - exit(1); + msg_perr("Error: cannot configure for baudrate %d\n", baud); + return -1; } if (sp_baudtable[i].baud == baud) { cfsetispeed(&options, sp_baudtable[i].flag); Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/serprog.c Mon Jul 30 21:42:33 2012 (r1557) @@ -110,20 +110,25 @@ int sock; msg_pdbg(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock < 0) - sp_die("Error: serprog cannot open socket"); + if (sock < 0) { + msg_perr("Error: serprog cannot open socket: %s\n", strerror(errno)); + return -1; + } hostPtr = gethostbyname(ip); if (NULL == hostPtr) { hostPtr = gethostbyaddr(ip, strlen(ip), AF_INET); - if (NULL == hostPtr) - sp_die("Error: cannot resolve"); + if (NULL == hostPtr) { + msg_perr("Error: cannot resolve %s\n", ip); + return -1; + } } sp.si.sin_family = AF_INET; sp.si.sin_port = htons(port); (void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length); if (connect(sock, &sp.s, sizeof(sp.si)) < 0) { close(sock); - sp_die("Error: serprog cannot connect"); + msg_perr("Error: serprog cannot connect: %s\n", strerror(errno)); + return -1; } /* We are latency limited, and sometimes do write-write-read * * (write-n) - so enable TCP_NODELAY. */ @@ -233,17 +238,23 @@ unsigned char c; if (sp_automatic_cmdcheck(command)) return 1; - if (write(sp_fd, &command, 1) != 1) - sp_die("Error: cannot write op code"); - if (write(sp_fd, params, parmlen) != (parmlen)) - sp_die("Error: cannot write parameters"); - if (read(sp_fd, &c, 1) != 1) - sp_die("Error: cannot read from device"); + if (write(sp_fd, &command, 1) != 1) { + msg_perr("Error: cannot write op code: %s\n", strerror(errno)); + return 1; + } + if (write(sp_fd, params, parmlen) != (parmlen)) { + msg_perr("Error: cannot write parameters: %s\n", strerror(errno)); + return 1; + } + if (read(sp_fd, &c, 1) != 1) { + msg_perr("Error: cannot read from device: %s\n", strerror(errno)); + return 1; + } if (c == S_NAK) return 1; if (c != S_ACK) { - msg_perr("Error: invalid response 0x%02X from device\n",c); - exit(1); + msg_perr("Error: invalid response 0x%02X from device\n", c); + return 1; } if (retlen) { int rd_bytes = 0; @@ -251,8 +262,10 @@ int r; r = read(sp_fd, retparms + rd_bytes, retlen - rd_bytes); - if (r <= 0) - sp_die("Error: cannot read return parameters"); + if (r <= 0) { + msg_perr("Error: cannot read return parameters: %s\n", strerror(errno)); + return 1; + } rd_bytes += r; } while (rd_bytes != retlen); } @@ -362,6 +375,10 @@ } if (strlen(device)) { sp_fd = sp_openserport(device, atoi(baudport)); + if (sp_fd < 0) { + free(device); + return 1; + } have_device++; } } @@ -395,6 +412,10 @@ } if (strlen(device)) { sp_fd = sp_opensocket(device, atoi(baudport)); + if (sp_fd < 0) { + free(device); + return 1; + } have_device++; } } @@ -466,11 +487,12 @@ "bustype is SPI\n"); return 1; } + if (sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL)) + return 1; /* Success of any of these commands is optional. We don't need the programmer to tell us its limits, but if it doesn't, we will assume stuff, so it's in the programmers best interest to tell us. */ - sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL); if (!sp_docommand(S_CMD_Q_WRNMAXLEN, 0, NULL, 3, rbuf)) { uint32_t v; v = ((unsigned int)(rbuf[0]) << 0); @@ -492,7 +514,8 @@ msg_pdbg(MSGHEADER "Maximum read-n length is %d\n", v); } bt = serprog_buses_supported; - sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL); + if (sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL)) + return 1; } if (serprog_buses_supported & BUS_NONSPI) {

1 0

AT25DF321A with ASRock 880G Pro3 MB
by Roman Elshin 30 Jul '12

30 Jul '12

It looks like support for this flash part work correctly in flashrom (it is not native flash for this mb).

2 4

Creating a nonprofit
by Carl-Daniel Hailfinger 29 Jul '12

29 Jul '12

Hi, the flashrom project gets donation offers roughly twice a month, and quite a few times people wanted to donate more than 50 EUR / 60 USD. We can't accept those donations right now because there is no legal entity behind the flashrom project. At the same time, we could use some money to improve flasher support by buying some flash chips and programmers so all developers can easily test changes. Besides that, posters/handouts for LinuxTag/FOSDEM/... booths are currently paid for by those flashrom guys who go to those exhibitions. My proposal is to create a nonprofit club in Germany (eingetragener Verein) in the same way as KDE and OpenEmbedded did it. Given that the majority of the flashrom team lives somewhere in the EU, starting or joining a nonprofit in the USA wouldn't make sense. An informal request for comments among those who are involved in flashrom did yield some noticeable interest, and I guess now is the time to make this plan public. coreboot is not an immediate target of this nonprofit club because I don't want to interfere with any plans which may be ongoing on the coreboot side. Nonwithstanding the above, if the coreboot project leaders decide that participating in a nonprofit in Germany would make sense, there's no reason not to do this together. Then again, the majority of coreboot developers live in the USA and a nonprofit outside the USA might not make sense for them. Side note: We (coreboot/flashrom) won a substantial amount of money (to be redeemed in hardware) in a "project beauty contest" held by Thomas-Krenn.com, a nice server manufacturer. We need a legal entity to accept that hardware. Comments? Regards, Carl-Daniel

2 1

Re: [flashrom] [PATCH 3/7] print_wiki.c fix columns calculations
by Stefan Tauner 28 Jul '12

28 Jul '12

On Sat, 3 Mar 2012 21:11:11 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > - chipsets > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > print_wiki.c | 36 +++++++++++++++++++++++------------- > 1 files changed, 23 insertions(+), 13 deletions(-) refined, combined with the other two and committed in r1556. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 4/7] squash! print_wiki.c fix columns calculations
by Stefan Tauner 28 Jul '12

28 Jul '12

On Sat, 3 Mar 2012 21:11:12 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > - boards > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > print_wiki.c | 26 ++++++++++++++++---------- > 1 files changed, 16 insertions(+), 10 deletions(-) refined, combined with the other two and committed in r1556. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 5/7] squash! print_wiki.c fix columns calculations
by Stefan Tauner 28 Jul '12

28 Jul '12

On Sat, 3 Mar 2012 21:11:13 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > - chips > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > print_wiki.c | 30 ++++++++++++++++++------------ > 1 files changed, 18 insertions(+), 12 deletions(-) refined, combined with the other two and committed in r1556. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1556 - trunk
by repository service 28 Jul '12

28 Jul '12

Author: stefanct Date: Sun Jul 29 04:04:21 2012 New Revision: 1556 URL: http://flashrom.org/trac/flashrom/changeset/1556 Log: print_wiki: fix columns calculations. for - chipsets - boards, and - chips Previously the chipset columns were not uniformly divided at all, which led to very odd table bottoms. This patches fixes this as far as wiki code can do (browser rendering can still create odd effects because we do not define cell heights). Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/print_wiki.c Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Sat Jul 28 21:35:26 2012 (r1555) +++ trunk/print_wiki.c Sun Jul 29 04:04:21 2012 (r1556) @@ -35,15 +35,21 @@ generated by pasting '''flashrom -z''' output. \ '''Last update:''' %s(generated by flashrom %s)\n</div>\n"; +static const char th_start[] = "| valign=\"top\"|\n\n\ +{| border=\"0\" style=\"font-size: smaller\" valign=\"top\"\n\ +|- bgcolor=\"#6699dd\"\n"; + #if CONFIG_INTERNAL == 1 -static const char chipset_th[] = "{| border=\"0\" style=\"font-size: smaller\"\n\ -|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Southbridge\n! align=\"center\" | PCI IDs\n\ +static const char chipset_th[] = "\ +! align=\"left\" | Vendor\n\ +! align=\"left\" | Southbridge\n\ +! align=\"center\" | PCI IDs\n\ ! align=\"center\" | Status\n\n"; -static const char board_th[] = "{| border=\"0\" style=\"font-size: smaller\" \ -valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Mainboard\n! align=\"left\" | Required option\n\ +static const char board_th[] = "\ +! align=\"left\" | Vendor\n\ +! align=\"left\" | Mainboard\n\ +! align=\"left\" | Required option\n\ ! align=\"center\" | Status\n\n"; static const char board_intro[] = "\ @@ -59,9 +65,7 @@ further verified mainboards on the [[Mailinglist|mailing list]].\n"; #endif -static const char chip_th[] = "{\ -| border=\"0\" style=\"font-size: smaller\" valign=\"top\"\n\ -|- bgcolor=\"#6699dd\"\n\ +static const char chip_th[] = "\ ! align=\"left\" | Vendor\n\ ! align=\"left\" | Device\n\ ! align=\"center\" | Size [kB]\n\ @@ -72,14 +76,16 @@ | Probe\n| Read\n| Erase\n| Write\n\ | align=\"center\" | Min \n| align=\"center\" | Max\n\n"; -static const char programmer_section[] = "\ -\n== Supported programmers ==\n\nThis is a list \ -of supported PCI devices flashrom can use as programmer:\n\n{| border=\"0\" \ -valign=\"top\"\n| valign=\"top\"|\n\n{| border=\"0\" style=\"font-size: \ -smaller\" valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Device\n! align=\"center\" | PCI IDs\n\ +static const char programmer_th[] = "\ +! align=\"left\" | Vendor\n\ +! align=\"left\" | Device\n\ +! align=\"center\" | PCI IDs\n\ ! align=\"center\" | Status\n\n"; +static const char programmer_intro[] = "\ +\n== Supported programmers ==\n\n\ +This is a list of supported PCI devices flashrom can use as programmer:\n\n{"; + #if CONFIG_INTERNAL == 1 static const char laptop_intro[] = "\n== Supported laptops/notebooks ==\n\n\ In general, flashing laptops is more difficult because laptops\n\n\ @@ -94,18 +100,25 @@ static void print_supported_chipsets_wiki(int cols) { - int i, j, enablescount = 0, color = 1; + int i; + unsigned int lines_per_col; const struct penable *e; + int enablescount = 0, color = 1; for (e = chipset_enables; e->vendor_name != NULL; e++) enablescount++; - printf("\n== Supported chipsets ==\n\nTotal amount of supported " - "chipsets: '''%d'''\n\n{| border=\"0\" valign=\"top\"\n| " - "valign=\"top\"|\n\n%s", enablescount, chipset_th); + /* +1 to force the resulting number of columns to be < cols */ + lines_per_col = enablescount / cols + ((enablescount%cols) > 0 ? 1 : 0); + + printf("\n== Supported chipsets ==\n\nTotal amount of supported chipsets: '''%d'''\n\n" + "{| border=\"0\" valign=\"top\"\n", enablescount); e = chipset_enables; - for (i = 0, j = 0; e[i].vendor_name != NULL; i++, j++) { + for (i = 0; e[i].vendor_name != NULL; i++) { + if ((i % lines_per_col) == 0) + printf("%s%s", th_start, chipset_th); + /* Alternate colors if the vendor changes. */ if (i > 0 && strcmp(e[i].vendor_name, e[i - 1].vendor_name)) color = !color; @@ -116,20 +129,20 @@ e[i].vendor_id, e[i].device_id, (e[i].status == OK) ? "{{OK}}" : "{{?3}}"); - /* Split table in 'cols' columns. */ - if (j >= (enablescount / cols + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", chipset_th); - j = 0; - } + if (((i % lines_per_col) + 1) == lines_per_col) + printf("\n|}\n\n"); } - printf("\n|}\n\n|}\n"); + /* end inner table if it did not fill the last column fully */ + if (((i % lines_per_col)) > 0) + printf("\n|}\n\n"); + printf("\n\n|}\n"); } -static void wiki_helper(const char *devicetype, int cols, - const struct board_info boards[]) +static void wiki_helper(const char *devicetype, int cols, const struct board_info boards[]) { - int i, j, k; + int i, k; + unsigned int boardcount, lines_per_col; unsigned int boardcount_good = 0, boardcount_bad = 0, boardcount_nt = 0; int num_notes = 0, color = 1; char *notes = calloc(1, 1); @@ -144,14 +157,19 @@ else boardcount_bad++; } + boardcount = boardcount_good + boardcount_nt + boardcount_bad; + + /* +1 to force the resulting number of columns to be < cols */ + lines_per_col = boardcount / cols + ((boardcount%cols) > 0 ? 1 : 0); printf("\n\nTotal amount of known good boards %s: '''%d'''; " "Untested (e.g. user vanished before testing new code): '''%d'''; " "Not yet supported (i.e. known-bad): '''%d'''.\n\n" - "{| border=\"0\" valign=\"top\"\n| valign=\"top\"|\n\n%s", - devicetype, boardcount_good, boardcount_nt, boardcount_bad, board_th); + "{| border=\"0\" valign=\"top\"\n", devicetype, boardcount_good, boardcount_nt, boardcount_bad); - for (i = 0, j = 0; boards[i].vendor != NULL; i++, j++) { + for (i = 0; boards[i].vendor != NULL; i++) { + if ((i % lines_per_col) == 0) + printf("%s%s", th_start, board_th); /* Alternate colors if the vendor changes. */ if (i > 0 && strcmp(boards[i].vendor, boards[i - 1].vendor)) @@ -187,14 +205,14 @@ printf("\n"); } - /* Split table in 'cols' columns. */ - if (j >= ((boardcount_good + boardcount_bad) / cols + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", board_th); - j = 0; - } + if (((i % lines_per_col) + 1) == lines_per_col) + printf("\n|}\n\n"); } - printf("\n|}\n\n|}\n"); + /* end inner table if it did not fill the last column fully */ + if (((i % lines_per_col)) > 0) + printf("\n|}\n\n"); + printf("\n\n|}\n"); if (num_notes > 0) printf("\n\n%s\n", notes); @@ -213,12 +231,13 @@ static void print_supported_chips_wiki(int cols) { - int i = 0, c = 1, chipcount = 0; - const struct flashchip *f, *old = NULL; + unsigned int lines_per_col; uint32_t t; char *s; char vmax[6]; char vmin[6]; + const struct flashchip *f, *old = NULL; + int i = 0, c = 1, chipcount = 0; for (f = flashchips; f->name != NULL; f++) { /* Don't count generic entries. */ @@ -229,21 +248,27 @@ chipcount++; } - printf("\n== Supported chips ==\n\nTotal amount of supported " - "chips: '''%d'''\n\n{| border=\"0\" valign=\"top\"\n" - "| valign=\"top\"|\n\n%s", chipcount, chip_th); + /* +1 to force the resulting number of columns to be < cols */ + lines_per_col = chipcount / cols + ((chipcount%cols) > 0 ? 1 : 0); + + printf("\n== Supported chips ==\n\nTotal amount of supported chips: '''%d'''\n\n" + "{| border=\"0\" valign=\"top\"\n", chipcount); - for (f = flashchips; f->name != NULL; f++, i++) { + for (f = flashchips; f->name != NULL; f++) { /* Don't print generic entries. */ if (!strncmp(f->vendor, "Unknown", 7) || !strncmp(f->vendor, "Programmer", 10) || !strncmp(f->name, "unknown", 7)) continue; + if ((i % lines_per_col) == 0) + printf("%s%s", th_start, chip_th); + /* Alternate colors if the vendor changes. */ if (old != NULL && strcmp(old->vendor, f->vendor)) c = !c; + old = f; t = f->tested; s = flashbuses_to_text(f->bustype); sprintf(vmin, "%0.03f", f->voltage.min / (double)1000); @@ -267,16 +292,14 @@ f->voltage.min ? vmax : "N/A"); free(s); - /* Split table into 'cols' columns. */ - if (i >= (chipcount / cols + 1)) { - printf("\n|}\n\n| valign=\"top\"|\n\n%s", chip_th); - i = 0; - } - - old = f; + if (((i % lines_per_col) + 1) == lines_per_col) + printf("\n|}\n\n"); + i++; } - - printf("\n|}\n\n|}\n"); + /* end inner table if it did not fill the last column fully */ + if (((i % lines_per_col)) > 0) + printf("\n|}\n\n"); + printf("|}\n\n"); } /* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ @@ -309,7 +332,8 @@ print_supported_chipsets_wiki(3); print_supported_boards_wiki(); #endif - printf("%s", programmer_section); + printf("%s%s%s", programmer_intro, th_start, programmer_th); + #if CONFIG_NIC3COM == 1 print_supported_pcidevs_wiki(nics_3com); #endif @@ -343,6 +367,6 @@ #if CONFIG_SATAMV == 1 print_supported_pcidevs_wiki(satas_mv); #endif - printf("\n|}\n"); + printf("\n|}\n\n|}\n"); }

1 0

Re: [flashrom] [PATCH 1/7] Introduce and use enum test_state
by Carl-Daniel Hailfinger 28 Jul '12

28 Jul '12

Am 03.03.2012 21:11 schrieb Stefan Tauner: > Previously boards in the wiki were tagged either as working or as known > bad. But we added support to various boards via board enables that were > then never tested because the owners have not reported back. This can > now be tagged with NT and is shown appropriately. > > Also, the underlying data structure indicating state was converted from > macros to an enum while preserving original integer values. > > Because all lines specifying supported boards and laptops were touched > anyway, this patch also re-indents them. > > --- > TODO: change other occurrences to use it. wanted to get feedack first. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > > diff --git a/print_wiki.c b/print_wiki.c > index 377154d..9a9cd83 100644 > --- a/print_wiki.c > +++ b/print_wiki.c > @@ -136,9 +136,9 @@ static void wiki_helper(const char *devicetype, int cols, > const struct board_match *b = board_matches; > > for (i = 0; boards[i].vendor != NULL; i++) { > - if (boards[i].working) > + if (boards[i].working == OK) > boardcount_good++; > - else > + if (boards[i].working == BAD) > boardcount_bad++; You could replace that construct with a switch(), and it might make sense to count untested boards as well. > } > > @@ -171,7 +171,8 @@ static void wiki_helper(const char *devicetype, int cols, > b[k].lb_vendor ? b[k].lb_vendor : "", > b[k].lb_vendor ? ":" : "", > b[k].lb_vendor ? b[k].lb_part : "", > - (boards[i].working) ? "OK" : "No"); > + (boards[i].working == OK) ? "OK" : > + (boards[i].working == NT) ? "?3" : "No"); The ?3 looks odd, but I assume you tested it. > > if (boards[i].note) { > printf("%d\n", num_notes + 1); > diff --git a/print.c b/print.c > index 1fdeac7..544a846 100644 > --- a/print.c > +++ b/print.c > @@ -545,428 +545,427 @@ void print_supported(void) > [...] > - B("ZOTAC", "Fusion-ITX WiFi (FUSION350-A-E)", 1, NULL, NULL), > - B("ZOTAC", "GeForce 8200", 1, "http://pden.zotac.com/index.php?page=shop.product_details&product_id=129&ca…", NULL), > - B("ZOTAC", "H67-ITX WiFi (H67ITX-C-E)", 0, NULL, "Probing works (Winbond W25Q32, 4096 kB, SPI), but parts of the flash are problematic: descriptor is r/o (conforming to ICH reqs), ME region is locked."), > - B("ZOTAC", "ZBOX HD-ID11", 1, "http://pdde.zotac.com/index.php?page=shop.product_details&product_id=240&ca…", NULL), > + B("A-Trend", "ATC-6220", OK, "http://www.motherboard.cz/mb/atrend/atc6220.htm", NULL), > + B("abit", "A-S78H", OK, "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?pMODEL_NA…", NULL), > + B("abit", "AN-M2", OK, "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?DEFTITLE=…", NULL), > + B("abit", "AV8", OK, "http://www.abit.com.tw/page/en/motherboard/motherboard_detail.php?DEFTITLE=…", NULL), Is it possible that this patch made the board table one or two tabs wider? The patch looks like that, and while I agree that some files/sections should not have line length limits, adding another 16 columns of whitespace is something I'd like to avoid. print_wiki related code is something I rarely touch (except for programmer additions), so please don't expect in-depth reviews from me. A cursory review suggests that the patch at least doesn't make the code worse and I don't have any strong feelings about this code. If you feel this patch is beneficial, I can send a weak Acked-by, more like Meh-by. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom