X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=0a78a802e3c7f14f9cf90dda983c358504ac64ac;hb=c8733a2bbb876496e3c6eb9e95084d9d5fb7e834;hp=f609001dd61dc43fdda2f0b3d33cf6e458cbc861;hpb=a885ce3ee9ed770594d5b231f6dec0b740bba03b;p=libsigrok.git

diff --git a/device.c b/device.c
index f609001d..0a78a802 100644
--- a/device.c
+++ b/device.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -183,31 +183,37 @@ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
  *            If the device's 'driver' field is NULL (virtual device), this
  *            function will always return FALSE (virtual devices don't have
  *            a hardware capabilities list).
- * @param hwcap The capability that should be checked (whether it's supported
- *              by the specified device).
+ * @param key The option that should be checked for support on the
+ *            specified device.
  *
- * @return TRUE if the device has the specified capability, FALSE otherwise.
- *         FALSE is also returned upon invalid input parameters or other
+ * @return TRUE if the device has the specified option, FALSE otherwise.
+ *         FALSE is also returned on invalid input parameters or other
  *         error conditions.
  */
-SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap)
+SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 {
-	const int *hwcaps;
-	int i;
+	GVariant *gvar;
+	const int *devopts;
+	gsize num_opts, i;
+	int ret;
 
-	if (!sdi || !sdi->driver)
+	if (!sdi || !sdi->driver || !sdi->driver->config_list)
 		return FALSE;
 
-	if (sdi->driver->info_get(SR_DI_HWCAPS,
-			(const void **)&hwcaps, NULL) != SR_OK)
+	if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS, &gvar, NULL) != SR_OK)
 		return FALSE;
 
-	for (i = 0; hwcaps[i]; i++) {
-		if (hwcaps[i] == hwcap)
-			return TRUE;
+	ret = FALSE;
+	devopts = g_variant_get_fixed_array(gvar, &num_opts, sizeof(int32_t));
+	for (i = 0; i < num_opts; i++) {
+		if (devopts[i] == key) {
+			ret = TRUE;
+			break;
+		}
 	}
+	g_variant_unref(gvar);
 
-	return FALSE;
+	return ret;
 }
 
 /** @private */
@@ -217,7 +223,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
 	struct sr_dev_inst *sdi;
 
 	if (!(sdi = g_try_malloc(sizeof(struct sr_dev_inst)))) {
-		sr_err("%s: sdi malloc failed", __func__);
+		sr_err("Device instance malloc failed.");
 		return NULL;
 	}
 
@@ -263,7 +269,7 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 	struct sr_usb_dev_inst *udi;
 
 	if (!(udi = g_try_malloc(sizeof(struct sr_usb_dev_inst)))) {
-		sr_err("%s: udi malloc failed", __func__);
+		sr_err("USB device instance malloc failed.");
 		return NULL;
 	}
 
@@ -284,19 +290,37 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
 
 #endif
 
-/** @private */
+/** @private
+ * @param pathname OS-specific serial port specification. Examples:
+ * "/dev/ttyUSB0", "/dev/ttyACM1", "/dev/tty.Modem-0", "COM1".
+ * @param serialcomm A serial communication parameters string, in the form
+ * of <speed>/<data bits><parity><stopbits>, for example "9600/8n1" or
+ * "600/7o2". This is an optional parameter; it may be filled in later.
+ * @return A pointer to a newly initialized struct sr_serial_dev_inst,
+ * or NULL on error.
+ *
+ * Both parameters are copied to newly allocated strings, and freed
+ * automatically by sr_serial_dev_inst_free().
+ */
 SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
-							  int fd)
+		const char *serialcomm)
 {
 	struct sr_serial_dev_inst *serial;
 
-	if (!(serial = g_try_malloc(sizeof(struct sr_serial_dev_inst)))) {
-		sr_err("%s: serial malloc failed", __func__);
+	if (!port) {
+		sr_err("Serial port required.");
+		return NULL;
+	}
+
+	if (!(serial = g_try_malloc0(sizeof(struct sr_serial_dev_inst)))) {
+		sr_err("Serial device instance malloc failed.");
 		return NULL;
 	}
 
 	serial->port = g_strdup(port);
-	serial->fd = fd;
+	if (serialcomm)
+		serial->serialcomm = g_strdup(serialcomm);
+	serial->fd = -1;
 
 	return serial;
 }
@@ -305,26 +329,12 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
 SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
 {
 	g_free(serial->port);
-}
-
-SR_API int sr_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-		const void *value)
-{
-	int ret;
-
-	if (!sdi || !sdi->driver || !sdi->driver->dev_config_set) {
-		sr_err("Unable to set config option.");
-		return SR_ERR;
-	}
-
-	ret = sdi->driver->dev_config_set(sdi, hwcap, value);
-
-	return ret;
+	g_free(serial->serialcomm);
+	g_free(serial);
 }
 
 SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
 {
-
 	if (driver && driver->dev_list)
 		return driver->dev_list();
 	else
@@ -333,7 +343,6 @@ SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
 
 SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver)
 {
-
 	if (driver && driver->dev_clear)
 		return driver->dev_clear();
 	else