X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fderee-de5000%2Fapi.c;h=2f1109b553f66646d1cd75d42a077041ce6aea1c;hb=ab939ebba60a18786b91509298bd82f28c4b8fb3;hp=40ace4eee8529b0169b2e75ef3d73b5e9188b19e;hpb=b50891952d22d1c5012a99ad643ee3dd58495420;p=libsigrok.git
diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 40ace4ee..2f1109b5 100644
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -17,68 +17,59 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi)
{
struct drv_context *drvc;
- drvc = di->priv;
+ drvc = di->context;
sdi->driver = di;
drvc->instances = g_slist_append(drvc->instances, sdi);
}
-static GSList *std_dev_list(struct sr_dev_driver *di)
-{
- return ((struct drv_context *)di->priv)->instances;
-}
-
#define LOG_PREFIX "deree-de5000"
SR_PRIV struct sr_dev_driver deree_de5000_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, &deree_de5000_driver_info, LOG_PREFIX);
+ return std_init(sr_ctx, di, LOG_PREFIX);
}
-static int cleanup(void)
+static int dev_clear(const struct sr_dev_driver *di)
{
- return std_dev_clear(&deree_de5000_driver_info, es51919_serial_clean);
+ return std_dev_clear(di, es51919_serial_clean);
}
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct sr_dev_inst *sdi;
if (!(sdi = es51919_serial_scan(options, "DER EE", "DE-5000")))
return NULL;
- std_dev_attach(&deree_de5000_driver_info, sdi);
+ std_dev_attach(di, sdi);
return g_slist_append(NULL, sdi);
}
-static GSList *dev_list(void)
-{
- return std_dev_list(&deree_de5000_driver_info);
-}
-
SR_PRIV struct sr_dev_driver deree_de5000_driver_info = {
.name = "deree-de5000",
.longname = "DER EE DE-5000",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
- .dev_clear = NULL,
+ .dev_list = std_dev_list,
+ .dev_clear = dev_clear,
.config_get = es51919_serial_config_get,
.config_set = es51919_serial_config_set,
.config_list = es51919_serial_config_list,
@@ -86,5 +77,5 @@ SR_PRIV struct sr_dev_driver deree_de5000_driver_info = {
.dev_close = std_serial_dev_close,
.dev_acquisition_start = es51919_serial_acquisition_start,
.dev_acquisition_stop = es51919_serial_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};