Commit d99a2bd0 authored by Nico Huber's avatar Nico Huber Committed by Stefan Tauner

dediprog: port to libusb1 and use asynchronous bulk transfers for reading

This patch is based on Nico Huber's original version that was rebased
by David Hendricks for Chromium OS in
Change-Id: I84384b9d8ed53911657cf2293733531a6e11fd23

Corresponding to flashrom svn r1929.
Signed-off-by: default avatarNico Huber <nico.huber@secunet.com>
Signed-off-by: default avatarDavid Hendricks <dhendrix@chromium.org>
Signed-off-by: default avatarStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: default avatarStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
parent c05900f3
...@@ -742,7 +742,7 @@ endif ...@@ -742,7 +742,7 @@ endif
ifeq ($(CONFIG_DEDIPROG), yes) ifeq ($(CONFIG_DEDIPROG), yes)
FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1'
PROGRAMMER_OBJS += dediprog.o PROGRAMMER_OBJS += dediprog.o
NEED_LIBUSB0 += CONFIG_DEDIPROG NEED_LIBUSB1 += CONFIG_DEDIPROG
endif endif
ifeq ($(CONFIG_SATAMV), yes) ifeq ($(CONFIG_SATAMV), yes)
......
This diff is collapsed.
...@@ -1082,11 +1082,11 @@ needs TCP access to the network or userspace access to a serial port. ...@@ -1082,11 +1082,11 @@ needs TCP access to the network or userspace access to a serial port.
.B buspirate_spi .B buspirate_spi
needs userspace access to a serial port. needs userspace access to a serial port.
.sp .sp
.BR dediprog ", " ft2232_spi ", " usbblaster_spi " and " pickit2_spi .BR ft2232_spi ", " usbblaster_spi " and " pickit2_spi
need access to the respective USB device via libusb API version 0.1. need access to the respective USB device via libusb API version 0.1.
.sp .sp
.BR ch341a_spi .BR ch341a_spi " and " dediprog
needs access to the respective USB device via libusb API version 1.0. need access to the respective USB device via libusb API version 1.0.
.sp .sp
.B dummy .B dummy
needs no access permissions at all. needs no access permissions at all.
......
...@@ -95,9 +95,8 @@ static usb_dev_handle *pickit2_handle; ...@@ -95,9 +95,8 @@ static usb_dev_handle *pickit2_handle;
#define SCR_VDD_OFF 0xFE #define SCR_VDD_OFF 0xFE
#define SCR_VDD_ON 0xFF #define SCR_VDD_ON 0xFF
/* Copied from dediprog.c */ /* Might be useful for other USB devices as well. static for now.
/* Might be useful for other USB devices as well. static for now. */ * device parameter allows user to specify one device of multiple installed */
/* device parameter allows user to specify one device of multiple installed */
static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsigned int device) static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsigned int device)
{ {
struct usb_bus *bus; struct usb_bus *bus;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment