X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=5e1c8364edb22dab1ca88a775332c00726cb3033;hb=ae4c3d0431571346f489be3a370a9bb431a6ec59;hp=3214a078e7824d337879a4544abb0ad5db4c43b6;hpb=cbadb856d6d833f2822cf63e4884abb409da6172;p=libsigrok.git diff --git a/device.c b/device.c index 3214a078..5e1c8364 100644 --- a/device.c +++ b/device.c @@ -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,16 +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 GSList *sr_dev_inst_list(const struct sr_dev_driver *driver) { - if (driver && driver->dev_list) return driver->dev_list(); else @@ -340,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