diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-09-08 00:00:29 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2011-09-08 00:00:29 +0000 |
| commit | b1a5eb9aae688b70689704f8c9b1a44ed0f3a86e (patch) | |
| tree | c4bbc8a1958eeae3521810d75d2b90f4bd85625c /programmer.h | |
| parent | 25ff7a4904d87d08e841d2c169c66c3f57da1697 (diff) | |
| download | flashrom-b1a5eb9aae688b70689704f8c9b1a44ed0f3a86e.zip flashrom-b1a5eb9aae688b70689704f8c9b1a44ed0f3a86e.tar.gz | |
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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'programmer.h')
| -rw-r--r-- | programmer.h | 4 |
1 files changed, 1 insertions, 3 deletions
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 { |
