X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fmodbus%2Fmodbus.c;h=b7bf2e5ec565d6db33268a565850291d9d9ac065;hb=358105152aaceb9065e4a18b2b0e0a1fc118eecb;hp=ee0183318740d5a2e850875c721327ddc0d79b00;hpb=ae1827f557a90e49dc3428bc931bddc5437e7868;p=libsigrok.git
diff --git a/src/modbus/modbus.c b/src/modbus/modbus.c
index ee018331..b7bf2e5e 100644
--- a/src/modbus/modbus.c
+++ b/src/modbus/modbus.c
@@ -17,9 +17,10 @@
* along with this program. If not, see .
*/
+#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "modbus"
@@ -27,11 +28,13 @@
SR_PRIV extern const struct sr_modbus_dev_inst modbus_serial_rtu_dev;
static const struct sr_modbus_dev_inst *modbus_devs[] = {
-#ifdef HAVE_LIBSERIALPORT
- &modbus_serial_rtu_dev, /* Must be last as it matches any resource. */
+#ifdef HAVE_SERIAL_COMM
+ &modbus_serial_rtu_dev, /* Must be last as it matches any resource. */
#endif
};
+static const unsigned int modbus_devs_size = ARRAY_SIZE(modbus_devs);
+
static struct sr_dev_inst *sr_modbus_scan_resource(const char *resource,
const char *serialcomm, int modbusaddr,
struct sr_dev_inst *(*probe_device)(struct sr_modbus_dev_inst *modbus))
@@ -48,13 +51,14 @@ static struct sr_dev_inst *sr_modbus_scan_resource(const char *resource,
return NULL;
};
- if ((sdi = probe_device(modbus)))
- return sdi;
+ sdi = probe_device(modbus);
sr_modbus_close(modbus);
- sr_modbus_free(modbus);
- return NULL;
+ if (!sdi)
+ sr_modbus_free(modbus);
+
+ return sdi;
}
/**
@@ -95,7 +99,7 @@ SR_PRIV GSList *sr_modbus_scan(struct drv_context *drvc, GSList *options,
}
devices = NULL;
- for (i = 0; i < ARRAY_SIZE(modbus_devs); i++) {
+ for (i = 0; i < modbus_devs_size; i++) {
if ((resource && strcmp(resource, modbus_devs[i]->prefix))
|| !modbus_devs[i]->scan)
continue;
@@ -143,7 +147,7 @@ SR_PRIV struct sr_modbus_dev_inst *modbus_dev_inst_new(const char *resource,
gchar **params;
unsigned int i;
- for (i = 0; i < ARRAY_SIZE(modbus_devs); i++) {
+ for (i = 0; i < modbus_devs_size; i++) {
modbus_dev = modbus_devs[i];
if (!strncmp(resource, modbus_dev->prefix, strlen(modbus_dev->prefix))) {
sr_dbg("Opening %s device %s.", modbus_dev->name, resource);