X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=e49318e236cd7d48169319761401edc874f206ab;hb=f99e32affc3a18a2a6b45c988bc440013a8b2e4e;hp=a5c8c509bae914b5909ba37c323cfc17202449e6;hpb=035a1078fda93cf1da37d19b3a1d95311b99b00f;p=libsigrok.git diff --git a/device.c b/device.c index a5c8c509..e49318e2 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 + * Copyright (C) 2013 Bert Vermeulen * * 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 @@ -79,6 +79,8 @@ SR_PRIV struct sr_probe *sr_probe_new(int index, int type, * of the string is made. * * @return SR_OK on success, or SR_ERR_ARG on invalid arguments. + * + * @since 0.1.0 (but the API changed in 0.2.0) */ SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi, int probenum, const char *name) @@ -114,6 +116,8 @@ SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi, * @param state TRUE to enable the probe, FALSE to disable. * * @return SR_OK on success, or SR_ERR_ARG on invalid arguments. + * + * @since 0.2.0 */ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, gboolean state) @@ -149,6 +153,8 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, * @param trigger Trigger string, in the format used by sigrok-cli * * @return SR_OK on success, or SR_ERR_ARG on invalid arguments. + * + * @since 0.1.0 (but the API changed in 0.2.0) */ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, const char *trigger) @@ -183,31 +189,39 @@ 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. + * + * @since 0.1.0 (but the API changed in 0.2.0) */ -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->config_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 +231,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; } @@ -229,6 +243,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status, sdi->model = model ? g_strdup(model) : NULL; sdi->version = version ? g_strdup(version) : NULL; sdi->probes = NULL; + sdi->conn = NULL; sdi->priv = NULL; return sdi; @@ -251,7 +266,6 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi) g_free(sdi->model); g_free(sdi->version); g_free(sdi); - } #ifdef HAVE_LIBUSB_1_0 @@ -263,7 +277,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,17 +298,21 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb) #endif -/** @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 /, 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. +/** + * @private * * Both parameters are copied to newly allocated strings, and freed * automatically by sr_serial_dev_inst_free(). + * + * @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 /, 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. */ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port, const char *serialcomm) @@ -302,12 +320,12 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port, struct sr_serial_dev_inst *serial; if (!port) { - sr_err("hwdriver: serial port required"); + sr_err("Serial port required."); return NULL; } if (!(serial = g_try_malloc0(sizeof(struct sr_serial_dev_inst)))) { - sr_err("hwdriver: serial malloc failed"); + sr_err("Serial device instance malloc failed."); return NULL; } @@ -322,40 +340,21 @@ 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, - const void *value) +SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver) { - int ret; - - if (!sdi || !sdi->driver || !sdi->driver->config_set) { - sr_err("Unable to set config option."); - return SR_ERR; - } - - ret = sdi->driver->config_set(hwcap, value, sdi); - - return ret; -} - -SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver) -{ - if (driver && driver->dev_list) return driver->dev_list(); else return NULL; } -SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver) +SR_API int sr_dev_clear(const struct sr_dev_driver *driver) { - if (driver && driver->dev_clear) return driver->dev_clear(); else