X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fderee-de5000%2Fapi.c;h=8c24eb18d2631a0a341a8c5ba66b9cfef3116bb8;hb=700d6b64d578ce10e57f6a2289e37a5564eccf1c;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..8c24eb18 100644
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -17,68 +17,64 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #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)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)di->priv)->instances;
+	return ((struct drv_context *)di->context)->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_clear = dev_clear,
 	.config_get = es51919_serial_config_get,
 	.config_set = es51919_serial_config_set,
 	.config_list = es51919_serial_config_list,
@@ -86,5 +82,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,
 };