diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index 935412e5..b19c06f3 100644 --- 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 e7283177..146b9117 100644 --- 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 95da9a24..ec5ce75c 100644 --- 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 1a438e41..953630da 100644 --- 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 d7f6d411..7752d42e 100644 --- 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 9a5d0cbe..7d19725f 100644 --- 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;