aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-05-31 19:14:24 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-05-31 19:19:10 +0800
commit95eb9dd339dbc590d61065796f0a7fa820d8d699 (patch)
tree3e5345f7eb48fbc21431956f102a593f62c88d90
parentca660ac9caff1cbf15e9bfa1820f49575f3a1f77 (diff)
[gprs] Use the defaults coming from a trace file.
* Enable sending RLC3 * Use values from the trace.. This is not intended to be merged to master as this enables the RLC3 that the comment claims to only work on EGPRS enabled models and it is changing timers to hex indicating a change where none happened... This is mostly for testing.
-rw-r--r--openbsc/src/bsc_init.c30
-rw-r--r--openbsc/src/gsm_data.c2
2 files changed, 15 insertions, 17 deletions
diff --git a/openbsc/src/bsc_init.c b/openbsc/src/bsc_init.c
index 13d924ede..f31255188 100644
--- a/openbsc/src/bsc_init.c
+++ b/openbsc/src/bsc_init.c
@@ -345,7 +345,7 @@ static unsigned char nanobts_attr_nse[] = {
3, /* (un)blocking retries */
3, /* reset timer (Tns-reset) */
3, /* reset retries */
- 30, /* test timer (Tns-test) */
+ 3, /* test timer (Tns-test) */
3, /* alive timer (Tns-alive) */
10, /* alive retrires */
NM_ATT_IPACC_BSSGP_CFG, 0, 11,
@@ -366,29 +366,27 @@ static unsigned char nanobts_attr_cell[] = {
NM_ATT_IPACC_RAC, 0, 1, 1, /* routing area code */
NM_ATT_IPACC_GPRS_PAGING_CFG, 0, 2,
5, /* repeat time (50ms) */
- 3, /* repeat count */
+ 1, /* repeat count */
NM_ATT_IPACC_BVCI, 0, 2, 0x03, 0x9d, /* BVCI 925 */
NM_ATT_IPACC_RLC_CFG, 0, 9,
- 20, /* T3142 */
- 5, /* T3169 */
- 5, /* T3191 */
- 200, /* T3193 */
- 5, /* T3195 */
- 10, /* N3101 */
- 4, /* N3103 */
- 8, /* N3105 */
- 15, /* RLC CV countdown */
- NM_ATT_IPACC_CODING_SCHEMES, 0, 2, 0x0f, 0x00, /* CS1..CS4 */
+ 0x14, /* T3142 */
+ 0x05, /* T3169 */
+ 0x05, /* T3191 */
+ 0x14, /* T3193 */
+ 0x05, /* T3195 */
+ 0x0a, /* N3101 */
+ 0x04, /* N3103 */
+ 0x08, /* N3105 */
+ 0x0f, /* RLC CV countdown */
+ NM_ATT_IPACC_CODING_SCHEMES, 0, 2, 0x8f, 0xff, /* CS1..CS4 */
NM_ATT_IPACC_RLC_CFG_2, 0, 5,
- 0x00, 250, /* T downlink TBF extension (0..500) */
- 0x00, 250, /* T uplink TBF extension (0..500) */
+ 0x00, 0x96, /* T downlink TBF extension (0..500) */
+ 0x00, 0x32, /* T uplink TBF extension (0..500) */
2, /* CS2 */
-#if 0
/* EDGE model only, breaks older models.
* Should inquire the BTS capabilities */
NM_ATT_IPACC_RLC_CFG_3, 0, 1,
2, /* MCS2 */
-#endif
};
static unsigned char nanobts_attr_nsvc0[] = {
diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c
index b54dd84cd..baeb36dde 100644
--- a/openbsc/src/gsm_data.c
+++ b/openbsc/src/gsm_data.c
@@ -172,7 +172,7 @@ struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts)
return trx;
}
-static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 };
+static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 3, 3, 10 };
static const uint8_t bts_cell_timer_default[] =
{ 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 };