X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fteleinfo%2Fapi.c;h=dbf7f03d8ebf3c708fc9576b10ee38f7e3b79922;hb=62974b235a5c5aeaacad5d28a50aef39f528dccd;hp=0f099c210411d8fdf55d380d3b8be6329e4823fa;hpb=aac29cc192ccf82b64e77b5e6b11b411da32deed;p=libsigrok.git
diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 0f099c21..dbf7f03d 100644
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -17,9 +17,10 @@
* along with this program. If not, see .
*/
+#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "protocol.h"
@@ -36,20 +37,18 @@ static const uint32_t devopts[] = {
};
SR_PRIV struct sr_dev_driver teleinfo_driver_info;
-static struct sr_dev_driver *di = &teleinfo_driver_info;
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
}
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
struct sr_dev_inst *sdi;
- struct sr_channel *ch;
GSList *devices = NULL, *l;
const char *conn = NULL, *serialcomm = NULL;
uint8_t buf[292];
@@ -74,14 +73,14 @@ static GSList *scan(GSList *options)
if (!serialcomm)
serialcomm = "1200/7e1";
- if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
- return NULL;
+ serial = sr_serial_dev_inst_new(conn, serialcomm);
+
if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
return NULL;
sr_info("Probing serial port %s.", conn);
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = NULL;
serial_flush(serial);
@@ -96,69 +95,34 @@ static GSList *scan(GSList *options)
sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup("EDF");
sdi->model = g_strdup("Teleinfo");
-
- if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
- sr_err("Device context malloc failed.");
- goto scan_cleanup;
- }
-
+ devc = g_malloc0(sizeof(struct dev_context));
devc->optarif = teleinfo_get_optarif(buf);
-
sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial;
sdi->priv = devc;
sdi->driver = di;
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P");
if (devc->optarif == OPTARIF_BASE) {
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "BASE")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "BASE");
} else if (devc->optarif == OPTARIF_HC) {
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HP")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HC")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HP");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HC");
} else if (devc->optarif == OPTARIF_EJP) {
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HN")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPM")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HN");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPM");
} else if (devc->optarif == OPTARIF_BBR) {
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJB")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJW")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJR")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJB")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJW")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJR")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJB");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJW");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJR");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJB");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJW");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJR");
}
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "IINST")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
-
- if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "PAPP")))
- goto scan_cleanup;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "IINST");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "PAPP");
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
@@ -169,12 +133,12 @@ scan_cleanup:
return devices;
}
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
{
return std_dev_clear(di, NULL);
}
@@ -197,11 +161,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data);
- sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples);
break;
case SR_CONF_LIMIT_MSEC:
devc->limit_msec = g_variant_get_uint64(data);
- sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec);
break;
default:
return SR_ERR_NA;
@@ -287,5 +249,5 @@ SR_PRIV struct sr_dev_driver teleinfo_driver_info = {
.dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};