ols: Display actual expanded sample instead of the raw sample

[libsigrok.git] / src / hardware / openbench-logic-sniffer / protocol.c

diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c
index 4f6400477b562848a9ff63892044760e06d137e7..bedf29500f841ececadce828bcd0eb57a6e4232f 100644 (file)
--- 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,7 +346,7 @@ SR_PRIV void abort_acquisition(const struct sr_dev_inst *sdi)
        struct sr_serial_dev_inst *serial;
 
        serial = sdi->conn;
-       send_shortcommand(serial, CMD_RESET);
+       ols_send_reset(serial);
 
        serial_source_remove(sdi->session, serial);
 
@@ -463,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]);
                        }
 
                        /*