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

Added drive_no parameter to SoE layer.

This commit is contained in:
Florian Pose 2010-07-20 10:52:31 +02:00
parent 0e0033f572
commit 190cdce964
10 changed files with 70 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/ecrt.h
View File

@ -687,6 +687,7 @@ int ecrt_master_sdo_upload(
int ecrt_master_write_idn(
ec_master_t *master, /**< EtherCAT master. */
uint16_t slave_position, /**< Slave position. */
uint8_t drive_no, /**< Drive number. */
uint16_t idn, /**< SoE IDN (see ecrt_slave_config_idn()). */
uint8_t *data, /**< Pointer to data to write. */
size_t data_size, /**< Size of data to write. */
@ -705,6 +706,7 @@ int ecrt_master_write_idn(
int ecrt_master_read_idn(
ec_master_t *master, /**< EtherCAT master. */
uint16_t slave_position, /**< Slave position. */
uint8_t drive_no, /**< Drive number. */
uint16_t idn, /**< SoE IDN (see ecrt_slave_config_idn()). */
uint8_t *target, /**< Pointer to memory where the read data can be
stored. */
@ -1212,6 +1214,7 @@ void ecrt_slave_config_state(
*/
int ecrt_slave_config_idn(
ec_slave_config_t *sc, /**< Slave configuration. */
uint8_t drive_no, /**< Drive number. */
uint16_t idn, /**< SoE IDN. */
ec_al_state_t state, /**< AL state in which to write the IDN (PREOP or
SAFEOP). */

7
lib/master.c
View File

@ -305,11 +305,13 @@ int ecrt_master_sdo_upload(ec_master_t *master, uint16_t slave_position,
/*****************************************************************************/
int ecrt_master_write_idn(ec_master_t *master, uint16_t slave_position,
uint16_t idn, uint8_t *data, size_t data_size, uint16_t *error_code)
uint8_t drive_no, uint16_t idn, uint8_t *data, size_t data_size,
uint16_t *error_code)
{
ec_ioctl_slave_soe_write_t io;
io.slave_position = slave_position;
io.drive_no = drive_no;
io.idn = idn;
io.data_size = data_size;
io.data = data;
@ -328,12 +330,13 @@ int ecrt_master_write_idn(ec_master_t *master, uint16_t slave_position,
/*****************************************************************************/
int ecrt_master_read_idn(ec_master_t *master, uint16_t slave_position,
uint16_t idn, uint8_t *target, size_t target_size,
uint8_t drive_no, uint16_t idn, uint8_t *target, size_t target_size,
size_t *result_size, uint16_t *error_code)
{
ec_ioctl_slave_soe_read_t io;
io.slave_position = slave_position;
io.drive_no = drive_no;
io.idn = idn;
io.mem_size = target_size;
io.data = target;

5
lib/slave_config.c
View File

@ -472,12 +472,13 @@ void ecrt_slave_config_state(const ec_slave_config_t *sc,
/*****************************************************************************/
int ecrt_slave_config_idn(ec_slave_config_t *sc, uint16_t idn,
ec_al_state_t al_state, const uint8_t *data, size_t size)
int ecrt_slave_config_idn(ec_slave_config_t *sc, uint8_t drive_no,
uint16_t idn, ec_al_state_t al_state, const uint8_t *data, size_t size)
{
ec_ioctl_sc_idn_t io;
io.config_index = sc->index;
io.drive_no = drive_no;
io.idn = idn;
io.al_state = al_state;
io.data = data;

7
master/cdev.c
View File

@ -2474,7 +2474,7 @@ int ec_cdev_ioctl_sc_idn(
up(&master->master_sem); // FIXME
ret = ecrt_slave_config_idn(
sc, ioctl.idn, ioctl.al_state, data, ioctl.size);
sc, ioctl.drive_no, ioctl.idn, ioctl.al_state, data, ioctl.size);
kfree(data);
return ret;
}
@ -3344,7 +3344,7 @@ int ec_cdev_ioctl_slave_soe_read(
}
retval = ecrt_master_read_idn(master, ioctl.slave_position,
ioctl.idn, data, ioctl.mem_size, &ioctl.data_size,
ioctl.drive_no, ioctl.idn, data, ioctl.mem_size, &ioctl.data_size,
&ioctl.error_code);
if (retval) {
kfree(data);
@ -3395,7 +3395,8 @@ int ec_cdev_ioctl_slave_soe_write(
}
retval = ecrt_master_write_idn(master, ioctl.slave_position,
ioctl.idn, data, ioctl.data_size, &ioctl.error_code);
ioctl.drive_no, ioctl.idn, data, ioctl.data_size,
&ioctl.error_code);
kfree(data);
if (retval) {
return retval;

12
master/fsm_soe.c
View File

@ -201,7 +201,8 @@ void ec_fsm_soe_read_start(ec_fsm_soe_t *fsm /**< finite state machine */)
ec_soe_request_t *request = fsm->request;
uint8_t *data;
EC_SLAVE_DBG(slave, 1, "Reading IDN 0x%04X.\n", request->idn);
EC_SLAVE_DBG(slave, 1, "Reading IDN 0x%04X of drive %u.\n", request->idn,
request->drive_no);
if (!(slave->sii.mailbox_protocols & EC_MBOX_SOE)) {
EC_SLAVE_ERR(slave, "Slave does not support SoE!\n");
@ -218,7 +219,7 @@ void ec_fsm_soe_read_start(ec_fsm_soe_t *fsm /**< finite state machine */)
return;
}
EC_WRITE_U8(data, OPCODE_READ_REQUEST);
EC_WRITE_U8(data, OPCODE_READ_REQUEST | (request->drive_no & 0x07) << 5);
EC_WRITE_U8(data + 1, 1 << 6); // request value
EC_WRITE_U16(data + 2, request->idn);
@ -492,7 +493,8 @@ void ec_fsm_soe_write_next_fragment(
return;
}
EC_WRITE_U8(data, OPCODE_WRITE_REQUEST | incomplete << 3);
EC_WRITE_U8(data, OPCODE_WRITE_REQUEST | incomplete << 3 |
(req->drive_no & 0x07) << 5);
EC_WRITE_U8(data + 1, 1 << 6); // only value included
EC_WRITE_U16(data + 2, incomplete ? fragments_left : req->idn);
memcpy(data + 4, req->data + fsm->offset, fragment_size);
@ -517,8 +519,8 @@ void ec_fsm_soe_write_start(ec_fsm_soe_t *fsm /**< finite state machine */)
ec_slave_t *slave = fsm->slave;
ec_soe_request_t *req = fsm->request;
EC_SLAVE_DBG(slave, 1, "Writing IDN 0x%04X (%zu byte).\n",
req->idn, req->data_size);
EC_SLAVE_DBG(slave, 1, "Writing IDN 0x%04X of drive %u (%zu byte).\n",
req->idn, req->drive_no, req->data_size);
if (!(slave->sii.mailbox_protocols & EC_MBOX_SOE)) {
EC_SLAVE_ERR(slave, "Slave does not support SoE!\n");

5
master/ioctl.h
View File

@ -56,7 +56,7 @@
*
* Increment this when changing the ioctl interface!
*/
#define EC_IOCTL_VERSION_MAGIC 6
#define EC_IOCTL_VERSION_MAGIC 7
// Command-line tool
#define EC_IOCTL_MODULE EC_IOR(0x00, ec_ioctl_module_t)
@ -413,6 +413,7 @@ typedef struct {
typedef struct {
// inputs
uint16_t slave_position;
uint8_t drive_no;
uint16_t idn;
uint32_t mem_size;
uint8_t *data;
@ -427,6 +428,7 @@ typedef struct {
typedef struct {
// inputs
uint16_t slave_position;
uint8_t drive_no;
uint16_t idn;
uint32_t data_size;
uint8_t *data;
@ -582,6 +584,7 @@ typedef struct {
typedef struct {
// inputs
uint32_t config_index;
uint8_t drive_no;
uint16_t idn;
ec_al_state_t al_state;
const uint8_t *data;

17
master/master.c
View File

@ -2345,13 +2345,20 @@ uint32_t ecrt_master_sync_monitor_process(ec_master_t *master)
/*****************************************************************************/
int ecrt_master_write_idn(ec_master_t *master, uint16_t slave_position,
uint16_t idn, uint8_t *data, size_t data_size, uint16_t *error_code)
uint8_t drive_no, uint16_t idn, uint8_t *data, size_t data_size,
uint16_t *error_code)
{
ec_master_soe_request_t request;
int retval;
if (drive_no > 7) {
EC_MASTER_ERR(master, "Invalid drive number!\n");
return -EINVAL;
}
INIT_LIST_HEAD(&request.list);
ec_soe_request_init(&request.req);
ec_soe_request_set_drive_no(&request.req, drive_no);
ec_soe_request_set_idn(&request.req, idn);
if (ec_soe_request_alloc(&request.req, data_size)) {
@ -2413,13 +2420,19 @@ int ecrt_master_write_idn(ec_master_t *master, uint16_t slave_position,
/*****************************************************************************/
int ecrt_master_read_idn(ec_master_t *master, uint16_t slave_position,
uint16_t idn, uint8_t *target, size_t target_size,
uint8_t drive_no, uint16_t idn, uint8_t *target, size_t target_size,
size_t *result_size, uint16_t *error_code)
{
ec_master_soe_request_t request;
if (drive_no > 7) {
EC_MASTER_ERR(master, "Invalid drive number!\n");
return -EINVAL;
}
INIT_LIST_HEAD(&request.list);
ec_soe_request_init(&request.req);
ec_soe_request_set_drive_no(&request.req, drive_no);
ec_soe_request_set_idn(&request.req, idn);
ec_soe_request_read(&request.req);

17
master/slave_config.c
View File

@ -938,16 +938,22 @@ void ecrt_slave_config_state(const ec_slave_config_t *sc,
/*****************************************************************************/
int ecrt_slave_config_idn(ec_slave_config_t *sc, uint16_t idn,
ec_al_state_t state, const uint8_t *data, size_t size)
int ecrt_slave_config_idn(ec_slave_config_t *sc, uint8_t drive_no,
uint16_t idn, ec_al_state_t state, const uint8_t *data,
size_t size)
{
ec_slave_t *slave = sc->slave;
ec_soe_request_t *req;
int ret;
EC_CONFIG_DBG(sc, 1, "%s(sc = 0x%p, idn = 0x%04X, state = %u, "
"data = 0x%p, size = %zu)\n",
__func__, sc, idn, state, data, size);
EC_CONFIG_DBG(sc, 1, "%s(sc = 0x%p, drive_no = %u, idn = 0x%04X, "
"state = %u, data = 0x%p, size = %zu)\n",
__func__, sc, drive_no, idn, state, data, size);
if (drive_no > 7) {
EC_CONFIG_ERR(sc, "Invalid drive number!\n");
return -EINVAL;
}
if (state != EC_AL_STATE_PREOP && state != EC_AL_STATE_SAFEOP) {
EC_CONFIG_ERR(sc, "AL state for IDN config"
@ -967,6 +973,7 @@ int ecrt_slave_config_idn(ec_slave_config_t *sc, uint16_t idn,
}
ec_soe_request_init(req);
ec_soe_request_set_drive_no(req, drive_no);
ec_soe_request_set_idn(req, idn);
req->al_state = state;

15
master/soe_request.c
View File

@ -56,6 +56,8 @@ void ec_soe_request_init(
ec_soe_request_t *req /**< SoE request. */
)
{
req->drive_no = 0x00;
req->idn = 0x0000;
req->al_state = EC_AL_STATE_INIT;
req->data = NULL;
req->mem_size = 0;
@ -86,6 +88,7 @@ int ec_soe_request_copy(
const ec_soe_request_t *other /**< Other SoE request to copy from. */
)
{
req->drive_no = other->drive_no;
req->idn = other->idn;
req->al_state = other->al_state;
return ec_soe_request_copy_data(req, other->data, other->data_size);
@ -93,6 +96,18 @@ int ec_soe_request_copy(
/*****************************************************************************/
/** Set drive number.
*/
void ec_soe_request_set_drive_no(
ec_soe_request_t *req, /**< SoE request. */
uint8_t drive_no /** Drive Number. */
)
{
req->drive_no = drive_no;
}
/*****************************************************************************/
/** Set IDN.
*/
void ec_soe_request_set_idn(

2
master/soe_request.h
View File

@ -47,6 +47,7 @@
*/
typedef struct {
struct list_head list; /**< List item. */
uint8_t drive_no; /**< Drive number. */
uint16_t idn; /**< Sercos ID-Number. */
ec_al_state_t al_state; /**< AL state (only valid for IDN config). */
uint8_t *data; /**< Pointer to SDO data. */
@ -66,6 +67,7 @@ void ec_soe_request_init(ec_soe_request_t *);
void ec_soe_request_clear(ec_soe_request_t *);
int ec_soe_request_copy(ec_soe_request_t *, const ec_soe_request_t *);
void ec_soe_request_set_drive_no(ec_soe_request_t *, uint8_t);
void ec_soe_request_set_idn(ec_soe_request_t *, uint16_t);
int ec_soe_request_alloc(ec_soe_request_t *, size_t);
int ec_soe_request_copy_data(ec_soe_request_t *, const uint8_t *, size_t);