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

Various minor cosmetics and consistency fixes.

This commit is contained in:
Uwe Hermann 2015-08-15 17:16:01 +02:00
parent ad0293f19c
commit c442ffda0f
13 changed files with 42 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hardware/fx2lafw/api.c
View File

@ -778,8 +778,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (devc->dslogic) { if (devc->dslogic) {
dslogic_trigger_request(sdi); dslogic_trigger_request(sdi);
} } else {
else {
start_transfers(sdi); start_transfers(sdi);
if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) { if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) {
fx2lafw_abort_acquisition(devc); fx2lafw_abort_acquisition(devc);

5
src/hardware/hantek-dso/api.c
View File

@ -472,10 +472,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
*data = g_variant_new_string(devc->triggersource); *data = g_variant_new_string(devc->triggersource);
break; break;
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
if (devc->triggerslope == SLOPE_POSITIVE) s = (devc->triggerslope == SLOPE_POSITIVE) ? "r" : "f";
s = "r";
else
s = "f";
*data = g_variant_new_string(s); *data = g_variant_new_string(s);
break; break;
case SR_CONF_HORIZ_TRIGGERPOS: case SR_CONF_HORIZ_TRIGGERPOS:

2
src/hardware/link-mso19/protocol.c
View File

@ -198,7 +198,7 @@ SR_PRIV int mso_dac_out(const struct sr_dev_inst *sdi, uint16_t val)
return mso_send_control_message(devc->serial, ARRAY_AND_SIZE(ops)); return mso_send_control_message(devc->serial, ARRAY_AND_SIZE(ops));
} }
SR_PRIV inline uint16_t mso_calc_raw_from_mv(struct dev_context * devc) SR_PRIV uint16_t mso_calc_raw_from_mv(struct dev_context *devc)
{ {
return (uint16_t) (0x200 - return (uint16_t) (0x200 -
((devc->dso_trigger_voltage / devc->dso_probe_attn) / ((devc->dso_trigger_voltage / devc->dso_probe_attn) /

2
src/hardware/link-mso19/protocol.h
View File

@ -134,7 +134,7 @@ SR_PRIV int mso_read_buffer(struct sr_dev_inst *sdi);
SR_PRIV int mso_arm(const struct sr_dev_inst *sdi); SR_PRIV int mso_arm(const struct sr_dev_inst *sdi);
SR_PRIV int mso_force_capture(struct sr_dev_inst *sdi); SR_PRIV int mso_force_capture(struct sr_dev_inst *sdi);
SR_PRIV int mso_dac_out(const struct sr_dev_inst *sdi, uint16_t val); SR_PRIV int mso_dac_out(const struct sr_dev_inst *sdi, uint16_t val);
SR_PRIV inline uint16_t mso_calc_raw_from_mv(struct dev_context *devc); SR_PRIV uint16_t mso_calc_raw_from_mv(struct dev_context *devc);
SR_PRIV int mso_reset_fsm(struct sr_dev_inst *sdi); SR_PRIV int mso_reset_fsm(struct sr_dev_inst *sdi);
SR_PRIV int mso_toggle_led(struct sr_dev_inst *sdi, int state); SR_PRIV int mso_toggle_led(struct sr_dev_inst *sdi, int state);

2
src/hardware/manson-hcs-3xxx/api.c
View File

@ -20,7 +20,7 @@
*/ */
/** @file /** @file
* <em>Manson HCS-3xxx Series</em> power supply driver * <em>Manson HCS-3xxx series</em> power supply driver
* @internal * @internal
*/ */

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

@ -794,8 +794,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;

3
src/hardware/norma-dmm/api.c
View File

@ -250,8 +250,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;