summaryrefslogtreecommitdiff
path: root/cesar/maximus/common
diff options
context:
space:
mode:
authorIPMbox Team2012-02-03 14:32:28 +0100
committerNicolas Schodet2012-02-20 10:08:46 +0100
commit3ed571f9d933e5c5dadef650c07e20e8aad06213 (patch)
tree761bfe80d4660605e00f52afb8532d9a2ef847b6 /cesar/maximus/common
parent89328e8cc096f8c9f340a3eb8910d06748a3e572 (diff)
cesar, cleopatre, common: new ipmbox design, closes #848
Diffstat (limited to 'cesar/maximus/common')
-rw-r--r--cesar/maximus/common/types/ethernet_types.h11
-rw-r--r--cesar/maximus/common/types/sci_types.h4
2 files changed, 4 insertions, 11 deletions
diff --git a/cesar/maximus/common/types/ethernet_types.h b/cesar/maximus/common/types/ethernet_types.h
index 62525203dc..78e25a996d 100644
--- a/cesar/maximus/common/types/ethernet_types.h
+++ b/cesar/maximus/common/types/ethernet_types.h
@@ -60,18 +60,11 @@ enum Ethernet_Type
ETHERNET_TYPE_MME = 0x02, // Ether SCI msg data contain the MSDU (MME)
/* HLE_MSG_TYPE_BUFFER_ADD > Buffer alloc message type. */
- ETHERNET_TYPE_DATA_BUFFER_ADD = 0x03, // Ether SCI msg data contain the number of buffers to allocate (uint32_t)
- // and IDs of each buffer to allocate (uint32_t)
- ETHERNET_TYPE_MME_BUFFER_ADD = 0x04, // Ether SCI msg data contain the number of buffers to allocate (uint32_t)
- // and IDs of each buffer to allocate (uint32_t)
- ETHERNET_TYPE_INTERFACE_BUFFER_ADD = 0x05, // Ether SCI msg data contain the number of buffers to allocate (uint32_t)
+ ETHERNET_TYPE_BUFFER_ADD = 0x03, // Ether SCI msg data contain the number of buffers to allocate (uint32_t)
// and IDs of each buffer to allocate (uint32_t)
/* HLE_MSG_TYPE_SEND_DONE > Buffer dealloc message type. */
- ETHERNET_TYPE_BUFFER_RELEASED = 0x06, // Ether SCI msg data contain the ID of released buffer (uint32_t)
-
- /* HLE_MSG_TYPE_INTERFACE > Interface message type. */
- ETHERNET_TYPE_SNIFFER = 0x07, // Ether SCI msg data contain a sniffed packet
+ ETHERNET_TYPE_BUFFER_RELEASED = 0x04, // Ether SCI msg data contain the ID of released buffer (uint32_t)
ETHERNET_TYPE_NB
};
diff --git a/cesar/maximus/common/types/sci_types.h b/cesar/maximus/common/types/sci_types.h
index 7e5e957947..81e7b6b1f1 100644
--- a/cesar/maximus/common/types/sci_types.h
+++ b/cesar/maximus/common/types/sci_types.h
@@ -34,7 +34,7 @@ The original location of this file is /home/buret/eclipse/maximus/common/types/s
#include <stdint.h> // for 'uint8_t', 'uint16_t' and 'uint32_t' types
#define SCI_MSG_MAGIC "MAXI"
-#define SCI_MSG_VERSION 0x02
+#define SCI_MSG_VERSION 0x03
#define SCI_MSG_ID_STATION 0x8000
#define SCI_MSG_ID_MASK 0x7fff
#define SCI_MSG_MAX_SIZE 16384
@@ -67,7 +67,7 @@ enum Sci_Msg_Status
struct Sci_Msg_Header
{
uint32_t magic_id; /* 1st field is magic id (32 bits): always “MAXI” */
- uint8_t version; /* 2nd field is version (8 bits): message protocol version; always 0x02 */
+ uint8_t version; /* 2nd field is version (8 bits): message protocol version */
uint8_t type; /* 3rd field is type (8): message type; Sci_Msg_Type */
uint16_t length; /* 4th field is length (16 bits): message length without header */
uint16_t station_id; /* 5th field is station id (16 bits): source or destination station id; in general, the process id of the simulated station */