Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-02-07 04:11:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduced EC_MBOX_HEADER_SIZE.

Browse Source
This commit is contained in:
Florian Pose
2008-09-22 15:26:54 +00:00
parent b02f75cd3a
commit b7d5fbfa8a
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
master/globals.h
View File

@@ -88,6 +88,9 @@
#define EC_MAX_DATA_SIZE (ETH_DATA_LEN - EC_FRAME_HEADER_SIZE \
- EC_DATAGRAM_HEADER_SIZE - EC_DATAGRAM_FOOTER_SIZE)
/** Mailbox header size. */
#define EC_MBOX_HEADER_SIZE 6
/** Word offset of first SII category. */
#define EC_FIRST_SII_CATEGORY_OFFSET 0x40

16
master/mailbox.c
View File

@@ -66,7 +66,7 @@ uint8_t *ec_slave_mbox_prepare_send(const ec_slave_t *slave, /**< slave */
return NULL;
}
total_size = size + 6;
total_size = EC_MBOX_HEADER_SIZE + size;
if (unlikely(total_size > slave->sii.rx_mailbox_size)) {
EC_ERR("Data size does not fit in mailbox!\n");
return NULL;
@@ -82,7 +82,7 @@ uint8_t *ec_slave_mbox_prepare_send(const ec_slave_t *slave, /**< slave */
EC_WRITE_U8 (datagram->data + 4, 0x00); // channel & priority
EC_WRITE_U8 (datagram->data + 5, type); // underlying protocol type
return datagram->data + 6;
return datagram->data + EC_MBOX_HEADER_SIZE;
}
/*****************************************************************************/
@@ -167,7 +167,7 @@ uint8_t *ec_slave_mbox_fetch(const ec_slave_t *slave, /**< slave */
data_size = EC_READ_U16(datagram->data);
if (data_size > slave->sii.tx_mailbox_size - 6) {
if (data_size + EC_MBOX_HEADER_SIZE > slave->sii.tx_mailbox_size) {
EC_ERR("Corrupt mailbox response received from slave %u!\n",
slave->ring_position);
ec_print_data(datagram->data, slave->sii.tx_mailbox_size);
@@ -179,12 +179,12 @@ uint8_t *ec_slave_mbox_fetch(const ec_slave_t *slave, /**< slave */
if (*type == 0x00) {
const ec_code_msg_t *mbox_msg;
uint16_t code = EC_READ_U16(datagram->data + 8);
uint16_t code = EC_READ_U16(datagram->data + 8);
EC_ERR("Mailbox error response received from slave %u - ",
slave->ring_position);
slave->ring_position);
for (mbox_msg = mbox_error_messages; mbox_msg->code; mbox_msg++) {
for (mbox_msg = mbox_error_messages; mbox_msg->code; mbox_msg++) {
if (mbox_msg->code != code) continue;
printk("Code 0x%04X: \"%s\".\n",
mbox_msg->code, mbox_msg->message);
@@ -195,12 +195,12 @@ uint8_t *ec_slave_mbox_fetch(const ec_slave_t *slave, /**< slave */
printk("Unknown error reply code 0x%04X.\n", code);
if (slave->master->debug_level)
ec_print_data(datagram->data + 6, data_size);
ec_print_data(datagram->data + EC_MBOX_HEADER_SIZE, data_size);
return NULL;
}
return datagram->data + 6;
return datagram->data + EC_MBOX_HEADER_SIZE;
}
/*****************************************************************************/