summaryrefslogtreecommitdiff
path: root/mac
diff options
context:
space:
mode:
Diffstat (limited to 'mac')
-rw-r--r--mac/sar/test/inc/sar_unit_test_functions.h7
-rw-r--r--mac/sar/test/maximus_test/src/Sta_sar.c12
-rw-r--r--mac/sar/test/src/sar_unit_test_functions.c7
-rw-r--r--mac/sar/test/unit_test/ecos/src/reassembly_mfs_update_expiration_date.c2
4 files changed, 5 insertions, 23 deletions
diff --git a/mac/sar/test/inc/sar_unit_test_functions.h b/mac/sar/test/inc/sar_unit_test_functions.h
index 906c2477ce..86b533dc43 100644
--- a/mac/sar/test/inc/sar_unit_test_functions.h
+++ b/mac/sar/test/inc/sar_unit_test_functions.h
@@ -86,13 +86,6 @@ pbproc_rx_segment_refill (pbproc_t *ctx, pb_t *first, pb_t *last,
uint nb);
/**
- * Get the current NTB.
- * \param ctx pbproc context
- * \return current NTB
- */
-u32 pbproc_get_ntb (pbproc_t *ctx);
-
-/**
* Unregister an MFS from the Channel Access, so that it can no longer be
* sent.
* \param ctx ca context
diff --git a/mac/sar/test/maximus_test/src/Sta_sar.c b/mac/sar/test/maximus_test/src/Sta_sar.c
index ddb3ce954f..0fc067355b 100644
--- a/mac/sar/test/maximus_test/src/Sta_sar.c
+++ b/mac/sar/test/maximus_test/src/Sta_sar.c
@@ -393,8 +393,7 @@ void fill_mac_store (bool tx, sar_max_job_t *job_curr)
dbg_assert (added);
/* Add the mfs to the SAR expiration */
- mfs->common.expiration_ntb = pbproc_get_ntb (sar_ctx->pbproc_ctx)
- + 100;
+ mfs->common.expiration_ntb = mac_ntb() + 100;
sar_mfs_add (sar_ctx, (mfs_t *) mfs);
if (log_init_info)
@@ -410,8 +409,7 @@ void fill_mac_store (bool tx, sar_max_job_t *job_curr)
dbg_assert (added);
/* Add the mfs to the sar expiration */
- mfs->common.expiration_ntb = pbproc_get_ntb (sar_ctx->pbproc_ctx)
- + 100;
+ mfs->common.expiration_ntb = mac_ntb() + 100;
sar_mfs_add (sar_ctx, (mfs_t *) mfs);
}
else
@@ -442,8 +440,7 @@ void fill_mac_store (bool tx, sar_max_job_t *job_curr)
dbg_assert (added);
/* Add the mfs to the SAR expiration */
- mfs->common.expiration_ntb
- = pbproc_get_ntb (sar_ctx->pbproc_ctx) + 100;
+ mfs->common.expiration_ntb = mac_ntb() + 100;
sar_mfs_add (sar_ctx, (mfs_t *) mfs);
}
@@ -469,8 +466,7 @@ void fill_mac_store (bool tx, sar_max_job_t *job_curr)
dbg_assert (added);
/* Add the mfs to the sar expiration */
- mfs->common.expiration_ntb
- = pbproc_get_ntb (sar_ctx->pbproc_ctx) + 100;
+ mfs->common.expiration_ntb = mac_ntb() + 100;
sar_mfs_add (sar_ctx, (mfs_t *) mfs);
}
}
diff --git a/mac/sar/test/src/sar_unit_test_functions.c b/mac/sar/test/src/sar_unit_test_functions.c
index f7df933941..085c267cec 100644
--- a/mac/sar/test/src/sar_unit_test_functions.c
+++ b/mac/sar/test/src/sar_unit_test_functions.c
@@ -66,13 +66,6 @@ void pbproc_rx_segment_refill (pbproc_t *ctx, pb_t *first, pb_t *last, uint nb)
blk_release_desc ((blk_t *) first);
}
-u32
-pbproc_get_ntb (pbproc_t *ctx)
-{
- dbg_assert (ctx);
- ((sar_pbproc_t *)ctx)->cpt_expiration += 5;
- return ((sar_pbproc_t *)ctx)->cpt_expiration;
-}
/**
* Unregister an MFS from the Channel Access, so that it can no longer be
diff --git a/mac/sar/test/unit_test/ecos/src/reassembly_mfs_update_expiration_date.c b/mac/sar/test/unit_test/ecos/src/reassembly_mfs_update_expiration_date.c
index 3c6ccfe458..6cdd3b9f74 100644
--- a/mac/sar/test/unit_test/ecos/src/reassembly_mfs_update_expiration_date.c
+++ b/mac/sar/test/unit_test/ecos/src/reassembly_mfs_update_expiration_date.c
@@ -62,7 +62,7 @@ int main (void)
sar_mfs_add (sar_ctx, (mfs_t *) rx->mfs);
sar_expiration_mfs_update_date (&sar_ctx->expiration, (mfs_t *) rx->mfs,
- pbproc_get_ntb (sar_ctx->pbproc_ctx));
+ mac_ntb());
test_init (test, 0, NULL);