openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 07:02:34 +02:00
Code Issues Releases Wiki Activity

usb_device.c: Allow for programmer_cfg plumbing

Browse Source 
The only driver impacted is raiden_debug_spi.c and so
plumb state directly.

Change-Id: I85ff3117de8743b0a548dad98875cc41f48cac93
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66670
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Edward O'Callaghan 2022-08-12 15:19:49 +10:00 committed by Anastasia Klimchuk
parent 5c710ea54a
commit ea938173a4
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/usb_device.h
View File

@ -102,7 +102,7 @@ struct usb_match {
* extract_programmer_param_str. If the value is found convert it to an integer * extract_programmer_param_str. If the value is found convert it to an integer
* using strtol, accepting hex, decimal and octal encoding. * using strtol, accepting hex, decimal and octal encoding.
*/ */
void usb_match_init(struct usb_match *match); void usb_match_init(const struct programmer_cfg *cfg, struct usb_match *match);
/* /*
* Add a default value to a usb_match_value. This must be done after calling * Add a default value to a usb_match_value. This must be done after calling

2
raiden_debug_spi.c
View File

@ -1497,7 +1497,7 @@ static int raiden_debug_spi_init(const struct programmer_cfg *cfg)
return 1; return 1;
} }
usb_match_init(&match); usb_match_init(cfg, &match);
usb_match_value_default(&match.vid, GOOGLE_VID); usb_match_value_default(&match.vid, GOOGLE_VID);
usb_match_value_default(&match.class, LIBUSB_CLASS_VENDOR_SPEC); usb_match_value_default(&match.class, LIBUSB_CLASS_VENDOR_SPEC);

31
usb_device.c
View File

@ -28,10 +28,11 @@
* Possibly extract a programmer parameter and use it to initialize the given * Possibly extract a programmer parameter and use it to initialize the given
* match value structure. * match value structure.
*/ */
static void usb_match_value_init(struct usb_match_value *match, static void usb_match_value_init(const struct programmer_cfg *cfg,
struct usb_match_value *match,
char const *parameter) char const *parameter)
{ {
char *string = extract_programmer_param_str(NULL, parameter); /* TODO(quasisec): pass prog_param */ char *string = extract_programmer_param_str(cfg, parameter);
match->name = parameter; match->name = parameter;
@ -45,21 +46,21 @@ static void usb_match_value_init(struct usb_match_value *match,
free(string); free(string);
} }
#define USB_MATCH_VALUE_INIT(NAME) \ #define USB_MATCH_VALUE_INIT(PPARAM, NAME) \
usb_match_value_init(&match->NAME, #NAME) usb_match_value_init(PPARAM, &match->NAME, #NAME)
void usb_match_init(struct usb_match *match) void usb_match_init(const struct programmer_cfg *cfg, struct usb_match *match)
{ {
USB_MATCH_VALUE_INIT(vid); USB_MATCH_VALUE_INIT(cfg, vid);
USB_MATCH_VALUE_INIT(pid); USB_MATCH_VALUE_INIT(cfg, pid);
USB_MATCH_VALUE_INIT(bus); USB_MATCH_VALUE_INIT(cfg, bus);
USB_MATCH_VALUE_INIT(address); USB_MATCH_VALUE_INIT(cfg, address);
USB_MATCH_VALUE_INIT(config); USB_MATCH_VALUE_INIT(cfg, config);
USB_MATCH_VALUE_INIT(interface); USB_MATCH_VALUE_INIT(cfg, interface);
USB_MATCH_VALUE_INIT(altsetting); USB_MATCH_VALUE_INIT(cfg, altsetting);
USB_MATCH_VALUE_INIT(class); USB_MATCH_VALUE_INIT(cfg, class);
USB_MATCH_VALUE_INIT(subclass); USB_MATCH_VALUE_INIT(cfg, subclass);
USB_MATCH_VALUE_INIT(protocol); USB_MATCH_VALUE_INIT(cfg, protocol);
} }
void usb_match_value_default(struct usb_match_value *value, void usb_match_value_default(struct usb_match_value *value,