From 0f9189f4c651a27c4c750fd8e1bb78cb1653304c Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Mon, 22 Sep 2008 15:26:54 +0000
Subject: [PATCH] Introduced EC_MBOX_HEADER_SIZE.
---
master/globals.h | 3 +++
master/mailbox.c | 16 ++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/master/globals.h b/master/globals.h
index 501dcf3c..c836c608 100644
--- a/master/globals.h
+++ b/master/globals.h
@@ -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
diff --git a/master/mailbox.c b/master/mailbox.c
index 185a3e8c..d84f21a5 100644
--- a/master/mailbox.c
+++ b/master/mailbox.c
@@ -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;
}
/*****************************************************************************/
--
GitLab