openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

internal.c: Seperate out get_params() from internal_init()

Browse Source 
Move all programmer parameter wrangling into its own
function.

BUG=none
TEST=`flashrom -p internal` on dooly DUT.

Change-Id: I66bb370eb0466c5c838621762a6ba825c44567d4
Tested-by: Nikolai Artemiev <nartemiev@google.com>
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/61578
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan 2022-02-03 11:55:13 +11:00 committed by Edward O'Callaghan
parent 387631e115
commit b9e8b898c0
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
internal.c
View File

@ -174,22 +174,21 @@ static const struct par_master par_master_internal = {
.chip_writen = fallback_chip_writen,
};
static int internal_init(void)
static int get_params(int *boardenable, int *boardmismatch,
int *force_laptop, int *not_a_laptop,
char **board_vendor, char **board_model)
{
int ret = 0;
int force_laptop = 0;
int not_a_laptop = 0;
char *board_vendor = NULL;
char *board_model = NULL;
#if defined(__i386__) || defined(__x86_64__)
const char *cb_vendor = NULL;
const char *cb_model = NULL;
#endif
char *arg;
/* default values. */
*force_laptop = 0;
*not_a_laptop = 0;
*board_vendor = NULL;
*board_model = NULL;
arg = extract_programmer_param("boardenable");
if (arg && !strcmp(arg,"force")) {
force_boardenable = 1;
*boardenable = 1;
} else if (arg && !strlen(arg)) {
msg_perr("Missing argument for boardenable.\n");
free(arg);
@ -203,7 +202,7 @@ static int internal_init(void)
arg = extract_programmer_param("boardmismatch");
if (arg && !strcmp(arg,"force")) {
force_boardmismatch = 1;
*boardmismatch = 1;
} else if (arg && !strlen(arg)) {
msg_perr("Missing argument for boardmismatch.\n");
free(arg);
@ -217,9 +216,9 @@ static int internal_init(void)
arg = extract_programmer_param("laptop");
if (arg && !strcmp(arg, "force_I_want_a_brick"))
force_laptop = 1;
*force_laptop = 1;
else if (arg && !strcmp(arg, "this_is_not_a_laptop"))
not_a_laptop = 1;
*not_a_laptop = 1;
else if (arg && !strlen(arg)) {
msg_perr("Missing argument for laptop.\n");
free(arg);
@ -233,7 +232,7 @@ static int internal_init(void)
arg = extract_programmer_param("mainboard");
if (arg && strlen(arg)) {
if (board_parse_parameter(arg, &board_vendor, &board_model)) {
if (board_parse_parameter(arg, board_vendor, board_model)) {
free(arg);
return 1;
}
@ -244,6 +243,27 @@ static int internal_init(void)
}
free(arg);
return 0;
}
static int internal_init(void)
{
int ret = 0;
int force_laptop;
int not_a_laptop;
char *board_vendor;
char *board_model;
#if defined(__i386__) || defined(__x86_64__)
const char *cb_vendor = NULL;
const char *cb_model = NULL;
#endif
ret = get_params(&force_boardenable, &force_boardmismatch,
&force_laptop, &not_a_laptop,
&board_vendor, &board_model);
if (ret)
return ret;
/* Default to Parallel/LPC/FWH flash devices. If a known host controller
* is found, the host controller init routine sets the
* internal_buses_supported bitfield.