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

motech-lps-30x: Cleanup.

This commit is contained in:
Matthias Heidbrink 2014-05-19 20:47:15 +02:00
parent 1c3d002b68
commit 1f7da0c2bb
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hardware/motech-lps-30x/api.c
View File

@ -281,7 +281,6 @@ SR_PRIV int lps_query_status(struct sr_dev_inst* sdi)
{ {
char buf[LINELEN_MAX]; char buf[LINELEN_MAX];
int stat; int stat;
const char* ptr;
struct dev_context* devc; struct dev_context* devc;
devc = (struct dev_context*)sdi->priv; devc = (struct dev_context*)sdi->priv;
@ -293,11 +292,7 @@ SR_PRIV int lps_query_status(struct sr_dev_inst* sdi)
return SR_ERR; return SR_ERR;
} }
/* Jump across leading zeros to prevent sr_atoi() believing this to be octal. */ if (sr_atoi(buf, &stat) != SR_OK)
for (ptr = buf; isspace(*buf) || (*ptr == '0'); ptr++)
;
if (sr_atoi(ptr, &stat) != SR_OK)
return SR_ERR; return SR_ERR;
return lps_process_status(sdi, stat); return lps_process_status(sdi, stat);
@ -369,7 +364,7 @@ SR_PRIV int lps_read_reply(struct sr_serial_dev_inst *serial, char **buf, int *b
/** Scan for LPS-300 series device. /** Scan for LPS-300 series device.
*/ */
static GSList *doScan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *options) static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *options)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct drv_context *drvc; struct drv_context *drvc;
@ -511,7 +506,7 @@ exit_err:
/** Scan for LPS-301 device. */ /** Scan for LPS-301 device. */
static GSList *scan_lps301(GSList *options) static GSList *scan_lps301(GSList *options)
{ {
return doScan(LPS_301, &motech_lps_301_driver_info, options); return do_scan(LPS_301, &motech_lps_301_driver_info, options);
} }
static GSList *doDevList(struct sr_dev_driver *drv) static GSList *doDevList(struct sr_dev_driver *drv)

4
hardware/motech-lps-30x/protocol.c
View File

@ -139,7 +139,6 @@ SR_PRIV int motech_lps_30x_receive_data(int fd, int revents, void *cb_data)
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
// char achar;
int len; int len;
gdouble elapsed_s; gdouble elapsed_s;
@ -166,9 +165,6 @@ SR_PRIV int motech_lps_30x_receive_data(int fd, int revents, void *cb_data)
continue; continue;
} }
// achar = *(devc->buf + devc->buflen);
// sr_spew("read 0x%02x/%d/'%c'", achar, achar, achar);
devc->buflen += len; devc->buflen += len;
devc->buf[devc->buflen] = '\0'; devc->buf[devc->buflen] = '\0';