Rename SR_CONF_NUM_TIMEBASE to SR_CONF_NUM_HDIV.

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 1483b08e4448c384a95b1a2ad61e460c323eca94..662e986e56df88995d73a65401823ab588ea4701 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -706,8 +706,8 @@ enum sr_configkey {
        /** The device supports setting its sample interval, in ms. */
        SR_CONF_SAMPLE_INTERVAL,
 
        /** The device supports setting its sample interval, in ms. */
        SR_CONF_SAMPLE_INTERVAL,
 

-       /** Number of timebases, as related to SR_CONF_TIMEBASE.  */
-       SR_CONF_NUM_TIMEBASE,
+       /** Number of horizontal divisions, as related to SR_CONF_TIMEBASE. */
+       SR_CONF_NUM_HDIV,

 
        /** Number of vertical divisions, as related to SR_CONF_VDIV.  */
        SR_CONF_NUM_VDIV,
 
        /** Number of vertical divisions, as related to SR_CONF_VDIV.  */
        SR_CONF_NUM_VDIV,

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 8f27669ffde1c509b80e5ea728c5dbe53bc8bcec..77feac8637d54c00d039fd761cf5a39794bba0d3 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -221,7 +221,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        state = devc->model_state;
 
        switch (key) {
        state = devc->model_state;
 
        switch (key) {

-       case SR_CONF_NUM_TIMEBASE:
+       case SR_CONF_NUM_HDIV:

                *data = g_variant_new_int32(model->num_xdivs);
                ret = SR_OK;
                break;
                *data = g_variant_new_int32(model->num_xdivs);
                ret = SR_OK;
                break;

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 9487bac490c9c26dfeb3e35b1233c30c6568486b..28c9fd611950b270efbb441d8102f7be31b4640e 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -50,7 +50,7 @@ static const uint32_t hmo_devopts[] = {
        SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,

-       SR_CONF_NUM_TIMEBASE | SR_CONF_GET,
+       SR_CONF_NUM_HDIV | SR_CONF_GET,

        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_SAMPLERATE | SR_CONF_GET,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_SAMPLERATE | SR_CONF_GET,

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index efd36853dfc36ea7a1058e9aad31cba810018ff1..d375c2aac718105ff37c796badee684c14d71f3e 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -57,7 +57,7 @@ static const uint32_t devopts[] = {
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,

-       SR_CONF_NUM_TIMEBASE | SR_CONF_GET,
+       SR_CONF_NUM_HDIV | SR_CONF_GET,

        SR_CONF_NUM_VDIV | SR_CONF_GET,
 };
 
        SR_CONF_NUM_VDIV | SR_CONF_GET,
 };
 


@@ -439,7 +439,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        (void)cg;
 
        switch (key) {
        (void)cg;
 
        switch (key) {

-       case SR_CONF_NUM_TIMEBASE:
+       case SR_CONF_NUM_HDIV:

                *data = g_variant_new_int32(NUM_TIMEBASE);
                break;
        case SR_CONF_NUM_VDIV:
                *data = g_variant_new_int32(NUM_TIMEBASE);
                break;
        case SR_CONF_NUM_VDIV:

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 38aadf436de0ef89c13a83288364cab37f226f3e..a8f8bcdee73e4b18ec33a7f194a158be174b0368 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -41,7 +41,7 @@ static const uint32_t devopts[] = {
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,

-       SR_CONF_NUM_TIMEBASE | SR_CONF_GET,
+       SR_CONF_NUM_HDIV | SR_CONF_GET,

        SR_CONF_SAMPLERATE | SR_CONF_GET,
 };
 
        SR_CONF_SAMPLERATE | SR_CONF_GET,
 };
 


@@ -529,7 +529,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        }
 
        switch (key) {
        }
 
        switch (key) {

-       case SR_CONF_NUM_TIMEBASE:
+       case SR_CONF_NUM_HDIV:

                *data = g_variant_new_int32(devc->model->series->num_horizontal_divs);
                break;
        case SR_CONF_NUM_VDIV:
                *data = g_variant_new_int32(devc->model->series->num_horizontal_divs);
                break;
        case SR_CONF_NUM_VDIV:

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index b4a1305babdd5407ad8db5dbab6bc80d5331c4bb..27957406386828511c03b02b4120be07382307e8 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -218,7 +218,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        state = devc->model_state;
 
        switch (key) {
        state = devc->model_state;
 
        switch (key) {

-       case SR_CONF_NUM_TIMEBASE:
+       case SR_CONF_NUM_HDIV:

                *data = g_variant_new_int32(model->num_xdivs);
                ret = SR_OK;
                break;
                *data = g_variant_new_int32(model->num_xdivs);
                ret = SR_OK;
                break;

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 5dc03194af2ca207773f31d4d73ec564bd6c00d1..9f5daf1ce9d88bf1093497a08995263d3aa821f5 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -33,7 +33,7 @@ static const uint32_t dlm_devopts[] = {
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,

-       SR_CONF_NUM_TIMEBASE | SR_CONF_GET,
+       SR_CONF_NUM_HDIV | SR_CONF_GET,

        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
 };
 
        SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
 };
 

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 170922069edc95b19e6527110b61af3e194e8bdc..b1e0c3e68730a10237545e0db042cd598eff27ad 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -101,8 +101,8 @@ static struct sr_config_info sr_config_info_data[] = {
                "Trigger matches", NULL},
        {SR_CONF_SAMPLE_INTERVAL, SR_T_UINT64, "sample_interval",
                "Sample interval", NULL},
                "Trigger matches", NULL},
        {SR_CONF_SAMPLE_INTERVAL, SR_T_UINT64, "sample_interval",
                "Sample interval", NULL},

-       {SR_CONF_NUM_TIMEBASE, SR_T_INT32, "num_timebase",
-               "Number of time bases", NULL},
+       {SR_CONF_NUM_HDIV, SR_T_INT32, "num_hdiv",
+               "Number of horizontal divisions", NULL},

        {SR_CONF_NUM_VDIV, SR_T_INT32, "num_vdiv",
                "Number of vertical divisions", NULL},
        {SR_CONF_SPL_WEIGHT_FREQ, SR_T_STRING, "spl_weight_freq",
        {SR_CONF_NUM_VDIV, SR_T_INT32, "num_vdiv",
                "Number of vertical divisions", NULL},
        {SR_CONF_SPL_WEIGHT_FREQ, SR_T_STRING, "spl_weight_freq",