Mark some private stuff 'static'.

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 281d9da4521f50f9c1ed114486703ac58281de0b..734b01da6bb86b61667bc972d7e150a1366666b8 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -41,6 +41,7 @@ enum {
        GENMODE_INC,
 };
 
+/* FIXME: Should not be global. */
 GIOChannel *channels[2];
 
 struct databag {

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 146b9117b0ad7b6ca70919c30574301d218b1cdb..b3ad93041e2022c2f7040f5cca25b98cf571f113 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -224,7 +224,6 @@ static int mso_configure_rate(struct sr_device_instance *sdi,
        return ret;
 }
 
-
 static inline uint16_t mso_calc_raw_from_mv(struct mso *mso)
 {
        return (uint16_t) (0x200 -
@@ -589,7 +588,6 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        default:
                return SR_OK; /* FIXME */
        }
-
 }
 
 #define MSO_TRIGGER_UNKNOWN    '!'

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 7752d42e86e3aa4eae8fd7bf253c61675f4a3d31..d55122a26e5e0ad504876d64683008bcc504c316 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -51,7 +51,7 @@ typedef struct {
  * Note -- 16032, 16064 and 16128 *usually* -- but not always -- have the
  * same 128K sample depth.
  */
-model_t zeroplus_models[] = {
+static model_t zeroplus_models[] = {
        {0x7009, "LAP-C(16064)",  16, 64,   100},
        {0x700A, "LAP-C(16128)",  16, 128,  200},
        {0x700B, "LAP-C(32128)",  32, 128,  200},
@@ -116,8 +116,8 @@ static struct sr_samplerates samplerates = {
 /* TODO: All of these should go in a device-specific struct. */
 static uint64_t cur_samplerate = 0;
 static uint64_t limit_samples = 0;
-int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
-uint64_t memory_size = 0;
+static int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
+static uint64_t memory_size = 0;
 static uint8_t probe_mask = 0;
 static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 };
 static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 };
@@ -189,7 +189,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
        return 0;
 }
 
-struct sr_device_instance *zp_open_device(int device_index)
+static struct sr_device_instance *zp_open_device(int device_index)
 {
        struct sr_device_instance *sdi;
        libusb_device **devlist;