X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Fprotocol.h;h=25f349d1757c4682b934ab53d2065a603895cd01;hb=4399cc0f41077cd975601a095fd272a2bf27bb99;hp=1e353ad6a36b9d4344d98c0f737da8e922ecabc7;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/protocol.h b/src/hardware/sysclk-lwla/protocol.h
index 1e353ad6..25f349d1 100644
--- a/src/hardware/sysclk-lwla/protocol.h
+++ b/src/hardware/sysclk-lwla/protocol.h
@@ -22,11 +22,11 @@
 
 #define LOG_PREFIX "sysclk-lwla"
 
-#include "lwla.h"
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
 #include <stdint.h>
 #include <glib.h>
+#include <libsigrok/libsigrok.h>
+#include "libsigrok-internal.h"
+#include "lwla.h"
 
 /* For now, only the LWLA1034 is supported.
  */
@@ -35,7 +35,7 @@
 
 #define USB_VID_PID	"2961.6689"
 #define USB_INTERFACE	0
-#define USB_TIMEOUT	3000 /* ms */
+#define USB_TIMEOUT_MS	3000
 
 #define NUM_CHANNELS	34
 
@@ -46,7 +46,7 @@
 /** Unit and packet size for the sigrok logic datafeed.
  */
 #define UNIT_SIZE	((NUM_CHANNELS + 7) / 8)
-#define PACKET_LENGTH	10000	/* units */
+#define PACKET_LENGTH	(10 * 1000)	/* units */
 
 /** Size of the acquisition buffer in device memory units.
  */
@@ -207,10 +207,10 @@ struct dev_context {
 	/** The samplerate selected by the user. */
 	uint64_t samplerate;
 
-	/** The maximimum sampling duration, in milliseconds. */
+	/** The maximum sampling duration, in milliseconds. */
 	uint64_t limit_msec;
 
-	/** The maximimum number of samples to acquire. */
+	/** The maximum number of samples to acquire. */
 	uint64_t limit_samples;
 
 	/** Channels to use. */
@@ -260,4 +260,4 @@ SR_PRIV int lwla_abort_acquisition(const struct sr_dev_inst *sdi);
 
 SR_PRIV int lwla_receive_data(int fd, int revents, void *cb_data);
 
-#endif /* !LIBSIGROK_HARDWARE_SYSCLK_LWLA_PROTOCOL_H */
+#endif