configure.ac: Drop std-options, unneeded.

[libsigrok.git] / hardware / link-mso19 / api.c

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 77faf08b79fd4ed2d4918f27b28a9a905e0619bd..94ef39fd49741eb21ea9b67e26db3e739ec597cf 100644 (file)
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -22,6 +22,7 @@
 #include "protocol.h"
 
 static const int hwcaps[] = {
+       SR_CONF_OSCILLOSCOPE,
        SR_CONF_LOGIC_ANALYZER,
        SR_CONF_SAMPLERATE,
        SR_CONF_TRIGGER_SLOPE,
@@ -38,15 +39,15 @@ static const int hwcaps[] = {
  * See also: http://www.linkinstruments.com/images/mso19_1113.gif
  */
 SR_PRIV const char *mso19_probe_names[NUM_PROBES + 1] = {
-       "0", "1", "2", "3", "4", "5", "6", "7", NULL
+       /* Note: DSO needs to be first. */
+       "DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL,
 };
 
-/*supported samplerates */
 static const struct sr_samplerates samplerates = {
-       SR_HZ(100),
-       SR_MHZ(200),
-       SR_HZ(100),
-       NULL,
+       .low  = SR_HZ(100),
+       .high = SR_MHZ(200),
+       .step = SR_HZ(100),
+       .list = NULL,
 };
 
 SR_PRIV struct sr_dev_driver link_mso19_driver_info;
@@ -54,17 +55,7 @@ static struct sr_dev_driver *di = &link_mso19_driver_info;
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-       struct drv_context *drvc;
-
-       if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-               sr_err("Driver context malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-
-       drvc->sr_ctx = sr_ctx;
-       di->priv = drvc;
-
-       return SR_OK;
+       return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -76,6 +67,7 @@ static GSList *hw_scan(GSList *options)
        GSList *l;
        struct sr_config *src;
        struct udev *udev;
+       int ptype;
 
        (void)options;
 
@@ -194,7 +186,8 @@ static GSList *hw_scan(GSList *options)
 
                for (i = 0; i < NUM_PROBES; i++) {
                        struct sr_probe *probe;
-                       if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
+                       ptype = (i == 0) ? SR_PROBE_ANALOG : SR_PROBE_LOGIC;
+                       if (!(probe = sr_probe_new(i, ptype, TRUE,
                                                   mso19_probe_names[i])))
                                return 0;
                        sdi->probes = g_slist_append(sdi->probes, probe);
@@ -211,11 +204,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-       struct drv_context *drvc;
-
-       drvc = di->priv;
-
-       return drvc->instances;
+       return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -303,9 +292,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        struct dev_context *devc;
 
        switch (id) {
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
-               break;
        case SR_CONF_SAMPLERATE:
                if (sdi) {
                        devc = sdi->priv;
@@ -341,8 +327,8 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
                break;
        case SR_CONF_LIMIT_SAMPLES:
                num_samples = *(uint64_t *)value;
-               if (num_samples < 1024) {
-                       sr_err("minimum of 1024 samples required");
+               if (num_samples != 1024) {
+                       sr_err("Only 1024 samples are supported.");
                        ret = SR_ERR_ARG;
                } else {
                        devc->limit_samples = num_samples;
@@ -392,6 +378,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
        (void)sdi;
 
        switch (key) {
+       case SR_CONF_DEVICE_OPTIONS:
+               *data = hwcaps;
+               break;
        case SR_CONF_SAMPLERATE:
                *data = &samplerates;
                break;
@@ -408,8 +397,6 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                                    void *cb_data)
 {
-       struct sr_datafeed_packet *packet;
-       struct sr_datafeed_header *header;
        struct dev_context *devc;
        int ret = SR_ERR;
 
@@ -460,27 +447,16 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        if (ret != SR_OK)
                return ret;
 
-       sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
+       /* Reset trigger state. */
+       devc->trigger_state = 0x00;
 
-       if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-               sr_err("Datafeed packet malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-
-       if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-               sr_err("Datafeed header malloc failed.");
-               g_free(packet);
-               return SR_ERR_MALLOC;
-       }
+       /* Send header packet to the session bus. */
+       std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
-       packet->type = SR_DF_HEADER;
-       packet->payload = (unsigned char *)header;
-       header->feed_version = 1;
-       gettimeofday(&header->starttime, NULL);
-       sr_session_send(cb_data, packet);
+       /* Our first probe is analog, the other 8 are of type 'logic'. */
+       /* TODO. */
 
-       g_free(header);
-       g_free(packet);
+       sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
 
        return SR_OK;
 }