sysclk-sla5032: Make a few functions static.

diff --git a/src/hardware/sysclk-sla5032/api.c b/src/hardware/sysclk-sla5032/api.c
index cc7e7907d1e0e4f03e405a8dedeb85caa12e6557..0eb6a732068b399951440be690fb9689a12a5d8f 100644 (file)
--- a/src/hardware/sysclk-sla5032/api.c
+++ b/src/hardware/sysclk-sla5032/api.c
@@ -501,7 +501,7 @@ static int config_list(uint32_t key, GVariant **data,
  */
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
-       return la_start_acquisition(sdi);
+       return sla5032_start_acquisition(sdi);
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)

diff --git a/src/hardware/sysclk-sla5032/protocol.c b/src/hardware/sysclk-sla5032/protocol.c
index b4a4e4d69d8e7141d2a630713341ca1fd3f072e7..46e24819bad4a9d58ddfb331d971330ad8c2928c 100644 (file)
--- a/src/hardware/sysclk-sla5032/protocol.c
+++ b/src/hardware/sysclk-sla5032/protocol.c
@@ -245,7 +245,7 @@ static int la_read_samples(const struct sr_usb_dev_inst *usb, unsigned int addr)
        return la_write_cmd_buf(usb, CMD_READ_DATA, addr, 0, NULL); /* rd samples */
 }
 
-SR_PRIV int sla5032_set_depth(const struct sr_usb_dev_inst *usb, uint32_t pre, uint32_t post)
+static int sla5032_set_depth(const struct sr_usb_dev_inst *usb, uint32_t pre, uint32_t post)
 {
        int ret;
 
@@ -257,7 +257,7 @@ SR_PRIV int sla5032_set_depth(const struct sr_usb_dev_inst *usb, uint32_t pre, u
        return la_write_reg(usb, 6, post);
 }
 
-SR_PRIV int sla5032_set_triggers(const struct sr_usb_dev_inst *usb,
+static int sla5032_set_triggers(const struct sr_usb_dev_inst *usb,
                uint32_t trg_value, uint32_t trg_edge_mask, uint32_t trg_mask)
 {
        int ret;
@@ -330,7 +330,7 @@ static const struct pll_tbl_entry_t pll_tbl[] = {
        {      2000, 99999, 0                      }, /*   2k = f/100000   */
 };
 
-SR_PRIV int sla5032_set_samplerate(const struct sr_usb_dev_inst *usb, unsigned int sr)
+static int sla5032_set_samplerate(const struct sr_usb_dev_inst *usb, unsigned int sr)
 {
        int i, ret;
        const struct pll_tbl_entry_t *e;
@@ -361,7 +361,7 @@ SR_PRIV int sla5032_set_samplerate(const struct sr_usb_dev_inst *usb, unsigned i
                (e->pll_mul_flags & PLL_MUL1_25) ? 0 : 1); /* bit7 (0=en_mul_1.25) */
 }
 
-SR_PRIV int sla5032_start_sample(const struct sr_usb_dev_inst *usb)
+static int sla5032_start_sample(const struct sr_usb_dev_inst *usb)
 {
        int ret;
        const unsigned int bits[10][2] = {
@@ -382,7 +382,7 @@ SR_PRIV int sla5032_start_sample(const struct sr_usb_dev_inst *usb)
        return ret;
 }
 
-SR_PRIV int sla5032_get_status(const struct sr_usb_dev_inst *usb, uint32_t status[3])
+static int sla5032_get_status(const struct sr_usb_dev_inst *usb, uint32_t status[3])
 {
        int ret;
        uint32_t v;
@@ -419,7 +419,7 @@ static int la_read_samples_data(const struct sr_usb_dev_inst *usb, void *buf,
                        xfer_len, USB_DATA_TIMEOUT_MS);
 }
 
-SR_PRIV int sla5032_read_data_chunk(const struct sr_usb_dev_inst *usb,
+static int sla5032_read_data_chunk(const struct sr_usb_dev_inst *usb,
                void *buf, unsigned int len, int *xfer_len)
 {
        int ret;
@@ -443,7 +443,7 @@ SR_PRIV int sla5032_read_data_chunk(const struct sr_usb_dev_inst *usb,
        return la_read_samples_data(usb, buf, len, xfer_len);
 }
 
-SR_PRIV int sla5032_set_read_back(const struct sr_usb_dev_inst *usb)
+static int sla5032_set_read_back(const struct sr_usb_dev_inst *usb)
 {
        int ret;
 
@@ -454,7 +454,7 @@ SR_PRIV int sla5032_set_read_back(const struct sr_usb_dev_inst *usb)
        return la_write_reg(usb, 5, 0x28);
 }
 
-SR_PRIV int sla5032_set_pwm1(const struct sr_usb_dev_inst* usb, uint32_t hi, uint32_t lo)
+static int sla5032_set_pwm1(const struct sr_usb_dev_inst* usb, uint32_t hi, uint32_t lo)
 {
        int ret;
 
@@ -465,7 +465,7 @@ SR_PRIV int sla5032_set_pwm1(const struct sr_usb_dev_inst* usb, uint32_t hi, uin
        return la_write_reg(usb, 10, lo);
 }
 
-SR_PRIV int sla5032_set_pwm2(const struct sr_usb_dev_inst* usb, uint32_t hi, uint32_t lo)
+static int sla5032_set_pwm2(const struct sr_usb_dev_inst* usb, uint32_t hi, uint32_t lo)
 {
        int ret;
 
@@ -476,7 +476,7 @@ SR_PRIV int sla5032_set_pwm2(const struct sr_usb_dev_inst* usb, uint32_t hi, uin
        return la_write_reg(usb, 12, lo);
 }
 
-SR_PRIV int sla5032_write_reg14_zero(const struct sr_usb_dev_inst* usb)
+static int sla5032_write_reg14_zero(const struct sr_usb_dev_inst* usb)
 {
        return la_write_reg(usb, 14, 0);
 }
@@ -866,7 +866,7 @@ static int la_prepare_data(int fd, int revents, void *cb_data)
        return G_SOURCE_CONTINUE;
 }
 
-SR_PRIV int la_start_acquisition(const struct sr_dev_inst *sdi)
+SR_PRIV int sla5032_start_acquisition(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;

diff --git a/src/hardware/sysclk-sla5032/protocol.h b/src/hardware/sysclk-sla5032/protocol.h
index 1c1fa7db105bfd4ba7abd81ff311a3233f801aae..20369cd4b31c830828eb5b79f155f39b30c62748 100644 (file)
--- a/src/hardware/sysclk-sla5032/protocol.h
+++ b/src/hardware/sysclk-sla5032/protocol.h
@@ -88,8 +88,6 @@ enum command_id {
        CMD_READ_DATA = 7,
 };
 
-struct sr_usb_dev_inst;
-
 struct dev_context {
        uint64_t samplerate;            /* requested samplerate */
        uint64_t limit_samples;         /* requested capture length (samples) */
@@ -108,18 +106,7 @@ struct dev_context {
        enum protocol_state state;      /* async protocol state */
 };
 
-SR_PRIV int la_start_acquisition(const struct sr_dev_inst *sdi);
-
+SR_PRIV int sla5032_start_acquisition(const struct sr_dev_inst *sdi);
 SR_PRIV int sla5032_apply_fpga_config(const struct sr_dev_inst* sdi);
-SR_PRIV int sla5032_start_sample(const struct sr_usb_dev_inst *usb);
-SR_PRIV int sla5032_get_status(const struct sr_usb_dev_inst *usb, uint32_t status[3]);
-SR_PRIV int sla5032_set_read_back(const struct sr_usb_dev_inst *usb);
-SR_PRIV int sla5032_read_data_chunk(const struct sr_usb_dev_inst *usb, void *buf, unsigned int len, int *xfer_len);
-SR_PRIV int sla5032_set_depth(const struct sr_usb_dev_inst *usb, uint32_t pre, uint32_t post);
-SR_PRIV int sla5032_set_triggers(const struct sr_usb_dev_inst *usb,  uint32_t trg_value, uint32_t trg_edge_mask, uint32_t trg_mask);
-SR_PRIV int sla5032_set_samplerate(const struct sr_usb_dev_inst *usb, unsigned int sr);
-SR_PRIV int sla5032_set_pwm1(const struct sr_usb_dev_inst *usb, uint32_t hi, uint32_t lo);
-SR_PRIV int sla5032_set_pwm2(const struct sr_usb_dev_inst* usb, uint32_t hi, uint32_t lo);
-SR_PRIV int sla5032_write_reg14_zero(const struct sr_usb_dev_inst* usb);
 
 #endif