From: Matt Ranostay Date: Sun, 25 Aug 2013 05:00:52 +0000 (-0700) Subject: ols: add test mode support X-Git-Tag: libsigrok-0.2.2~79 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=967760a8937e997ba9d7b729442f882947be154e ols: add test mode support ols allows both external and internal test patterns at ~20khz which are helpful for unit tests and demos. pattern=internal -> route pattern internally to all 32 pins (input otherwise disabled) pattern=external -> generates pattern on unbuffered pins 16:31 (which can be looped back to the buffered pins 0:15) Signed-off-by: Matt Ranostay --- diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c index 63c98821..0000b42d 100644 --- a/hardware/openbench-logic-sniffer/api.c +++ b/hardware/openbench-logic-sniffer/api.c @@ -32,9 +32,25 @@ static const int32_t hwcaps[] = { SR_CONF_TRIGGER_TYPE, SR_CONF_CAPTURE_RATIO, SR_CONF_LIMIT_SAMPLES, + SR_CONF_PATTERN_MODE, SR_CONF_RLE, }; +#define STR_PATTERN_EXTERNAL "external" +#define STR_PATTERN_INTERNAL "internal" + +/* Supported methods of test pattern outputs */ +enum { + /** + * Capture pins 31:16 (unbuffered wing) output a test pattern + * that can captured on pins 0:15. + */ + PATTERN_EXTERNAL, + + /** Route test pattern internally to capture buffer. */ + PATTERN_INTERNAL, +}; + /* Probes are numbered 0-31 (on the PCB silkscreen). */ SR_PRIV const char *ols_probe_names[NUM_PROBES + 1] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", @@ -235,6 +251,12 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) case SR_CONF_LIMIT_SAMPLES: *data = g_variant_new_uint64(devc->limit_samples); break; + case SR_CONF_PATTERN_MODE: + if (devc->flag_reg & FLAG_EXTERNAL_TEST_MODE) + *data = g_variant_new_string(STR_PATTERN_EXTERNAL); + else if (devc->flag_reg & FLAG_INTERNAL_TEST_MODE) + *data = g_variant_new_string(STR_PATTERN_INTERNAL); + break; case SR_CONF_RLE: *data = g_variant_new_boolean(devc->flag_reg & FLAG_RLE ? TRUE : FALSE); break; @@ -250,6 +272,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) struct dev_context *devc; int ret; uint64_t tmp_u64; + const char *stropt; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -278,6 +301,19 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) } else ret = SR_OK; break; + case SR_CONF_PATTERN_MODE: + stropt = g_variant_get_string(data, NULL); + ret = SR_OK; + if (!strcmp(stropt, STR_PATTERN_INTERNAL)) { + sr_info("Enabling internal test mode."); + devc->flag_reg |= FLAG_INTERNAL_TEST_MODE; + } else if (!strcmp(stropt, STR_PATTERN_EXTERNAL)) { + sr_info("Enabling external test mode."); + devc->flag_reg |= FLAG_EXTERNAL_TEST_MODE; + } else { + ret = SR_ERR; + } + break; case SR_CONF_RLE: if (g_variant_get_boolean(data)) { sr_info("Enabling RLE."); diff --git a/hardware/openbench-logic-sniffer/protocol.h b/hardware/openbench-logic-sniffer/protocol.h index 3322409f..bf449e70 100644 --- a/hardware/openbench-logic-sniffer/protocol.h +++ b/hardware/openbench-logic-sniffer/protocol.h @@ -46,6 +46,7 @@ /* Command opcodes */ #define CMD_RESET 0x00 #define CMD_RUN 0x01 +#define CMD_TESTMODE 0x03 #define CMD_ID 0x02 #define CMD_METADATA 0x04 #define CMD_SET_FLAGS 0x82 @@ -74,6 +75,8 @@ #define FLAG_CLOCK_EXTERNAL 0x40 #define FLAG_CLOCK_INVERTED 0x80 #define FLAG_RLE 0x0100 +#define FLAG_EXTERNAL_TEST_MODE 0x0400 +#define FLAG_INTERNAL_TEST_MODE 0x0800 /* Private, per-device-instance driver context. */ struct dev_context {