bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building with --disable-eoe.

This commit is contained in:
Florian Pose 2024-02-05 15:41:02 +01:00
parent 25bf7ef885
commit 25cfa1ead1
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/slave_config.c
View File

@ -890,6 +890,8 @@ int ecrt_slave_config_flag(ec_slave_config_t *sc, const char *key,
/****************************************************************************/
#ifdef EC_EOE
int ecrt_slave_config_eoe_link(ec_slave_config_t *sc,
const unsigned char *mac_address)
{
@ -1017,4 +1019,6 @@ int ecrt_slave_config_eoe_name(ec_slave_config_t *sc,
return 0;
}
#endif // EC_EOE
/****************************************************************************/

4
master/ioctl.c
View File

@ -3303,6 +3303,8 @@ static ATTRIBUTES int ec_ioctl_sc_flag(
/****************************************************************************/
#ifdef EC_EOE
/** Configures EoE IP parameters.
*
* \return Zero on success, otherwise a negative error code.
@ -3362,6 +3364,8 @@ static ATTRIBUTES int ec_ioctl_sc_ip(
return ret;
}
#endif
/****************************************************************************/
/** Gets the domain's data size.

6
master/slave_config.c
View File

@ -1434,6 +1434,8 @@ int ecrt_slave_config_flag(ec_slave_config_t *sc, const char *key,
/****************************************************************************/
#ifdef EC_EOE
int ecrt_slave_config_eoe_link(ec_slave_config_t *sc,
const unsigned char *mac_address)
{
@ -1489,6 +1491,8 @@ int ecrt_slave_config_eoe_name(ec_slave_config_t *sc,
return 0;
}
#endif
/****************************************************************************/
/** \cond */
@ -1519,12 +1523,14 @@ EXPORT_SYMBOL(ecrt_slave_config_create_reg_request);
EXPORT_SYMBOL(ecrt_slave_config_state);
EXPORT_SYMBOL(ecrt_slave_config_idn);
EXPORT_SYMBOL(ecrt_slave_config_flag);
#ifdef EOE
EXPORT_SYMBOL(ecrt_slave_config_eoe_link);
EXPORT_SYMBOL(ecrt_slave_config_eoe_addr);
EXPORT_SYMBOL(ecrt_slave_config_eoe_subnet);
EXPORT_SYMBOL(ecrt_slave_config_eoe_default);
EXPORT_SYMBOL(ecrt_slave_config_eoe_dns);
EXPORT_SYMBOL(ecrt_slave_config_eoe_name);
#endif
/** \endcond */

4
tool/CommandConfig.cpp
View File

@ -147,7 +147,9 @@ void CommandConfig::showDetailedConfigs(
ec_ioctl_config_sdo_t sdo;
ec_ioctl_config_idn_t idn;
ec_ioctl_config_flag_t flag;
#ifdef EC_EOE
ec_ioctl_eoe_ip_t ip;
#endif
string indent(doIndent ? " " : "");
for (configIter = configList.begin();
@ -300,6 +302,7 @@ void CommandConfig::showDetailedConfigs(
cout << indent << " None." << endl;
}
#ifdef EC_EOE
m.getIpParam(&ip, configIter->config_index);
if (ip.mac_address_included or ip.ip_address_included or
ip.subnet_mask_included or ip.gateway_included or
@ -351,6 +354,7 @@ void CommandConfig::showDetailedConfigs(
cout << indent << " Hostname:" << ip.name << endl;
}
}
#endif
if (configIter->dc_assign_activate) {
int i;