openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-08-15 19:40:19 +02:00
Code Issues Releases Wiki Activity

Use a common parameter variable for all programmers

Browse Source 
This allows us to reduce #ifdef clauses a lot if we compile out some
programmers completely.

Corresponding to flashrom svn r679.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
This commit is contained in:
Carl-Daniel Hailfinger
2009-08-12 13:32:56 +00:00
parent 415e513d90
commit ef58a9ce3f
9 changed files with 54 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ft2232_spi.c
View File

@@ -26,8 +26,6 @@
#include "flash.h"
#include "spi.h"
char *ft2232spi_param = NULL;
#if FT2232_SPI_SUPPORT == 1
#include <ftdi.h>
@@ -83,16 +81,16 @@ int ft2232_spi_init(void)
return EXIT_FAILURE;
}
if (ft2232spi_param && !strlen(ft2232spi_param)) {
free(ft2232spi_param);
ft2232spi_param = NULL;
if (programmer_param && !strlen(programmer_param)) {
free(programmer_param);
programmer_param = NULL;
}
if (ft2232spi_param) {
if (strstr(ft2232spi_param, "2232"))
if (programmer_param) {
if (strstr(programmer_param, "2232"))
ft2232_type = FTDI_FT2232H;
if (strstr(ft2232spi_param, "4232"))
if (strstr(programmer_param, "4232"))
ft2232_type = FTDI_FT4232H;
portpos = strstr(ft2232spi_param, "port=");
portpos = strstr(programmer_param, "port=");
if (portpos) {
portpos += 5;
switch (toupper(*portpos)) {
@@ -107,7 +105,7 @@ int ft2232_spi_init(void)
"using default.\n");
}
}
free(ft2232spi_param);
free(programmer_param);
}
printf_debug("Using device type %s ",
(ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H");