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

Removed eeprom_write_enable file.

This commit is contained in:
Florian Pose 2007-03-01 14:50:53 +00:00
parent e3412a4c2f
commit 9afbed92d2
3 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
master/master.c
View File

@ -70,12 +70,10 @@ ssize_t ec_store_master_attribute(struct kobject *, struct attribute *,
/** \cond */
EC_SYSFS_READ_ATTR(info);
EC_SYSFS_READ_WRITE_ATTR(eeprom_write_enable);
EC_SYSFS_READ_WRITE_ATTR(debug_level);
static struct attribute *ec_def_attrs[] = {
&attr_info,
&attr_eeprom_write_enable,
&attr_debug_level,
NULL,
};
@ -154,8 +152,6 @@ int ec_master_init(ec_master_t *master, /**< EtherCAT master */
master->release_cb = NULL;
master->cb_data = NULL;
master->eeprom_write_enable = 0;
master->sdo_request = NULL;
master->sdo_seq_user = 0;
master->sdo_seq_master = 0;
@ -1003,9 +999,6 @@ ssize_t ec_show_master_attribute(struct kobject *kobj, /**< kobject */
else if (attr == &attr_debug_level) {
return sprintf(buffer, "%i\n", master->debug_level);
}
else if (attr == &attr_eeprom_write_enable) {
return sprintf(buffer, "%i\n", master->eeprom_write_enable);
}
return 0;
}
@ -1025,26 +1018,7 @@ ssize_t ec_store_master_attribute(struct kobject *kobj, /**< slave's kobject */
{
ec_master_t *master = container_of(kobj, ec_master_t, kobj);
if (attr == &attr_eeprom_write_enable) {
if (!strcmp(buffer, "1\n")) {
master->eeprom_write_enable = 1;
EC_INFO("Slave EEPROM writing enabled.\n");
return size;
}
else if (!strcmp(buffer, "0\n")) {
master->eeprom_write_enable = 0;
EC_INFO("Slave EEPROM writing disabled.\n");
return size;
}
EC_ERR("Invalid value for eeprom_write_enable!\n");
if (master->eeprom_write_enable) {
master->eeprom_write_enable = 0;
EC_INFO("Slave EEPROM writing disabled.\n");
}
}
else if (attr == &attr_debug_level) {
if (attr == &attr_debug_level) {
if (!strcmp(buffer, "0\n")) {
master->debug_level = 0;
}

2
master/master.h
View File

@ -138,8 +138,6 @@ struct ec_master
void (*release_cb)(void *); /**< lock release callback */
void *cb_data; /**< data parameter of locking callbacks */
uint8_t eeprom_write_enable; /**< allow write operations to EEPROMs */
ec_sdo_request_t *sdo_request; /**< pointer to the current SDO request */
unsigned int sdo_seq_user; /**< sequence number for user space */
unsigned int sdo_seq_master; /**< sequence number for master */

6
master/slave.c
View File

@ -789,12 +789,6 @@ ssize_t ec_slave_write_eeprom(ec_slave_t *slave, /**< EtherCAT slave */
const uint16_t *data_words, *next_header;
uint16_t *new_data;
if (!slave->master->eeprom_write_enable) {
EC_ERR("Writing EEPROMs not allowed! Enable via"
" eeprom_write_enable SysFS entry.\n");
return -1;
}
if (slave->master->mode != EC_MASTER_MODE_IDLE) {
EC_ERR("Writing EEPROMs only allowed in idle mode!\n");
return -1;