X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fderee-de5000%2Fapi.c;h=7a832022789adb9fe47cec018f8ad91faf37b519;hb=1f8f5bc08e0f684156baac513431b40d79ab4ea1;hp=88aa88281a4cf78a5c4764e978e93e1caf12973c;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git

diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 88aa8828..7a832022 100644
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -17,38 +17,34 @@
  * 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 *dev_list(const 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_dev_driver *di, struct sr_context *sr_ctx)
 {
-	return std_init(sr_ctx, di, LOG_PREFIX);
+	return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
-static int cleanup(const struct sr_dev_driver *di)
+static int dev_clear(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, es51919_serial_clean);
 }
@@ -70,10 +66,10 @@ SR_PRIV struct sr_dev_driver deree_de5000_driver_info = {
 	.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,
@@ -81,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,
 };