BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

asix-sigma: Weed out in-condition assignments 

Remove all those if ((ret = foo(bar)) < 0) constructs from upload_firmware()
function. This is just a confusing programming practice, kill it. While at it,
replace all the uses of &devc->ftdic with plain ftdic , which is defined at
the begining.

Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut 2014-04-20 17:58:35 +02:00 committed by Bert Vermeulen
parent 499b17e9c0
commit 8bbf7627df
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hardware/asix-sigma/asix-sigma.c
View File

@ -543,25 +543,29 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc)
size_t buf_size; size_t buf_size;
unsigned char result[32]; unsigned char result[32];
const char *firmware = sigma_firmware_files[firmware_idx]; const char *firmware = sigma_firmware_files[firmware_idx];
struct ftdi_context *ftdic = &devc->ftdic;
/* Make sure it's an ASIX SIGMA. */ /* Make sure it's an ASIX SIGMA. */
if ((ret = ftdi_usb_open_desc(&devc->ftdic, ret = ftdi_usb_open_desc(ftdic, USB_VENDOR, USB_PRODUCT,
USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) { USB_DESCRIPTION, NULL);
if (ret < 0) {
sr_err("ftdi_usb_open failed: %s", sr_err("ftdi_usb_open failed: %s",
ftdi_get_error_string(&devc->ftdic)); ftdi_get_error_string(ftdic));
return 0; return 0;
} }
if ((ret = ftdi_set_bitmode(&devc->ftdic, 0xdf, BITMODE_BITBANG)) < 0) { ret = ftdi_set_bitmode(ftdic, 0xdf, BITMODE_BITBANG);
if (ret < 0) {
sr_err("ftdi_set_bitmode failed: %s", sr_err("ftdi_set_bitmode failed: %s",
ftdi_get_error_string(&devc->ftdic)); ftdi_get_error_string(ftdic));
return 0; return 0;
} }
/* Four times the speed of sigmalogan - Works well. */ /* Four times the speed of sigmalogan - Works well. */
if ((ret = ftdi_set_baudrate(&devc->ftdic, 750000)) < 0) { ret = ftdi_set_baudrate(ftdic, 750000);
if (ret < 0) {
sr_err("ftdi_set_baudrate failed: %s", sr_err("ftdi_set_baudrate failed: %s",
ftdi_get_error_string(&devc->ftdic)); ftdi_get_error_string(ftdic));
return 0; return 0;
} }
@ -571,7 +575,8 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc)
return ret; return ret;
/* Prepare firmware. */ /* Prepare firmware. */
if ((ret = bin2bitbang(firmware, &buf, &buf_size)) != SR_OK) { ret = bin2bitbang(firmware, &buf, &buf_size);
if (ret != SR_OK) {
sr_err("An error occured while reading the firmware: %s", sr_err("An error occured while reading the firmware: %s",
firmware); firmware);
return ret; return ret;
@ -583,13 +588,14 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc)
g_free(buf); g_free(buf);
if ((ret = ftdi_set_bitmode(&devc->ftdic, 0x00, BITMODE_RESET)) < 0) { ret = ftdi_set_bitmode(ftdic, 0x00, BITMODE_RESET);
if (ret < 0) {
sr_err("ftdi_set_bitmode failed: %s", sr_err("ftdi_set_bitmode failed: %s",
ftdi_get_error_string(&devc->ftdic)); ftdi_get_error_string(ftdic));
return SR_ERR; return SR_ERR;
} }
ftdi_usb_purge_buffers(&devc->ftdic); ftdi_usb_purge_buffers(ftdic);
/* Discard garbage. */ /* Discard garbage. */
while (1 == sigma_read(&pins, 1, devc)) while (1 == sigma_read(&pins, 1, devc))