X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=400b294b8594f4665f2ebe6780bfbcb4ad4b8bea;hb=82b9f3d116ce0c982291a2dfdd15cd8a1c4cc16e;hp=20ab882b86d889d0dfa27c1977e959c2299119bb;hpb=e47a9562e990c44cd6915cde8bab270ff41ec9d7;p=libsigrok.git diff --git a/src/device.c b/src/device.c index 20ab882b..400b294b 100644 --- a/src/device.c +++ b/src/device.c @@ -93,6 +93,8 @@ SR_PRIV void sr_channel_free(struct sr_channel *ch) /** * Wrapper around @ref sr_channel_free(), suitable for glib iterators. + * + * @private */ SR_PRIV void sr_channel_free_cb(void *p) { @@ -203,7 +205,7 @@ SR_PRIV struct sr_channel *sr_next_enabled_channel(const struct sr_dev_inst *sdi * * @return #TRUE upon differences or unexpected input, #FALSE otherwise. * - * @internal + * @private */ SR_PRIV gboolean sr_channels_differ(struct sr_channel *ch1, struct sr_channel *ch2) { @@ -229,7 +231,7 @@ SR_PRIV gboolean sr_channels_differ(struct sr_channel *ch1, struct sr_channel *c * * @return #TRUE upon differences or unexpected input, #FALSE otherwise. * - * @internal + * @private */ SR_PRIV gboolean sr_channel_lists_differ(GSList *l1, GSList *l2) { @@ -518,7 +520,7 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb) #endif -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM /** * Allocate and init a struct for a serial device instance. @@ -814,7 +816,7 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi) struct libusb_device **devlist; #endif -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM struct sr_serial_dev_inst *serial; #endif @@ -824,7 +826,7 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi) if (!sdi) return NULL; -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM if ((!sdi->connection_id) && (sdi->inst_type == SR_INST_SERIAL)) { /* connection_id isn't populated, let's do that for serial devices. */