hantek-6xxx: properly set encoding digits

[libsigrok.git] / src / hardware / hantek-dso / api.c

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 6162d5c13f022b34ddcbf6501bae618c01fab0b2..4705fd571272532890fc990048497c0c28264d11 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -160,8 +160,6 @@ static const char *coupling[] = {
        "GND",
 };
 
-SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
-
 static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
@@ -169,7 +167,6 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
        struct sr_dev_inst *sdi;
        struct sr_channel *ch;
        struct sr_channel_group *cg;
-       struct drv_context *drvc;
        struct dev_context *devc;
        unsigned int i;
 
@@ -177,7 +174,6 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
        sdi->status = SR_ST_INITIALIZING;
        sdi->vendor = g_strdup(prof->vendor);
        sdi->model = g_strdup(prof->model);
-       sdi->driver = &hantek_dso_driver_info;
 
        /*
         * Add only the real channels -- EXT isn't a source of data, only
@@ -209,8 +205,6 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
        devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
        devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
        sdi->priv = devc;
-       drvc = hantek_dso_driver_info.context;
-       drvc->instances = g_slist_append(drvc->instances, sdi);
 
        return sdi;
 }
@@ -254,11 +248,6 @@ static int dev_clear(const struct sr_dev_driver *di)
        return std_dev_clear(di, clear_dev_context);
 }
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(di, sr_ctx, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct drv_context *drvc;
@@ -355,7 +344,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        }
        libusb_free_device_list(devlist, 1);
 
-       return devices;
+       return std_scan_complete(di, devices);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -699,21 +688,26 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
                int num_samples)
 {
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog_old analog;
+       struct sr_datafeed_analog analog;
+       struct sr_analog_encoding encoding;
+       struct sr_analog_meaning meaning;
+       struct sr_analog_spec spec;
        struct dev_context *devc;
        float ch1, ch2, range;
-       int num_channels, data_offset, i;
+       int num_channels, data_offset;
+       unsigned int i;
 
        devc = sdi->priv;
        num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
-       packet.type = SR_DF_ANALOG_OLD;
+       packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
        /* TODO: support for 5xxx series 9-bit samples */
-       analog.channels = devc->enabled_channels;
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+       analog.meaning->channels = devc->enabled_channels;
        analog.num_samples = num_samples;
-       analog.mq = SR_MQ_VOLTAGE;
-       analog.unit = SR_UNIT_VOLT;
-       analog.mqflags = 0;
+       analog.meaning->mq = SR_MQ_VOLTAGE;
+       analog.meaning->unit = SR_UNIT_VOLT;
+       analog.meaning->mqflags = 0;
        /* TODO: Check malloc return value. */
        analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels);
        data_offset = 0;
@@ -736,13 +730,13 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
                        ch1 = range / 255 * *(buf + i * 2 + 1);
                        /* Value is centered around 0V. */
                        ch1 -= range / 2;
-                       analog.data[data_offset++] = ch1;
+                       ((float *)analog.data)[data_offset++] = ch1;
                }
                if (devc->ch2_enabled) {
                        range = ((float)vdivs[devc->voltage[1]][0] / vdivs[devc->voltage[1]][1]) * 8;
                        ch2 = range / 255 * *(buf + i * 2);
                        ch2 -= range / 2;
-                       analog.data[data_offset++] = ch2;
+                       ((float *)analog.data)[data_offset++] = ch2;
                }
        }
        sr_session_send(sdi, &packet);
@@ -873,7 +867,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                 */
                usb_source_remove(sdi->session, drvc->sr_ctx);
 
-               std_session_send_df_end(sdi, LOG_PREFIX);
+               std_session_send_df_end(sdi);
 
                devc->dev_state = IDLE;
 
@@ -982,7 +976,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        devc->dev_state = CAPTURE;
        usb_source_add(sdi->session, drvc->sr_ctx, TICK, handle_event, (void *)sdi);
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        return SR_OK;
 }
@@ -1000,11 +994,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
+static struct sr_dev_driver hantek_dso_driver_info = {
        .name = "hantek-dso",
        .longname = "Hantek DSO",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
@@ -1018,3 +1012,4 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(hantek_dso_driver_info);