X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fprotocol.c;h=36a091c731d83ff2b7b9f4582dee87db7524e856;hp=eb848cf9b8c4f5fe0e17bba769611aa62eb6f15a;hb=0ccc6f7cdf3ce1a3ac1f9116b1524f2b326dd6be;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52 diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c index eb848cf9..36a091c7 100644 --- a/src/hardware/openbench-logic-sniffer/protocol.c +++ b/src/hardware/openbench-logic-sniffer/protocol.c @@ -20,8 +20,6 @@ #include #include "protocol.h" -extern SR_PRIV struct sr_dev_driver ols_driver_info; - SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial, uint8_t command) { @@ -59,6 +57,18 @@ SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial, return SR_OK; } +SR_PRIV int ols_send_reset(struct sr_serial_dev_inst *serial) +{ + unsigned int i; + + for (i = 0; i < 5; i++) { + if (send_shortcommand(serial, CMD_RESET) != SR_OK) + return SR_ERR; + } + + return SR_OK; +} + /* Configures the channel mask based on which channels are enabled. */ SR_PRIV void ols_channel_mask(const struct sr_dev_inst *sdi) { @@ -124,24 +134,50 @@ SR_PRIV struct dev_context *ols_dev_new(void) struct dev_context *devc; devc = g_malloc0(sizeof(struct dev_context)); - - /* Device-specific settings */ - devc->max_samples = devc->max_samplerate = devc->protocol_version = 0; - - /* Acquisition settings */ - devc->limit_samples = devc->capture_ratio = 0; devc->trigger_at = -1; - devc->channel_mask = 0xffffffff; - devc->flag_reg = 0; return devc; } +static void ols_channel_new(struct sr_dev_inst *sdi, int num_chan) +{ + struct dev_context *devc = sdi->priv; + int i; + + for (i = 0; i < num_chan; i++) + sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, + ols_channel_names[i]); + + devc->max_channels = num_chan; +} + +static void metadata_quirks(struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + gboolean is_shrimp; + + if (!sdi) + return; + devc = sdi->priv; + if (!devc) + return; + + is_shrimp = sdi->model && strcmp(sdi->model, "Shrimp1.0") == 0; + if (is_shrimp) { + if (!devc->max_channels) + ols_channel_new(sdi, 4); + if (!devc->max_samples) + devc->max_samples = 256 * 1024; + if (!devc->max_samplerate) + devc->max_samplerate = SR_MHZ(20); + } +} + SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) { struct sr_dev_inst *sdi; struct dev_context *devc; - uint32_t tmp_int, ui; + uint32_t tmp_int; uint8_t key, type, token; int delay_ms; GString *tmp_str, *devname, *version; @@ -149,7 +185,6 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; - sdi->driver = &ols_driver_info; devc = ols_dev_new(); sdi->priv = devc; @@ -213,9 +248,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) switch (token) { case 0x00: /* Number of usable channels */ - for (ui = 0; ui < tmp_int; ui++) - sr_channel_new(sdi, ui, SR_CHANNEL_LOGIC, TRUE, - ols_channel_names[ui]); + ols_channel_new(sdi, tmp_int); break; case 0x01: /* Amount of sample memory available (bytes) */ @@ -249,9 +282,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) switch (token) { case 0x00: /* Number of usable channels */ - for (ui = 0; ui < tmp_c; ui++) - sr_channel_new(sdi, ui, SR_CHANNEL_LOGIC, TRUE, - ols_channel_names[ui]); + ols_channel_new(sdi, tmp_c); break; case 0x01: /* protocol version */ @@ -274,6 +305,9 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) g_string_free(devname, FALSE); g_string_free(version, FALSE); + /* Optionally amend received metadata, model specific quirks. */ + metadata_quirks(sdi); + return sdi; } @@ -290,13 +324,11 @@ SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi, sr_info("Enabling demux mode."); devc->flag_reg |= FLAG_DEMUX; devc->flag_reg &= ~FLAG_FILTER; - devc->max_channels = NUM_CHANNELS / 2; devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1; } else { sr_info("Disabling demux mode."); devc->flag_reg &= ~FLAG_DEMUX; devc->flag_reg |= FLAG_FILTER; - devc->max_channels = NUM_CHANNELS; devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1; } @@ -315,15 +347,12 @@ SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi, SR_PRIV void abort_acquisition(const struct sr_dev_inst *sdi) { - struct sr_datafeed_packet packet; struct sr_serial_dev_inst *serial; serial = sdi->conn; serial_source_remove(sdi->session, serial); - /* Terminate session */ - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + std_session_send_df_end(sdi); } SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) @@ -344,16 +373,12 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) serial = sdi->conn; devc = sdi->priv; + if (devc->num_transfers == 0 && revents == 0) { + /* Ignore timeouts as long as we haven't received anything */ + return TRUE; + } + if (devc->num_transfers++ == 0) { - /* - * First time round, means the device started sending data, - * and will not stop until done. If it stops sending for - * longer than it takes to send a byte, that means it's - * finished. We'll double that to 30ms to be sure... - */ - serial_source_remove(sdi->session, serial); - serial_source_add(sdi->session, serial, G_IO_IN, 30, - ols_receive_data, cb_data); devc->raw_sample_buf = g_try_malloc(devc->limit_samples * 4); if (!devc->raw_sample_buf) { sr_err("Sample buffer malloc failed."); @@ -364,7 +389,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) } num_ols_changrp = 0; - for (i = NUM_CHANNELS; i > 0x02; i /= 2) { + for (i = 0x20; i > 0x02; i >>= 1) { if ((devc->flag_reg & i) == 0) { num_ols_changrp++; } @@ -479,12 +504,11 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) logic.unitsize = 4; logic.data = devc->raw_sample_buf + (devc->limit_samples - devc->num_samples) * 4; - sr_session_send(cb_data, &packet); + sr_session_send(sdi, &packet); } /* Send the trigger. */ - packet.type = SR_DF_TRIGGER; - sr_session_send(cb_data, &packet); + std_session_send_df_trigger(sdi); /* Send post-trigger samples. */ packet.type = SR_DF_LOGIC; @@ -493,7 +517,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) logic.unitsize = 4; logic.data = devc->raw_sample_buf + devc->trigger_at * 4 + (devc->limit_samples - devc->num_samples) * 4; - sr_session_send(cb_data, &packet); + sr_session_send(sdi, &packet); } else { /* no trigger was used */ packet.type = SR_DF_LOGIC; @@ -502,7 +526,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) logic.unitsize = 4; logic.data = devc->raw_sample_buf + (devc->limit_samples - devc->num_samples) * 4; - sr_session_send(cb_data, &packet); + sr_session_send(sdi, &packet); } g_free(devc->raw_sample_buf);