X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fchronovu-la8.c;h=cfca8e3dea36d467bfef1edadc7fbf5bf5a49aa7;hb=ae32d7d759f5722f9d82a2da8ec4bbdebcfd029b;hp=67f0ecea6ab9ebd726f48429a48d8288b8765318;hpb=f36cbf60cbd43be46ede083265549068db21f4b6;p=libsigrok.git diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c index 67f0ecea..cfca8e3d 100644 --- a/hardware/chronovu-la8/chronovu-la8.c +++ b/hardware/chronovu-la8/chronovu-la8.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #define USB_VENDOR_ID 0x0403 #define USB_PRODUCT_ID 0x6001 @@ -41,6 +41,18 @@ static GSList *device_instances = NULL; +static const char *probe_names[NUM_PROBES + 1] = { + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + NULL, +}; + struct la8 { /** FTDI device context (used by libftdi). */ struct ftdi_context *ftdic; @@ -48,6 +60,9 @@ struct la8 { /** The currently configured samplerate of the device. */ uint64_t cur_samplerate; + /** period in picoseconds corresponding to the samplerate */ + uint64_t period_ps; + /** The current sampling limit (in ms). */ uint64_t limit_msec; @@ -123,7 +138,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_device_id); +static void hw_stop_acquisition(int device_index, gpointer session_data); static int la8_reset(struct la8 *la8); static void fill_supported_samplerates_if_needed(void) @@ -315,7 +330,7 @@ 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_dbg("la8: entering %s", __func__); + sr_spew("la8: entering %s", __func__); if (!la8) { sr_err("la8: %s: la8 was NULL", __func__); @@ -347,7 +362,7 @@ static int la8_close_usb_reset_sequencer(struct la8 *la8) sr_warn("la8: %s: ftdi_usb_close: (%d) %s", __func__, ret, ftdi_get_error_string(la8->ftdic)); } else { - sr_dbg("la8: %s: usb_dev was NULL, nothing to do", __func__); + sr_spew("la8: %s: usb_dev was NULL, nothing to do", __func__); } ftdi_free(la8->ftdic); /* Returns void. */ @@ -464,21 +479,21 @@ static int hw_init(const char *deviceinfo) struct sr_device_instance *sdi; struct la8 *la8; - sr_dbg("la8: entering %s", __func__); + sr_spew("la8: entering %s", __func__); /* Avoid compiler errors. */ - deviceinfo = deviceinfo; + (void)deviceinfo; /* Allocate memory for our private driver context. */ if (!(la8 = g_try_malloc(sizeof(struct la8)))) { sr_err("la8: %s: struct la8 malloc failed", __func__); - ret = SR_ERR_MALLOC; goto err_free_nothing; } /* Set some sane defaults. */ la8->ftdic = NULL; la8->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */ + la8->period_ps = 10000; la8->limit_msec = 0; la8->limit_samples = 0; la8->session_id = NULL; @@ -495,24 +510,21 @@ static int hw_init(const char *deviceinfo) /* Allocate memory where we'll store the de-mangled data. */ if (!(la8->final_buf = g_try_malloc(SDRAM_SIZE))) { sr_err("la8: %s: final_buf malloc failed", __func__); - ret = SR_ERR_MALLOC; goto err_free_la8; } /* Allocate memory for the FTDI context (ftdic) and initialize it. */ if (!(la8->ftdic = ftdi_new())) { sr_err("la8: %s: ftdi_new failed", __func__); - ret = SR_ERR; /* TODO: More specific error? */ goto err_free_final_buf; } /* 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_err("la8: %s: ftdi_usb_open_desc: (%d) %s", + 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. */ - ret = SR_ERR; /* TODO: More specific error? */ goto err_free_ftdic; } sr_dbg("la8: found device"); @@ -522,7 +534,6 @@ static int hw_init(const char *deviceinfo) USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); if (!sdi) { sr_err("la8: %s: sr_device_instance_new failed", __func__); - ret = SR_ERR; /* TODO: More specific error? */ goto err_close_ftdic; } @@ -530,12 +541,11 @@ static int hw_init(const char *deviceinfo) device_instances = g_slist_append(device_instances, sdi); - sr_dbg("la8: %s finished successfully", __func__); + sr_spew("la8: %s finished successfully", __func__); /* Close device. We'll reopen it again when we need it. */ (void) la8_close(la8); /* Log, but ignore errors. */ - // return SR_OK; /* TODO */ return 1; err_close_ftdic: @@ -547,7 +557,7 @@ err_free_final_buf: err_free_la8: g_free(la8); err_free_nothing: - // return ret; /* TODO */ + return 0; } @@ -623,7 +633,7 @@ static int set_samplerate(struct sr_device_instance *sdi, uint64_t samplerate) return SR_ERR_ARG; } - sr_dbg("la8: setting samplerate"); + sr_spew("la8: setting samplerate"); fill_supported_samplerates_if_needed(); @@ -633,6 +643,7 @@ static int set_samplerate(struct sr_device_instance *sdi, uint64_t samplerate) /* Set the new samplerate. */ la8->cur_samplerate = samplerate; + la8->period_ps = 1000000000000 / samplerate; sr_dbg("la8: samplerate set to %" PRIu64 "Hz", la8->cur_samplerate); @@ -661,7 +672,7 @@ static int hw_closedev(int device_index) /* TODO: Really ignore errors here, or return SR_ERR? */ (void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */ } else { - sr_dbg("la8: %s: status not ACTIVE, nothing to do", __func__); + sr_spew("la8: %s: status not ACTIVE, nothing to do", __func__); } sdi->status = SR_ST_INACTIVE; @@ -677,7 +688,7 @@ static void hw_cleanup(void) GSList *l; struct sr_device_instance *sdi; - sr_dbg("la8: entering %s", __func__); + sr_spew("la8: entering %s", __func__); /* Properly close all devices. */ for (l = device_instances; l; l = l->next) { @@ -685,11 +696,17 @@ static void hw_cleanup(void) sr_warn("la8: %s: sdi was NULL, continuing", __func__); 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. */ } g_slist_free(device_instances); /* Returns void. */ @@ -702,7 +719,7 @@ static void *hw_get_device_info(int device_index, int device_info_id) struct la8 *la8; void *info; - sr_dbg("la8: entering %s", __func__); + sr_spew("la8: entering %s", __func__); if (!(sdi = sr_get_device_instance(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); @@ -721,6 +738,9 @@ static void *hw_get_device_info(int device_index, int device_info_id) case SR_DI_NUM_PROBES: info = GINT_TO_POINTER(NUM_PROBES); break; + case SR_DI_PROBE_NAMES: + info = probe_names; + break; case SR_DI_SAMPLERATES: fill_supported_samplerates_if_needed(); info = &samplerates; @@ -757,7 +777,7 @@ static int hw_get_status(int device_index) static int *hw_get_capabilities(void) { - sr_dbg("la8: entering %s", __func__); + sr_spew("la8: entering %s", __func__); return capabilities; } @@ -767,7 +787,7 @@ static int hw_set_configuration(int device_index, int capability, void *value) struct sr_device_instance *sdi; struct la8 *la8; - sr_dbg("la8: entering %s", __func__); + sr_spew("la8: entering %s", __func__); if (!(sdi = sr_get_device_instance(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); @@ -838,14 +858,14 @@ static int la8_read_block(struct la8 *la8) return SR_ERR_ARG; } - // sr_dbg("la8: %s: reading block %d", __func__, la8->block_counter); + sr_spew("la8: %s: reading block %d", __func__, la8->block_counter); bytes_read = la8_read(la8, la8->mangled_buf, BS); /* If first block read got 0 bytes, retry until success or timeout. */ if ((bytes_read == 0) && (la8->block_counter == 0)) { do { - // sr_dbg("la8: %s: reading block 0 again", __func__); + sr_spew("la8: %s: reading block 0 again", __func__); bytes_read = la8_read(la8, la8->mangled_buf, BS); /* TODO: How to handle read errors here? */ now = time(NULL); @@ -860,7 +880,7 @@ static int la8_read_block(struct la8 *la8) } /* De-mangle the data. */ - // sr_dbg("la8: de-mangling samples of block %d", la8->block_counter); + sr_spew("la8: de-mangling samples of block %d", la8->block_counter); byte_offset = la8->block_counter * BS; m = byte_offset / (1024 * 1024); mi = m * (1024 * 1024); @@ -879,6 +899,7 @@ static void send_block_to_session_bus(struct la8 *la8, int block) int i; uint8_t sample, expected_sample; struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; int trigger_point; /* Relative trigger point (in this block). */ /* Note: No sanity checks on la8/block, caller is responsible. */ @@ -911,12 +932,15 @@ static void send_block_to_session_bus(struct la8 *la8, int block) /* If no trigger was found, send one SR_DF_LOGIC packet. */ if (trigger_point == -1) { /* Send an SR_DF_LOGIC packet to the session bus. */ - // sr_dbg("la8: sending SR_DF_LOGIC packet (%d bytes) for " - // "block %d", BS, block); + sr_spew("la8: sending SR_DF_LOGIC packet (%d bytes) for " + "block %d", BS, block); packet.type = SR_DF_LOGIC; - packet.length = BS; - packet.unitsize = 1; - packet.payload = la8->final_buf + (block * BS); + packet.timeoffset = block * BS * la8->period_ps; + packet.duration = BS * la8->period_ps; + packet.payload = &logic; + logic.length = BS; + logic.unitsize = 1; + logic.data = la8->final_buf + (block * BS); sr_session_bus(la8->session_id, &packet); return; } @@ -933,50 +957,56 @@ static void send_block_to_session_bus(struct la8 *la8, int block) /* If at least one sample is located before the trigger... */ if (trigger_point > 0) { /* Send pre-trigger SR_DF_LOGIC packet to the session bus. */ - sr_dbg("la8: sending pre-trigger SR_DF_LOGIC packet, " + sr_spew("la8: sending pre-trigger SR_DF_LOGIC packet, " "start = %d, length = %d", block * BS, trigger_point); packet.type = SR_DF_LOGIC; - packet.length = trigger_point; - packet.unitsize = 1; - packet.payload = la8->final_buf + (block * BS); + packet.timeoffset = block * BS * la8->period_ps; + packet.duration = trigger_point * la8->period_ps; + packet.payload = &logic; + logic.length = trigger_point; + logic.unitsize = 1; + logic.data = la8->final_buf + (block * BS); sr_session_bus(la8->session_id, &packet); } /* Send the SR_DF_TRIGGER packet to the session bus. */ - sr_dbg("la8: sending SR_DF_TRIGGER packet, sample = %d", + sr_spew("la8: sending SR_DF_TRIGGER packet, sample = %d", (block * BS) + trigger_point); packet.type = SR_DF_TRIGGER; - packet.length = 0; - packet.unitsize = 0; + packet.timeoffset = (block * BS + trigger_point) * la8->period_ps; + packet.duration = 0; packet.payload = NULL; sr_session_bus(la8->session_id, &packet); /* If at least one sample is located after the trigger... */ if (trigger_point < (BS - 1)) { /* Send post-trigger SR_DF_LOGIC packet to the session bus. */ - sr_dbg("la8: sending post-trigger SR_DF_LOGIC packet, " - "start = %d, length = %d", + sr_spew("la8: sending post-trigger SR_DF_LOGIC packet, " + "start = %d, length = %d", (block * BS) + trigger_point, BS - trigger_point); packet.type = SR_DF_LOGIC; - packet.length = BS - trigger_point; - packet.unitsize = 1; - packet.payload = la8->final_buf + (block * BS) + trigger_point; + packet.timeoffset = (block * BS + trigger_point) * la8->period_ps; + packet.duration = (BS - trigger_point) * la8->period_ps; + packet.payload = &logic; + logic.length = BS - trigger_point; + logic.unitsize = 1; + logic.data = la8->final_buf + (block * BS) + trigger_point; sr_session_bus(la8->session_id, &packet); } } -static int receive_data(int fd, int revents, void *user_data) +static int receive_data(int fd, int revents, void *session_data) { int i, ret; struct sr_device_instance *sdi; struct la8 *la8; /* Avoid compiler errors. */ - fd = fd; - revents = revents; + (void)fd; + (void)revents; - if (!(sdi = user_data)) { - sr_err("la8: %s: user_data was NULL", __func__); + if (!(sdi = session_data)) { + sr_err("la8: %s: session_data was NULL", __func__); return FALSE; } @@ -988,7 +1018,7 @@ static int receive_data(int fd, int revents, void *user_data) /* Get one block of data. */ if ((ret = la8_read_block(la8)) < 0) { sr_err("la8: %s: la8_read_block error: %d", __func__, ret); - hw_stop_acquisition(sdi->index, user_data); + hw_stop_acquisition(sdi->index, session_data); return FALSE; } @@ -1004,13 +1034,13 @@ static int receive_data(int fd, int revents, void *user_data) for (i = 0; i < NUM_BLOCKS; i++) send_block_to_session_bus(la8, i); - hw_stop_acquisition(sdi->index, user_data); + hw_stop_acquisition(sdi->index, session_data); // return FALSE; /* FIXME? */ return TRUE; } -static int hw_start_acquisition(int device_index, gpointer session_device_id) +static int hw_start_acquisition(int device_index, gpointer session_data) { struct sr_device_instance *sdi; struct la8 *la8; @@ -1019,7 +1049,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) uint8_t buf[4]; int bytes_written; - sr_dbg("la8: entering %s", __func__); + sr_spew("la8: entering %s", __func__); if (!(sdi = sr_get_device_instance(device_instances, device_index))) { sr_err("la8: %s: sdi was NULL", __func__); @@ -1061,21 +1091,18 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) sr_dbg("la8: acquisition started successfully"); - la8->session_id = session_device_id; + la8->session_id = session_data; /* Send header packet to the session bus. */ sr_dbg("la8: %s: sending SR_DF_HEADER", __func__); packet.type = SR_DF_HEADER; - packet.length = sizeof(struct sr_datafeed_header); - packet.unitsize = 0; packet.payload = &header; header.feed_version = 1; gettimeofday(&header.starttime, NULL); header.samplerate = la8->cur_samplerate; - header.protocol_id = SR_PROTO_RAW; header.num_logic_probes = NUM_PROBES; header.num_analog_probes = 0; - sr_session_bus(session_device_id, &packet); + sr_session_bus(session_data, &packet); /* Time when we should be done (for detecting trigger timeouts). */ la8->done = (la8->divcount + 1) * 0.08388608 + time(NULL) @@ -1089,7 +1116,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) return SR_OK; } -static void hw_stop_acquisition(int device_index, gpointer session_device_id) +static void hw_stop_acquisition(int device_index, gpointer session_data) { struct sr_device_instance *sdi; struct la8 *la8; @@ -1110,10 +1137,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) /* Send end packet to the session bus. */ sr_dbg("la8: %s: sending SR_DF_END", __func__); packet.type = SR_DF_END; - packet.length = 0; - packet.unitsize = 0; - packet.payload = NULL; - sr_session_bus(session_device_id, &packet); + sr_session_bus(session_data, &packet); } struct sr_device_plugin chronovu_la8_plugin_info = {