X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.c;h=bb72fd3ffefaac1dfbfa2b15ed6f320cd7abaa12;hb=6f1be0a2d40b3998abd8d10b5479e4538bc4ff1e;hp=308fb50e9c3ce587e79baf363ee47650479b9480;hpb=2566bd4884bf33518488504575ba62e99ef43a7b;p=libsigrok.git

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 308fb50e..bb72fd3f 100644
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -7,6 +7,14 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
@@ -20,6 +28,7 @@
 #include <libudev.h>
 #include <sigrok.h>
 #include <arpa/inet.h>
+#include <sigrok-internal.h>
 #include "config.h"
 #include "link-mso19.h"
 
@@ -27,13 +36,13 @@
 #define USB_PRODUCT "f190"
 
 static int capabilities[] = {
-	HWCAP_LOGIC_ANALYZER,
-//	HWCAP_OSCILLOSCOPE,
-//	HWCAP_PAT_GENERATOR,
+	SR_HWCAP_LOGIC_ANALYZER,
+//	SR_HWCAP_OSCILLOSCOPE,
+//	SR_HWCAP_PAT_GENERATOR,
 
-	HWCAP_SAMPLERATE,
-//	HWCAP_CAPTURE_RATIO,
-	HWCAP_LIMIT_SAMPLES,
+	SR_HWCAP_SAMPLERATE,
+//	SR_HWCAP_CAPTURE_RATIO,
+	SR_HWCAP_LIMIT_SAMPLES,
 	0,
 };
 
@@ -43,13 +52,13 @@ static uint64_t supported_samplerates[] = {
 	MHZ(10), MHZ(20), MHZ(50), MHZ(100), MHZ(200), 0
 };
 
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
 	100, MHZ(200), 0, supported_samplerates,
 };
 
 static GSList *device_instances = NULL;
 
-static int mso_send_control_message(struct sigrok_device_instance *sdi,
+static int mso_send_control_message(struct sr_device_instance *sdi,
 		uint16_t payload[], int n)
 {
 	int fd = sdi->serial->fd;
@@ -75,21 +84,21 @@ static int mso_send_control_message(struct sigrok_device_instance *sdi,
 
 	w = 0;
 	while (w < s) {
-		ret = write(fd, buf + w, s - w);
+		ret = serial_write(fd, buf + w, s - w);
 		if (ret < 0) {
-			ret = SIGROK_ERR;
+			ret = SR_ERR;
 			goto free;
 		}
 		w += ret;
 	}
-	ret = SIGROK_OK;
+	ret = SR_OK;
 free:
 	free(buf);
 ret:
 	return ret;
 }
 
-static int mso_reset_adc(struct sigrok_device_instance *sdi)
+static int mso_reset_adc(struct sr_device_instance *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[2];
@@ -101,7 +110,7 @@ static int mso_reset_adc(struct sigrok_device_instance *sdi)
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_reset_fsm(struct sigrok_device_instance *sdi)
+static int mso_reset_fsm(struct sr_device_instance *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[1];
@@ -112,7 +121,7 @@ static int mso_reset_fsm(struct sigrok_device_instance *sdi)
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_toggle_led(struct sigrok_device_instance *sdi, int state)
+static int mso_toggle_led(struct sr_device_instance *sdi, int state)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[1];
@@ -125,7 +134,7 @@ static int mso_toggle_led(struct sigrok_device_instance *sdi, int state)
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_check_trigger(struct sigrok_device_instance *sdi,
+static int mso_check_trigger(struct sr_device_instance *sdi,
 		uint8_t *info)
 {
 	uint16_t ops[] = { mso_trans(REG_TRIGGER, 0) };
@@ -133,25 +142,25 @@ static int mso_check_trigger(struct sigrok_device_instance *sdi,
 	int ret;
 
 	ret = mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
-	if (info == NULL || ret != SIGROK_OK)
+	if (info == NULL || ret != SR_OK)
 		return ret;
 
 	buf[0] = 0;
-	if (read(sdi->serial->fd, buf, 1) != 1) /* FIXME: Need timeout */
-		ret = SIGROK_ERR;
+	if (serial_read(sdi->serial->fd, buf, 1) != 1) /* FIXME: Need timeout */
+		ret = SR_ERR;
 	*info = buf[0];
 
 	return ret;
 }
 
-static int mso_read_buffer(struct sigrok_device_instance *sdi)
+static int mso_read_buffer(struct sr_device_instance *sdi)
 {
 	uint16_t ops[] = { mso_trans(REG_BUFFER, 0) };
 
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_arm(struct sigrok_device_instance *sdi)
+static int mso_arm(struct sr_device_instance *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[] = {
@@ -163,7 +172,7 @@ static int mso_arm(struct sigrok_device_instance *sdi)
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_force_capture(struct sigrok_device_instance *sdi)
+static int mso_force_capture(struct sr_device_instance *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[] = {
@@ -174,7 +183,7 @@ static int mso_force_capture(struct sigrok_device_instance *sdi)
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_dac_out(struct sigrok_device_instance *sdi, uint16_t val)
+static int mso_dac_out(struct sr_device_instance *sdi, uint16_t val)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[] = {
@@ -186,7 +195,7 @@ static int mso_dac_out(struct sigrok_device_instance *sdi, uint16_t val)
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_clkrate_out(struct sigrok_device_instance *sdi, uint16_t val)
+static int mso_clkrate_out(struct sr_device_instance *sdi, uint16_t val)
 {
 	uint16_t ops[] = {
 		mso_trans(REG_CLKRATE1, (val >> 8) & 0xff),
@@ -196,18 +205,18 @@ static int mso_clkrate_out(struct sigrok_device_instance *sdi, uint16_t val)
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_configure_rate(struct sigrok_device_instance *sdi,
+static int mso_configure_rate(struct sr_device_instance *sdi,
 		uint32_t rate)
 {
 	struct mso *mso = sdi->priv;
 	unsigned int i;
-	int ret = SIGROK_ERR;
+	int ret = SR_ERR;
 
 	for (i = 0; i < ARRAY_SIZE(rate_map); i++) {
 		if (rate_map[i].rate == rate) {
 			mso->slowmode = rate_map[i].slowmode;
 			ret = mso_clkrate_out(sdi, rate_map[i].val);
-			if (ret == SIGROK_OK)
+			if (ret == SR_OK)
 				mso->cur_rate = rate;
 			return ret;
 		}
@@ -215,7 +224,6 @@ static int mso_configure_rate(struct sigrok_device_instance *sdi,
 	return ret;
 }
 
-
 static inline uint16_t mso_calc_raw_from_mv(struct mso *mso)
 {
 	return (uint16_t) (0x200 -
@@ -223,7 +231,7 @@ static inline uint16_t mso_calc_raw_from_mv(struct mso *mso)
 			 mso->vbit));
 }
 
-static int mso_configure_trigger(struct sigrok_device_instance *sdi)
+static int mso_configure_trigger(struct sr_device_instance *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[16];
@@ -293,7 +301,7 @@ static int mso_configure_trigger(struct sigrok_device_instance *sdi)
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_configure_threshold_level(struct sigrok_device_instance *sdi)
+static int mso_configure_threshold_level(struct sr_device_instance *sdi)
 {
 	struct mso *mso = sdi->priv;
 
@@ -316,7 +324,7 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct,
 	/* parse iSerial */
 	if (iSerial[0] != '4' || sscanf(iSerial, "%5u%3u%3u%1u%1u%6u",
 				&u1, &u2, &u3, &u4, &u5, &u6) != 6)
-		return SIGROK_ERR;
+		return SR_ERR;
 	mso->hwmodel = u4;
 	mso->hwrev = u5;
 	mso->serial = u6;
@@ -336,12 +344,12 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct,
 	 * I will not implement it yet
 	 */
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
 static int hw_init(char *deviceinfo)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	int devcnt = 0;
 	struct udev *udev;
 	struct udev_enumerate *enumerate;
@@ -409,14 +417,14 @@ static int hw_init(char *deviceinfo)
 			continue;
 		memset(mso, 0, sizeof(struct mso));
 
-		if (mso_parse_serial(iSerial, iProduct, mso) != SIGROK_OK) {
+		if (mso_parse_serial(iSerial, iProduct, mso) != SR_OK) {
 			g_warning("Invalid iSerial: %s", iSerial);
 			goto err_free_mso;
 		}
 		/* hardware initial state */
 		mso->ctlbase = 0;
 
-		sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING,
+		sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING,
 			manufacturer, product, hwrev);
 		if (!sdi) {
 			g_warning("Unable to create device instance for %s",
@@ -427,7 +435,7 @@ static int hw_init(char *deviceinfo)
 		/* save a pointer to our private instance data */
 		sdi->priv = mso;
 
-		sdi->serial = serial_device_instance_new(path, -1);
+		sdi->serial = sr_serial_device_instance_new(path, -1);
 		if (!sdi->serial)
 			goto err_device_instance_free;
 
@@ -436,7 +444,7 @@ static int hw_init(char *deviceinfo)
 		continue;
 
 err_device_instance_free:
-		sigrok_device_instance_free(sdi);
+		sr_device_instance_free(sdi);
 err_free_mso:
 		free(mso);
 	}
@@ -451,7 +459,7 @@ ret:
 static void hw_cleanup(void)
 {
 	GSList *l;
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
 	/* Properly close all devices. */
 	for (l = device_instances; l; l = l->next) {
@@ -460,7 +468,7 @@ static void hw_cleanup(void)
 			serial_close(sdi->serial->fd);
 		if (sdi->priv != NULL)
 			free(sdi->priv);
-		sigrok_device_instance_free(sdi);
+		sr_device_instance_free(sdi);
 	}
 	g_slist_free(device_instances);
 	device_instances = NULL;
@@ -468,11 +476,11 @@ static void hw_cleanup(void)
 
 static int hw_opendev(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct mso *mso;
-	int ret = SIGROK_ERR;
+	int ret = SR_ERR;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
 		return ret;
 
 	mso = sdi->priv;
@@ -481,10 +489,10 @@ static int hw_opendev(int device_index)
 		return ret;
 
 	ret = serial_set_params(sdi->serial->fd, 460800, 8, 0, 1, 2);
-	if (ret != SIGROK_OK)
+	if (ret != SR_OK)
 		return ret;
 
-	sdi->status = ST_ACTIVE;
+	sdi->status = SR_ST_ACTIVE;
 
 	/* FIXME: discard serial buffer */
 
@@ -492,58 +500,58 @@ static int hw_opendev(int device_index)
 //	g_warning("trigger state: %c", mso->trigger_state);
 
 	ret = mso_reset_adc(sdi);
-	if (ret != SIGROK_OK)
+	if (ret != SR_OK)
 		return ret;
 
 	mso_check_trigger(sdi, &mso->trigger_state);
 //	g_warning("trigger state: %c", mso->trigger_state);
 
 //	ret = mso_reset_fsm(sdi);
-//	if (ret != SIGROK_OK)
+//	if (ret != SR_OK)
 //		return ret;
 
-//	return SIGROK_ERR;
-	return SIGROK_OK;
+//	return SR_ERR;
+	return SR_OK;
 }
 
 static void hw_closedev(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
 		return;
 
 	if (sdi->serial->fd != -1) {
 		serial_close(sdi->serial->fd);
 		sdi->serial->fd = -1;
-		sdi->status = ST_INACTIVE;
+		sdi->status = SR_ST_INACTIVE;
 	}
 }
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct mso *mso;
 	void *info = NULL;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
 		return NULL;
 	mso = sdi->priv;
 
 	switch (device_info_id) {
-	case DI_INSTANCE:
+	case SR_DI_INSTANCE:
 		info = sdi;
 		break;
-	case DI_NUM_PROBES: /* FIXME: How to report analog probe? */
+	case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */
 		info = GINT_TO_POINTER(8);
 		break;
-	case DI_SAMPLERATES:
+	case SR_DI_SAMPLERATES:
 		info = &samplerates;
 		break;
-	case DI_TRIGGER_TYPES:
+	case SR_DI_TRIGGER_TYPES:
 		info = "01"; /* FIXME */
 		break;
-	case DI_CUR_SAMPLERATE:
+	case SR_DI_CUR_SAMPLERATE:
 		info = &mso->cur_rate;
 		break;
 	}
@@ -552,10 +560,10 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-		return ST_NOT_FOUND;
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+		return SR_ST_NOT_FOUND;
 
 	return sdi->status;
 }
@@ -567,20 +575,19 @@ static int *hw_get_capabilities(void)
 
 static int hw_set_configuration(int device_index, int capability, void *value)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-		return SIGROK_ERR;
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+		return SR_ERR;
 
 	switch (capability) {
-	case HWCAP_SAMPLERATE:
+	case SR_HWCAP_SAMPLERATE:
 		return mso_configure_rate(sdi, *(uint64_t *) value);
-	case HWCAP_PROBECONFIG:
-	case HWCAP_LIMIT_SAMPLES:
+	case SR_HWCAP_PROBECONFIG:
+	case SR_HWCAP_LIMIT_SAMPLES:
 	default:
-		return SIGROK_OK; /* FIXME */
+		return SR_OK; /* FIXME */
 	}
-
 }
 
 #define MSO_TRIGGER_UNKNOWN	'!'
@@ -594,16 +601,16 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 /* FIXME: Pass errors? */
 static int receive_data(int fd, int revents, void *user_data)
 {
-	struct sigrok_device_instance *sdi = user_data;
+	struct sr_device_instance *sdi = user_data;
 	struct mso *mso = sdi->priv;
-	struct datafeed_packet packet;
+	struct sr_datafeed_packet packet;
 	uint8_t in[1024], logic_out[1024];
 	double analog_out[1024];
 	size_t i, s;
 
 	revents = revents;
 
-	s = read(fd, in, sizeof(in));
+	s = serial_read(fd, in, sizeof(in));
 	if (s <= 0)
 		return FALSE;
 
@@ -636,40 +643,40 @@ static int receive_data(int fd, int revents, void *user_data)
 			((mso->buffer[i * 3 + 2] & 0x3f) << 2);
 	}
 
-	packet.type = DF_LOGIC;
+	packet.type = SR_DF_LOGIC;
 	packet.length = 1024;
 	packet.unitsize = 1;
 	packet.payload = logic_out;
-	session_bus(mso->session_id, &packet);
+	sr_session_bus(mso->session_id, &packet);
 
 
-	packet.type = DF_ANALOG;
+	packet.type = SR_DF_ANALOG;
 	packet.length = 1024;
 	packet.unitsize = sizeof(double);
 	packet.payload = analog_out;
-	session_bus(mso->session_id, &packet);
+	sr_session_bus(mso->session_id, &packet);
 
-	packet.type = DF_END;
-	session_bus(mso->session_id, &packet);
+	packet.type = SR_DF_END;
+	sr_session_bus(mso->session_id, &packet);
 
 	return TRUE;
 }
 
 static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct mso *mso;
-	struct datafeed_packet packet;
-	struct datafeed_header header;
-	int ret = SIGROK_ERR;
+	struct sr_datafeed_packet packet;
+	struct sr_datafeed_header header;
+	int ret = SR_ERR;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
 		return ret;
 	mso = sdi->priv;
 
 	/* FIXME: No need to do full reconfigure every time */
 //	ret = mso_reset_fsm(sdi);
-//	if (ret != SIGROK_OK)
+//	if (ret != SR_OK)
 //		return ret;
 
 	/* FIXME: ACDC Mode */
@@ -677,20 +684,20 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 //	mso->ctlbase |= mso->acdcmode;
 
 	ret = mso_configure_rate(sdi, mso->cur_rate);
-	if (ret != SIGROK_OK)
+	if (ret != SR_OK)
 		return ret;
 
 	/* set dac offset */
 	ret = mso_dac_out(sdi, mso->dac_offset);
-	if (ret != SIGROK_OK)
+	if (ret != SR_OK)
 		return ret;
 
 	ret = mso_configure_threshold_level(sdi);
-	if (ret != SIGROK_OK)
+	if (ret != SR_OK)
 		return ret;
 
 	ret = mso_configure_trigger(sdi);
-	if (ret != SIGROK_OK)
+	if (ret != SR_OK)
 		return ret;
 
 	/* FIXME: trigger_position */
@@ -700,32 +707,32 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
 	/* with trigger */
 	ret = mso_arm(sdi);
-	if (ret != SIGROK_OK)
+	if (ret != SR_OK)
 		return ret;
 
 	/* without trigger */
 //	ret = mso_force_capture(sdi);
-//	if (ret != SIGROK_OK)
+//	if (ret != SR_OK)
 //		return ret;
 
 	mso_check_trigger(sdi, &mso->trigger_state);
 	ret = mso_check_trigger(sdi, NULL);
-	if (ret != SIGROK_OK)
+	if (ret != SR_OK)
 		return ret;
 
 	mso->session_id = session_device_id;
-	source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi);
+	sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi);
 
-	packet.type = DF_HEADER;
-	packet.length = sizeof(struct datafeed_header);
+	packet.type = SR_DF_HEADER;
+	packet.length = sizeof(struct sr_datafeed_header);
 	packet.payload = (unsigned char *) &header;
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = mso->cur_rate;
 	header.num_analog_probes = 1;
 	header.num_logic_probes = 8;
-	header.protocol_id = PROTO_RAW;
-	session_bus(session_device_id, &packet);
+	header.protocol_id = SR_PROTO_RAW;
+	sr_session_bus(session_device_id, &packet);
 
 	return ret;
 }
@@ -733,20 +740,20 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 /* FIXME */
 static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 {
-	struct datafeed_packet packet;
+	struct sr_datafeed_packet packet;
 
 	device_index = device_index;
 
-	packet.type = DF_END;
-	session_bus(session_device_id, &packet);
+	packet.type = SR_DF_END;
+	sr_session_bus(session_device_id, &packet);
 }
 
-struct device_plugin link_mso19_plugin_info = {
+struct sr_device_plugin link_mso19_plugin_info = {
 	.name = "link-mso19",
+	.longname = "Link Instruments MSO-19",
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
-
 	.open = hw_opendev,
 	.close = hw_closedev,
 	.get_device_info = hw_get_device_info,