diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2016-02-22 08:59:27 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2016-02-22 08:59:27 +0000 |
| commit | fe62a00686561aeff216d16cdacbd3973f00c920 (patch) | |
| tree | fa61a001405821df55486cd6d8a0058ccc9127f1 | |
| parent | 591d7903c46ebe0d547f61eb66b68705cbc12e8a (diff) | |
| download | flashrom-fe62a00686561aeff216d16cdacbd3973f00c920.zip flashrom-fe62a00686561aeff216d16cdacbd3973f00c920.tar.gz | |
dediprog: use ordinary USB devs array
Even though there is currently only one USB device ID in the wild using our
standard way to define the devices creates nicer output for -L and -z.
Corresponding to flashrom svn r1942.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
| -rw-r--r-- | dediprog.c | 10 | ||||
| -rw-r--r-- | flashrom.c | 5 | ||||
| -rw-r--r-- | programmer.h | 1 |
3 files changed, 12 insertions, 4 deletions
@@ -143,6 +143,11 @@ enum dediprog_standalone_mode { LEAVE_STANDALONE_MODE = 1, }; +const struct dev_entry devs_dediprog[] = { + {0x0483, 0xDADA, OK, "Dediprog", "SF100/SF600"}, + + {0}, +}; static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); enum dediprog_devtype dediprog_devicetype = DEV_UNKNOWN; @@ -1019,7 +1024,10 @@ int dediprog_init(void) msg_perr("Could not initialize libusb!\n"); return 1; } - dediprog_handle = get_device_by_vid_pid_number(0x0483, 0xdada, (unsigned int) usedevice); + + const uint16_t vid = devs_dediprog[0].vendor_id; + const uint16_t pid = devs_dediprog[0].device_id; + dediprog_handle = get_device_by_vid_pid_number(vid, pid, (unsigned int) usedevice); if (!dediprog_handle) { msg_perr("Could not find a Dediprog programmer on USB.\n"); libusb_exit(usb_ctx); @@ -247,9 +247,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_DEDIPROG == 1 { .name = "dediprog", - .type = OTHER, - /* FIXME */ - .devs.note = "Dediprog SF100\n", + .type = USB, + .devs.dev = devs_dediprog, .init = dediprog_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, diff --git a/programmer.h b/programmer.h index 9a880d7..bd8e98d 100644 --- a/programmer.h +++ b/programmer.h @@ -528,6 +528,7 @@ int linux_spi_init(void); /* dediprog.c */ #if CONFIG_DEDIPROG == 1 int dediprog_init(void); +extern const struct dev_entry devs_dediprog[]; #endif /* ch341a_spi.c */ |
