summaryrefslogtreecommitdiff
path: root/cesar/cp
diff options
context:
space:
mode:
authorlaranjeiro2009-07-29 15:36:38 +0000
committerlaranjeiro2009-07-29 15:36:38 +0000
commitb4474fcec9f5522f993f99e08252a62c2a7e67e9 (patch)
tree93b63e9bcfdfb73f75b0478802cb58a340a52a7f /cesar/cp
parentd798d0755d0b526fb867428b1c5822d2e14d5d7d (diff)
*cp/msg, *cp/sta/action:
* Renamed DRV_STA_START and DRV_STA_STOP to DRV_STA_MAC_START and DRV_STA_MAC_STOP. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@5116 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/cp')
-rw-r--r--cesar/cp/mme.h12
-rw-r--r--cesar/cp/msg/src/msg.c4
-rw-r--r--cesar/cp/sta/action/src/drv.c4
-rw-r--r--cesar/cp/sta/action/test/utest/src/drv.c6
4 files changed, 13 insertions, 13 deletions
diff --git a/cesar/cp/mme.h b/cesar/cp/mme.h
index ccbf632f2d..db5887bea1 100644
--- a/cesar/cp/mme.h
+++ b/cesar/cp/mme.h
@@ -99,8 +99,8 @@
#define DRV_STA_SET_U_STA_HFID 0xB01C
#define DRV_STA_SET_AVLN_HFID 0xB020
#define DRV_STA_SET_TONEMASK 0xB024
-#define DRV_STA_START 0xB028
-#define DRV_STA_STOP 0xB02C
+#define DRV_STA_MAC_START 0xB028
+#define DRV_STA_MAC_STOP 0xB02C
#define DRV_STA_SET_NID 0xB030
#define DRV_STA_SC 0xB034
#define DRV_CCO_APPOINT 0xB038
@@ -268,10 +268,10 @@ enum cp_mmtype_t
DRV_STA_SET_AVLN_HFID_CNF = DRV_STA_SET_AVLN_HFID + CP_MME_CNF,
DRV_STA_SET_TONEMASK_REQ = DRV_STA_SET_TONEMASK + CP_MME_REQ,
DRV_STA_SET_TONEMASK_CNF = DRV_STA_SET_TONEMASK + CP_MME_CNF,
- DRV_STA_START_REQ = DRV_STA_START + CP_MME_REQ,
- DRV_STA_START_CNF = DRV_STA_START + CP_MME_CNF,
- DRV_STA_STOP_REQ = DRV_STA_STOP + CP_MME_REQ,
- DRV_STA_STOP_CNF = DRV_STA_STOP + CP_MME_CNF,
+ DRV_STA_MAC_START_REQ = DRV_STA_MAC_START + CP_MME_REQ,
+ DRV_STA_MAC_START_CNF = DRV_STA_MAC_START + CP_MME_CNF,
+ DRV_STA_MAC_STOP_REQ = DRV_STA_MAC_STOP + CP_MME_REQ,
+ DRV_STA_MAC_STOP_CNF = DRV_STA_MAC_STOP + CP_MME_CNF,
DRV_STA_SET_NID_REQ = DRV_STA_SET_NID + CP_MME_REQ,
DRV_STA_SET_NID_CNF = DRV_STA_SET_NID + CP_MME_CNF,
DRV_STA_SC_REQ = DRV_STA_SC + CP_MME_REQ,
diff --git a/cesar/cp/msg/src/msg.c b/cesar/cp/msg/src/msg.c
index 03d3a4c46a..571d1a5828 100644
--- a/cesar/cp/msg/src/msg.c
+++ b/cesar/cp/msg/src/msg.c
@@ -259,10 +259,10 @@ cp_msg_dispatch (cp_t *ctx, cp_mme_rx_t *mme)
case DRV_STA_SET_TONEMASK_REQ:
type = CP_FSM_EVENT_TYPE_DRV_STA_SET_TONEMASK_REQ;
break;
- case DRV_STA_START_REQ:
+ case DRV_STA_MAC_START_REQ:
type = CP_FSM_EVENT_TYPE_DRV_STA_MAC_START_REQ;
break;
- case DRV_STA_STOP_REQ:
+ case DRV_STA_MAC_STOP_REQ:
type = CP_FSM_EVENT_TYPE_DRV_STA_MAC_STOP_REQ;
break;
case DRV_STA_SC_REQ:
diff --git a/cesar/cp/sta/action/src/drv.c b/cesar/cp/sta/action/src/drv.c
index 3f99022813..91c0999b21 100644
--- a/cesar/cp/sta/action/src/drv.c
+++ b/cesar/cp/sta/action/src/drv.c
@@ -184,7 +184,7 @@ cp_sta_action_drv__stopped__drv_sta_mac_start_req (cp_t *ctx,
/* Start power-on procedure. */
cp_sta_action_poweron_start (ctx);
}
- cp_msg_drv_any_cnf_send (ctx, &mme->peer, DRV_STA_START_CNF,
+ cp_msg_drv_any_cnf_send (ctx, &mme->peer, DRV_STA_MAC_START_CNF,
ok ? CP_MSG_DRV_RESULT_SUCCESS
: CP_MSG_DRV_RESULT_FAILURE);
@@ -211,7 +211,7 @@ cp_sta_action_drv__stopping__stopped (cp_t *ctx)
dbg_assert (ctx);
/* Signal the station is stopped. */
cp_msg_drv_any_cnf_send (ctx, &ctx->sta_action.drv_peer,
- DRV_STA_STOP_CNF, CP_MSG_DRV_RESULT_SUCCESS);
+ DRV_STA_MAC_STOP_CNF, CP_MSG_DRV_RESULT_SUCCESS);
}
void
diff --git a/cesar/cp/sta/action/test/utest/src/drv.c b/cesar/cp/sta/action/test/utest/src/drv.c
index eb4806f9bd..ce1c4e5029 100644
--- a/cesar/cp/sta/action/test/utest/src/drv.c
+++ b/cesar/cp/sta/action/test/utest/src/drv.c
@@ -337,7 +337,7 @@ drv_basic_test_case (test_t t)
.type = CP_FSM_EVENT_TYPE_to_poweron),
SCENARIO_EVENT (cp_msg_drv_any_cnf_send,
.peer = peer,
- .mmtype = DRV_STA_START_CNF,
+ .mmtype = DRV_STA_MAC_START_CNF,
.result = CP_MSG_DRV_RESULT_SUCCESS),
SCENARIO_END
};
@@ -355,7 +355,7 @@ drv_basic_test_case (test_t t)
.ok = false),
SCENARIO_EVENT (cp_msg_drv_any_cnf_send,
.peer = peer,
- .mmtype = DRV_STA_START_CNF,
+ .mmtype = DRV_STA_MAC_START_CNF,
.result = CP_MSG_DRV_RESULT_FAILURE),
SCENARIO_END
};
@@ -377,7 +377,7 @@ drv_basic_test_case (test_t t)
SCENARIO_ACTION (drv__stopping__stopped),
SCENARIO_EVENT (cp_msg_drv_any_cnf_send,
.peer = peer,
- .mmtype = DRV_STA_STOP_CNF,
+ .mmtype = DRV_STA_MAC_STOP_CNF,
.result = CP_MSG_DRV_RESULT_SUCCESS),
SCENARIO_END
};