dediprog: use ordinary USB devs array.
authorstefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>
Mon, 22 Feb 2016 08:59:27 +0000 (08:59 +0000)
committerstefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>
Mon, 22 Feb 2016 08:59:27 +0000 (08:59 +0000)
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.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: svn://flashrom.org/flashrom/trunk@1942 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

dediprog.c
flashrom.c
programmer.h

index 6a9b9ae..019de46 100644 (file)
@@ -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);
index d671003..25e53f2 100644 (file)
@@ -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,
index 9a880d7..bd8e98d 100644 (file)
@@ -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 */