X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbrymen-dmm%2Fapi.c;h=911789f85c45b2a33336df790b8a33041557199d;hb=ce19d4c6157b2998aa88a2f32670dd7bdcca02e8;hp=797d05a94a8f942775c88deaa6205285d99cf7e1;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git
diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index 797d05a9..911789f8 100644
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
static const uint32_t scanopts[] = {
@@ -34,7 +35,7 @@ static const uint32_t devopts[] = {
SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
static struct sr_dev_driver *di = &brymen_bm857_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);
}
@@ -44,15 +45,13 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
struct sr_dev_inst *sdi;
struct dev_context *devc;
struct drv_context *drvc;
- struct sr_channel *ch;
struct sr_serial_dev_inst *serial;
GSList *devices;
int ret;
uint8_t buf[128];
size_t len;
- if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
- return NULL;
+ serial = sr_serial_dev_inst_new(conn, serialcomm);
if (serial_open(serial, SERIAL_RDWR) != SR_OK)
return NULL;
@@ -82,11 +81,10 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
devc = g_malloc0(sizeof(struct dev_context));
sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial;
- drvc = di->priv;
+ drvc = di->context;
sdi->priv = devc;
sdi->driver = di;
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
@@ -96,7 +94,7 @@ scan_cleanup:
return devices;
}
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct sr_config *src;
@@ -104,7 +102,7 @@ static GSList *scan(GSList *options)
const char *conn, *serialcomm;
devices = NULL;
- drvc = di->priv;
+ drvc = di->context;
drvc->instances = NULL;
conn = serialcomm = NULL;
@@ -133,12 +131,12 @@ static GSList *scan(GSList *options)
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);
}
@@ -252,5 +250,5 @@ SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
.dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};