osmocom-net-gprs

osmocom-net-gprs@lists.osmocom.org

483 discussions

[PATCH] Support of 11 bit RACH
by Bhargava Abhyankar 16 Mar '16

16 Mar '16

This patch is first of series of patches to support 11 bit RACH. This includes interface structure changes between osmo-pcu and osmo-bts to support 11 bit RACH.Processing of 11 bit RACH for GPRS is added in bts.cpp. Unit test for the same shall be sent as separate patch. EGPRS PACKET CHANNEL REQUEST is not part of this patch.Note also that this feature requires changes in osmo-bts and versioning needs to be addressed further. --- src/bts.cpp | 36 +++++++++++++++++++++++++++--------- src/bts.h | 9 ++++++++- src/pcu_l1_if.cpp | 2 +- src/pcuif_proto.h | 3 ++- 4 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 715fb51..a999c48 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -459,7 +459,7 @@ int BTS::rcv_imm_ass_cnf(const uint8_t *data, uint32_t fn) return 0; } -int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) +int BTS::rcv_rach(uint16_t ra, uint32_t Fn, int16_t qta, uint8_t rach_type) { struct gprs_rlcmac_ul_tbf *tbf = NULL; uint8_t trx_no, ts_no = 0; @@ -475,14 +475,32 @@ int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF on RACH, so we provide " "one:\n"); - if ((ra & 0xf8) == 0x70) { - LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single block " - "allocation\n"); - sb = 1; - } else if (m_bts.force_two_phase) { - LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single phase access, " - "but we force two phase access\n"); - sb = 1; + + if (rach_type == GPRS_8_BIT_RACH ) { + if ((ra & 0xf8) == 0x70) { + LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single block " + "allocation\n"); + sb = 1; + } else if (m_bts.force_two_phase) { + LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single phase access, " + "but we force two phase access\n"); + sb = 1; + } + + } else if(rach_type == GPRS_11_BIT_RACH ) { + if((ra & RACH_CAUSE_SINGLE_BLOCK) == 0x0600) { + LOGP(DRLCMAC, LOGL_DEBUG, "11 bit RACH received.MS requests single block " + "allocation\n"); + sb = 1; + + } else if (m_bts.force_two_phase) { + LOGP(DRLCMAC, LOGL_DEBUG, "11 bit RACHreceived.MS requests single phase access, " + "but we force two phase access\n"); + sb = 1; + } + } else if (rach_type == EGPRS_11_BIT_RACH) { + /*TODO*/ + } if (qta < 0) qta = 0; diff --git a/src/bts.h b/src/bts.h index c975304..870e6f3 100644 --- a/src/bts.h +++ b/src/bts.h @@ -41,6 +41,7 @@ extern "C" { #define LLC_CODEL_DISABLE 0 #define LLC_CODEL_USE_DEFAULT (-1) +#define RACH_CAUSE_SINGLE_BLOCK ((~((~0) << 6)) << 5) /* Establish cause */ struct BTS; struct GprsMs; @@ -251,6 +252,12 @@ public: TIMER_T3190_MSEC = 5000, }; + enum { + GPRS_8_BIT_RACH = 0, + GPRS_11_BIT_RACH = 1, + EGPRS_11_BIT_RACH = 2, + }; + BTS(); ~BTS(); @@ -275,7 +282,7 @@ public: int tfi_find_free(enum gprs_rlcmac_tbf_direction dir, uint8_t *_trx, int8_t use_trx); int rcv_imm_ass_cnf(const uint8_t *data, uint32_t fn); - int rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta); + int rcv_rach(uint16_t ra, uint32_t Fn, int16_t qta, uint8_t rach_type = 0); void trigger_dl_ass(gprs_rlcmac_dl_tbf *tbf, gprs_rlcmac_tbf *old_tbf); void snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 19dda5c..d937d20 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -313,7 +313,7 @@ static int pcu_rx_rach_ind(struct gsm_pcu_if_rach_ind *rach_ind) case PCU_IF_SAPI_RACH: rc = BTS::main_bts()->rcv_rach( rach_ind->ra, rach_ind->fn, - rach_ind->qta); + rach_ind->qta,rach_ind->rach_type); break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU rach request with " diff --git a/src/pcuif_proto.h b/src/pcuif_proto.h index 9d740ac..0844183 100644 --- a/src/pcuif_proto.h +++ b/src/pcuif_proto.h @@ -64,10 +64,11 @@ struct gsm_pcu_if_rts_req { struct gsm_pcu_if_rach_ind { uint8_t sapi; - uint8_t ra; + uint16_t ra; int16_t qta; uint32_t fn; uint16_t arfcn; + uint8_t rach_type; } __attribute__ ((packed)); struct gsm_pcu_if_info_trx { -- 2.5.0

3 5

[PATCH] UT Expected error files TbfTest.err, EdgeTest.err for FANR
by Aravind Sirsikar 16 Mar '16

16 Mar '16

Modifies TbfTest.err, EdgeTest.err for FANR feature --- tests/edge/EdgeTest.err | 601 +++++++++++++++++++++++++++++------------------ tests/tbf/TbfTest.err | 90 ++++--- 2 files changed, 430 insertions(+), 261 deletions(-)

2 1

[PATCH] Introduce EGPRS header type1 and type2 in UL
by Aravind Sirsikar 16 Mar '16

16 Mar '16

Defines new structures for UL EGPRS header type1 and type2 for supporting MCS5-MCS9 --- src/rlc.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/rlc.h b/src/rlc.h index 54f28df..3f10f8c 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -288,6 +288,44 @@ struct rlc_li_field_egprs { li:7; } __attribute__ ((packed)); +/* TS 44.060 10.3a.4.1.1 */ +struct gprs_rlc_ul_header_egprs_1 { + uint8_t r:1, + si:1, + cv:4, + tfi_a:2; + uint8_t tfi_b:3, + bsn1_a:5; + uint8_t bsn1_b:6, + bsn2_a:2; + uint8_t bsn2_b; + uint8_t cps:5, + rsb:1, + pi:1, + spare_a:1; + uint8_t spare_b:6, + dummy:2; +} __attribute__ ((packed)); + +/* TS 44.060 10.3a.4.2.1 */ +struct gprs_rlc_ul_header_egprs_2 { + uint8_t r:1, + si:1, + cv:4, + tfi_a:2; + uint8_t tfi_b:3, + bsn1_a:5; + uint8_t bsn1_b:6, + cps_a:2; + uint8_t cps_b:1, + rsb:1, + pi:1, + spare_a:5; + uint8_t spare_b:5, + dummy:3; +} __attribute__ ((packed)); + +/* TS 44.060 10.3a.4.3.1 */ struct gprs_rlc_ul_header_egprs_3 { uint8_t r:1, si:1, -- 1.7.9.5

1 0

Padding patch and moving forward with EGPRS support/merge
by Holger Freyther 16 Mar '16

16 Mar '16

Dear Saurabh, it would be nice if you could address the review comment of Harald for the padding patch and send it again. In terms of the commit message it would be interesting to know how you found it, if something broke because of it (e.g. if a specific Handset+Chipset+Firmware release broke). Such information is nicely captured in a commit message and might help future developers to prevent doing a revert or similar. In terms of the EDGE support it is custom in Free Software projects to build on top of what is already present. I don't have a specific approach and there are multiple options but from what I see the situation is: * You seem to have added additional encoding regression tests. It would be nice to move them to the master version and see if the result is similar/correct as well. * Jacob has not implemented compressed bitmaps in the DL TBF handling. The reason is because we want to avoid bufferbloat our windows don't really get that big and it seems we didn't need it yet. Now that you have built a tree based encoder, it might make sense to include the encoder, add tests for the encoding, reason/explain the performance and then hook the encoding in the DL ACK handling. * Any other corrections/fixes you have. * Identify other areas where your support is behaving better than the code in master or features missing and implemented in your branch. Do you already have an idea yourself how you intend to move forward and get your improvements included in the main repository? kind regards holger

6 7

[PATCH] Add test vectors for EGPRS messages
by Saurabh Sharan 15 Mar '16

15 Mar '16

This patch is the test suite modification for the fix encoding of padding bits. New test vectors have been added both in downlink and uplink. --- tests/rlcmac/RLCMACTest.cpp | 7 +++++-- tests/rlcmac/RLCMACTest.ok | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-)

2 1

[PATCH] Fix encoding of padding bits to start with 0 bit
by Saurabh Sharan 15 Mar '16

15 Mar '16

This patch is for fixing encoding of padding bits according to the 3gpp spec 44.060 section 11, wherein it shall always start with 0 bit followed with spare padding bits. During introduction of basic EGPRS feature new hex dump messages from a different working network log were used in Unit test. These exposed the issue of incorrect handling of padding bits encoding in osmo-pcu. Corrections in the existing test vector of rlcmac is also updated. In testsuite tbf appropriate corrections for the Tbftest.err is also done. --- src/csn1.cpp | 7 ++++++- tests/rlcmac/RLCMACTest.cpp | 6 +++--- tests/rlcmac/RLCMACTest.ok | 18 +++++++++--------- tests/tbf/TbfTest.err | 18 +++++++++--------- 4 files changed, 27 insertions(+), 22 deletions(-)

3 2

[PATCH 1/2] WIP..
by Holger Freyther 13 Mar '16

13 Mar '16

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> --- tests/rlcmac/RLCMACTest.cpp | 8 ++++---- tests/rlcmac/RLCMACTest.ok | 26 +++++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 66bc53c..124e643 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -89,7 +89,7 @@ void testRlcMacDownlink() std::string testData[] = { "4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment - "48282407a6a074227201000b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment + "48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment "47240c00400000000000000079eb2ac9402b2b2b2b2b2b", // Packet Uplink Ack Nack "47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b" // Packet Uplink Assignment "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b" @@ -152,9 +152,9 @@ void testRlcMacUplink() bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); std::string testData[] = { - "400e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block - "400b8020000000000000002480e00b2b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack - "4016713dc094270ca2ae57ef909006aa0fc0001f80222b" // Packet Resource Request + "400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block + "400b8020000000000000002480e0032b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack + "4016713dc094270ca2ae57ef909006aa0fc0001f80222b", // Packet Resource Request "400a9020000000000000003010012a0800132b2b2b2b2b" }; diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 99117ff..801de42 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -7,13 +7,13 @@ vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector2 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE -vector1 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b +vector2 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b =========Start DECODE=========== @@ -32,21 +32,21 @@ vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b vector2 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE UPLINK -vector1 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector2 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE -vector1 = 40b802000000002480e0b2b2b2b2b2b2b2b2b +vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40b802000000002480e0b2b2b2b2b2b2b2b2b -vector2 = 40b802000000002480e0b2b2b2b2b2b2b2b2b +vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b +vector2 = 40b802000000002480e032b2b2b2b2b2b2b2b vector1 == vector2 : TRUE vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b =========Start DECODE=========== @@ -56,3 +56,11 @@ vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector2 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector1 == vector2 : TRUE +vector1 = 40a90200000000301012a80132b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 40a90200000000301012a80132b2b2b2b2b +vector2 = 40a90200000000301012a80132b2b2b2b2b +vector1 == vector2 : TRUE -- 2.6.3

1 1

[PATCH] Add test vectors for EGPRS messages
by Holger Freyther 12 Mar '16

12 Mar '16

1 1

[PATCH] WIP: test patchwork test setup please ignore..
by Holger Hans Peter Freyther 11 Mar '16

11 Mar '16

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index a449398..97500c8 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,6 @@ * Make the TBF ul/dl list per BTS + + * Make the SBA per BTS * Make the tbf point to the BTS so we can kill plenty of parameters * Group more into in classes.. remove bts pointers. -- 2.6.3

1 0

[PATCH] WIP: test patchwork test setup please ignore..
by Holger Hans Peter Freyther 11 Mar '16

11 Mar '16

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index a449398..b154940 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ + * Make the TBF ul/dl list per BTS * Make the SBA per BTS * Make the tbf point to the BTS so we can kill plenty of parameters -- 2.6.3

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

osmocom-net-gprs