Bump copyright year

[libsigrok.git] / device.c

diff --git a/device.c b/device.c
index b51af2ba5127dda17a5325b1ae5962427471696b..d489ef3f8cff7d6e1e65d2443e801aaa7cebe069 100644 (file)
--- 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,7 +183,7 @@ 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 option The option that should be checked for support on the
+ * @param key The option that should be checked for support on the
  *            specified device.
  *
  * @return TRUE if the device has the specified option, FALSE otherwise.
@@ -217,7 +217,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 +263,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;
        }
 
@@ -302,12 +302,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,31 +322,13 @@ 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_config_set(const struct sr_dev_inst *sdi, int hwcap,
-               const void *value)
-{
-       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
@@ -355,7 +337,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