Various #include file cosmetic fixes.

Generally include system headers before local headers, unless there's
a technical reason to use another order.

diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c
index 56218051bd222bc030ba780080232885dfce1bae..d1b765665c2bb9dbfedfed684ff3627f118d2660 100644 (file)
--- a/src/hardware/agilent-dmm/sched.c
+++ b/src/hardware/agilent-dmm/sched.c
@@ -18,13 +18,13 @@
  */
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "agilent-dmm.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <math.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "agilent-dmm.h"
 
 static void dispatch(const struct sr_dev_inst *sdi)
 {

diff --git a/src/hardware/baylibre-acme/gpio.c b/src/hardware/baylibre-acme/gpio.c
index 7af4ebf5d27423e40d3735890af93f93c7a1bfc5..fb5d298c7e3b018f9730daedb4c3b0e08c277728 100644 (file)
--- a/src/hardware/baylibre-acme/gpio.c
+++ b/src/hardware/baylibre-acme/gpio.c
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "gpio.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "gpio.h"
 
 #define LOG_PREFIX "gpio"
 

diff --git a/src/hardware/beaglelogic/beaglelogic.h b/src/hardware/beaglelogic/beaglelogic.h
index 78363c1cb8f58fe1414b77cea387514ffb736f42..9015c61035e37787bf38792095ef32884d35f0ee 100644 (file)
--- a/src/hardware/beaglelogic/beaglelogic.h
+++ b/src/hardware/beaglelogic/beaglelogic.h
@@ -21,14 +21,11 @@
 #define BEAGLELOGIC_H_
 
 #include <fcntl.h>
-
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-
 #include <stdlib.h>
-
 #include <unistd.h>
 
 /* BeagleLogic device node name */

diff --git a/src/hardware/beaglelogic/protocol.c b/src/hardware/beaglelogic/protocol.c
index a0a784e874502d6ca5ef93498674ac241c331468..a07bb203d1526369190b1db7bfe0764215563542 100644 (file)
--- a/src/hardware/beaglelogic/protocol.c
+++ b/src/hardware/beaglelogic/protocol.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include "protocol.h"
 
 /* Define data packet size independent of packet (bufunitsize bytes) size
  * from the BeagleLogic kernel module */

diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index 62f4dc0e2c6f748ce59d3c328a4de28b23985f1c..a60444010f23b257820e994971b8e60a0e01da15 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -18,14 +18,14 @@
  */
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "protocol.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "protocol.h"
 
 /* The Colead SL-5868P uses this. */
 #define SERIALCOMM "2400/8n1"

diff --git a/src/hardware/colead-slm/protocol.c b/src/hardware/colead-slm/protocol.c
index d68e8f50b1c6dd061a1d1cd714039a4ffbe9b38d..01e748fbe0586c38a93d1406fa0b43ac8882ee86 100644 (file)
--- a/src/hardware/colead-slm/protocol.c
+++ b/src/hardware/colead-slm/protocol.c
@@ -19,11 +19,11 @@
 
 #include <stdlib.h>
 #include <glib.h>
+#include <errno.h>
+#include <string.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "protocol.h"
-#include <errno.h>
-#include <string.h>
 
 static void process_packet(const struct sr_dev_inst *sdi)
 {

diff --git a/src/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c
index 766157484c4aa1c96b04bb4c936d06597973ec64..7a2d2379dd736f01b837d70f0ccf23a823a83f1c 100644 (file)
--- a/src/hardware/hantek-dso/dso.c
+++ b/src/hardware/hantek-dso/dso.c
@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "dso.h"
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "dso.h"
 
 extern struct sr_dev_driver hantek_dso_driver_info;
 

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index ff4b9e21599d7b78a46ce8ba76212077cd1faed4..ee873e8684a0b98131f4c853c758fc6935610ef4 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <math.h>
 #include <string.h>
-
 #include "protocol.h"
 
 /* Forward declarations */

diff --git a/src/hardware/motech-lps-30x/protocol.c b/src/hardware/motech-lps-30x/protocol.c
index c8ac58ac82d1885228e6cf6f90f1c32298059912..db69eb5f32f93c387f178e4a7889a11aaaee3f7b 100644 (file)
--- a/src/hardware/motech-lps-30x/protocol.c
+++ b/src/hardware/motech-lps-30x/protocol.c
@@ -25,7 +25,6 @@
 
 #include <errno.h>
 #include <string.h>
-
 #include "protocol.h"
 
 /** Send data packets for current measurements. */

diff --git a/src/hardware/motech-lps-30x/protocol.h b/src/hardware/motech-lps-30x/protocol.h
index 94eeb67e0fe37bf6c81de08fb34dd8d9c21e9cb4..493f7827ed4795239278c83a1daecd8158fb0a39 100644 (file)
--- a/src/hardware/motech-lps-30x/protocol.h
+++ b/src/hardware/motech-lps-30x/protocol.h
@@ -23,7 +23,6 @@
  *  @internal
  */
 
-
 #ifndef LIBSIGROK_HARDWARE_MOTECH_LPS_30X_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_MOTECH_LPS_30X_PROTOCOL_H
 
@@ -32,7 +31,6 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-
 SR_PRIV int lps_process_status(struct sr_dev_inst* sdi, int stat);
 SR_PRIV int lps_send_req(struct sr_serial_dev_inst *serial, const char* fmt, ...);
 

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index 144378391eaedbe1e656ed06248193138f647c29..620f5e1bde9155df76996b36315e3b2b3f5c6e5b 100644 (file)
--- 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"
 

diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c
index 1aa345c1d9c357e59ac5443f3f73d5c2256f7a69..9082ec1851fcd160bae1e6b4c2d5c434e8db9bba 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/protocol.c
+++ b/src/hardware/openbench-logic-sniffer/protocol.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"
 
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 

diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h
index 12a7e69f4b6e8f9469eb995642cc647c7ef740c0..4923835a3bcad14046aad5d35600575fb05c4d53 100644 (file)
--- a/src/hardware/pipistrello-ols/protocol.h
+++ b/src/hardware/pipistrello-ols/protocol.h
@@ -20,11 +20,6 @@
 #ifndef LIBSIGROK_HARDWARE_PIPISTRELLO_OLS_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_PIPISTRELLO_OLS_PROTOCOL_H
 
-#define USB_VENDOR_ID                  0x0403
-#define USB_DEVICE_ID                  0x6010
-#define USB_VENDOR_NAME                "Saanlima"
-#define USB_IPRODUCT                   "Pipistrello LX45"
-
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
@@ -34,6 +29,11 @@
 
 #define LOG_PREFIX "p-ols"
 
+#define USB_VENDOR_ID          0x0403
+#define USB_DEVICE_ID          0x6010
+#define USB_VENDOR_NAME                "Saanlima"
+#define USB_IPRODUCT           "Pipistrello LX45"
+
 #define FTDI_BUF_SIZE          (16 * 1024)
 
 #define NUM_CHANNELS           32

diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c
index 3bc7c7566c6abfb3d3fec30e52f1c7ac9f1d48e6..4bb16814ecfa79f55cc2dfc626bdef070e9bf006 100644 (file)
--- a/src/hardware/saleae-logic16/protocol.c
+++ b/src/hardware/saleae-logic16/protocol.c
@@ -19,8 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
-
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
@@ -30,6 +28,7 @@
 #include <math.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
+#include "protocol.h"
 
 #define FPGA_FIRMWARE_18       FIRMWARE_DIR"/saleae-logic16-fpga-18.bitstream"
 #define FPGA_FIRMWARE_33       FIRMWARE_DIR"/saleae-logic16-fpga-33.bitstream"

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 3fe9b2bd0b6f43fc8e8ca39744a13f117c613c79..7da96eec4e91c3bea57db1ba9ed5f1bd0952a60d 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
 #include <glib.h>
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "protocol.h"
 
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,

diff --git a/src/hardware/sysclk-lwla/lwla.c b/src/hardware/sysclk-lwla/lwla.c
index 2f55014e857a73d0ef1edb909c4c75d1f85ee08a..e0e1c87b713b2a26b6212f5bead0ee4ebc35481c 100644 (file)
--- a/src/hardware/sysclk-lwla/lwla.c
+++ b/src/hardware/sysclk-lwla/lwla.c
@@ -17,11 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lwla.h"
-#include "protocol.h"
-#include "libsigrok-internal.h"
 #include <errno.h>
 #include <glib/gstdio.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "protocol.h"
+#include "lwla.h"
 
 #define BITSTREAM_MAX_SIZE    (256 * 1024) /* bitstream size limit for safety */
 #define BITSTREAM_HEADER_SIZE 4            /* transfer header size in bytes */

diff --git a/src/hardware/sysclk-lwla/lwla.h b/src/hardware/sysclk-lwla/lwla.h
index 052e1199eeaf3360cbab7d613b84669f23d9ddba..8d72eda1dbaebe01faac9206fa07ad6a1bc6ad7a 100644 (file)
--- a/src/hardware/sysclk-lwla/lwla.h
+++ b/src/hardware/sysclk-lwla/lwla.h
@@ -20,10 +20,10 @@
 #ifndef LIBSIGROK_HARDWARE_SYSCLK_LWLA_LWLA_H
 #define LIBSIGROK_HARDWARE_SYSCLK_LWLA_LWLA_H
 
-#include "libsigrok.h"
 #include <stdint.h>
 #include <libusb.h>
 #include <glib.h>
+#include "libsigrok.h"
 
 struct sr_usb_dev_inst;
 

diff --git a/src/hardware/sysclk-lwla/protocol.c b/src/hardware/sysclk-lwla/protocol.c
index 7b8c4885e5608dfd6e7c311953d018229a0b210e..a8659a6b04082d98ba0801f72eff555c2fed3947 100644 (file)
--- a/src/hardware/sysclk-lwla/protocol.c
+++ b/src/hardware/sysclk-lwla/protocol.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
 #include <string.h>
+#include "protocol.h"
 
 /* Bit mask for the RLE repeat-count-follows flag. */
 #define RLE_FLAG_LEN_FOLLOWS ((uint64_t)1 << 35)

diff --git a/src/hardware/sysclk-lwla/protocol.h b/src/hardware/sysclk-lwla/protocol.h
index 1c17b48dbffd9c3da365fb1f01527fb644a01a5c..d890775bf75dc4f8ce42c5d2a5061a417fc8c7b0 100644 (file)
--- 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.h"
+#include "libsigrok-internal.h"
+#include "lwla.h"
 
 /* For now, only the LWLA1034 is supported.
  */

diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c
index b1ebf8a19e6d84aa8537ffbc6d02259e4159a0d2..a4868287d5b3d9f838657cf82424a757eee35328 100644 (file)
--- a/src/hardware/uni-t-ut32x/api.c
+++ b/src/hardware/uni-t-ut32x/api.c
@@ -17,9 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
-
 #include <string.h>
+#include "protocol.h"
 
 static const uint32_t devopts[] = {
        SR_CONF_THERMOMETER,

diff --git a/src/hardware/uni-t-ut32x/protocol.c b/src/hardware/uni-t-ut32x/protocol.c
index 3bbdd99bd06c4c9571a7d978eafb5fd7ef6e7eae..1a910b3aa27b232fb84cbd4b0253c7fcfd2fd338 100644 (file)
--- a/src/hardware/uni-t-ut32x/protocol.c
+++ b/src/hardware/uni-t-ut32x/protocol.c
@@ -17,10 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
-
 #include <string.h>
 #include <math.h>
+#include "protocol.h"
 
 extern struct sr_dev_driver uni_t_ut32x_driver_info;
 

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index 0835c90b60e0cacb40e1c2d2925179ebe28f8a59..52fe76ddbb13bdc423663ed1ab6cd86e01138d82 100644 (file)
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -17,11 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
 #include <glib.h>
 #include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi"
 

diff --git a/src/scpi/scpi_libgpib.c b/src/scpi/scpi_libgpib.c
index 5df90413ff4dd1197e9475419a4f03537721bc31..cd098e8965ddaa531937bddf6e0192db187d7a99 100644 (file)
--- a/src/scpi/scpi_libgpib.c
+++ b/src/scpi/scpi_libgpib.c
@@ -17,11 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
 #include <gpib/ib.h>
 #include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_gpib"
 

diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index de307989ad17a0bb5f3e837111f42908257ad8e7..68a684c2d40fd4758c34f5a6d4b93d29ef76a836 100644 (file)
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -18,12 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_serial"
 

diff --git a/src/scpi/scpi_tcp.c b/src/scpi/scpi_tcp.c
index ef3a6c7564e219a65e7f921a4bc72bb6f58501e1..7b3c9155d2026e99472365215f8cf9da1510312d 100644 (file)
--- a/src/scpi/scpi_tcp.c
+++ b/src/scpi/scpi_tcp.c
@@ -22,10 +22,6 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
-
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
 #include <glib.h>
 #include <string.h>
 #include <unistd.h>
@@ -36,6 +32,8 @@
 #include <netdb.h>
 #endif
 #include <errno.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_tcp"
 

diff --git a/src/scpi/scpi_visa.c b/src/scpi/scpi_visa.c
index cf34a55529aadfc7afe25f515df9c4a51c416807..34ac9455d09038e97f21570df16634d655f5ac0b 100644 (file)
--- a/src/scpi/scpi_visa.c
+++ b/src/scpi/scpi_visa.c
@@ -17,11 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
 #include <visa.h>
 #include <string.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi_visa"
 

diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index e7a4b2b5087eec89c7ca3111848f3ec49d78e9fe..e7e48d62776e8974e94abccff8fd469729fd1b30 100644 (file)
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -22,7 +22,6 @@
 
 #include <rpc/rpc.h>
 #include <string.h>
-
 #include "vxi.h"
 #include "libsigrok.h"
 #include "libsigrok-internal.h"