X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fmodbus%2Fmodbus.c;h=88be136c5e8d9fc888b5720cf899acb300bd6929;hb=1df81f4b062fcfe8c6de4d2e5edf9743030ae0fc;hp=ee0183318740d5a2e850875c721327ddc0d79b00;hpb=ae1827f557a90e49dc3428bc931bddc5437e7868;p=libsigrok.git

diff --git a/src/modbus/modbus.c b/src/modbus/modbus.c
index ee018331..88be136c 100644
--- a/src/modbus/modbus.c
+++ b/src/modbus/modbus.c
@@ -17,9 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #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))
@@ -95,7 +98,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 +146,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);