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

metex14: Pass 'info' as a void pointer. 

This is done so that the function prototype of all sr_*_parse() DMM
functions is the same, which will be needed later.
This commit is contained in:
Uwe Hermann 2012-12-01 19:01:07 +01:00
parent 93357bc3ce
commit 1fbab46626
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hardware/common/dmm/metex14.c
View File

@ -268,29 +268,34 @@ SR_PRIV gboolean sr_metex14_packet_valid(const uint8_t *buf)
/** /**
* Parse a protocol packet. * Parse a protocol packet.
* *
* @param buf Buffer containing the protocol packet. * @param buf Buffer containing the protocol packet. Must not be NULL.
* @param floatval Pointer to a float variable. That variable will be modified * @param floatval Pointer to a float variable. That variable will be modified
* in-place depending on the protocol packet. * in-place depending on the protocol packet. Must not be NULL.
* @param analog Pointer to a struct sr_datafeed_analog. The struct will be * @param analog Pointer to a struct sr_datafeed_analog. The struct will be
* filled with data according to the protocol packet. * filled with data according to the protocol packet.
* Must not be NULL.
* @param info Pointer to a struct metex14_info. The struct will be filled
* with data according to the protocol packet. Must not be NULL.
* *
* @return SR_OK upon success, SR_ERR upon failure. Upon errors, the * @return SR_OK upon success, SR_ERR upon failure. Upon errors, the
* 'analog' variable contents are undefined and should not be used. * 'analog' variable contents are undefined and should not be used.
*/ */
SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval, SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
struct sr_datafeed_analog *analog, struct sr_datafeed_analog *analog, void *info)
struct metex14_info *info)
{ {
int ret; int ret;
struct metex14_info *info_local;
info_local = (struct metex14_info *)info;
if ((ret = parse_value(buf, floatval)) != SR_OK) { if ((ret = parse_value(buf, floatval)) != SR_OK) {
sr_err("Error parsing value: %d.", ret); sr_err("Error parsing value: %d.", ret);
return ret; return ret;
} }
memset(info, 0x00, sizeof(struct metex14_info)); memset(info_local, 0x00, sizeof(struct metex14_info));
parse_flags((const char *)buf, info); parse_flags((const char *)buf, info_local);
handle_flags(analog, floatval, info); handle_flags(analog, floatval, info_local);
return SR_OK; return SR_OK;
} }

3
libsigrok-internal.h
View File

@ -202,7 +202,6 @@ struct metex14_info {
SR_PRIV gboolean sr_metex14_packet_valid(const uint8_t *buf); SR_PRIV gboolean sr_metex14_packet_valid(const uint8_t *buf);
SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval, SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
struct sr_datafeed_analog *analog, struct sr_datafeed_analog *analog, void *info);
struct metex14_info *info);
#endif #endif