X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fchronovu-la8.c;h=6d639af7cb2982a3c648180c2da20be12b49920e;hb=9fc6aa0a566d093b36cdbdad46e0cbdc116ff538;hp=ad8c3601f8e150179d8b16e97f84dc4e51684b58;hpb=ca070ed9a0237e5cea10e5dd974e06da62de890d;p=libsigrok.git diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c index ad8c3601..6d639af7 100644 --- a/hardware/chronovu-la8/chronovu-la8.c +++ b/hardware/chronovu-la8/chronovu-la8.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "sigrok.h" #include "sigrok-internal.h" @@ -135,7 +136,7 @@ static int capabilities[] = { /* Function prototypes. */ static int la8_close_usb_reset_sequencer(struct la8 *la8); -static void hw_stop_acquisition(int device_index, gpointer session_data); +static int hw_stop_acquisition(int device_index, gpointer session_data); static int la8_reset(struct la8 *la8); static void fill_supported_samplerates_if_needed(void) @@ -169,8 +170,8 @@ static int is_valid_samplerate(uint64_t samplerate) return 1; } - sr_warn("la8: %s: invalid samplerate (%" PRIu64 "Hz)", - __func__, samplerate); + sr_err("la8: %s: invalid samplerate (%" PRIu64 "Hz)", + __func__, samplerate); return 0; } @@ -236,12 +237,12 @@ static int la8_write(struct la8 *la8, uint8_t *buf, int size) bytes_written = ftdi_write_data(la8->ftdic, buf, size); if (bytes_written < 0) { - sr_warn("la8: %s: ftdi_write_data: (%d) %s", __func__, - bytes_written, ftdi_get_error_string(la8->ftdic)); + sr_err("la8: %s: ftdi_write_data: (%d) %s", __func__, + bytes_written, ftdi_get_error_string(la8->ftdic)); (void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */ } else if (bytes_written != size) { - sr_warn("la8: %s: bytes to write: %d, bytes written: %d", - __func__, size, bytes_written); + sr_err("la8: %s: bytes to write: %d, bytes written: %d", + __func__, size, bytes_written); (void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */ } @@ -283,11 +284,11 @@ static int la8_read(struct la8 *la8, uint8_t *buf, int size) bytes_read = ftdi_read_data(la8->ftdic, buf, size); if (bytes_read < 0) { - sr_warn("la8: %s: ftdi_read_data: (%d) %s", __func__, - bytes_read, ftdi_get_error_string(la8->ftdic)); + sr_err("la8: %s: ftdi_read_data: (%d) %s", __func__, + bytes_read, ftdi_get_error_string(la8->ftdic)); } else if (bytes_read != size) { - // sr_warn("la8: %s: bytes to read: %d, bytes read: %d", - // __func__, size, bytes_read); + // sr_err("la8: %s: bytes to read: %d, bytes read: %d", + // __func__, size, bytes_read); } return bytes_read; @@ -308,8 +309,8 @@ static int la8_close(struct la8 *la8) } if ((ret = ftdi_usb_close(la8->ftdic)) < 0) { - sr_warn("la8: %s: ftdi_usb_close: (%d) %s", - __func__, ret, ftdi_get_error_string(la8->ftdic)); + sr_err("la8: %s: ftdi_usb_close: (%d) %s", + __func__, ret, ftdi_get_error_string(la8->ftdic)); } return ret; @@ -327,8 +328,6 @@ static int la8_close_usb_reset_sequencer(struct la8 *la8) uint8_t buf[8] = {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}; int ret; - sr_spew("la8: entering %s", __func__); - if (!la8) { sr_err("la8: %s: la8 was NULL", __func__); return SR_ERR_ARG; @@ -350,16 +349,14 @@ static int la8_close_usb_reset_sequencer(struct la8 *la8) /* Log errors, but ignore them (i.e., don't abort). */ if ((ret = ftdi_usb_purge_buffers(la8->ftdic)) < 0) - sr_warn("la8: %s: ftdi_usb_purge_buffers: (%d) %s", + sr_err("la8: %s: ftdi_usb_purge_buffers: (%d) %s", __func__, ret, ftdi_get_error_string(la8->ftdic)); if ((ret = ftdi_usb_reset(la8->ftdic)) < 0) - sr_warn("la8: %s: ftdi_usb_reset: (%d) %s", __func__, - ret, ftdi_get_error_string(la8->ftdic)); + sr_err("la8: %s: ftdi_usb_reset: (%d) %s", __func__, + ret, ftdi_get_error_string(la8->ftdic)); if ((ret = ftdi_usb_close(la8->ftdic)) < 0) - sr_warn("la8: %s: ftdi_usb_close: (%d) %s", __func__, - ret, ftdi_get_error_string(la8->ftdic)); - } else { - sr_spew("la8: %s: usb_dev was NULL, nothing to do", __func__); + sr_err("la8: %s: ftdi_usb_close: (%d) %s", __func__, + ret, ftdi_get_error_string(la8->ftdic)); } ftdi_free(la8->ftdic); /* Returns void. */ @@ -476,8 +473,6 @@ static int hw_init(const char *deviceinfo) struct sr_device_instance *sdi; struct la8 *la8; - sr_spew("la8: entering %s", __func__); - /* Avoid compiler errors. */ (void)deviceinfo; @@ -518,15 +513,13 @@ static int hw_init(const char *deviceinfo) /* Check for the device and temporarily open it. */ if ((ret = ftdi_usb_open_desc(la8->ftdic, USB_VENDOR_ID, USB_PRODUCT_ID, USB_DESCRIPTION, NULL)) < 0) { - sr_dbg("la8: %s: ftdi_usb_open_desc: (%d) %s", - __func__, ret, ftdi_get_error_string(la8->ftdic)); (void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */ goto err_free_ftdic; } sr_dbg("la8: found device"); /* Register the device with libsigrok. */ - sdi = sr_device_instance_new(0, SR_ST_INITIALIZING, + sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING, USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); if (!sdi) { sr_err("la8: %s: sr_device_instance_new failed", __func__); @@ -563,7 +556,7 @@ static int hw_opendev(int device_index) struct sr_device_instance *sdi; struct la8 *la8; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); return SR_ERR; /* TODO: SR_ERR_ARG? */ } @@ -650,7 +643,7 @@ static int hw_closedev(int device_index) struct sr_device_instance *sdi; struct la8 *la8; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); return SR_ERR; /* TODO: SR_ERR_ARG? */ } @@ -678,34 +671,26 @@ 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; - - sr_spew("la8: entering %s", __func__); + int ret = SR_OK; /* Properly close all devices. */ for (l = device_instances; l; l = l->next) { - if ((sdi = l->data) == NULL) { - sr_warn("la8: %s: sdi was NULL, continuing", __func__); + if (!(sdi = l->data)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("la8: %s: sdi was NULL, continuing", __func__); + ret = SR_ERR_BUG; continue; } -#if 0 - /* - * Fixes a segfault as it's free()d elsewhere already. - * TODO: Document who is supposed to free this, and when. - */ - if (sdi->priv != NULL) - free(sdi->priv); - else - sr_warn("la8: %s: sdi->priv was NULL, nothing " - "to do", __func__); -#endif - sr_device_instance_free(sdi); /* Returns void. */ + sr_dev_inst_free(sdi); /* Returns void. */ } g_slist_free(device_instances); /* Returns void. */ device_instances = NULL; + + return ret; } static void *hw_get_device_info(int device_index, int device_info_id) @@ -716,7 +701,7 @@ static void *hw_get_device_info(int device_index, int device_info_id) sr_spew("la8: entering %s", __func__); - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); return NULL; } @@ -760,8 +745,8 @@ static int hw_get_status(int device_index) { struct sr_device_instance *sdi; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { - sr_warn("la8: %s: sdi was NULL, device not found", __func__); + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { + sr_err("la8: %s: sdi was NULL, device not found", __func__); return SR_ST_NOT_FOUND; } @@ -784,7 +769,7 @@ static int hw_set_configuration(int device_index, int capability, void *value) sr_spew("la8: entering %s", __func__); - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); return SR_ERR; /* TODO: SR_ERR_ARG? */ } @@ -869,7 +854,7 @@ static int la8_read_block(struct la8 *la8) /* Check if block read was successful or a timeout occured. */ if (bytes_read != BS) { - sr_warn("la8: %s: trigger timed out", __func__); + sr_err("la8: %s: trigger timed out", __func__); (void) la8_reset(la8); /* Ignore errors. */ return SR_ERR; } @@ -1038,7 +1023,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data) sr_spew("la8: entering %s", __func__); - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); return SR_ERR; /* TODO: SR_ERR_ARG? */ } @@ -1088,7 +1073,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data) gettimeofday(&header.starttime, NULL); header.samplerate = la8->cur_samplerate; header.num_logic_probes = NUM_PROBES; - header.num_analog_probes = 0; sr_session_bus(session_data, &packet); /* Time when we should be done (for detecting trigger timeouts). */ @@ -1103,7 +1087,7 @@ 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 la8 *la8; @@ -1111,20 +1095,22 @@ static void hw_stop_acquisition(int device_index, gpointer session_data) sr_dbg("la8: stopping acquisition"); - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); - return; + return SR_ERR_BUG; } if (!(la8 = sdi->priv)) { sr_err("la8: %s: sdi->priv was NULL", __func__); - return; + return SR_ERR_BUG; } /* Send end packet to the session bus. */ sr_dbg("la8: %s: sending SR_DF_END", __func__); packet.type = SR_DF_END; sr_session_bus(session_data, &packet); + + return SR_OK; } SR_PRIV struct sr_device_plugin chronovu_la8_plugin_info = {