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

scpi-pps: Fix "aquisition" typo everywhere.

This commit is contained in:
Uwe Hermann 2019-04-17 17:32:26 +02:00
parent 9652610080
commit fd2433153a
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/scpi-pps/api.c
View File

@ -764,9 +764,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
/* Prime the pipe with the first channel. */ /* Prime the pipe with the first channel. */
devc->cur_acquisition_channel = sr_next_enabled_channel(sdi, NULL); devc->cur_acquisition_channel = sr_next_enabled_channel(sdi, NULL);
/* Device specific initialization before aquisition starts. */ /* Device specific initialization before acquisition starts. */
if (devc->device->init_aquisition) if (devc->device->init_acquisition)
devc->device->init_aquisition(sdi); devc->device->init_acquisition(sdi);
if ((ret = sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10, if ((ret = sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10,
scpi_pps_receive_data, (void *)sdi)) != SR_OK) scpi_pps_receive_data, (void *)sdi)) != SR_OK)

54
src/hardware/scpi-pps/profiles.c
View File

@ -483,7 +483,7 @@ static const struct scpi_command hp_6630a_cmd[] = {
ALL_ZERO ALL_ZERO
}; };
static int hp_6630a_init_aquisition(const struct sr_dev_inst *sdi) static int hp_6630a_init_acquisition(const struct sr_dev_inst *sdi)
{ {
struct sr_scpi_dev_inst *scpi; struct sr_scpi_dev_inst *scpi;
int ret; int ret;
@ -665,7 +665,7 @@ static const struct scpi_command hp_6630b_cmd[] = {
ALL_ZERO ALL_ZERO
}; };
static int hp_6630b_init_aquisition(const struct sr_dev_inst *sdi) static int hp_6630b_init_acquisition(const struct sr_dev_inst *sdi)
{ {
struct sr_scpi_dev_inst *scpi; struct sr_scpi_dev_inst *scpi;
int ret; int ret;
@ -1047,7 +1047,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(agilent_n5700a_cg), ARRAY_AND_SIZE(agilent_n5700a_cg),
agilent_n5700a_cmd, agilent_n5700a_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
@ -1059,7 +1059,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(agilent_n5700a_cg), ARRAY_AND_SIZE(agilent_n5700a_cg),
agilent_n5700a_cmd, agilent_n5700a_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
@ -1071,7 +1071,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(bk_9130_cg), ARRAY_AND_SIZE(bk_9130_cg),
bk_9130_cmd, bk_9130_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
@ -1083,7 +1083,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(chroma_61604_cg), ARRAY_AND_SIZE(chroma_61604_cg),
chroma_61604_cmd, chroma_61604_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
@ -1095,7 +1095,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
NULL, 0, NULL, 0,
chroma_62000_cmd, chroma_62000_cmd,
.probe_channels = chroma_62000p_probe_channels, .probe_channels = chroma_62000p_probe_channels,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
@ -1112,7 +1112,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630a_cg), ARRAY_AND_SIZE(hp_6630a_cg),
hp_6630a_cmd, hp_6630a_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630a_init_aquisition, hp_6630a_init_acquisition,
hp_6630a_update_status, hp_6630a_update_status,
}, },
*/ */
@ -1125,7 +1125,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630a_cg), ARRAY_AND_SIZE(hp_6630a_cg),
hp_6630a_cmd, hp_6630a_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630a_init_aquisition, hp_6630a_init_acquisition,
hp_6630a_update_status, hp_6630a_update_status,
}, },
@ -1137,7 +1137,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630a_cg), ARRAY_AND_SIZE(hp_6630a_cg),
hp_6630a_cmd, hp_6630a_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630a_init_aquisition, hp_6630a_init_acquisition,
hp_6630a_update_status, hp_6630a_update_status,
}, },
@ -1149,7 +1149,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630a_cg), ARRAY_AND_SIZE(hp_6630a_cg),
hp_6630a_cmd, hp_6630a_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630a_init_aquisition, hp_6630a_init_acquisition,
hp_6630a_update_status, hp_6630a_update_status,
}, },
@ -1161,7 +1161,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1173,7 +1173,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1185,7 +1185,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1197,7 +1197,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1209,7 +1209,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1221,7 +1221,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1233,7 +1233,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1245,7 +1245,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1257,7 +1257,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(hp_6630b_cg), ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd, hp_6630b_cmd,
.probe_channels = NULL, .probe_channels = NULL,
hp_6630b_init_aquisition, hp_6630b_init_acquisition,
hp_6630b_update_status, hp_6630b_update_status,
}, },
@ -1269,7 +1269,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rigol_dp700_cg), ARRAY_AND_SIZE(rigol_dp700_cg),
rigol_dp700_cmd, rigol_dp700_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
{ "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0, { "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0,
@ -1279,7 +1279,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rigol_dp700_cg), ARRAY_AND_SIZE(rigol_dp700_cg),
rigol_dp700_cmd, rigol_dp700_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
@ -1291,7 +1291,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rigol_dp820_cg), ARRAY_AND_SIZE(rigol_dp820_cg),
rigol_dp800_cmd, rigol_dp800_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
{ "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP, { "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
@ -1301,7 +1301,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rigol_dp830_cg), ARRAY_AND_SIZE(rigol_dp830_cg),
rigol_dp800_cmd, rigol_dp800_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
{ "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP, { "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
@ -1311,7 +1311,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rigol_dp830_cg), ARRAY_AND_SIZE(rigol_dp830_cg),
rigol_dp800_cmd, rigol_dp800_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
@ -1323,7 +1323,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
NULL, 0, NULL, 0,
philips_pm2800_cmd, philips_pm2800_cmd,
philips_pm2800_probe_channels, philips_pm2800_probe_channels,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
@ -1335,7 +1335,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rs_hmc8043_cg), ARRAY_AND_SIZE(rs_hmc8043_cg),
rs_hmc8043_cmd, rs_hmc8043_cmd,
.probe_channels = NULL, .probe_channels = NULL,
.init_aquisition = NULL, .init_acquisition = NULL,
.update_status = NULL, .update_status = NULL,
}, },
}; };

2
src/hardware/scpi-pps/protocol.h
View File

@ -107,7 +107,7 @@ struct scpi_pps {
int (*probe_channels) (struct sr_dev_inst *sdi, struct sr_scpi_hw_info *hwinfo, int (*probe_channels) (struct sr_dev_inst *sdi, struct sr_scpi_hw_info *hwinfo,
struct channel_spec **channels, unsigned int *num_channels, struct channel_spec **channels, unsigned int *num_channels,
struct channel_group_spec **channel_groups, unsigned int *num_channel_groups); struct channel_group_spec **channel_groups, unsigned int *num_channel_groups);
int (*init_aquisition) (const struct sr_dev_inst *sdi); int (*init_acquisition) (const struct sr_dev_inst *sdi);
int (*update_status) (const struct sr_dev_inst *sdi); int (*update_status) (const struct sr_dev_inst *sdi);
}; };