summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaranjeiro2007-08-02 13:26:01 +0000
committerlaranjeiro2007-08-02 13:26:01 +0000
commit2c0480d52974d1029604007eed5e2fe766db5a6b (patch)
tree1bb8b78c9fdacb4ea3b53e14eb260380521ff240
parent7cea3ae81ac59e75aea2e22fbe014e78de4b7820 (diff)
Modified the SAR achitecture to use the maximus bridge and the sar bridge.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@576 017c9cb6-072f-447c-8318-d5b54f68fe89
-rw-r--r--mac/sar/Module2
-rw-r--r--mac/sar/bridgedma/Module1
-rw-r--r--mac/sar/bridgedma/inc/bridge.h (renamed from mac/sar/inc/bridge.h)14
-rw-r--r--mac/sar/bridgedma/src/bridge.c (renamed from mac/sar/src/bridge.c)4
-rw-r--r--mac/sar/inc/reassembly.h4
-rw-r--r--mac/sar/inc/sar_common.h24
-rw-r--r--mac/sar/inc/sar_unit_test_functions.h9
-rw-r--r--mac/sar/src/sar.c1
-rw-r--r--mac/sar/src/sar_common.c2
-rw-r--r--mac/sar/test/unit_test/sar_complete/Makefile2
-rw-r--r--mac/sar/test/unit_test/sar_complete/src/sar_complete.c2
11 files changed, 37 insertions, 28 deletions
diff --git a/mac/sar/Module b/mac/sar/Module
index 64a329ac74..9307b438f9 100644
--- a/mac/sar/Module
+++ b/mac/sar/Module
@@ -1 +1 @@
-SOURCES := sar.c sar_common.c reassembly.c segmentation.c bridge.c sar_unit_test_functions.c segmentation_unit_test_functions.c reassembly_unit_test_functions.c \ No newline at end of file
+SOURCES := sar.c sar_common.c reassembly.c segmentation.c sar_unit_test_functions.c segmentation_unit_test_functions.c reassembly_unit_test_functions.c \ No newline at end of file
diff --git a/mac/sar/bridgedma/Module b/mac/sar/bridgedma/Module
new file mode 100644
index 0000000000..dc07b476c1
--- /dev/null
+++ b/mac/sar/bridgedma/Module
@@ -0,0 +1 @@
+SOURCES := bridge.c \ No newline at end of file
diff --git a/mac/sar/inc/bridge.h b/mac/sar/bridgedma/inc/bridge.h
index b68e4fd9b6..208e7e9031 100644
--- a/mac/sar/inc/bridge.h
+++ b/mac/sar/bridgedma/inc/bridge.h
@@ -1,9 +1,19 @@
#ifndef BRIDGE_H_
#define BRIDGE_H_
-#include "mac/sar/inc/sar_common.h"
+#include <cyg/kernel/kapi.h>
+#include <cyg/hal/hal_arch.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "common/std.h"
+
+#include "lib/rnd.h"
+
#include "mac/pbproc/pbproc.h"
-//#include "hal/phy/bridgedma.h"
+
+#include "hal/phy/bridgedma.h"
struct bridge_dma_test_t
{
diff --git a/mac/sar/src/bridge.c b/mac/sar/bridgedma/src/bridge.c
index fb1b23afe2..f57b53acb7 100644
--- a/mac/sar/src/bridge.c
+++ b/mac/sar/bridgedma/src/bridge.c
@@ -1,4 +1,4 @@
-#include "mac/sar/inc/bridge.h"
+#include "mac/sar/bridgedma/inc/bridge.h"
phy_bridgedma_t *
phy_bridgedma_init (void *user_data, phy_bridgedma_cb_t bridgedma_cb,
@@ -72,7 +72,7 @@ void bridge_run (void)
{
//RX
buffer = malloc (2048 * sizeof(u8));
- header_len = mf_get_type (first, offset);
+ header_len = (*(first->data + offset) >> 6);
memcpy (buffer, (first->data + offset), BLK_SIZE- offset);
data_len -= BLK_SIZE - offset;
diff --git a/mac/sar/inc/reassembly.h b/mac/sar/inc/reassembly.h
index ff72186a43..ec864e1123 100644
--- a/mac/sar/inc/reassembly.h
+++ b/mac/sar/inc/reassembly.h
@@ -13,10 +13,6 @@
* \ingroup mac_sar
*/
-#include <cyg/kernel/kapi.h>
-#include <cyg/hal/hal_arch.h>
-
-
#include "mac/sar/inc/sar_common.h"
#define MAX_TIME_WAIT_MPDU 50
diff --git a/mac/sar/inc/sar_common.h b/mac/sar/inc/sar_common.h
index 804b83fb14..be2a80c261 100644
--- a/mac/sar/inc/sar_common.h
+++ b/mac/sar/inc/sar_common.h
@@ -15,28 +15,18 @@
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include <stdio.h>
-#include <stdlib.h>
#include "common/std.h"
-#include "lib/blk.h"
-#include "lib/rnd.h"
-#include "lib/utils.h"
-#include "lib/heap.h"
+#include "mac/pbproc/pbproc.h"
+#include "mac/common/store.h"
+#include "mac/common/mfs.h"
+#include "mac/ca/ca.h"
+
#include "lib/test.h"
+#include "lib/blk.h"
#include "hal/phy/bridgedma.h"
-#include "hal/phy/phy.h"
-
-#include "mac/common/pb.h"
-#include "mac/common/mfs.h"
-#include "mac/common/store.h"
-#include "mac/common/defs.h"
-
-#include "mac/ca/ca.h"
-#include "mac/pbproc/pbproc.h"
-#include "mac/sar/inc/bridge.h"
#define SAR_MAX_REASSEMBLY_TIMER 30
#define SAR_MAX_SEGMENTATION_TIMER 30
@@ -241,6 +231,7 @@ struct sar_work_message_t
};
typedef struct sar_work_message_t sar_work_message_t;
+#ifndef STATION_H_
//TODO TO BE REMOVED (TBR)
struct maximus_phy_ctrl_t
{
@@ -254,6 +245,7 @@ struct phy_t
maximus_phy_ctrl_t control;
};
//End of struct to remove
+#endif
/** PB pool a pool used by the Pb proc to stock the data received from the other
* STA.
diff --git a/mac/sar/inc/sar_unit_test_functions.h b/mac/sar/inc/sar_unit_test_functions.h
index 9b095aa645..f2956d3a23 100644
--- a/mac/sar/inc/sar_unit_test_functions.h
+++ b/mac/sar/inc/sar_unit_test_functions.h
@@ -15,6 +15,15 @@
*
*/
+#include <cyg/kernel/kapi.h>
+#include <cyg/hal/hal_arch.h>
+
+#include <stdio.h>
+
+#include "common/std.h"
+
+#include "lib/rnd.h"
+
#include "mac/sar/inc/reassembly.h"
#include "mac/sar/inc/segmentation.h"
diff --git a/mac/sar/src/sar.c b/mac/sar/src/sar.c
index 2f352f6bf2..f24bbee1df 100644
--- a/mac/sar/src/sar.c
+++ b/mac/sar/src/sar.c
@@ -11,6 +11,7 @@
* \ingroup mac_sar
*/
+#include "common/std.h"
#include "mac/sar/sar.h"
/**
diff --git a/mac/sar/src/sar_common.c b/mac/sar/src/sar_common.c
index 3cfec928f8..0fd531d0b8 100644
--- a/mac/sar/src/sar_common.c
+++ b/mac/sar/src/sar_common.c
@@ -1041,5 +1041,5 @@ sar_work_message_t* sar_work_get (void)
//TODO TBR
u32 phy_date (phy_t *phy_ctx)
{
- return phy_ctx->control.current_date;
+ return sar_ctx.phy_ctx->control.current_date;
}
diff --git a/mac/sar/test/unit_test/sar_complete/Makefile b/mac/sar/test/unit_test/sar_complete/Makefile
index 1a726f2b23..0acc026760 100644
--- a/mac/sar/test/unit_test/sar_complete/Makefile
+++ b/mac/sar/test/unit_test/sar_complete/Makefile
@@ -4,6 +4,6 @@ ECOS = y
TARGET_PROGRAMS = sar_complete
sar_complete_SOURCES = sar_complete.c
-sar_complete_MODULES = lib mac/sar mac/common
+sar_complete_MODULES = lib mac/sar mac/common mac/sar/bridgedma
include $(BASE)/common/make/top.mk
diff --git a/mac/sar/test/unit_test/sar_complete/src/sar_complete.c b/mac/sar/test/unit_test/sar_complete/src/sar_complete.c
index aa165cb05c..c7b71b6612 100644
--- a/mac/sar/test/unit_test/sar_complete/src/sar_complete.c
+++ b/mac/sar/test/unit_test/sar_complete/src/sar_complete.c
@@ -21,7 +21,7 @@
#include "mac/sar/inc/reassembly_unit_test_functions.h"
#include "mac/sar/inc/sar_unit_test_functions.h"
-#include "mac/sar/inc/bridge.h"
+#include "mac/sar/bridgedma/inc/bridge.h"
void sar_complete_segmentation_done (void *user, u8* buffer, u16 length);
void sar_complete_reassembly_done (void *user, u8* buffer, u16 length);