X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fderee-de5000%2Fapi.c;h=580add493ae3b42cfb36302f52e8bd59e18bb32d;hb=8626feaeb57aa50d68293f1706593fa8269a3b2e;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..580add49 100644
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -17,69 +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;
-
-	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"
+#define LOG_PREFIX "serial-lcr-es51919"
 
-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);
-}
+struct lcr_es51919_info {
+	struct sr_dev_driver di;
+	const char *vendor;
+	const char *model;
+};
 
-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);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
+	struct lcr_es51919_info *lcr;
 	struct sr_dev_inst *sdi;
 
-	if (!(sdi = es51919_serial_scan(options, "DER EE", "DE-5000")))
-		return NULL;
+	lcr = (struct lcr_es51919_info *)di;
 
-	std_dev_attach(di, sdi);
+	if (!(sdi = es51919_serial_scan(options, lcr->vendor, lcr->model)))
+		return NULL;
 
-	return g_slist_append(NULL, sdi);
+	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
-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,
-	.scan = scan,
-	.dev_list = dev_list,
-	.dev_clear = NULL,
-	.config_get = es51919_serial_config_get,
-	.config_set = es51919_serial_config_set,
-	.config_list = es51919_serial_config_list,
-	.dev_open = std_serial_dev_open,
-	.dev_close = std_serial_dev_close,
-	.dev_acquisition_start = es51919_serial_acquisition_start,
-	.dev_acquisition_stop = es51919_serial_acquisition_stop,
-	.priv = NULL,
-};
+#define LCR_ES51919(id, vendor, model) \
+	&((struct lcr_es51919_info) { \
+		{ \
+			.name = id, \
+			.longname = vendor " " model, \
+			.api_version = 1, \
+			.init = std_init, \
+			.cleanup = std_cleanup, \
+			.scan = scan, \
+			.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, \
+			.dev_open = std_serial_dev_open, \
+			.dev_close = std_serial_dev_close, \
+			.dev_acquisition_start = es51919_serial_acquisition_start, \
+			.dev_acquisition_stop = std_serial_dev_acquisition_stop, \
+			.context = NULL, \
+		}, \
+		vendor, model, \
+	}).di
+
+SR_REGISTER_DEV_DRIVER_LIST(lcr_es51919_drivers,
+	LCR_ES51919("deree-de5000", "DER EE", "DE-5000"),
+	LCR_ES51919("peaktech-2170", "PeakTech", "2170"),
+);