X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fprotocol.c;h=bedf29500f841ececadce828bcd0eb57a6e4232f;hp=4101995e53ba310a4c84764919c5cce352413a67;hb=29f15d52cb1c2ab6b284ebe04f57f71bcffc5506;hpb=6f9234e6f33374a6cc113ad2f4a5e77fd8a52c33 diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c index 4101995e..bedf2950 100644 --- a/src/hardware/openbench-logic-sniffer/protocol.c +++ b/src/hardware/openbench-logic-sniffer/protocol.c @@ -151,7 +151,7 @@ static void ols_channel_new(struct sr_dev_inst *sdi, int num_chan) devc->max_channels = num_chan; } -static void metadata_quirks(struct sr_dev_inst *sdi) +static void ols_metadata_quirks(struct sr_dev_inst *sdi) { struct dev_context *devc; gboolean is_shrimp; @@ -302,7 +302,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial) g_string_free(version, FALSE); /* Optionally amend received metadata, model specific quirks. */ - metadata_quirks(sdi); + ols_metadata_quirks(sdi); return sdi; } @@ -346,6 +346,8 @@ SR_PRIV void abort_acquisition(const struct sr_dev_inst *sdi) struct sr_serial_dev_inst *serial; serial = sdi->conn; + ols_send_reset(serial); + serial_source_remove(sdi->session, serial); std_session_send_df_end(sdi); @@ -461,7 +463,8 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data) } } memcpy(devc->sample, devc->tmp_sample, 4); - sr_spew("Expanded sample: 0x%.8x.", sample); + sr_spew("Expanded sample: 0x%.2hhx%.2hhx%.2hhx%.2hhx ", + devc->sample[3], devc->sample[2], devc->sample[1], devc->sample[0]); } /*