[flashrom] [commit] r1941 - trunk

[repository service]

Author: stefanct
Date: Mon Feb 22 09:59:15 2016
New Revision: 1941
URL: http://flashrom.org/trac/flashrom/changeset/1941

Log:
pickit2_spi: 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.

Signed-off-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Modified:
   trunk/flashrom.c
   trunk/pickit2_spi.c
   trunk/programmer.h

Modified: trunk/flashrom.c
==============================================================================
--- trunk/flashrom.c	Sun Feb 21 19:25:15 2016	(r1940)
+++ trunk/flashrom.c	Mon Feb 22 09:59:15 2016	(r1941)
@@ -382,9 +382,8 @@
 #if CONFIG_PICKIT2_SPI == 1
 	{
 		.name			= "pickit2_spi",
-		.type			= OTHER,
-					/* FIXME */
-		.devs.note		= "Microchip PICkit2\n",
+		.type			= USB,
+		.devs.dev		= devs_pickit2_spi,
 		.init			= pickit2_spi_init,
 		.map_flash_region	= fallback_map,
 		.unmap_flash_region	= fallback_unmap,

Modified: trunk/pickit2_spi.c
==============================================================================
--- trunk/pickit2_spi.c	Sun Feb 21 19:25:15 2016	(r1940)
+++ trunk/pickit2_spi.c	Mon Feb 22 09:59:15 2016	(r1941)
@@ -55,6 +55,12 @@
 #include "programmer.h"
 #include "spi.h"
 
+const struct dev_entry devs_pickit2_spi[] = {
+	{0x04D8, 0x0033, OK, "Microchip", "PICkit 2"},
+
+	{}
+};
+
 static usb_dev_handle *pickit2_handle;
 
 /* Default USB transaction timeout in ms */
@@ -64,9 +70,6 @@
 #define ENDPOINT_OUT            0x01
 #define ENDPOINT_IN             0x81
 
-#define PICKIT2_VID             0x04D8
-#define PICKIT2_PID             0x0033
-
 #define CMD_GET_VERSION         0x76
 #define CMD_SET_VDD             0xA0
 #define CMD_SET_VPP             0xA1
@@ -448,7 +451,9 @@
 	usb_init();
 	(void)usb_find_busses();
 	(void)usb_find_devices();
-	struct usb_device *dev = get_device_by_vid_pid(PICKIT2_VID, PICKIT2_PID, usedevice);
+	const uint16_t vid = devs_pickit2_spi[0].vendor_id;
+	const uint16_t pid = devs_pickit2_spi[0].device_id;
+ 	struct usb_device *dev = get_device_by_vid_pid(vid, pid, usedevice);
 	if (dev == NULL) {
 		msg_perr("Could not find a PICkit2 on USB!\n");
 		return 1;

Modified: trunk/programmer.h
==============================================================================
--- trunk/programmer.h	Sun Feb 21 19:25:15 2016	(r1940)
+++ trunk/programmer.h	Mon Feb 22 09:59:15 2016	(r1941)
@@ -499,6 +499,7 @@
 /* pickit2_spi.c */
 #if CONFIG_PICKIT2_SPI == 1
 int pickit2_spi_init(void);
+extern const struct dev_entry devs_pickit2_spi[];
 #endif
 
 /* rayer_spi.c */