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

programmer_init: use struct programmer_entry*

Browse Source 
Change-Id: Iacf0f25abc94a84c5d52c8d69a3e8640817b060a
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55121
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Thomas Heijligen 2021-06-01 14:37:12 +02:00 committed by Nico Huber
parent 4bb086423c
commit 5d25f04fd5
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli_classic.c
View File

@ -562,7 +562,7 @@ int main(int argc, char *argv[])
/* FIXME: Delay calibration should happen in programmer code. */ /* FIXME: Delay calibration should happen in programmer code. */
myusec_calibrate_delay(); myusec_calibrate_delay();
if (programmer_init(prog, pparam)) { if (programmer_init(programmer_table[prog], pparam)) {
msg_perr("Error: Programmer initialization failed.\n"); msg_perr("Error: Programmer initialization failed.\n");
ret = 1; ret = 1;
goto out_shutdown; goto out_shutdown;

6
flashrom.c
View File

@ -130,15 +130,15 @@ static int deregister_chip_restore(struct flashctx *flash)
return rc; return rc;
} }
int programmer_init(enum programmer prog, const char *param) int programmer_init(const struct programmer_entry *prog, const char *param)
{ {
int ret; int ret;
if (prog >= programmer_table_size) { if (prog == NULL) {
msg_perr("Invalid programmer specified!\n"); msg_perr("Invalid programmer specified!\n");
return -1; return -1;
} }
programmer = programmer_table[prog]; programmer = prog;
/* Initialize all programmer specific data. */ /* Initialize all programmer specific data. */
/* Default to unlimited decode sizes. */ /* Default to unlimited decode sizes. */
max_rom_decode = (const struct decode_sizes) { max_rom_decode = (const struct decode_sizes) {

2
libflashrom.c
View File

@ -287,7 +287,7 @@ int flashrom_programmer_init(struct flashrom_programmer **const flashprog,
list_programmers_linebreak(0, 80, 0); list_programmers_linebreak(0, 80, 0);
return 1; return 1;
} }
return programmer_init(prog, prog_param); return programmer_init(programmer_table[prog], prog_param);
} }
/** /**

2
programmer.h
View File

@ -178,7 +178,7 @@ struct programmer_entry {
extern const struct programmer_entry *const programmer_table[]; extern const struct programmer_entry *const programmer_table[];
extern const size_t programmer_table_size; extern const size_t programmer_table_size;
int programmer_init(enum programmer prog, const char *param); int programmer_init(const struct programmer_entry *prog, const char *param);
int programmer_shutdown(void); int programmer_shutdown(void);
struct bitbang_spi_master { struct bitbang_spi_master {

18
tests/init_shutdown.c
View File

@ -19,22 +19,22 @@
#include "io_mock.h" #include "io_mock.h"
#include "programmer.h" #include "programmer.h"
static void run_lifecycle(void **state, enum programmer prog, const char *param) static void run_lifecycle(void **state, const struct programmer_entry *prog, const char *param)
{ {
(void) state; /* unused */ (void) state; /* unused */
printf("Testing programmer_init for programmer=%u ...\n", prog); printf("Testing programmer_init for programmer=%s ...\n", prog->name);
assert_int_equal(0, programmer_init(prog, strdup(param))); assert_int_equal(0, programmer_init(prog, strdup(param)));
printf("... programmer_init for programmer=%u successful\n", prog); printf("... programmer_init for programmer=%s successful\n", prog->name);
printf("Testing programmer_shutdown for programmer=%u ...\n", prog); printf("Testing programmer_shutdown for programmer=%s ...\n", prog->name);
assert_int_equal(0, programmer_shutdown()); assert_int_equal(0, programmer_shutdown());
printf("... programmer_shutdown for programmer=%u successful\n", prog); printf("... programmer_shutdown for programmer=%s successful\n", prog->name);
} }
void dummy_init_and_shutdown_test_success(void **state) void dummy_init_and_shutdown_test_success(void **state)
{ {
run_lifecycle(state, PROGRAMMER_DUMMY, "bus=parallel+lpc+fwh+spi"); run_lifecycle(state, &programmer_dummy, "bus=parallel+lpc+fwh+spi");
} }
struct mec1308_io_state { struct mec1308_io_state {
@ -72,7 +72,7 @@ void mec1308_init_and_shutdown_test_success(void **state)
io_mock_register(&mec1308_io); io_mock_register(&mec1308_io);
will_return_always(__wrap_sio_read, 0x4d); /* MEC1308_DEVICE_ID_VAL */ will_return_always(__wrap_sio_read, 0x4d); /* MEC1308_DEVICE_ID_VAL */
run_lifecycle(state, PROGRAMMER_MEC1308, ""); run_lifecycle(state, &programmer_mec1308, "");
io_mock_register(NULL); io_mock_register(NULL);
} }
@ -131,7 +131,7 @@ void ene_lpc_init_and_shutdown_test_success(void **state)
io_mock_register(&ene_lpc_io); io_mock_register(&ene_lpc_io);
run_lifecycle(state, PROGRAMMER_ENE_LPC, ""); run_lifecycle(state, &programmer_ene_lpc, "");
io_mock_register(NULL); io_mock_register(NULL);
} }
@ -144,5 +144,5 @@ void linux_spi_init_and_shutdown_test_success(void **state)
* and the fallback to getpagesize(). This test does the latter (fallback to * and the fallback to getpagesize(). This test does the latter (fallback to
* getpagesize). * getpagesize).
*/ */
run_lifecycle(state, PROGRAMMER_LINUX_SPI, "dev=/dev/null"); run_lifecycle(state, &programmer_linux_spi, "dev=/dev/null");
} }