Deprecate SR_DI_VDIVS.

[libsigrok.git] / device.c

diff --git a/device.c b/device.c
index f609001dd61dc43fdda2f0b3d33cf6e458cbc861..a5c8c509bae914b5909ba37c323cfc17202449e6 100644 (file)
--- a/device.c
+++ b/device.c
@@ -198,7 +198,7 @@ SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap)
        if (!sdi || !sdi->driver)
                return FALSE;
 
-       if (sdi->driver->info_get(SR_DI_HWCAPS,
+       if (sdi->driver->config_get(SR_DI_HWCAPS,
                        (const void **)&hwcaps, NULL) != SR_OK)
                return FALSE;
 
@@ -284,19 +284,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("hwdriver: serial port required");
+               return NULL;
+       }
+
+       if (!(serial = g_try_malloc0(sizeof(struct sr_serial_dev_inst)))) {
+               sr_err("hwdriver: serial malloc failed");
                return NULL;
        }
 
        serial->port = g_strdup(port);
-       serial->fd = fd;
+       if (serialcomm)
+               serial->serialcomm = g_strdup(serialcomm);
+       serial->fd = -1;
 
        return serial;
 }
@@ -304,7 +322,11 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
 /** @private */
 SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
 {
+
        g_free(serial->port);
+       g_free(serial->serialcomm);
+       g_free(serial);
+
 }
 
 SR_API int sr_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
@@ -312,12 +334,12 @@ SR_API int sr_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 {
        int ret;
 
-       if (!sdi || !sdi->driver || !sdi->driver->dev_config_set) {
+       if (!sdi || !sdi->driver || !sdi->driver->config_set) {
                sr_err("Unable to set config option.");
                return SR_ERR;
        }
 
-       ret = sdi->driver->dev_config_set(sdi, hwcap, value);
+       ret = sdi->driver->config_set(hwcap, value, sdi);
 
        return ret;
 }