openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 23:43:42 +02:00
Code Issues Releases Wiki Activity

pickit2_spi.c: Add pickit2_interrupt_transfer() helper

Browse Source 
Introduce the `pickit2_interrupt_transfer()` helper function to simplify
calls to the `libusb_interrupt_transfer()` function, as the last three
arguments are always the same: two constants and an unused output value.

Change-Id: I7ff704243b63a7ea2872fbc6e596190573dc13f6
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/65915
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Tested-by: Thomas Heijligen <src@posteo.de>
Reviewed-by: Thomas Heijligen <src@posteo.de>
This commit is contained in:
Angel Pons 2022-07-16 12:12:50 +02:00 committed by Thomas Heijligen
parent 398e2d8420
commit a71b22fba3
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pickit2_spi.c
View File

@ -89,20 +89,25 @@ struct pickit2_spi_data {
#define SCR_VDD_OFF 0xFE #define SCR_VDD_OFF 0xFE
#define SCR_VDD_ON 0xFF #define SCR_VDD_ON 0xFF
static int pickit2_interrupt_transfer(libusb_device_handle *handle, unsigned char endpoint, unsigned char *data)
{
int transferred;
return libusb_interrupt_transfer(handle, endpoint, data, CMD_LENGTH, &transferred, DFLT_TIMEOUT);
}
static int pickit2_get_firmware_version(libusb_device_handle *pickit2_handle) static int pickit2_get_firmware_version(libusb_device_handle *pickit2_handle)
{ {
int ret; int ret;
uint8_t command[CMD_LENGTH] = {CMD_GET_VERSION, CMD_END_OF_BUFFER}; uint8_t command[CMD_LENGTH] = {CMD_GET_VERSION, CMD_END_OF_BUFFER};
int transferred;
ret = libusb_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT); ret = pickit2_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, command);
if (ret != 0) { if (ret != 0) {
msg_perr("Command Get Firmware Version failed!\n"); msg_perr("Command Get Firmware Version failed!\n");
return 1; return 1;
} }
ret = libusb_interrupt_transfer(pickit2_handle, ENDPOINT_IN, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT); ret = pickit2_interrupt_transfer(pickit2_handle, ENDPOINT_IN, command);
if (ret != 0) { if (ret != 0) {
msg_perr("Command Get Firmware Version failed!\n"); msg_perr("Command Get Firmware Version failed!\n");
@ -148,8 +153,7 @@ static int pickit2_set_spi_voltage(libusb_device_handle *pickit2_handle, int mil
voltage_selector * 13, voltage_selector * 13,
CMD_END_OF_BUFFER CMD_END_OF_BUFFER
}; };
int transferred; int ret = pickit2_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, command);
int ret = libusb_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT);
if (ret != 0) { if (ret != 0) {
msg_perr("Command Set Voltage failed!\n"); msg_perr("Command Set Voltage failed!\n");
@ -184,8 +188,7 @@ static int pickit2_set_spi_speed(libusb_device_handle *pickit2_handle, unsigned
CMD_END_OF_BUFFER CMD_END_OF_BUFFER
}; };
int transferred; int ret = pickit2_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, command);
int ret = libusb_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT);
if (ret != 0) { if (ret != 0) {
msg_perr("Command Set SPI Speed failed!\n"); msg_perr("Command Set SPI Speed failed!\n");
@ -255,9 +258,7 @@ static int pickit2_spi_send_command(const struct flashctx *flash, unsigned int w
buf[i++] = CMD_UPLOAD_DATA; buf[i++] = CMD_UPLOAD_DATA;
buf[i++] = CMD_END_OF_BUFFER; buf[i++] = CMD_END_OF_BUFFER;
int transferred; int ret = pickit2_interrupt_transfer(pickit2_data->pickit2_handle, ENDPOINT_OUT, buf);
int ret = libusb_interrupt_transfer(pickit2_data->pickit2_handle,
ENDPOINT_OUT, buf, CMD_LENGTH, &transferred, DFLT_TIMEOUT);
if (ret != 0) { if (ret != 0) {
msg_perr("Send SPI failed!\n"); msg_perr("Send SPI failed!\n");
@ -357,9 +358,7 @@ static int pickit2_shutdown(void *data)
CMD_END_OF_BUFFER CMD_END_OF_BUFFER
}; };
int transferred; int ret = pickit2_interrupt_transfer(pickit2_data->pickit2_handle, ENDPOINT_OUT, command);
int ret = libusb_interrupt_transfer(pickit2_data->pickit2_handle,
ENDPOINT_OUT, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT);
if (ret != 0) { if (ret != 0) {
msg_perr("Command Shutdown failed!\n"); msg_perr("Command Shutdown failed!\n");
@ -492,8 +491,7 @@ static int pickit2_spi_init(void)
/* Perform basic setup. /* Perform basic setup.
* Configure pin directions and logic levels, turn Vdd on, turn busy LED on and clear buffers. */ * Configure pin directions and logic levels, turn Vdd on, turn busy LED on and clear buffers. */
int transferred; if (pickit2_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, buf) != 0) {
if (libusb_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, buf, CMD_LENGTH, &transferred, DFLT_TIMEOUT) != 0) {
msg_perr("Command Setup failed!\n"); msg_perr("Command Setup failed!\n");
goto init_err_cleanup_exit; goto init_err_cleanup_exit;
} }