fx2lafw: Cosmetics.

diff --git a/hardware/fx2lafw/command.c b/hardware/fx2lafw/command.c
index 6d033bef0c7b1e5737c1c61fb2d905b4cbb742be..0b89f88ca0f3550332a4454487f5442c1be20635 100644 (file)
--- a/hardware/fx2lafw/command.c
+++ b/hardware/fx2lafw/command.c
@@ -68,7 +68,7 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
        if ((SR_MHZ(48) % samplerate) == 0) {
                cmd.flags = CMD_START_FLAGS_CLK_48MHZ;
                delay = SR_MHZ(48) / samplerate - 1;
-               if(delay > MAX_SAMPLE_DELAY)
+               if (delay > MAX_SAMPLE_DELAY)
                        delay = 0;
        }
 
@@ -77,7 +77,7 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
                delay = SR_MHZ(30) / samplerate - 1;
        }
 
-       sr_info("fx2lafw: gpif delay = %d, clocksource = %sMHz", delay,
+       sr_info("fx2lafw: GPIF delay = %d, clocksource = %sMHz", delay,
                (cmd.flags & CMD_START_FLAGS_CLK_48MHZ) ? "48" : "30");
 
        if (delay <= 0 || delay > MAX_SAMPLE_DELAY) {
@@ -86,8 +86,8 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
                return SR_ERR;
        }
 
-       cmd.sample_delay_h = (delay >> 8) & 0x00FF;
-       cmd.sample_delay_l = delay & 0x00FF;
+       cmd.sample_delay_h = (delay >> 8) & 0xff;
+       cmd.sample_delay_l = delay & 0xff;
 
        /* Send the control message. */
        ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 15b1e20c31b774a4cac78f97795b13305c63d74b..dca21ba3aed9747d40f605976776955c51199754 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -34,7 +34,8 @@
 #define FX2LAFW_VERSION_MAJOR  1
 #define FX2LAFW_VERSION_MINOR  0
 
-#define MAX_SAMPLE_DELAY       (6*256) /* 6 delay states of up to 256 clock ticks*/
+/* 6 delay states of up to 256 clock ticks */
+#define MAX_SAMPLE_DELAY       (6 * 256)
 
 /* Software trigger implementation: positive values indicate trigger stage. */
 #define TRIGGER_FIRED          -1