From 2e681601b10c26e0293f285dfcb17d006349e450 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Thu, 8 Sep 2011 00:00:29 +0000 Subject: Change programmer selection in cli and generic code Bugfix: Do not accept multiple conflicting --programmer selections. Restriction: Do not accept multiple --programmer selections even if there is no conflict. Unexport the programmer variable. programmer_init requires the programmer as first parameter. The default programmer selection is now part of cli_classic. Corresponding to flashrom svn r1433. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Tauner --- programmer.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'programmer.h') diff --git a/programmer.h b/programmer.h index f878a53..1283909 100644 --- a/programmer.h +++ b/programmer.h @@ -85,8 +85,6 @@ enum programmer { PROGRAMMER_INVALID /* This must always be the last entry. */ }; -extern enum programmer programmer; - struct programmer_entry { const char *vendor; const char *name; @@ -110,7 +108,7 @@ struct programmer_entry { extern const struct programmer_entry programmer_table[]; -int programmer_init(char *param); +int programmer_init(enum programmer prog, char *param); int programmer_shutdown(void); enum bitbang_spi_master_type { -- cgit v1.1