summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2018-10-13 01:02:30 +0200
committerUwe Hermann <uwe@hermann-uwe.de>2018-10-13 02:17:06 +0200
commit5c723a57ebf09047b0fad0adab0f99c20e1b7d99 (patch)
treecf7a77a1d1c3b6743360da0f2139f657d8934177
parent725a2ca11e4c5d91dc8a7c33e81c0db1f1804994 (diff)
downloadlibsigrokdecode-5c723a57ebf09047b0fad0adab0f99c20e1b7d99.tar.gz
libsigrokdecode-5c723a57ebf09047b0fad0adab0f99c20e1b7d99.zip
log: Use human-readable output type name everywhere.
-rw-r--r--libsigrokdecode-internal.h1
-rw-r--r--session.c3
-rw-r--r--type_decoder.c6
3 files changed, 6 insertions, 4 deletions
diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h
index 1d0931e..d5a34a2 100644
--- a/libsigrokdecode-internal.h
+++ b/libsigrokdecode-internal.h
@@ -108,6 +108,7 @@ SRD_PRIV long srd_decoder_apiver(const struct srd_decoder *d);
/* type_decoder.c */
SRD_PRIV PyObject *srd_Decoder_type_new(void);
+SRD_PRIV const char *output_type_name(unsigned int idx);
/* type_logic.c */
SRD_PRIV PyObject *srd_logic_type_new(void);
diff --git a/session.c b/session.c
index 36b5005..73fdc08 100644
--- a/session.c
+++ b/session.c
@@ -372,7 +372,8 @@ SRD_API int srd_pd_output_callback_add(struct srd_session *sess,
if (!sess)
return SRD_ERR_ARG;
- srd_dbg("Registering new callback for output type %d.", output_type);
+ srd_dbg("Registering new callback for output type %s.",
+ output_type_name(output_type));
pd_cb = g_malloc(sizeof(struct srd_pd_callback));
pd_cb->output_type = output_type;
diff --git a/type_decoder.c b/type_decoder.c
index b90bdea..2ce7fc1 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -31,7 +31,7 @@ typedef struct {
} srd_Decoder;
/* This is only used for nicer srd_dbg() output. */
-static const char *output_type_name(unsigned int idx)
+SRD_PRIV const char *output_type_name(unsigned int idx)
{
static const char names[][16] = {
"OUTPUT_ANN",
@@ -519,8 +519,8 @@ static PyObject *Decoder_register(PyObject *self, PyObject *args,
return py_new_output_id;
}
- srd_dbg("Instance %s creating new output type %d for %s.",
- di->inst_id, output_type, proto_id);
+ srd_dbg("Instance %s creating new output type %s for %s.",
+ di->inst_id, output_type_name(output_type), proto_id);
pdo = g_malloc(sizeof(struct srd_pd_output));