--- a/master/mailbox.c	Tue Jan 20 08:04:50 2009 +0000
+++ b/master/mailbox.c	Tue Jan 20 09:55:32 2009 +0000
@@ -52,7 +52,6 @@
                                     )
 {
     size_t total_size;
-    uint16_t mailbox_offset, mailbox_size;
 
     if (unlikely(!slave->sii.mailbox_protocols)) {
         EC_ERR("Slave %u does not support mailbox communication!\n",
@@ -62,21 +61,15 @@
 
     total_size = size + 6;
 
-    if (slave->current_state != EC_SLAVE_STATE_BOOT) {
-        mailbox_offset = slave->sii.std_rx_mailbox_offset;
-        mailbox_size = slave->sii.std_rx_mailbox_size;
-    } else {
-        mailbox_offset = slave->sii.boot_rx_mailbox_offset;
-        mailbox_size = slave->sii.boot_rx_mailbox_size;
-    }
-
-    if (unlikely(total_size > mailbox_size)) {
-        EC_ERR("Data size does not fit in mailbox!\n");
+    if (unlikely(total_size > slave->configured_rx_mailbox_size)) {
+        EC_ERR("Data size (%u) does not fit in mailbox (%u)!\n",
+                total_size, slave->configured_rx_mailbox_size);
         return NULL;
     }
 
     if (ec_datagram_fpwr(datagram, slave->station_address,
-                         mailbox_offset, mailbox_size))
+                         slave->configured_rx_mailbox_offset,
+                         slave->configured_rx_mailbox_size))
         return NULL;
 
     EC_WRITE_U16(datagram->data,     size); // mailbox service data length
@@ -128,18 +121,9 @@
                                 ec_datagram_t *datagram /**< datagram */
                                 )
 {
-    uint16_t mailbox_offset, mailbox_size;
-
-    if (slave->current_state != EC_SLAVE_STATE_BOOT) {
-        mailbox_offset = slave->sii.std_tx_mailbox_offset;
-        mailbox_size = slave->sii.std_tx_mailbox_size;
-    } else {
-        mailbox_offset = slave->sii.boot_tx_mailbox_offset;
-        mailbox_size = slave->sii.boot_tx_mailbox_size;
-    }
-
     if (ec_datagram_fprd(datagram, slave->station_address,
-                         mailbox_offset, mailbox_size))
+                         slave->configured_tx_mailbox_offset,
+                         slave->configured_tx_mailbox_size))
         return -1;
 
     return 0;
@@ -177,22 +161,13 @@
                              )
 {
     size_t data_size;
-    uint16_t mailbox_offset, mailbox_size;
-
-    if (slave->current_state != EC_SLAVE_STATE_BOOT) {
-        mailbox_offset = slave->sii.std_tx_mailbox_offset;
-        mailbox_size = slave->sii.std_tx_mailbox_size;
-    } else {
-        mailbox_offset = slave->sii.boot_tx_mailbox_offset;
-        mailbox_size = slave->sii.boot_tx_mailbox_size;
-    }
 
     data_size = EC_READ_U16(datagram->data);
 
-    if (data_size > mailbox_size - 6) {
+    if (data_size > slave->configured_tx_mailbox_size - 6) {
         EC_ERR("Corrupt mailbox response received from slave %u!\n",
                slave->ring_position);
-        ec_print_data(datagram->data, mailbox_size);
+        ec_print_data(datagram->data, slave->configured_tx_mailbox_size);
         return NULL;
     }