X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fapi.c;h=246b900a6c13e86512f25e3db2211139b25e1095;hb=07ffa5b315caab0d6d703e04f09035bc0f2b3ee4;hp=4e776a544dae5d56a677d7491aa86b87e2fc0ab0;hpb=0f34cb472368be61aa2e7bc9d9d1b25bb28aa560;p=libsigrok.git

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index 4e776a54..246b900a 100644
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
 #include <libserialport.h>
+#include "protocol.h"
 
 #define SERIALCOMM "115200/8n1"
 
@@ -83,6 +83,8 @@ static const uint64_t samplerates[] = {
 	SR_HZ(1),
 };
 
+#define RESPONSE_DELAY_US (10 * 1000)
+
 SR_PRIV struct sr_dev_driver ols_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
@@ -98,7 +100,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 	GSList *l, *devices;
-	int ret, i;
+	int ret;
+	unsigned int i;
 	const char *conn, *serialcomm;
 	char buf[8];
 
@@ -121,7 +124,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	if (!conn)
 		return NULL;
 
-	if (serialcomm == NULL)
+	if (!serialcomm)
 		serialcomm = SERIALCOMM;
 
 	serial = sr_serial_dev_inst_new(conn, serialcomm);
@@ -150,8 +153,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	}
 	send_shortcommand(serial, CMD_ID);
 
-	/* Wait 10ms for a response. */
-	g_usleep(10000);
+	g_usleep(RESPONSE_DELAY_US);
 
 	if (sp_input_waiting(serial->data) == 0) {
 		sr_dbg("Didn't get any reply.");
@@ -175,8 +177,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	 */
 	send_shortcommand(serial, CMD_METADATA);
 
-	/* Wait 10ms for a response. */
-	g_usleep(10000);
+	g_usleep(RESPONSE_DELAY_US);
 
 	if (sp_input_waiting(serial->data) != 0) {
 		/* Got metadata. */
@@ -191,7 +192,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		sdi->model = g_strdup("Logic Analyzer");
 		sdi->version = g_strdup("v1.0");
 		sdi->driver = di;
-		for (i = 0; i < 32; i++)
+		for (i = 0; i < ARRAY_SIZE(ols_channel_names); i++)
 			sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
 					ols_channel_names[i]);
 		devc = ols_dev_new();