X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=f05bc4dce6fdd4da51e633ce4d8300ba82ed6cd9;hb=133a37bfba1a7e1423716b2b872d3bb82a2e64d9;hp=2340044d813dad60dd52bbc791d2c60d66cb8237;hpb=cd853ff0b2b0ad2643d65e73159661e1a3c6bc66;p=libsigrok.git diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index 2340044d..f05bc4dc 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -126,8 +126,8 @@ static int sigma_read(void *buf, size_t size, struct sigma *sigma) ret = ftdi_read_data(&sigma->ftdic, (unsigned char *)buf, size); if (ret < 0) { - sr_warn("ftdi_read_data failed: %s", - ftdi_get_error_string(&sigma->ftdic)); + sr_err("ftdi_read_data failed: %s", + ftdi_get_error_string(&sigma->ftdic)); } return ret; @@ -139,10 +139,10 @@ static int sigma_write(void *buf, size_t size, struct sigma *sigma) ret = ftdi_write_data(&sigma->ftdic, (unsigned char *)buf, size); if (ret < 0) { - sr_warn("ftdi_write_data failed: %s", - ftdi_get_error_string(&sigma->ftdic)); + sr_err("ftdi_write_data failed: %s", + ftdi_get_error_string(&sigma->ftdic)); } else if ((size_t) ret != size) { - sr_warn("ftdi_write_data did not complete write\n"); + sr_err("ftdi_write_data did not complete write\n"); } return ret; @@ -190,7 +190,7 @@ static uint8_t sigma_get_register(uint8_t reg, struct sigma *sigma) uint8_t value; if (1 != sigma_read_register(reg, &value, 1, sigma)) { - sr_warn("sigma_get_register: 1 byte expected"); + sr_err("sigma_get_register: 1 byte expected"); return 0; } @@ -337,12 +337,12 @@ static int bin2bitbang(const char *filename, f = g_fopen(filename, "rb"); if (!f) { - sr_warn("g_fopen(\"%s\", \"rb\")", filename); + sr_err("g_fopen(\"%s\", \"rb\")", filename); return SR_ERR; } if (-1 == fseek(f, 0, SEEK_END)) { - sr_warn("fseek on %s failed", filename); + sr_err("fseek on %s failed", filename); fclose(f); return SR_ERR; } @@ -376,7 +376,7 @@ static int bin2bitbang(const char *filename, if (ret < 0) { g_free(compressed_buf); g_free(firmware); - sr_warn("Could not unpack Sigma firmware. (Error %d)\n", ret); + sr_err("Could not unpack Sigma firmware. (Error %d)\n", ret); return SR_ERR; } @@ -404,9 +404,9 @@ static int bin2bitbang(const char *filename, if (offset != *buf_size) { g_free(*buf); - sr_warn("Error reading firmware %s " - "offset=%ld, file_size=%ld, buf_size=%zd\n", - filename, offset, file_size, *buf_size); + sr_err("Error reading firmware %s " + "offset=%ld, file_size=%ld, buf_size=%zd\n", + filename, offset, file_size, *buf_size); return SR_ERR; } @@ -474,21 +474,21 @@ static int upload_firmware(int firmware_idx, struct sigma *sigma) /* Make sure it's an ASIX SIGMA. */ if ((ret = ftdi_usb_open_desc(&sigma->ftdic, USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) { - sr_warn("ftdi_usb_open failed: %s", - ftdi_get_error_string(&sigma->ftdic)); + sr_err("ftdi_usb_open failed: %s", + ftdi_get_error_string(&sigma->ftdic)); return 0; } if ((ret = ftdi_set_bitmode(&sigma->ftdic, 0xdf, BITMODE_BITBANG)) < 0) { - sr_warn("ftdi_set_bitmode failed: %s", - ftdi_get_error_string(&sigma->ftdic)); + sr_err("ftdi_set_bitmode failed: %s", + ftdi_get_error_string(&sigma->ftdic)); return 0; } /* Four times the speed of sigmalogan - Works well. */ if ((ret = ftdi_set_baudrate(&sigma->ftdic, 750000)) < 0) { - sr_warn("ftdi_set_baudrate failed: %s", - ftdi_get_error_string(&sigma->ftdic)); + sr_err("ftdi_set_baudrate failed: %s", + ftdi_get_error_string(&sigma->ftdic)); return 0; } @@ -515,8 +515,8 @@ static int upload_firmware(int firmware_idx, struct sigma *sigma) firmware_files[firmware_idx]); if ((ret = bin2bitbang(firmware_path, &buf, &buf_size)) != SR_OK) { - sr_warn("An error occured while reading the firmware: %s", - firmware_path); + sr_err("An error occured while reading the firmware: %s", + firmware_path); return ret; } @@ -526,8 +526,8 @@ static int upload_firmware(int firmware_idx, struct sigma *sigma) g_free(buf); if ((ret = ftdi_set_bitmode(&sigma->ftdic, 0x00, BITMODE_RESET)) < 0) { - sr_warn("ftdi_set_bitmode failed: %s", - ftdi_get_error_string(&sigma->ftdic)); + sr_err("ftdi_set_bitmode failed: %s", + ftdi_get_error_string(&sigma->ftdic)); return SR_ERR; } @@ -544,7 +544,7 @@ static int upload_firmware(int firmware_idx, struct sigma *sigma) ret = sigma_read(result, 3, sigma); if (ret != 3 || result[0] != 0xa6 || result[1] != 0x55 || result[2] != 0xaa) { - sr_warn("Configuration failed. Invalid reply received."); + sr_err("Configuration failed. Invalid reply received."); return SR_ERR; } @@ -568,8 +568,8 @@ static int hw_opendev(int device_index) if ((ret = ftdi_usb_open_desc(&sigma->ftdic, USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) { - sr_warn("ftdi_usb_open failed: %s", - ftdi_get_error_string(&sigma->ftdic)); + sr_err("ftdi_usb_open failed: %s", + ftdi_get_error_string(&sigma->ftdic)); return 0; } @@ -643,8 +643,8 @@ static int configure_probes(struct sr_device_instance *sdi, GSList *probes) if (sigma->cur_samplerate >= SR_MHZ(100)) { /* Fast trigger support. */ if (trigger_set) { - sr_warn("ASIX SIGMA only supports a single " - "pin trigger in 100 and 200MHz mode."); + sr_err("ASIX SIGMA only supports a single " + "pin trigger in 100 and 200MHz mode."); return SR_ERR; } if (probe->trigger[0] == 'f') @@ -652,9 +652,9 @@ static int configure_probes(struct sr_device_instance *sdi, GSList *probes) else if (probe->trigger[0] == 'r') sigma->trigger.risingmask |= probebit; else { - sr_warn("ASIX SIGMA only supports " - "rising/falling trigger in 100 " - "and 200MHz mode."); + sr_err("ASIX SIGMA only supports " + "rising/falling trigger in 100 " + "and 200MHz mode."); return SR_ERR; } @@ -684,8 +684,8 @@ static int configure_probes(struct sr_device_instance *sdi, GSList *probes) * does not permit ORed triggers. */ if (trigger_set > 1) { - sr_warn("ASIX SIGMA only supports 1 rising/" - "falling triggers."); + sr_err("ASIX SIGMA only supports 1 rising/" + "falling triggers."); return SR_ERR; } }