BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conrad-digi-35-cpu: Add and use missing dev_context structure

This commit is contained in:
Frank Stettner 2017-09-07 16:09:10 +02:00 committed by Uwe Hermann
parent bc98407b8f
commit eea576077b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/conrad-digi-35-cpu/api.c
View File

@ -39,6 +39,7 @@ static const uint32_t devopts[] = {
static GSList *scan(struct sr_dev_driver *di, GSList *options) static GSList *scan(struct sr_dev_driver *di, GSList *options)
{ {
struct dev_context *devc;
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct sr_config *src; struct sr_config *src;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
@ -83,8 +84,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup("Conrad"); sdi->vendor = g_strdup("Conrad");
sdi->model = g_strdup("DIGI 35 CPU"); sdi->model = g_strdup("DIGI 35 CPU");
devc = g_malloc0(sizeof(struct dev_context));
sr_sw_limits_init(&devc->limits);
sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial; sdi->conn = serial;
sdi->priv = NULL; sdi->priv = devc;
sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1"); sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1");
return std_scan_complete(di, g_slist_append(NULL, sdi)); return std_scan_complete(di, g_slist_append(NULL, sdi));

4
src/hardware/conrad-digi-35-cpu/protocol.h
View File

@ -28,6 +28,10 @@
#define LOG_PREFIX "conrad-digi-35-cpu" #define LOG_PREFIX "conrad-digi-35-cpu"
struct dev_context {
struct sr_sw_limits limits;
};
SR_PRIV int send_msg1(const struct sr_dev_inst *sdi, char cmd, int param); SR_PRIV int send_msg1(const struct sr_dev_inst *sdi, char cmd, int param);
#endif #endif