summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-03-19 14:36:58 +0100
committerNélio Laranjeiro2012-09-07 08:56:58 +0200
commita663670bc4800c7e165be4c7f45a388c664e6415 (patch)
tree950a39d1237d1ce7cfba0ce76e68791e63d915d6
parent9b7b0106ed886ea4cd324e1bf58035e71b9b9010 (diff)
common/lib/mmtcgen: remove cp_ prefix from template, refs #409
-rw-r--r--cesar/ce/rx/cp/test/src/stub.c2
-rw-r--r--cesar/cp/av/msg/test/utest/src/cc_discover_list.c2
-rw-r--r--cesar/cp/av/msg/test/utest/src/mme_frag.c2
-rw-r--r--cesar/cp/av/msg/test/utest/src/msg_cc.c2
-rw-r--r--cesar/cp/av/msg/test/utest/src/msg_cm.c2
-rw-r--r--cesar/cp/av/msg/test/utest/src/msg_vs.c2
-rw-r--r--cesar/cp/av/msg/test/utest/src/relay.c4
-rw-r--r--cesar/cp/av/sta/action/test/utest/inc/scenario_defs.h4
-rw-r--r--cesar/cp/av/sta/action/test/utest/src/msg_stub.c4
-rw-r--r--cesar/cp/msg/inc/allowed_mme.h2
-rw-r--r--cesar/cp/msg/inc/cm_mme_error.h2
-rw-r--r--cesar/cp/msg/inc/msg_drv.h2
-rw-r--r--cesar/cp/msg/msg.h10
-rw-r--r--cesar/cp/msg/src/msg.c12
-rw-r--r--cesar/cp/msg/src/msg_cc.c2
-rw-r--r--cesar/cp/msg/src/msg_drv.c2
-rw-r--r--cesar/cp/msg/stub/src/msg.c20
-rw-r--r--cesar/cp/msg/stub/src/msg_cc.c8
-rw-r--r--cesar/cp/msg/stub/src/msg_drv.c4
-rw-r--r--cesar/cp/src/trace.c2
-rw-r--r--common/lib/mmtcgen/ctemplate.txt12
21 files changed, 52 insertions, 50 deletions
diff --git a/cesar/ce/rx/cp/test/src/stub.c b/cesar/ce/rx/cp/test/src/stub.c
index 1f9c73b87c..058e577c3e 100644
--- a/cesar/ce/rx/cp/test/src/stub.c
+++ b/cesar/ce/rx/cp/test/src/stub.c
@@ -27,7 +27,7 @@ cp_sta_get_peer (cp_sta_t *ctx, cp_mme_peer_t *peer)
}
cp_mme_tx_t *
-cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype)
+cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype)
{
static u8 buffer[ETH_PACKET_MAX_SIZE];
static cp_mme_tx_t mme;
diff --git a/cesar/cp/av/msg/test/utest/src/cc_discover_list.c b/cesar/cp/av/msg/test/utest/src/cc_discover_list.c
index 892779b44d..fb241385b0 100644
--- a/cesar/cp/av/msg/test/utest/src/cc_discover_list.c
+++ b/cesar/cp/av/msg/test/utest/src/cc_discover_list.c
@@ -53,7 +53,7 @@ test_cc_discover_list_uninit (test_cc_discover_list_t *ctx)
void
test_check_mme_header (test_t test, bitstream_t *s, u8 *buffer, mac_t dmac,
mac_t smac, u16 eth_type, u16 vlan_tci,
- cp_mmtype_t mmtype, uint fmi_nbfrags, uint fmi_nb,
+ mmtype_t mmtype, uint fmi_nbfrags, uint fmi_nb,
uint fmi_fmsn)
{
test_within (test);
diff --git a/cesar/cp/av/msg/test/utest/src/mme_frag.c b/cesar/cp/av/msg/test/utest/src/mme_frag.c
index df9e66d5c0..51ebbc29c1 100644
--- a/cesar/cp/av/msg/test/utest/src/mme_frag.c
+++ b/cesar/cp/av/msg/test/utest/src/mme_frag.c
@@ -30,7 +30,7 @@ struct mme_header_t
uint vlan;
uint mtype;
uint mmv;
- cp_mmtype_t mmtype;
+ mmtype_t mmtype;
uint fmi_inf;
uint fmi_mi;
uint fmi_ssn;
diff --git a/cesar/cp/av/msg/test/utest/src/msg_cc.c b/cesar/cp/av/msg/test/utest/src/msg_cc.c
index 010700eeda..e06b37ffea 100644
--- a/cesar/cp/av/msg/test/utest/src/msg_cc.c
+++ b/cesar/cp/av/msg/test/utest/src/msg_cc.c
@@ -41,7 +41,7 @@ struct mme_header_t
uint vlan;
uint mtype;
uint mmv;
- cp_mmtype_t mmtype;
+ mmtype_t mmtype;
uint fmi_inf;
uint fmi_mi;
uint fmi_ssn;
diff --git a/cesar/cp/av/msg/test/utest/src/msg_cm.c b/cesar/cp/av/msg/test/utest/src/msg_cm.c
index e86170d993..156ee2dbcf 100644
--- a/cesar/cp/av/msg/test/utest/src/msg_cm.c
+++ b/cesar/cp/av/msg/test/utest/src/msg_cm.c
@@ -45,7 +45,7 @@ struct mme_header_t
uint vlan;
uint mtype;
uint mmv;
- cp_mmtype_t mmtype;
+ mmtype_t mmtype;
uint fmi_inf;
uint fmi_mi;
uint fmi_ssn;
diff --git a/cesar/cp/av/msg/test/utest/src/msg_vs.c b/cesar/cp/av/msg/test/utest/src/msg_vs.c
index c4d7860c81..df42ede2a3 100644
--- a/cesar/cp/av/msg/test/utest/src/msg_vs.c
+++ b/cesar/cp/av/msg/test/utest/src/msg_vs.c
@@ -39,7 +39,7 @@ struct mme_header_t
uint vlan;
uint mtype;
uint mmv;
- cp_mmtype_t mmtype;
+ mmtype_t mmtype;
uint fmi_inf;
uint fmi_mi;
u8 fmi_ssn;
diff --git a/cesar/cp/av/msg/test/utest/src/relay.c b/cesar/cp/av/msg/test/utest/src/relay.c
index c74184bff8..9536ec73b0 100644
--- a/cesar/cp/av/msg/test/utest/src/relay.c
+++ b/cesar/cp/av/msg/test/utest/src/relay.c
@@ -47,7 +47,7 @@ struct mme_header_t
mac_t oda;
mac_t osa;
u32 vlan;
- cp_mmtype_t mmtype;
+ mmtype_t mmtype;
uint fmi_nbfrag;
uint fmi_nb;
uint fmi_fmsn;
@@ -153,7 +153,7 @@ test_this_test_uninit (void)
void
test_this_mme_tx_init (cp_mme_tx_t *mme, cp_mme_peer_t peer,
- cp_mmtype_t mmtype)
+ mmtype_t mmtype)
{
dbg_assert (mme);
diff --git a/cesar/cp/av/sta/action/test/utest/inc/scenario_defs.h b/cesar/cp/av/sta/action/test/utest/inc/scenario_defs.h
index 9e89572348..e8eb4ee8c5 100644
--- a/cesar/cp/av/sta/action/test/utest/inc/scenario_defs.h
+++ b/cesar/cp/av/sta/action/test/utest/inc/scenario_defs.h
@@ -654,7 +654,7 @@ __ms (cp_msg_cm_hfid_cnf_send, enum cp_msg_cm_hfid_cnf_restype_t restype,
char *hfid)
__mr (cp_msg_cm_mme_error_ind_receive,
enum cp_msg_cm_mme_error_ind_reason_t reason, u8 rx_mmv,
- cp_mmtype_t rx_mmtype, uint offset)
+ mmtype_t rx_mmtype, uint offset)
__ms (cp_msg_cm_sc_join_cnf_send, cp_nid_t nid, bool avln_status, u8 cco_cap,
bool pco_cap, bool backup_cco_cap, bool cco_status, bool pco_status,
bool backup_cco_status)
@@ -689,7 +689,7 @@ __ms (cp_msg_drv_sta_set_key_ind_send, cp_key_t nmk,
enum cp_msg_drv_sta_set_key_type_t type, cp_nid_t nid,
cp_security_level_t sl)
__mr (cp_msg_drv_sta_set_dak_req_receive, cp_key_t dak)
-__ms (cp_msg_drv_any_cnf_send, cp_mmtype_t mmtype, cp_msg_drv_result_t result)
+__ms (cp_msg_drv_any_cnf_send, mmtype_t mmtype, cp_msg_drv_result_t result)
__mr (cp_msg_drv_sta_get_key_req_receive)
__ms (cp_msg_drv_sta_get_key_cnf_send, uint result, cp_key_t nmk,
cp_nid_t nid, cp_security_level_t sl)
diff --git a/cesar/cp/av/sta/action/test/utest/src/msg_stub.c b/cesar/cp/av/sta/action/test/utest/src/msg_stub.c
index fb877baec5..17b458f870 100644
--- a/cesar/cp/av/sta/action/test/utest/src/msg_stub.c
+++ b/cesar/cp/av/sta/action/test/utest/src/msg_stub.c
@@ -419,7 +419,7 @@ __ms (cp_msg_cm_hfid_cnf_send,
__mrd (cp_msg_cm_mme_error_ind_receive, cp_msg_cm_mme_error_ind_t,
(enum cp_msg_cm_mme_error_ind_reason_t, reason, assign),
(u8, rx_mmv, assign),
- (cp_mmtype_t, rx_mmtype, assign),
+ (mmtype_t, rx_mmtype, assign),
(uint, offset, assign))
__msd (cp_msg_cm_sc_join_cnf_send, cp_msg_cm_sc_join_cnf_t,
(cp_nid_t, nid, assign),
@@ -477,7 +477,7 @@ __ms (cp_msg_drv_sta_set_key_ind_send,
(cp_security_level_t, sl, assign))
__mr (cp_msg_drv_sta_set_dak_req_receive, (cp_key_t, dak, assign))
__ms (cp_msg_drv_any_cnf_send,
- (cp_mmtype_t, mmtype, assign),
+ (mmtype_t, mmtype, assign),
(cp_msg_drv_result_t, result, assign))
__mr (cp_msg_drv_sta_get_key_req_receive)
__msd (cp_msg_drv_sta_get_key_cnf_send, cp_msg_drv_sta_get_key_t,
diff --git a/cesar/cp/msg/inc/allowed_mme.h b/cesar/cp/msg/inc/allowed_mme.h
index c8a9ccb341..5a8b1f9a10 100644
--- a/cesar/cp/msg/inc/allowed_mme.h
+++ b/cesar/cp/msg/inc/allowed_mme.h
@@ -56,7 +56,7 @@ struct cp_msg_mme_allowed_t
/**
* The MMType of the MME.
*/
- cp_mmtype_t mmtype;
+ mmtype_t mmtype;
/**
* Status of ourself we at least need to have to allow the MME.
*/
diff --git a/cesar/cp/msg/inc/cm_mme_error.h b/cesar/cp/msg/inc/cm_mme_error.h
index 61e2b5b8b3..e3dc5af001 100644
--- a/cesar/cp/msg/inc/cm_mme_error.h
+++ b/cesar/cp/msg/inc/cm_mme_error.h
@@ -30,7 +30,7 @@ struct cp_msg_cm_mme_error_ind_t
/** Version of received MME. */
u8 rx_mmv;
/** MMTYPE of received MME. */
- cp_mmtype_t rx_mmtype;
+ mmtype_t rx_mmtype;
/** Offset of first invalid field. */
uint offset;
};
diff --git a/cesar/cp/msg/inc/msg_drv.h b/cesar/cp/msg/inc/msg_drv.h
index 76141c2de3..0902554be3 100644
--- a/cesar/cp/msg/inc/msg_drv.h
+++ b/cesar/cp/msg/inc/msg_drv.h
@@ -303,7 +303,7 @@ cp_msg_drv_sta_status_ind_send (cp_t *ctx, cp_mme_peer_t *peer,
* \param error_code the error code.
*/
void
-cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
cp_msg_drv_result_t result);
/**
diff --git a/cesar/cp/msg/msg.h b/cesar/cp/msg/msg.h
index af93b6d73b..9d19ba28a6 100644
--- a/cesar/cp/msg/msg.h
+++ b/cesar/cp/msg/msg.h
@@ -85,7 +85,7 @@ cp_msg_dispatch (cp_t *ctx, cp_mme_rx_t *mme);
* - writes the MME header.
*/
cp_mme_tx_t *
-cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype);
+cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype);
/**
* Initialise a MME handle for a new encrypted message to be transmitted.
@@ -102,7 +102,7 @@ cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype);
*/
cp_mme_tx_t *
cp_msg_mme_init_encrypted (cp_t *ctx, cp_mme_peer_t *peer,
- cp_mmtype_t mmtype,
+ mmtype_t mmtype,
cp_mme_peks_t peks,
const cp_secu_protocol_run_t *prun);
@@ -114,7 +114,7 @@ cp_msg_mme_init_encrypted (cp_t *ctx, cp_mme_peer_t *peer,
*/
void
cp_msg_mme_write_frag_header (cp_t *ctx, cp_mme_tx_t *msg, bitstream_t *bs,
- cp_mmtype_t mmtype);
+ mmtype_t mmtype);
/**
* Initialise a MME handle for a new message fragment to be transmitted.
@@ -125,7 +125,7 @@ cp_msg_mme_write_frag_header (cp_t *ctx, cp_mme_tx_t *msg, bitstream_t *bs,
* \return the newly created message
*/
cp_mme_tx_t *
-cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
uint mme_payload_length);
/**
@@ -144,7 +144,7 @@ cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
* - writes the MME header.
*/
cp_mme_tx_t *
-cp_msg_mme_init_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_mme_init_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
uint fmi_nbFrag);
/**
diff --git a/cesar/cp/msg/src/msg.c b/cesar/cp/msg/src/msg.c
index 3b6d0ad729..051cfb3164 100644
--- a/cesar/cp/msg/src/msg.c
+++ b/cesar/cp/msg/src/msg.c
@@ -300,7 +300,7 @@ cp_msg_mme_fmsn_increase (cp_msg_t *ctx)
* \return the header length.
*/
static inline uint
-cp_msg_mme_header_length (cp_mme_peer_t *peer, cp_mmtype_t mmtype)
+cp_msg_mme_header_length (cp_mme_peer_t *peer, mmtype_t mmtype)
{
uint header_length = 0;
@@ -589,7 +589,7 @@ cp_msg_dispatch (cp_t *ctx, cp_mme_rx_t *mme)
}
cp_mme_tx_t *
-cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
uint mme_payload_length)
{
cp_mme_tx_t *mme;
@@ -628,7 +628,7 @@ cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
}
cp_mme_tx_t *
-cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype)
+cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype)
{
cp_mme_tx_t *msg;
uint eth_packet_size = ETH_PACKET_GET_MAX_SIZE (peer->eth_type);
@@ -657,7 +657,7 @@ cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype)
cp_mme_tx_t *
cp_msg_mme_init_encrypted (cp_t *ctx, cp_mme_peer_t *peer,
- cp_mmtype_t mmtype,
+ mmtype_t mmtype,
cp_mme_peks_t peks,
const cp_secu_protocol_run_t *prun)
{
@@ -855,7 +855,7 @@ cp_msg_mme_write_relay (cp_t *ctx, bitstream_t *bs, cp_mme_tx_t *msg)
void
cp_msg_mme_write_frag_header (cp_t *ctx, cp_mme_tx_t *msg, bitstream_t *bs,
- cp_mmtype_t mmtype)
+ mmtype_t mmtype)
{
dbg_assert (ctx);
dbg_assert (msg);
@@ -898,7 +898,7 @@ cp_msg_mme_write_frag_header (cp_t *ctx, cp_mme_tx_t *msg, bitstream_t *bs,
}
cp_mme_tx_t *
-cp_msg_mme_init_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_mme_init_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
uint fmi_nbFrag)
{
cp_mme_tx_t *msg;
diff --git a/cesar/cp/msg/src/msg_cc.c b/cesar/cp/msg/src/msg_cc.c
index cdcc5a0155..a2be67e986 100644
--- a/cesar/cp/msg/src/msg_cc.c
+++ b/cesar/cp/msg/src/msg_cc.c
@@ -648,7 +648,7 @@ cp_msg_cc_set_tei_map_ind_receive_end (cp_t *ctx, cp_mme_rx_t *mme)
* \param ftei the final TEI.
*/
static cp_mme_tx_t *
-cp_msg_cc_relay_send_begin (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_cc_relay_send_begin (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
const cp_secu_protocol_run_t *prun,
cp_mme_peks_t peks,
mac_t fda, cp_tei_t ftei)
diff --git a/cesar/cp/msg/src/msg_drv.c b/cesar/cp/msg/src/msg_drv.c
index 5f7d18f838..5a4051f4de 100644
--- a/cesar/cp/msg/src/msg_drv.c
+++ b/cesar/cp/msg/src/msg_drv.c
@@ -610,7 +610,7 @@ cp_msg_drv_sta_status_ind_send (cp_t *ctx, cp_mme_peer_t *peer,
* \param result result code
*/
void
-cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
cp_msg_drv_result_t result)
{
cp_mme_tx_t *msg;
diff --git a/cesar/cp/msg/stub/src/msg.c b/cesar/cp/msg/stub/src/msg.c
index c43764b4f3..7774f8f290 100644
--- a/cesar/cp/msg/stub/src/msg.c
+++ b/cesar/cp/msg/stub/src/msg.c
@@ -37,33 +37,33 @@ cp_msg_dispatch (cp_t *ctx, cp_mme_rx_t *mme) {}
cp_mme_tx_t *
-cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
uint mme_payload_length) __attribute__((weak));
cp_mme_tx_t *
-cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_mme_init (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
uint mme_payload_length)
{
return NULL;
}
cp_mme_tx_t *
-cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype)
+cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype)
__attribute__((weak));
cp_mme_tx_t *
-cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype)
+cp_msg_mme_init_not_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype)
{
return NULL;
}
cp_mme_tx_t *
cp_msg_mme_init_encrypted (cp_t *ctx, cp_mme_peer_t *peer,
- cp_mmtype_t mmtype,
+ mmtype_t mmtype,
cp_mme_peks_t peks,
const cp_secu_protocol_run_t *prun) __attribute__((weak));
cp_mme_tx_t *
cp_msg_mme_init_encrypted (cp_t *ctx, cp_mme_peer_t *peer,
- cp_mmtype_t mmtype,
+ mmtype_t mmtype,
cp_mme_peks_t peks,
const cp_secu_protocol_run_t *prun)
{
@@ -72,18 +72,18 @@ cp_msg_mme_init_encrypted (cp_t *ctx, cp_mme_peer_t *peer,
void
cp_msg_mme_write_frag_header (cp_t *ctx, cp_mme_tx_t *msg, bitstream_t *bs,
- cp_mmtype_t mmtype) __attribute__((weak));
+ mmtype_t mmtype) __attribute__((weak));
void
cp_msg_mme_write_frag_header (cp_t *ctx, cp_mme_tx_t *msg, bitstream_t *bs,
- cp_mmtype_t mmtype) {}
+ mmtype_t mmtype) {}
cp_mme_tx_t *
-cp_msg_mme_init_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_mme_init_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
uint fmi_nbFrag) __attribute__((weak));
cp_mme_tx_t *
-cp_msg_mme_init_frag (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_mme_init_frag (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
uint fmi_nbFrag)
{
return NULL;
diff --git a/cesar/cp/msg/stub/src/msg_cc.c b/cesar/cp/msg/stub/src/msg_cc.c
index 637c778d73..39d1e9c0c0 100644
--- a/cesar/cp/msg/stub/src/msg_cc.c
+++ b/cesar/cp/msg/stub/src/msg_cc.c
@@ -277,10 +277,12 @@ cp_mme_tx_t *
cp_msg_cc_relay_req_send_begin (
cp_t *ctx, cp_mme_peer_t *peer, const cp_secu_protocol_run_t *prun,
cp_mme_peks_t peks, mac_t fda, cp_tei_t ftei) __attribute__((weak));
+
cp_mme_tx_t *
-cp_msg_cc_relay_req_send_begin (
- cp_t *ctx, cp_mme_peer_t *peer, const cp_secu_protocol_run_t *prun,
- cp_mme_peks_t peks, mac_t fda, cp_tei_t ftei)
+cp_msg_cc_relay_send_begin (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
+ const cp_secu_protocol_run_t *prun,
+ cp_mme_peks_t peks,
+ mac_t fda, cp_tei_t ftei)
{
return NULL;
}
diff --git a/cesar/cp/msg/stub/src/msg_drv.c b/cesar/cp/msg/stub/src/msg_drv.c
index 7fc0ebc205..fbfca53da5 100644
--- a/cesar/cp/msg/stub/src/msg_drv.c
+++ b/cesar/cp/msg/stub/src/msg_drv.c
@@ -257,10 +257,10 @@ cp_msg_drv_sta_status_ind_send (cp_t *ctx, cp_mme_peer_t *peer,
}
void
-cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
cp_msg_drv_result_t result) __attribute__((weak));
void
-cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, cp_mmtype_t mmtype,
+cp_msg_drv_any_cnf_send (cp_t *ctx, cp_mme_peer_t *peer, mmtype_t mmtype,
cp_msg_drv_result_t result)
{
}
diff --git a/cesar/cp/src/trace.c b/cesar/cp/src/trace.c
index f213af37fa..538aaa1955 100644
--- a/cesar/cp/src/trace.c
+++ b/cesar/cp/src/trace.c
@@ -115,7 +115,7 @@ cp_trace_format_mmtype (char *text, uint text_size, int data)
/* Try to find the MMType. */
uint i;
- cp_mmtype_t mmtype = data;
+ mmtype_t mmtype = data;
DICHOTOMY_SEARCH (0, cp_msg_mme_allowed_count, i,
mmtype <= cp_msg_mme_allowed[i].mmtype);
diff --git a/common/lib/mmtcgen/ctemplate.txt b/common/lib/mmtcgen/ctemplate.txt
index e01719ad51..c365e40398 100644
--- a/common/lib/mmtcgen/ctemplate.txt
+++ b/common/lib/mmtcgen/ctemplate.txt
@@ -1,5 +1,5 @@
-#ifndef cp_mmtype_h
-#define cp_mmtype_h
+#ifndef mmtype_h
+#define mmtype_h
/* Cesar project {{{
*
* Copyright (C) 2012 Spidcom
@@ -11,7 +11,7 @@
* Auto generated file.
*/
-#define CP_MSG_MMTYPE_BASE(mmtype) ((mmtype) & 0xFFFC)
+#define MMTYPE_BASE(mmtype) ((mmtype) & 0xFFFC)
$mmtypes_min_max
@@ -19,10 +19,10 @@ $defines_is
$defines
-enum cp_mmtype_t
+enum mmtype_t
{
$mmtypes
};
-typedef enum cp_mmtype_t cp_mmtype_t;
+typedef enum mmtype_t mmtype_t;
-#endif /* cp_mmtype_h */
+#endif /* mmtype_h */