summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-10-12 14:08:55 +0200
committerNélio Laranjeiro2012-10-19 15:57:46 +0200
commit2509bd5b6092da5f34e8f67960cacf8220f8f7bb (patch)
tree16f72eb21a14e73609c202e1bd7021711bc4e143
parent0d526aa0bd3d673b468bdb4af38d29af98edea54 (diff)
cesar/tools/sniffer_phy: integrate mmtcgen, closes #3442
-rw-r--r--cesar/tools/sniffer_phy/Makefile2
-rw-r--r--cesar/tools/sniffer_phy/src/mme.c10
-rw-r--r--common/tests/tests4
3 files changed, 10 insertions, 6 deletions
diff --git a/cesar/tools/sniffer_phy/Makefile b/cesar/tools/sniffer_phy/Makefile
index 367a4f4305..4466eff0d4 100644
--- a/cesar/tools/sniffer_phy/Makefile
+++ b/cesar/tools/sniffer_phy/Makefile
@@ -12,7 +12,7 @@ test_mme_MODULES = lib
TARGET_PROGRAMS = sniffer_phy
sniffer_phy_SOURCES = sniffer_phy.c lhle.c lowlevel.c mme.c
sniffer_phy_MODULES = lib hal/phy mac/common hal/ipmbox hal/arch \
- hle/tools
+ hle/tools common/defs/mmtypes
mac_common_MODULES_SOURCES = tonemask.c
include $(BASE)/common/make/top.mk
diff --git a/cesar/tools/sniffer_phy/src/mme.c b/cesar/tools/sniffer_phy/src/mme.c
index f345e97aad..be671760cd 100644
--- a/cesar/tools/sniffer_phy/src/mme.c
+++ b/cesar/tools/sniffer_phy/src/mme.c
@@ -24,7 +24,7 @@
#include "inc/context.h"
-#include "cp/mme.h"
+#include "mmtypes.h"
/** Sniffer mode: frame control RX. */
#define MME_SNIFFER_MODE_RX_FC 0x20
@@ -132,7 +132,7 @@ mme_send_drv_any_cnf (sniffer_phy_t *ctx, mme_buffer_t *mme, u16 mmtype,
dbg_assert (mme);
/* Prepare header. */
if (mme_send_prepare (ctx, &cnf, mme->sa,
- CP_MSG_MMTYPE_BASE (mmtype) + CP_MME_CNF))
+ MMTYPE_BASE (mmtype) + MME_CNF))
{
/* Write result. */
bitstream_write (&cnf.bitstream, result, 8);
@@ -170,7 +170,7 @@ mme_send_vs_sniffer_cnf (sniffer_phy_t *ctx, mme_buffer_t *mme, u8 result)
dbg_assert (ctx);
dbg_assert (mme);
/* Prepare header. */
- if (mme_send_prepare (ctx, &cnf, mme->sa, VS_SNIFFER + CP_MME_CNF))
+ if (mme_send_prepare (ctx, &cnf, mme->sa, VS_SNIFFER_CNF))
{
/* Write MME. */
bitstream_write (&cnf.bitstream, result, 8);
@@ -271,7 +271,7 @@ mme_handle_decode (sniffer_phy_t *ctx, mme_buffer_t *mme)
/* Acknowledge, but ignore. */
mme_send_drv_any_cnf (ctx, mme, mmtype, 0);
break;
- case VS_SNIFFER + CP_MME_REQ:
+ case VS_SNIFFER_REQ:
mme_handle_vs_sniffer_req (ctx, mme);
break;
}
@@ -326,7 +326,7 @@ mme_report_mpdu (sniffer_phy_t *ctx, lowlevel_rx_t *rx)
mme_buffer_t ind;
bitstream_t *bs = &ind.bitstream;
if (mme_send_prepare (ctx, &ind, ctx->mme.mac_sniffer,
- VS_SNIFFER + CP_MME_IND))
+ VS_SNIFFER_IND))
{
/* Write MME. */
bitstream_write (bs, MME_VS_SNIFFER_IND_TYPE_MPDU, 8);
diff --git a/common/tests/tests b/common/tests/tests
index 33bcbe09c9..3693627b79 100644
--- a/common/tests/tests
+++ b/common/tests/tests
@@ -512,3 +512,7 @@ spc300: PYTHONPATH=. python validlib/spc300.py
hpav_test: PYTHONPATH=. python validlib/hpav_test.py
attenuator: PYTHONPATH=. python validlib/attenuator.py
P2P_throughput: PYTHONPATH=. python test/P2P_throughput/P2P_throughput.py
+
+cesar/tools/sniffer_phy:
+make
+run: ./obj/test_mme