From: Bert Vermeulen <redacted>
Date: Sat, 22 Jan 2011 13:18:31 +0000 (+0100)
Subject: Revert "re-enable filter and datastore for DF_LOGIC"
X-Git-Tag: libsigrok-0.1.0~383
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=6ea7e23526b6be4d6c762b1136e361e4d3caccf6;p=libsigrok.git

Revert "re-enable filter and datastore for DF_LOGIC"

This reverts commit 23da86dfc0a89c7ab951fea31a318a493830eb69.
---

diff --git a/device.c b/device.c
index 752041d5..84cf6d1f 100644
--- a/device.c
+++ b/device.c
@@ -29,7 +29,7 @@ void device_scan(void)
 {
 	GSList *plugins, *l;
 	struct device_plugin *plugin;
-	int num_devices, num_probes, i, probe_type;
+	int num_devices, num_probes, i;
 
 	plugins = list_hwplugins();
 
@@ -46,13 +46,7 @@ void device_scan(void)
 			num_probes
 			  = (int)(unsigned long)plugin->get_device_info(i,
 			    DI_NUM_PROBES);
-			probe_type = (int)(unsigned long)
-				plugin->get_device_info(i, DI_PROBE_TYPE);
-
-			if (probe_type != PROBE_TYPE_ANALOG)
-				probe_type = PROBE_TYPE_LOGIC;
-
-			device_new(plugin, i, num_probes, probe_type);
+			device_new(plugin, i, num_probes);
 		}
 	}
 }
@@ -75,7 +69,7 @@ GSList *device_list(void)
 }
 
 struct device *device_new(struct device_plugin *plugin, int plugin_index,
-			  int num_probes, int probe_type)
+			  int num_probes)
 {
 	struct device *device;
 	int i;
@@ -84,7 +78,6 @@ struct device *device_new(struct device_plugin *plugin, int plugin_index,
 	device = g_malloc0(sizeof(struct device));
 	device->plugin = plugin;
 	device->plugin_index = plugin_index;
-	device->probe_type = probe_type;
 	devices = g_slist_append(devices, device);
 
 	for (i = 0; i < num_probes; i++) {
diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 06a22361..e117e6a5 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -163,11 +163,6 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 	case DI_PATTERNMODES:
 		info = &patternmodes;
 		break;
-#ifdef DEMO_ANALOG
-	case DI_PROBE_TYPE:
-		info = GINT_TO_POINTER(PROBE_TYPE_ANALOG);
-		break;
-#endif
 	}
 
 	return info;
diff --git a/input/input_binary.c b/input/input_binary.c
index 3957e769..ef9bddcb 100644
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -51,7 +51,7 @@ static int init(struct input *in)
 		num_probes = DEFAULT_NUM_PROBES;
 
 	/* create a virtual device */
-	in->vdevice = device_new(NULL, 0, num_probes, PROBE_TYPE_LOGIC);
+	in->vdevice = device_new(NULL, 0, num_probes);
 
 	return SIGROK_OK;
 }
diff --git a/sigrok-proto.h b/sigrok-proto.h
index 199599e1..1abdadd8 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -38,7 +38,7 @@ void device_scan(void);
 void device_close_all(void);
 GSList *device_list(void);
 struct device *device_new(struct device_plugin *plugin, int plugin_index,
-			  int num_probes, int probe_type);
+			  int num_probes);
 void device_clear(struct device *device);
 void device_destroy(struct device *dev);
 
diff --git a/sigrok.h b/sigrok.h
index 1ba03b63..e3b6ac78 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -190,7 +190,6 @@ struct device {
 	struct device_plugin *plugin;
 	/* A plugin may handle multiple devices of the same type */
 	int plugin_index;
-	uint8_t probe_type;
 	/* List of struct probe* */
 	GSList *probes;
 	/* Data acquired by this device, if any */
@@ -204,6 +203,7 @@ enum {
 
 struct probe {
 	int index;
+	int type;
 	gboolean enabled;
 	char *name;
 	char *trigger;
@@ -297,8 +297,6 @@ enum {
 	DI_CUR_SAMPLERATE,
 	/* Supported pattern generator modes */
 	DI_PATTERNMODES,
-	/* Probes type, DF_ANALOG needs this to be PROBE_TYPE_ANALOG */
-	DI_PROBE_TYPE,
 };
 
 /*