Renamed state field to al_state.
--- a/master/cdev.c Fri Jul 25 08:54:59 2008 +0000
+++ b/master/cdev.c Fri Jul 25 09:08:12 2008 +0000
@@ -190,7 +190,7 @@
data.coe_details = slave->sii.coe_details;
data.general_flags = slave->sii.general_flags;
data.current_on_ebus = slave->sii.current_on_ebus;
- data.state = slave->current_state;
+ data.al_state = slave->current_state;
data.error_flag = slave->error_flag;
data.sync_count = slave->sii.sync_count;
--- a/master/ioctl.h Fri Jul 25 08:54:59 2008 +0000
+++ b/master/ioctl.h Fri Jul 25 09:08:12 2008 +0000
@@ -115,7 +115,7 @@
ec_sii_coe_details_t coe_details;
ec_sii_general_flags_t general_flags;
int16_t current_on_ebus;
- uint8_t state;
+ uint8_t al_state;
uint8_t error_flag;
uint8_t sync_count;
uint16_t sdo_count;
@@ -216,7 +216,7 @@
typedef struct {
// inputs
uint16_t slave_position;
- uint8_t requested_state;
+ uint8_t al_state;
} ec_ioctl_slave_state_t;
/*****************************************************************************/
--- a/tool/CommandConfig.cpp Fri Jul 25 08:54:59 2008 +0000
+++ b/tool/CommandConfig.cpp Fri Jul 25 09:08:12 2008 +0000
@@ -128,7 +128,7 @@
if (configIter->slave_position != -1) {
m.getSlave(&slave, configIter->slave_position);
cout << configIter->slave_position
- << " (" << alStateString(slave.state) << ")" << endl;
+ << " (" << alStateString(slave.al_state) << ")" << endl;
} else {
cout << "none" << endl;
}
@@ -245,7 +245,7 @@
str.clear();
str.str("");
- str << alStateString(slave.state);
+ str << alStateString(slave.al_state);
info.state = str.str();
str.clear();
str.str("");
--- a/tool/CommandSlaves.cpp Fri Jul 25 08:54:59 2008 +0000
+++ b/tool/CommandSlaves.cpp Fri Jul 25 09:08:12 2008 +0000
@@ -126,7 +126,7 @@
info.relPos = str.str();
str.str("");
- info.state = alStateString(slave.state);
+ info.state = alStateString(slave.al_state);
info.flag = (slave.error_flag ? 'E' : '+');
if (strlen(slave.name)) {
@@ -186,7 +186,7 @@
cout << "Alias: " << slave.alias << endl;
cout
- << "State: " << alStateString(slave.state) << endl
+ << "State: " << alStateString(slave.al_state) << endl
<< "Flag: " << (slave.error_flag ? 'E' : '+') << endl
<< "Identity:" << endl
<< " Vendor Id: 0x"
--- a/tool/MasterDevice.cpp Fri Jul 25 08:54:59 2008 +0000
+++ b/tool/MasterDevice.cpp Fri Jul 25 09:08:12 2008 +0000
@@ -407,7 +407,7 @@
ec_ioctl_slave_state_t data;
data.slave_position = slavePosition;
- data.requested_state = state;
+ data.al_state = state;
if (ioctl(fd, EC_IOCTL_SLAVE_STATE, &data)) {
stringstream err;