Backport recent changes from mainline.

[libsigrok.git] / src / hardware / sysclk-lwla / protocol.h

diff --git a/src/hardware/sysclk-lwla/protocol.h b/src/hardware/sysclk-lwla/protocol.h
index ebfc704a97417b7737f8cd1c7fb11ac0fba93639..0db4bc79eb19fa7b71e7380019fe1cea84306949 100644 (file)
--- a/src/hardware/sysclk-lwla/protocol.h
+++ b/src/hardware/sysclk-lwla/protocol.h
@@ -20,15 +20,13 @@
 #ifndef LIBSIGROK_HARDWARE_SYSCLK_LWLA_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_SYSCLK_LWLA_PROTOCOL_H
 
-#define LOG_PREFIX "sysclk-lwla"
-
 #include <stdint.h>
 #include <libusb.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
 #include <libsigrok-internal.h>
 
-#define VENDOR_NAME    "SysClk"
+#define LOG_PREFIX "sysclk-lwla"
 
 /* Maximum configurable sample count limit.
  * Due to compression, there is no meaningful hardware limit the driver
@@ -46,46 +44,40 @@
 
 struct acquisition_state;
 
-/* USB vendor and product IDs.
- */
+/* USB vendor and product IDs. */
 enum {
        USB_VID_SYSCLK   = 0x2961,
        USB_PID_LWLA1016 = 0x6688,
        USB_PID_LWLA1034 = 0x6689,
 };
 
-/* USB device characteristics.
- */
+/* USB device characteristics. */
 enum {
        USB_CONFIG      = 1,
        USB_INTERFACE   = 0,
        USB_TIMEOUT_MS  = 1000,
 };
 
-/** USB device end points.
- */
+/** USB device end points. */
 enum usb_endpoint {
        EP_COMMAND = 2,
        EP_CONFIG  = 4,
        EP_REPLY   = 6 | LIBUSB_ENDPOINT_IN
 };
 
-/** LWLA1034 clock sources.
- */
+/** LWLA1034 clock sources. */
 enum clock_source {
        CLOCK_INTERNAL = 0,
        CLOCK_EXT_CLK,
 };
 
-/** LWLA1034 trigger sources.
- */
+/** LWLA1034 trigger sources. */
 enum trigger_source {
        TRIGGER_CHANNELS = 0,
        TRIGGER_EXT_TRG,
 };
 
-/** Edge choices for the LWLA1034 external clock and trigger inputs.
- */
+/** Edge choices for the LWLA1034 external clock and trigger inputs. */
 enum signal_edge {
        EDGE_POSITIVE = 0,
        EDGE_NEGATIVE,
@@ -96,8 +88,7 @@ enum {
        FPGA_NOCONF = -1,
 };
 
-/** Acquisition protocol states.
- */
+/** Acquisition protocol states. */
 enum protocol_state {
        /* idle states */
        STATE_IDLE = 0,
@@ -114,8 +105,6 @@ enum protocol_state {
        STATE_READ_REQUEST,
 };
 
-/** Private, per-device-instance driver context.
- */
 struct dev_context {
        uint64_t samplerate;    /* requested samplerate */
        uint64_t limit_msec;    /* requested capture duration in ms */
@@ -142,8 +131,7 @@ struct dev_context {
        enum signal_edge cfg_trigger_slope;     /* ext trigger slope setting */
 };
 
-/** LWLA model descriptor.
- */
+/** LWLA model descriptor. */
 struct model_info {
        char name[12];
        int num_channels;