X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=9f85d5f7d9e90899c35cf1ba5e72ec4c70044862;hb=d68e2d1a21ac5c3f24d88b7689f98764e4d57c30;hp=1bddda43e44f75e621ddf50b57150d888ce1954c;hpb=5c64390e5ac8a0052d8b7eeb49c781d86027c814;p=libsigrok.git diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index 1bddda43..9f85d5f7 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -41,7 +41,7 @@ #define TRIGGER_TYPES "rf10" #define NUM_PROBES 16 -static GSList *device_instances = NULL; +static GSList *dev_insts = NULL; static uint64_t supported_samplerates[] = { SR_KHZ(200), @@ -118,7 +118,7 @@ static const char *firmware_files[] = { "asix-sigma-phasor.fw", /* Frequency counter */ }; -static void hw_stop_acquisition(int device_index, gpointer session_data); +static int hw_stop_acquisition(int device_index, gpointer session_data); static int sigma_read(void *buf, size_t size, struct sigma *sigma) { @@ -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("sigma: 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("sigma: 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("sigma: 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: 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("sigma: g_fopen(\"%s\", \"rb\")", filename); return SR_ERR; } if (-1 == fseek(f, 0, SEEK_END)) { - sr_warn("fseek on %s failed", filename); + sr_err("sigma: fseek on %s failed", filename); fclose(f); return SR_ERR; } @@ -376,7 +376,8 @@ 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("sigma: Could not unpack Sigma firmware. " + "(Error %d)\n", ret); return SR_ERR; } @@ -404,9 +405,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("sigma: Error reading firmware %s " + "offset=%ld, file_size=%ld, buf_size=%zd\n", + filename, offset, file_size, *buf_size); return SR_ERR; } @@ -416,7 +417,7 @@ static int bin2bitbang(const char *filename, static int hw_init(const char *deviceinfo) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct sigma *sigma; /* Avoid compiler warnings. */ @@ -444,14 +445,15 @@ static int hw_init(const char *deviceinfo) sigma->use_triggers = 0; /* Register SIGMA device. */ - sdi = sr_device_instance_new(0, SR_ST_INITIALIZING, - USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); - if (!sdi) + if (!(sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING, USB_VENDOR_NAME, + USB_MODEL_NAME, USB_MODEL_VERSION))) { + sr_err("sigma: %s: sdi was NULL", __func__); goto free; + } sdi->priv = sigma; - device_instances = g_slist_append(device_instances, sdi); + dev_insts = g_slist_append(dev_insts, sdi); /* We will open the device again when we need it. */ ftdi_usb_close(&sigma->ftdic); @@ -474,21 +476,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("sigma: 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("sigma: 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("sigma: ftdi_set_baudrate failed: %s", + ftdi_get_error_string(&sigma->ftdic)); return 0; } @@ -515,8 +517,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("sigma: An error occured while reading the firmware: %s", + firmware_path); return ret; } @@ -526,8 +528,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("sigma: ftdi_set_bitmode failed: %s", + ftdi_get_error_string(&sigma->ftdic)); return SR_ERR; } @@ -544,7 +546,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("sigma: Configuration failed. Invalid reply received."); return SR_ERR; } @@ -555,11 +557,11 @@ static int upload_firmware(int firmware_idx, struct sigma *sigma) static int hw_opendev(int device_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct sigma *sigma; int ret; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) return SR_ERR; sigma = sdi->priv; @@ -568,8 +570,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("sigma: ftdi_usb_open failed: %s", + ftdi_get_error_string(&sigma->ftdic)); return 0; } @@ -579,8 +581,7 @@ static int hw_opendev(int device_index) return SR_OK; } -static int set_samplerate(struct sr_device_instance *sdi, - uint64_t samplerate) +static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate) { int i, ret; struct sigma *sigma = sdi->priv; @@ -610,7 +611,7 @@ static int set_samplerate(struct sr_device_instance *sdi, sigma->samples_per_event = 16 / sigma->num_probes; sigma->state.state = SIGMA_IDLE; - sr_info("Firmware uploaded"); + sr_info("sigma: Firmware uploaded"); return ret; } @@ -623,7 +624,7 @@ static int set_samplerate(struct sr_device_instance *sdi, * The Sigma supports complex triggers using boolean expressions, but this * has not been implemented yet. */ -static int configure_probes(struct sr_device_instance *sdi, GSList *probes) +static int configure_probes(struct sr_dev_inst *sdi, GSList *probes) { struct sigma *sigma = sdi->priv; struct sr_probe *probe; @@ -643,8 +644,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("sigma: ASIX SIGMA only supports a single " + "pin trigger in 100 and 200MHz mode."); return SR_ERR; } if (probe->trigger[0] == 'f') @@ -652,9 +653,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("sigma: ASIX SIGMA only supports " + "rising/falling trigger in 100 " + "and 200MHz mode."); return SR_ERR; } @@ -684,8 +685,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("sigma: ASIX SIGMA only supports 1 " + "rising/falling triggers."); return SR_ERR; } } @@ -699,10 +700,10 @@ static int configure_probes(struct sr_device_instance *sdi, GSList *probes) static int hw_closedev(int device_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct sigma *sigma; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { sr_err("sigma: %s: sdi was NULL", __func__); return SR_ERR; /* TODO: SR_ERR_ARG? */ } @@ -721,30 +722,36 @@ static int hw_closedev(int device_index) return SR_OK; } -static void hw_cleanup(void) +static int hw_cleanup(void) { GSList *l; - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; + int ret = SR_OK; /* Properly close all devices. */ - for (l = device_instances; l; l = l->next) { - sdi = l->data; - if (sdi->priv != NULL) - free(sdi->priv); - sr_device_instance_free(sdi); + for (l = dev_insts; l; l = l->next) { + if (!(sdi = l->data)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("sigma: %s: sdi was NULL, continuing", __func__); + ret = SR_ERR_BUG; + continue; + } + sr_dev_inst_free(sdi); } - g_slist_free(device_instances); - device_instances = NULL; + g_slist_free(dev_insts); + dev_insts = NULL; + + return ret; } static void *hw_get_device_info(int device_index, int device_info_id) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct sigma *sigma; void *info = NULL; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { - sr_err("It's NULL.\n"); + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { + sr_err("sigma: %s: sdi was NULL", __func__); return NULL; } @@ -776,9 +783,9 @@ static void *hw_get_device_info(int device_index, int device_info_id) static int hw_get_status(int device_index) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; - sdi = sr_get_device_instance(device_instances, device_index); + sdi = sr_dev_inst_get(dev_insts, device_index); if (sdi) return sdi->status; else @@ -792,11 +799,11 @@ static int *hw_get_capabilities(void) static int hw_set_configuration(int device_index, int capability, void *value) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct sigma *sigma; int ret; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) return SR_ERR; sigma = sdi->priv; @@ -868,7 +875,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, uint16_t *lastsample, int triggerpos, uint16_t limit_chunk, void *session_data) { - struct sr_device_instance *sdi = session_data; + struct sr_dev_inst *sdi = session_data; struct sigma *sigma = sdi->priv; uint16_t tsdiff, ts; uint16_t samples[65536 * sigma->samples_per_event]; @@ -999,7 +1006,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts, static int receive_data(int fd, int revents, void *session_data) { - struct sr_device_instance *sdi = session_data; + struct sr_dev_inst *sdi = session_data; struct sigma *sigma = sdi->priv; struct sr_datafeed_packet packet; const int chunks_per_read = 32; @@ -1045,7 +1052,7 @@ static int receive_data(int fd, int revents, void *session_data) newchunks = MIN(chunks_per_read, numchunks - sigma->state.chunks_downloaded); - sr_info("Downloading sample data: %.0f %%", + sr_info("sigma: Downloading sample data: %.0f %%", 100.0 * sigma->state.chunks_downloaded / numchunks); bufsz = sigma_read_dram(sigma->state.chunks_downloaded, @@ -1247,7 +1254,7 @@ static int build_basic_trigger(struct triggerlut *lut, struct sigma *sigma) static int hw_start_acquisition(int device_index, gpointer session_data) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct sigma *sigma; struct sr_datafeed_packet packet; struct sr_datafeed_header header; @@ -1260,7 +1267,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data) /* Avoid compiler warnings. */ (void)session_data; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) return SR_ERR; sigma = sdi->priv; @@ -1362,20 +1369,25 @@ static int hw_start_acquisition(int device_index, gpointer session_data) return SR_OK; } -static void hw_stop_acquisition(int device_index, gpointer session_data) +static int hw_stop_acquisition(int device_index, gpointer session_data) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; struct sigma *sigma; uint8_t modestatus; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) - return; - - sigma = sdi->priv; - /* Avoid compiler warnings. */ (void)session_data; + if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { + sr_err("sigma: %s: sdi was NULL", __func__); + return SR_ERR_BUG; + } + + if (!(sigma = sdi->priv)) { + sr_err("sigma: %s: sdi->priv was NULL", __func__); + return SR_ERR_BUG; + } + /* Stop acquisition. */ sigma_set_register(WRITE_MODE, 0x11, sigma); @@ -1387,15 +1399,16 @@ static void hw_stop_acquisition(int device_index, gpointer session_data) /* Check if trigger has fired. */ modestatus = sigma_get_register(READ_MODE, sigma); - if (modestatus & 0x20) { + if (modestatus & 0x20) sigma->state.triggerchunk = sigma->state.triggerpos / 512; - - } else + else sigma->state.triggerchunk = -1; sigma->state.chunks_downloaded = 0; sigma->state.state = SIGMA_DOWNLOAD; + + return SR_OK; } SR_PRIV struct sr_device_plugin asix_sigma_plugin_info = {