Add sr_ prefix to 'struct samplerates'.

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 935412e5c0bd58d62513b8c611e651ba6e303d02..b19c06f36eebed1bddd540bfd6c8cbd243b145e5 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -56,7 +56,7 @@ static uint64_t supported_samplerates[] = {
        0,
 };
 
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
        KHZ(200),
        MHZ(200),
        0,

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index e728317788d310adfb80848d76047b8f4a85e353..146b9117b0ad7b6ca70919c30574301d218b1cdb 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -52,7 +52,7 @@ static uint64_t supported_samplerates[] = {
        MHZ(10), MHZ(20), MHZ(50), MHZ(100), MHZ(200), 0
 };
 
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
        100, MHZ(200), 0, supported_samplerates,
 };
 

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 95da9a248e4bfa99bb59e9528cd1b93818657b44..ec5ce75ca7c0f6a0192f0116f3a3a04c810a9342 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -91,7 +91,7 @@ static int capabilities[] = {
        0,
 };
 
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
        10,
        MHZ(200),
        1,

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 1a438e41bc0628d24b3dab3cb562ea40104c10e9..953630da14befec620023f3438009d4bd5dc9d31 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -86,7 +86,7 @@ static uint64_t supported_samplerates[] = {
        0,
 };
 
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
        KHZ(200),
        MHZ(24),
        0,

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index d7f6d4114e3d30d87084f5a6459d333948f0d5d0..7752d42e86e3aa4eae8fd7bf253c61675f4a3d31 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -108,7 +108,7 @@ static uint64_t supported_samplerates[] = {
        0,
 };
 
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
        0, 0, 0,
        supported_samplerates,
 };

diff --git a/sigrok.h b/sigrok.h
index 9a5d0cbeade3bacab1e368481565652ca9f2af76..7d19725fd238ce49775440a93ec2266886a85906 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -299,7 +299,7 @@ enum {
        SR_DI_INSTANCE,
        /* The number of probes connected to this device */
        SR_DI_NUM_PROBES,
-       /* Samplerates supported by this device, (struct samplerates) */
+       /* Samplerates supported by this device, (struct sr_samplerates) */
        SR_DI_SAMPLERATES,
        /* Types of trigger supported, out of "01crf" (char *) */
        SR_DI_TRIGGER_TYPES,
@@ -314,7 +314,7 @@ enum {
  * granularity, or is limited to a set of defined samplerates. Use either
  * step or list, but not both.
  */
-struct samplerates {
+struct sr_samplerates {
        uint64_t low;
        uint64_t high;
        uint64_t step;