From fe62a00686561aeff216d16cdacbd3973f00c920 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Mon, 22 Feb 2016 08:59:27 +0000 Subject: 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 Acked-by: Carl-Daniel Hailfinger --- dediprog.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'dediprog.c') diff --git a/dediprog.c b/dediprog.c index 6a9b9ae..019de46 100644 --- a/dediprog.c +++ b/dediprog.c @@ -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); -- cgit v1.1