hantek-dso: use per-device firmware filenames

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

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 4b0dfe37708819b3e061c3111bc588d0331c8c8b..2a9fac3faf52787c54871ffde5ca2e731f6c8cac 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -37,9 +37,9 @@
 /* TODO tune this properly */
 #define TICK 1
 
-static const int hwcaps[] = {
+static const int devopts[] = {
        SR_CONF_OSCILLOSCOPE,
-       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_LIMIT_FRAMES,
        SR_CONF_CONTINUOUS,
        SR_CONF_TIMEBASE,
        SR_CONF_BUFFERSIZE,
@@ -60,19 +60,19 @@ static const char *probe_names[] = {
 static const struct dso_profile dev_profiles[] = {
        {       0x04b4, 0x2090, 0x04b5, 0x2090,
                "Hantek", "DSO-2090",
-               FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+               FIRMWARE_DIR "/hantek-dso-2090.fw" },
        {       0x04b4, 0x2150, 0x04b5, 0x2150,
                "Hantek", "DSO-2150",
-               FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+               FIRMWARE_DIR "/hantek-dso-2150.fw" },
        {       0x04b4, 0x2250, 0x04b5, 0x2250,
                "Hantek", "DSO-2250",
-               FIRMWARE_DIR "/hantek-dso-2xxx.fw" },
+               FIRMWARE_DIR "/hantek-dso-2250.fw" },
        {       0x04b4, 0x5200, 0x04b5, 0x5200,
                "Hantek", "DSO-5200",
-               FIRMWARE_DIR "/hantek-dso-5xxx.fw" },
+               FIRMWARE_DIR "/hantek-dso-5200.fw" },
        {       0x04b4, 0x520a, 0x04b5, 0x520a,
                "Hantek", "DSO-5200A",
-               FIRMWARE_DIR "/hantek-dso-5xxx.fw" },
+               FIRMWARE_DIR "/hantek-dso-5200A.fw" },
        { 0, 0, 0, 0, 0, 0, 0 },
 };
 
@@ -535,7 +535,7 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
-               *data = hwcaps;
+               *data = devopts;
                break;
        case SR_CONF_BUFFERSIZE:
                *data = buffersizes;
@@ -830,8 +830,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                                    void *cb_data)
 {
        const struct libusb_pollfd **lupfd;
-       struct sr_datafeed_packet packet;
-       struct sr_datafeed_header header;
        struct dev_context *devc;
        struct drv_context *drvc = di->priv;
        int i;
@@ -861,11 +859,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        free(lupfd);
 
        /* Send header packet to the session bus. */
-       packet.type = SR_DF_HEADER;
-       packet.payload = (unsigned char *)&header;
-       header.feed_version = 1;
-       gettimeofday(&header.starttime, NULL);
-       sr_session_send(cb_data, &packet);
+       std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
        return SR_OK;
 }
@@ -894,6 +888,7 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
+       .config_get = NULL,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,