Shorten/simplify hw_dev_list() implementations.

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

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 11ae88880df8008386c855146b4b9bcfd48af81a..4a71863dc1de0b4b7bb3d19a918934c14d9ade35 100644 (file)
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -41,12 +41,11 @@ SR_PRIV const char *mso19_probe_names[NUM_PROBES + 1] = {
        "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 +53,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)
@@ -211,11 +200,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)