February 2023 - gerrit-log - lists.osmocom.org

Change in libosmo-gprs[master]: rlcmac: Refactor msg_type enums and value_string

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31152 to look at the new patch set (#2). Change subject: rlcmac: Refactor msg_type enums and value_string ...................................................................... rlcmac: Refactor msg_type enums and value_string Add prefixes, clean formatting, move to proper place, etc. Change-Id: Ic55782d90c0d7876fc37d1da130b859857c11447 --- M include/osmocom/gprs/rlcmac/csn1_defs.h M include/osmocom/gprs/rlcmac/types.h M src/rlcmac/csn1_ts_44_060.c M src/rlcmac/ts_44_060.c 4 files changed, 199 insertions(+), 191 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/52/31152/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic55782d90c0d7876fc37d1da130b859857c11447 Gerrit-Change-Number: 31152 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Initial implementation of UL TBF assignment and scheduler

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31099 to look at the new patch set (#7). Change subject: rlcmac: Initial implementation of UL TBF assignment and scheduler ...................................................................... rlcmac: Initial implementation of UL TBF assignment and scheduler This patch is another towards a working RLC/MAC implementation. It adds: * An initial data model with MS (gprs_rlcmac_entity) and ul_tbf. * A UL_TBF state FSM from initial to FLOW status * A UL_TBF assignemnt FSM, covering both 1phase and 2phase assignments. * Triggering of UL_TBF allocation and assignment FSM when new LLC data is pushed from upper layers. * A scheduler generating some ctrl messages (PktResReq and UlDummyCtrlBlk) when indicated by the network. This patch is pushed as a WIP state since it already contains a considerable amount of code and lots of new files, which can be used/extended at a later point, making parallel contribution easier. Related: OS#5500 Change-Id: I420c57a9d0b63f9c2805a7c2ae8ce85532a48eef --- M include/osmocom/gprs/rlcmac/Makefile.am M include/osmocom/gprs/rlcmac/rlcmac.h A include/osmocom/gprs/rlcmac/rlcmac_enc.h M include/osmocom/gprs/rlcmac/rlcmac_private.h A include/osmocom/gprs/rlcmac/sched.h A include/osmocom/gprs/rlcmac/tbf.h A include/osmocom/gprs/rlcmac/tbf_ul.h A include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h A include/osmocom/gprs/rlcmac/tbf_ul_fsm.h A include/osmocom/gprs/rlcmac/types_private.h M src/rlcmac/Makefile.am M src/rlcmac/gre.c M src/rlcmac/misc.c M src/rlcmac/rlcmac.c A src/rlcmac/rlcmac_enc.c A src/rlcmac/sched.c A src/rlcmac/tbf.c A src/rlcmac/tbf_ul.c A src/rlcmac/tbf_ul_ass_fsm.c A src/rlcmac/tbf_ul_fsm.c 20 files changed, 1,272 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/99/31099/7 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I420c57a9d0b63f9c2805a7c2ae8ce85532a48eef Gerrit-Change-Number: 31099 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Initial implementation of UL TBF assignment and scheduler

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31099 ) Change subject: rlcmac: Initial implementation of UL TBF assignment and scheduler ...................................................................... Patch Set 6: (1 comment) File include/osmocom/gprs/rlcmac/types_private.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3191): https://gerrit.osmocom.org/c/libosmo-gprs/+/31099/comment/878ca13e_9a7f9444 PS6, Line 32: }; adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I420c57a9d0b63f9c2805a7c2ae8ce85532a48eef Gerrit-Change-Number: 31099 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Feb 2023 16:23:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rmcmac: Refactor msg_type enums and value_string

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31152 ) Change subject: rmcmac: Refactor msg_type enums and value_string ...................................................................... Patch Set 1: (83 comments) File include/osmocom/gprs/rlcmac/types.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/8b9b4395_2c4e8a5a PS1, Line 89: extern const struct value_string osmo_gprs_rlcmac_ul_msg_type_names[]; adding a line without newline at end of file File src/rlcmac/csn1_ts_44_060.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/833366ea_43e3a43a PS1, Line 4439: msg_type_name = get_value_string(osmo_gprs_rlcmac_ul_msg_type_names, data->u.MESSAGE_TYPE); please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/2cd9f856_36fe96ff PS1, Line 4444: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/d72121b0_a9b5ded1 PS1, Line 4454: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/429b513e_bb00b521 PS1, Line 4459: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/7dd720d7_a7159fa1 PS1, Line 4464: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/0e43f3e8_ab1fe6ca PS1, Line 4469: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/92154ab1_2df3e68c PS1, Line 4474: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/01454fc7_c51556cb PS1, Line 4480: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/760cef11_31313594 PS1, Line 4485: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/a68361ff_b831529a PS1, Line 4490: case OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/5a79c765_2ec4cfd2 PS1, Line 4495: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/c535fb7f_d6cf25c5 PS1, Line 4500: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/9fcf3090_22c1ecdd PS1, Line 4505: case OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/bf1425e0_f5f5e514 PS1, Line 4510: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/40b345d6_b25ecb08 PS1, Line 4515: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/63296b45_1351d5a4 PS1, Line 4601: msg_type_name = get_value_string(osmo_gprs_rlcmac_dl_msg_type_names, data->u.MESSAGE_TYPE); please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/436e3298_021f72d4 PS1, Line 4607: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/0c5ffc4d_1b35b8f0 PS1, Line 4612: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/4b87c89a_dea4a313 PS1, Line 4617: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/a0a5fe0e_c1c4748e PS1, Line 4622: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/bac257b8_c0de4e7a PS1, Line 4627: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/f2608678_55be15f2 PS1, Line 4632: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/4f887f51_a973b7ed PS1, Line 4637: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/b9bf1b14_ba6566e7 PS1, Line 4642: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/274f8b8d_8dcb7356 PS1, Line 4647: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/498efae3_1b557335 PS1, Line 4652: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/419e5614_7034e552 PS1, Line 4657: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/39324211_013a8288 PS1, Line 4662: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/a5c3caf5_62722521 PS1, Line 4667: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/b3dfd094_7e32376e PS1, Line 4672: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/f8d14a27_ff9a726e PS1, Line 4677: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/f3e4fbf4_8e7c9179 PS1, Line 4682: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/b3772b3f_795ec725 PS1, Line 4687: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/03f8b412_84ce97f7 PS1, Line 4692: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/730c78b9_b996e533 PS1, Line 4697: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/7e96382a_1fe8202a PS1, Line 4702: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/e78c8e6b_f6f89afb PS1, Line 4707: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/9ad5d458_096acf9c PS1, Line 4712: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/0044251d_f86a321d PS1, Line 4717: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/1d550b65_9cece7d5 PS1, Line 4722: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/e452d73a_c60db289 PS1, Line 4727: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/67e671a9_172b6529 PS1, Line 4762: msg_type_name = get_value_string(osmo_gprs_rlcmac_ul_msg_type_names, data->u.MESSAGE_TYPE); please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/ef06f346_bca9e42d PS1, Line 4767: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/aaae3311_64a4ef99 PS1, Line 4777: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/71502892_8c461334 PS1, Line 4782: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/d1f2b508_f8953fdf PS1, Line 4787: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/48d9b2b5_ffa61181 PS1, Line 4792: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/7df40cd0_84662736 PS1, Line 4797: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/5e066290_9dadeb5c PS1, Line 4803: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/ec13df23_f225dae2 PS1, Line 4808: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/34a53cac_2df833ca PS1, Line 4813: case OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/1c471ca2_43b17dfd PS1, Line 4818: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/1b2bd753_fdc00516 PS1, Line 4823: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/4cbaff0c_c6e580f9 PS1, Line 4828: case OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/8bb40eb1_0ffb3938 PS1, Line 4833: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/0d34a5c1_806e707f PS1, Line 4838: case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/83ab1723_b7fe8003 PS1, Line 4923: msg_type_name = get_value_string(osmo_gprs_rlcmac_dl_msg_type_names, data->u.MESSAGE_TYPE); please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/1803f938_048ffead PS1, Line 4928: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/72dcdda0_fdc8c646 PS1, Line 4933: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/43445995_eaed8013 PS1, Line 4938: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/d48176ab_0b730557 PS1, Line 4943: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/7bb87b98_2a067bb6 PS1, Line 4948: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/7ccd708c_0ebb736b PS1, Line 4953: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/7cea8e9b_6eb8c0e5 PS1, Line 4958: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/b47043de_ed52bad8 PS1, Line 4963: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/d4a89c5e_d18749cc PS1, Line 4968: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/fea0c9ad_4be0c2a1 PS1, Line 4973: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/998b82cc_ab130377 PS1, Line 4978: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/9b7993b0_9a9af42c PS1, Line 4983: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/84881f09_4dd67aba PS1, Line 4988: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/ca672627_59378a5f PS1, Line 4993: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/4e6c0868_bc78334b PS1, Line 4998: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/0ce24b45_47686aab PS1, Line 5003: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/f03b2056_92eb061b PS1, Line 5008: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/16c2452a_7be3b63a PS1, Line 5013: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/9487cdd6_c102cdbc PS1, Line 5018: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/faa1375c_0fc0d214 PS1, Line 5023: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/73957ff1_31ab6ddb PS1, Line 5028: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/8f8c20fb_32d359ef PS1, Line 5033: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/28ca0fc1_4264c323 PS1, Line 5038: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/edf1b758_83d502cb PS1, Line 5043: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5: please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-3190): https://gerrit.osmocom.org/c/libosmo-gprs/+/31152/comment/68957dc5_65c949dc PS1, Line 5048: case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13: please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic55782d90c0d7876fc37d1da130b859857c11447 Gerrit-Change-Number: 31152 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Feb 2023 16:23:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: WIP: rlcmac: Rearrange csn1 related definitions

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31130 ) Change subject: WIP: rlcmac: Rearrange csn1 related definitions ...................................................................... Abandoned I submitted a bunch of patches doing the modifications agreed upon here and through IM. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7f48c1f40581c7689b280c0881d88c4900d56a10 Gerrit-Change-Number: 31130 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Move spec related definitions for general use to types.h

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31151 ) Change subject: rlcmac: Move spec related definitions for general use to types.h ...................................................................... rlcmac: Move spec related definitions for general use to types.h Move types defined by spec not directly/solely intended for the CSN1 encoder/decoder operation to a separate types.h header. More and more types will be added there which will be used by the data domain inside and outside the library. Change-Id: Ib0fdae48fc3e76d701d21644826e5ffd8553fecb --- M include/osmocom/gprs/rlcmac/Makefile.am M include/osmocom/gprs/rlcmac/csn1_defs.h M include/osmocom/gprs/rlcmac/llc_queue.h M include/osmocom/gprs/rlcmac/rlcmac.h A include/osmocom/gprs/rlcmac/types.h M src/rlcmac/Makefile.am M src/rlcmac/csn1_ts_44_060.c A src/rlcmac/ts_44_060.c M src/rlcmac/ts_44_064.c M tests/rlcmac/ts_44_060_test.c 10 files changed, 72 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/51/31151/1 diff --git a/include/osmocom/gprs/rlcmac/Makefile.am b/include/osmocom/gprs/rlcmac/Makefile.am index 091882a..e797480 100644 --- a/include/osmocom/gprs/rlcmac/Makefile.am +++ b/include/osmocom/gprs/rlcmac/Makefile.am @@ -9,6 +9,7 @@ csn1_defs.h \ rlcmac.h \ rlcmac_prim.h \ + types.h \ $(NULL) rlcmacdir = $(includedir)/osmocom/gprs/rlcmac diff --git a/include/osmocom/gprs/rlcmac/csn1_defs.h b/include/osmocom/gprs/rlcmac/csn1_defs.h index a68267d..459dde2 100644 --- a/include/osmocom/gprs/rlcmac/csn1_defs.h +++ b/include/osmocom/gprs/rlcmac/csn1_defs.h @@ -5404,21 +5404,6 @@ EGPRS_PacketChannelRequestContent_t Content; } EGPRS_PacketChannelRequest_t; -typedef enum { - EGPRS_PKT_CHAN_REQ_ONE_PHASE = 0, - EGPRS_PKT_CHAN_REQ_SHORT, - EGPRS_PKT_CHAN_REQ_ONE_PHASE_RED_LATENCY, - EGPRS_PKT_CHAN_REQ_TWO_PHASE, - EGPRS_PKT_CHAN_REQ_SIGNALLING, - EGPRS_PKT_CHAN_REQ_ONE_PHASE_UNACK, - EGPRS_PKT_CHAN_REQ_DEDICATED_CHANNEL, - EGPRS_PKT_CHAN_REQ_EMERGENCY_CALL, - EGPRS_PKT_CHAN_REQ_TWO_PHASE_IPA, - EGPRS_PKT_CHAN_REQ_SIGNALLING_IPA, -} EGPRS_PacketChannelRequestType_t; - -extern const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[]; - int osmo_gprs_rlcmac_decode_uplink(struct bitvec *vector, RlcMacUplink_t *data); int osmo_gprs_rlcmac_decode_downlink(struct bitvec *vector, RlcMacDownlink_t *data); int osmo_gprs_rlcmac_encode_downlink(struct bitvec *vector, RlcMacDownlink_t *data); diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h b/include/osmocom/gprs/rlcmac/llc_queue.h index 7e941fb..a0a91e4 100644 --- a/include/osmocom/gprs/rlcmac/llc_queue.h +++ b/include/osmocom/gprs/rlcmac/llc_queue.h @@ -9,6 +9,7 @@ #include <osmocom/gprs/rlcmac/codel.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> +#include <osmocom/gprs/rlcmac/types.h> #include <osmocom/gprs/rlcmac/rlcmac.h> struct gprs_rlcmac_entity; diff --git a/include/osmocom/gprs/rlcmac/rlcmac.h b/include/osmocom/gprs/rlcmac/rlcmac.h index e433a08..d7bfb0a 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac.h +++ b/include/osmocom/gprs/rlcmac/rlcmac.h @@ -13,20 +13,6 @@ OSMO_GPRS_RLCMAC_LOCATION_PCU, }; -/* Section TS 44.064 6.2.3 Service Access Point Identifier (SAPI) */ -enum osmo_gprs_rlcmac_llc_sapi { - OSMO_GPRS_RLCMAC_LLC_SAPI_GMM = 1, - OSMO_GPRS_RLCMAC_LLC_SAPI_TOM2 = 2, - OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP3 = 3, - OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP5 = 5, - OSMO_GPRS_RLCMAC_LLC_SAPI_SMS = 7, - OSMO_GPRS_RLCMAC_LLC_SAPI_TOM8 = 8, - OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP9 = 9, - OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP11 = 11, -}; - -extern const struct value_string osmo_gprs_rlcmac_llc_sapi_names[]; - int osmo_gprs_rlcmac_init(enum osmo_gprs_rlcmac_location location); enum osmo_gprs_rlcmac_log_cat { diff --git a/include/osmocom/gprs/rlcmac/types.h b/include/osmocom/gprs/rlcmac/types.h new file mode 100644 index 0000000..e503fb4 --- /dev/null +++ b/include/osmocom/gprs/rlcmac/types.h @@ -0,0 +1,30 @@ +/* Types & defines from TS 44.060, TS 44.064 */ +#pragma once + +/* TS 44.060 Table 11.2.5a.2 "EGPRS Packet channel request" */ +enum osmo_gprs_rlcmac_egprs_pkt_ch_req_type { + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE = 0, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SHORT, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE_RED_LATENCY, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_TWO_PHASE, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE_UNACK, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_DEDICATED_CHANNEL, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_EMERGENCY_CALL, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_TWO_PHASE_IPA, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING_IPA, +}; +extern const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[]; + +/* TS 44.064 Section 6.2.3 Service Access Point Identifier (SAPI) */ +enum osmo_gprs_rlcmac_llc_sapi { + OSMO_GPRS_RLCMAC_LLC_SAPI_GMM = 1, + OSMO_GPRS_RLCMAC_LLC_SAPI_TOM2 = 2, + OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP3 = 3, + OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP5 = 5, + OSMO_GPRS_RLCMAC_LLC_SAPI_SMS = 7, + OSMO_GPRS_RLCMAC_LLC_SAPI_TOM8 = 8, + OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP9 = 9, + OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP11 = 11, +}; +extern const struct value_string osmo_gprs_rlcmac_llc_sapi_names[]; diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index 4150f84..676abe0 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -30,6 +30,7 @@ llc_queue.c \ rlcmac.c \ rlcmac_prim.c \ + ts_44_060.c \ ts_44_064.c \ misc.c \ $(NULL) diff --git a/src/rlcmac/csn1_ts_44_060.c b/src/rlcmac/csn1_ts_44_060.c index 0ebfbed..5cc9c4b 100644 --- a/src/rlcmac/csn1_ts_44_060.c +++ b/src/rlcmac/csn1_ts_44_060.c @@ -5261,20 +5261,6 @@ } } -const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[] = { - { EGPRS_PKT_CHAN_REQ_ONE_PHASE, "One Phase Access" }, - { EGPRS_PKT_CHAN_REQ_SHORT, "Short Access" }, - { EGPRS_PKT_CHAN_REQ_ONE_PHASE_RED_LATENCY, "One Phase Access (Reduced Latency MS)" }, - { EGPRS_PKT_CHAN_REQ_TWO_PHASE, "Two Phase Access" }, - { EGPRS_PKT_CHAN_REQ_SIGNALLING, "Signalling" }, - { EGPRS_PKT_CHAN_REQ_ONE_PHASE_UNACK, "One Phase Access (RLC unack mode)" }, - { EGPRS_PKT_CHAN_REQ_DEDICATED_CHANNEL, "Dedicated Channel Request" }, - { EGPRS_PKT_CHAN_REQ_EMERGENCY_CALL, "Emergency call" }, - { EGPRS_PKT_CHAN_REQ_TWO_PHASE_IPA, "Two Phase Access (by IPA capable MS)" }, - { EGPRS_PKT_CHAN_REQ_SIGNALLING_IPA, "Signalling (by IPA capable MS)" }, - { 0, NULL } -}; - int osmo_gprs_rlcmac_decode_egprs_pkt_ch_req(guint16 ra, EGPRS_PacketChannelRequest_t *req) { unsigned readIndex = 0; diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c new file mode 100644 index 0000000..931c262 --- /dev/null +++ b/src/rlcmac/ts_44_060.c @@ -0,0 +1,37 @@ +/* GPRS RLC/MAC definitions from TS 44.064 (LLC) */ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/utils.h> +#include <osmocom/gprs/rlcmac/types.h> + +const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[] = { + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE, "One Phase Access" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SHORT, "Short Access" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE_RED_LATENCY, "One Phase Access (Reduced Latency MS)" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_TWO_PHASE, "Two Phase Access" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING, "Signalling" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE_UNACK, "One Phase Access (RLC unack mode)" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_DEDICATED_CHANNEL, "Dedicated Channel Request" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_EMERGENCY_CALL, "Emergency call" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_TWO_PHASE_IPA, "Two Phase Access (by IPA capable MS)" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING_IPA, "Signalling (by IPA capable MS)" }, + { 0, NULL } +}; diff --git a/src/rlcmac/ts_44_064.c b/src/rlcmac/ts_44_064.c index 5ad9af5..e781d24 100644 --- a/src/rlcmac/ts_44_064.c +++ b/src/rlcmac/ts_44_064.c @@ -20,7 +20,7 @@ */ #include <osmocom/core/utils.h> -#include <osmocom/gprs/rlcmac/rlcmac.h> +#include <osmocom/gprs/rlcmac/types.h> const struct value_string osmo_gprs_rlcmac_llc_sapi_names[] = { { OSMO_GPRS_RLCMAC_LLC_SAPI_GMM, "GMM" }, diff --git a/tests/rlcmac/ts_44_060_test.c b/tests/rlcmac/ts_44_060_test.c index 1591102..06342b9 100644 --- a/tests/rlcmac/ts_44_060_test.c +++ b/tests/rlcmac/ts_44_060_test.c @@ -24,6 +24,7 @@ #include <osmocom/csn1/csn1.h> #include <osmocom/gprs/rlcmac/csn1_defs.h> +#include <osmocom/gprs/rlcmac/types.h> static void testRlcMacDownlink(void *test_ctx) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ib0fdae48fc3e76d701d21644826e5ffd8553fecb Gerrit-Change-Number: 31151 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rmcmac: Refactor msg_type enums and value_string

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31152 ) Change subject: rmcmac: Refactor msg_type enums and value_string ...................................................................... rmcmac: Refactor msg_type enums and value_string Add prefixes, clean formatting, move to proper place, etc. Change-Id: Ic55782d90c0d7876fc37d1da130b859857c11447 --- M include/osmocom/gprs/rlcmac/csn1_defs.h M include/osmocom/gprs/rlcmac/types.h M src/rlcmac/csn1_ts_44_060.c M src/rlcmac/ts_44_060.c 4 files changed, 199 insertions(+), 191 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/52/31152/1 diff --git a/include/osmocom/gprs/rlcmac/csn1_defs.h b/include/osmocom/gprs/rlcmac/csn1_defs.h index 459dde2..5e4b599 100644 --- a/include/osmocom/gprs/rlcmac/csn1_defs.h +++ b/include/osmocom/gprs/rlcmac/csn1_defs.h @@ -5071,59 +5071,6 @@ */ /* < Downlink RLC/MAC control message > */ -#define MT_PACKET_CELL_CHANGE_ORDER 0x01 -#define MT_PACKET_DOWNLINK_ASSIGNMENT 0x02 -#define MT_PACKET_MEASUREMENT_ORDER 0x03 -#define MT_PACKET_POLLING_REQ 0x04 -#define MT_PACKET_POWER_CONTROL_TIMING_ADVANCE 0x05 -#define MT_PACKET_QUEUEING_NOTIFICATION 0x06 -#define MT_PACKET_TIMESLOT_RECONFIGURE 0x07 -#define MT_PACKET_TBF_RELEASE 0x08 -#define MT_PACKET_UPLINK_ACK_NACK 0x09 -#define MT_PACKET_UPLINK_ASSIGNMENT 0x0A -#define MT_PACKET_CELL_CHANGE_CONTINUE 0x0B -#define MT_PACKET_NEIGHBOUR_CELL_DATA 0x0C -#define MT_PACKET_SERVING_CELL_DATA 0x0D -#define MT_PACKET_HANDOVER_COMMAND 0x15 -#define MT_PACKET_PHYSICAL_INFORMATION 0x16 -#define MT_PACKET_ACCESS_REJECT 0x21 -#define MT_PACKET_PAGING_REQUEST 0x22 -#define MT_PACKET_PDCH_RELEASE 0x23 -#define MT_PACKET_PRACH_PARAMETERS 0x24 -#define MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK 0x25 -#define MT_PACKET_SYSTEM_INFO_6 0x30 -#define MT_PACKET_SYSTEM_INFO_1 0x31 -#define MT_PACKET_SYSTEM_INFO_2 0x32 -#define MT_PACKET_SYSTEM_INFO_3 0x33 -#define MT_PACKET_SYSTEM_INFO_3_BIS 0x34 -#define MT_PACKET_SYSTEM_INFO_4 0x35 -#define MT_PACKET_SYSTEM_INFO_5 0x36 -#define MT_PACKET_SYSTEM_INFO_13 0x37 -#define MT_PACKET_SYSTEM_INFO_7 0x38 -#define MT_PACKET_SYSTEM_INFO_8 0x39 -#define MT_PACKET_SYSTEM_INFO_14 0x3A -#define MT_PACKET_SYSTEM_INFO_3_TER 0x3C -#define MT_PACKET_SYSTEM_INFO_3_QUATER 0x3D -#define MT_PACKET_SYSTEM_INFO_15 0x3E - -/* < Uplink RLC/MAC control message > */ -#define MT_PACKET_CELL_CHANGE_FAILURE 0x00 -#define MT_PACKET_CONTROL_ACK 0x01 -#define MT_PACKET_DOWNLINK_ACK_NACK 0x02 -#define MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK 0x03 -#define MT_PACKET_MEASUREMENT_REPORT 0x04 -#define MT_PACKET_RESOURCE_REQUEST 0x05 -#define MT_PACKET_MOBILE_TBF_STATUS 0x06 -#define MT_PACKET_PSI_STATUS 0x07 -#define MT_EGPRS_PACKET_DOWNLINK_ACK_NACK 0x08 -#define MT_PACKET_PAUSE 0x09 -#define MT_PACKET_ENHANCED_MEASUREMENT_REPORT 0x0A -#define MT_ADDITIONAL_MS_RAC 0x0B -#define MT_PACKET_CELL_CHANGE_NOTIFICATION 0x0C -#define MT_PACKET_SI_STATUS 0x0D -#define MT_ENHANCED_MEASUREMENT_REPORT 0x04 - -/* < Downlink RLC/MAC control message > */ typedef struct { union diff --git a/include/osmocom/gprs/rlcmac/types.h b/include/osmocom/gprs/rlcmac/types.h index e503fb4..082ead5 100644 --- a/include/osmocom/gprs/rlcmac/types.h +++ b/include/osmocom/gprs/rlcmac/types.h @@ -28,3 +28,62 @@ OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP11 = 11, }; extern const struct value_string osmo_gprs_rlcmac_llc_sapi_names[]; + +/* TS 44.060 11.2.0.1 Downlink RLC/MAC messages */ +enum osmo_gprs_rlcmac_dl_msg_type { + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER = 0x01, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT = 0x02, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER = 0x03, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ = 0x04, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE = 0x05, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION = 0x06, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE = 0x07, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE = 0x08, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK = 0x09, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT = 0x0A, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE = 0x0B, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA = 0x0C, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA = 0x0D, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND = 0x15, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION = 0x16, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT = 0x21, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST = 0x22, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE = 0x23, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS = 0x24, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK = 0x25, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_6 = 0x30, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1 = 0x31, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2 = 0x32, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3 = 0x33, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_BIS = 0x34, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_4 = 0x35, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5 = 0x36, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13 = 0x37, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_7 = 0x38, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_8 = 0x39, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_14 = 0x3A, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_TER = 0x3C, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_QUATER = 0x3D, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_15 = 0x3E, +}; +extern const struct value_string osmo_gprs_rlcmac_dl_msg_type_names[]; + +/* TS 44.060 11.2.0.2 Uplink RLC/MAC messages */ +enum osmo_gprs_rlcmac_ul_msg_type { + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE = 0x00, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK = 0x01, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK = 0x02, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK = 0x03, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT = 0x04, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST = 0x05, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS = 0x06, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS = 0x07, + OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK = 0x08, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE = 0x09, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT = 0x0A, + OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC = 0x0B, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION = 0x0C, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS = 0x0D, + OSMO_GPRS_RLCMAC_UL_MSGT_ENHANCED_MEASUREMENT_REPORT = 0x04, +}; +extern const struct value_string osmo_gprs_rlcmac_ul_msg_type_names[]; \ No newline at end of file diff --git a/src/rlcmac/csn1_ts_44_060.c b/src/rlcmac/csn1_ts_44_060.c index 5cc9c4b..296c498 100644 --- a/src/rlcmac/csn1_ts_44_060.c +++ b/src/rlcmac/csn1_ts_44_060.c @@ -30,6 +30,7 @@ #include <osmocom/csn1/csn1.h> #include <osmocom/gprs/rlcmac/csn1_defs.h> +#include <osmocom/gprs/rlcmac/types.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> /* Payload type as defined in TS 44.060 / 10.4.7 */ @@ -4407,62 +4408,6 @@ // ---------------------------------------------------------------------------- // osmo-pcu RLCMAC APIs // ---------------------------------------------------------------------------- -static const struct value_string rlcmac_ul_msg_names[] = { - { MT_PACKET_CELL_CHANGE_FAILURE, "Pkt Cell Change Failure" }, - { MT_PACKET_CONTROL_ACK, "Pkt Control Ack" }, - { MT_PACKET_DOWNLINK_ACK_NACK , "Pkt DL ACK/NACK" }, - { MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK, "Pkt UL Dummy Ctrl Block" }, - { MT_PACKET_MEASUREMENT_REPORT, "Pkt Meas Report" }, - { MT_PACKET_RESOURCE_REQUEST, "Pkt Resource Req" }, - { MT_PACKET_MOBILE_TBF_STATUS, "Pkt Mobile TBF Status" }, - { MT_PACKET_PSI_STATUS, "Pkt PSI Status" }, - { MT_EGPRS_PACKET_DOWNLINK_ACK_NACK, "EGPRS Pkt DL ACK/NACK" }, - { MT_PACKET_PAUSE, "Pkt Pause" }, - { MT_PACKET_ENHANCED_MEASUREMENT_REPORT,"Pkt Enchanced Meas Report" }, - { MT_ADDITIONAL_MS_RAC, "Additional MS RAC" }, - { MT_PACKET_CELL_CHANGE_NOTIFICATION, "Pkt Cell Change Notification" }, - { MT_PACKET_SI_STATUS, "Pkt SI Status" }, - { MT_ENHANCED_MEASUREMENT_REPORT, "Enchanced Meas Report" }, - { 0, NULL } -}; - -static const struct value_string rlcmac_dl_msg_names[] = { - { MT_PACKET_CELL_CHANGE_ORDER, "Pkt Cell Change Order" }, - { MT_PACKET_DOWNLINK_ASSIGNMENT, "Pkt DL ASS" }, - { MT_PACKET_MEASUREMENT_ORDER, "Pkt Meas Order" }, - { MT_PACKET_POLLING_REQ, "Pkt Polling Req" }, - { MT_PACKET_POWER_CONTROL_TIMING_ADVANCE, "Pkt PWR CTRL TA" }, - { MT_PACKET_QUEUEING_NOTIFICATION, "Pkt Queueing Notification" }, - { MT_PACKET_TIMESLOT_RECONFIGURE, "Pkt TS Reconf" }, - { MT_PACKET_TBF_RELEASE, "Pkt TBF Release" }, - { MT_PACKET_UPLINK_ACK_NACK, "Pkt UL ACK/NACK" }, - { MT_PACKET_UPLINK_ASSIGNMENT, "Pkt UL ASS" }, - { MT_PACKET_CELL_CHANGE_CONTINUE, "Pkt Cell Change Continue" }, - { MT_PACKET_NEIGHBOUR_CELL_DATA, "Pkt Neightbour Cell Data" }, - { MT_PACKET_SERVING_CELL_DATA, "Pkt Serving Cell Data" }, - { MT_PACKET_HANDOVER_COMMAND, "Pkt Handover Cmd" }, - { MT_PACKET_PHYSICAL_INFORMATION, "Pkt Physical Info" }, - { MT_PACKET_ACCESS_REJECT, "Pkt Access Reject" }, - { MT_PACKET_PAGING_REQUEST, "Pkt Paging Request" }, - { MT_PACKET_PDCH_RELEASE, "Pkt PDCH Release" }, - { MT_PACKET_PRACH_PARAMETERS, "Pkt PRACH Params" }, - { MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK, "Pkt DL Dummy Ctrl Block" }, - { MT_PACKET_SYSTEM_INFO_6, "Pkt SI 6" }, - { MT_PACKET_SYSTEM_INFO_1, "Pkt SI 1" }, - { MT_PACKET_SYSTEM_INFO_2, "Pkt SI 2" }, - { MT_PACKET_SYSTEM_INFO_3, "Pkt SI 3" }, - { MT_PACKET_SYSTEM_INFO_3_BIS, "Pkt SI 3bis" }, - { MT_PACKET_SYSTEM_INFO_4, "Pkt SI 4" }, - { MT_PACKET_SYSTEM_INFO_5, "Pkt SI 5" }, - { MT_PACKET_SYSTEM_INFO_13, "Pkt SI 13" }, - { MT_PACKET_SYSTEM_INFO_7, "Pkt SI 7" }, - { MT_PACKET_SYSTEM_INFO_8, "Pkt SI 8" }, - { MT_PACKET_SYSTEM_INFO_14, "Pkt SI 14" }, - { MT_PACKET_SYSTEM_INFO_3_TER, "Pkt SI 3ter" }, - { MT_PACKET_SYSTEM_INFO_3_QUATER, "Pkt SI 3quater" }, - { MT_PACKET_SYSTEM_INFO_15, "Pkt SI 15" }, - { 0, NULL } -}; /* Returns 0 on success, negative on error. */ int osmo_gprs_rlcmac_decode_uplink(struct bitvec *vector, RlcMacUplink_t * data) @@ -4491,12 +4436,12 @@ readIndex = 0; /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere, so we need to start the log somewhere... */ - msg_type_name = get_value_string(rlcmac_ul_msg_names, data->u.MESSAGE_TYPE); + msg_type_name = get_value_string(osmo_gprs_rlcmac_ul_msg_type_names, data->u.MESSAGE_TYPE); LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (type: %s (%d)): ", msg_type_name, data->u.MESSAGE_TYPE); switch (data->u.MESSAGE_TYPE) { - case MT_PACKET_CELL_CHANGE_FAILURE: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE: { /* * data is the pointer to the unpack struct that hold the unpack value @@ -4506,68 +4451,68 @@ ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Cell_Change_Failure_t), vector, &readIndex, &data->u.Packet_Cell_Change_Failure); break; } - case MT_PACKET_CONTROL_ACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Control_Acknowledgement_t), vector, &readIndex, &data->u.Packet_Control_Acknowledgement); break; } - case MT_PACKET_DOWNLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Downlink_Ack_Nack_t), vector, &readIndex, &data->u.Packet_Downlink_Ack_Nack); break; } - case MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Uplink_Dummy_Control_Block_t), vector, &readIndex, &data->u.Packet_Uplink_Dummy_Control_Block); break; } - case MT_PACKET_MEASUREMENT_REPORT: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Measurement_Report_t), vector, &readIndex, &data->u.Packet_Measurement_Report); break; } - case MT_PACKET_RESOURCE_REQUEST: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Resource_Request_t), vector, &readIndex, &data->u.Packet_Resource_Request); break; } - case MT_PACKET_MOBILE_TBF_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Mobile_TBF_Status_t), vector, &readIndex, &data->u.Packet_Mobile_TBF_Status); break; } - case MT_PACKET_PSI_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_PSI_Status_t), vector, &readIndex, &data->u.Packet_PSI_Status); break; } - case MT_EGPRS_PACKET_DOWNLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(EGPRS_PD_AckNack_t), vector, &readIndex, &data->u.Egprs_Packet_Downlink_Ack_Nack); break; } - case MT_PACKET_PAUSE: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Pause_t), vector, &readIndex, &data->u.Packet_Pause); break; } - case MT_PACKET_ENHANCED_MEASUREMENT_REPORT: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Enh_Measurement_Report_t), vector, &readIndex, &data->u.Packet_Enh_Measurement_Report); break; } - case MT_ADDITIONAL_MS_RAC: + case OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Additional_MS_Rad_Access_Cap_t), vector, &readIndex, &data->u.Additional_MS_Rad_Access_Cap); break; } - case MT_PACKET_CELL_CHANGE_NOTIFICATION: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Cell_Change_Notification_t), vector, &readIndex, &data->u.Packet_Cell_Change_Notification); break; } - case MT_PACKET_SI_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_SI_Status_t), vector, &readIndex, &data->u.Packet_SI_Status); break; @@ -4653,133 +4598,133 @@ osmo_csn1_stream_init(&ar, bit_offset, bit_length); /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere, so we need to start the log somewhere... */ - msg_type_name = get_value_string(rlcmac_dl_msg_names, data->u.MESSAGE_TYPE); + msg_type_name = get_value_string(osmo_gprs_rlcmac_dl_msg_type_names, data->u.MESSAGE_TYPE); LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (type: %s (%d): ", msg_type_name, data->u.MESSAGE_TYPE); switch (data->u.MESSAGE_TYPE) { - case MT_PACKET_ACCESS_REJECT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Access_Reject_t), vector, &readIndex, &data->u.Packet_Access_Reject); break; } - case MT_PACKET_CELL_CHANGE_ORDER: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Cell_Change_Order_t), vector, &readIndex, &data->u.Packet_Cell_Change_Order); break; } - case MT_PACKET_CELL_CHANGE_CONTINUE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Cell_Change_Continue_t), vector, &readIndex, &data->u.Packet_Cell_Change_Continue); break; } - case MT_PACKET_DOWNLINK_ASSIGNMENT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Downlink_Assignment_t), vector, &readIndex, &data->u.Packet_Downlink_Assignment); break; } - case MT_PACKET_MEASUREMENT_ORDER: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Measurement_Order_t), vector, &readIndex, &data->u.Packet_Measurement_Order); break; } - case MT_PACKET_NEIGHBOUR_CELL_DATA: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Neighbour_Cell_Data_t), vector, &readIndex, &data->u.Packet_Neighbour_Cell_Data); break; } - case MT_PACKET_SERVING_CELL_DATA: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Serving_Cell_Data_t), vector, &readIndex, &data->u.Packet_Serving_Cell_Data); break; } - case MT_PACKET_PAGING_REQUEST: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Paging_Request_t), vector, &readIndex, &data->u.Packet_Paging_Request); break; } - case MT_PACKET_PDCH_RELEASE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_PDCH_Release_t), vector, &readIndex, &data->u.Packet_PDCH_Release); break; } - case MT_PACKET_POLLING_REQ: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Polling_Request_t), vector, &readIndex, &data->u.Packet_Polling_Request); break; } - case MT_PACKET_POWER_CONTROL_TIMING_ADVANCE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Power_Control_Timing_Advance_t), vector, &readIndex, &data->u.Packet_Power_Control_Timing_Advance); break; } - case MT_PACKET_PRACH_PARAMETERS: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_PRACH_Parameters_t), vector, &readIndex, &data->u.Packet_PRACH_Parameters); break; } - case MT_PACKET_QUEUEING_NOTIFICATION: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Queueing_Notification_t), vector, &readIndex, &data->u.Packet_Queueing_Notification); break; } - case MT_PACKET_TIMESLOT_RECONFIGURE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Timeslot_Reconfigure_t), vector, &readIndex, &data->u.Packet_Timeslot_Reconfigure); break; } - case MT_PACKET_TBF_RELEASE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_TBF_Release_t), vector, &readIndex, &data->u.Packet_TBF_Release); break; } - case MT_PACKET_UPLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Uplink_Ack_Nack_t), vector, &readIndex, &data->u.Packet_Uplink_Ack_Nack); break; } - case MT_PACKET_UPLINK_ASSIGNMENT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Uplink_Assignment_t), vector, &readIndex, &data->u.Packet_Uplink_Assignment); break; } - case MT_PACKET_HANDOVER_COMMAND: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Handover_Command_t), vector, &readIndex, &data->u.Packet_Handover_Command); break; } - case MT_PACKET_PHYSICAL_INFORMATION: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_PhysicalInformation_t), vector, &readIndex, &data->u.Packet_Handover_Command); break; } - case MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Downlink_Dummy_Control_Block_t), vector, &readIndex, &data->u.Packet_Downlink_Dummy_Control_Block); break; } - case MT_PACKET_SYSTEM_INFO_1: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI1_t), vector, &readIndex, &data->u.PSI1); break; } - case MT_PACKET_SYSTEM_INFO_2: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI2_t), vector, &readIndex, &data->u.PSI2); break; } - case MT_PACKET_SYSTEM_INFO_3: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI3_t), vector, &readIndex, &data->u.PSI3); break; } - case MT_PACKET_SYSTEM_INFO_5: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI5_t), vector, &readIndex, &data->u.PSI5); break; } - case MT_PACKET_SYSTEM_INFO_13: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI13_t), vector, &readIndex, &data->u.PSI13); break; @@ -4814,12 +4759,12 @@ writeIndex = 0; /* recursive osmo_csn1_stream_encode call uses LOGPC everywhere, so we need to start the log somewhere... */ - msg_type_name = get_value_string(rlcmac_ul_msg_names, data->u.MESSAGE_TYPE); + msg_type_name = get_value_string(osmo_gprs_rlcmac_ul_msg_type_names, data->u.MESSAGE_TYPE); LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_encode (type: %s (%d)): ", msg_type_name, data->u.MESSAGE_TYPE); switch (data->u.MESSAGE_TYPE) { - case MT_PACKET_CELL_CHANGE_FAILURE: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE: { /* * data is the pointer to the unpack struct that hold the unpack value @@ -4829,68 +4774,68 @@ ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Cell_Change_Failure_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Failure); break; } - case MT_PACKET_CONTROL_ACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Control_Acknowledgement_t), vector, &writeIndex, &data->u.Packet_Control_Acknowledgement); break; } - case MT_PACKET_DOWNLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Downlink_Ack_Nack_t), vector, &writeIndex, &data->u.Packet_Downlink_Ack_Nack); break; } - case MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Uplink_Dummy_Control_Block_t), vector, &writeIndex, &data->u.Packet_Uplink_Dummy_Control_Block); break; } - case MT_PACKET_MEASUREMENT_REPORT: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Measurement_Report_t), vector, &writeIndex, &data->u.Packet_Measurement_Report); break; } - case MT_PACKET_RESOURCE_REQUEST: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Resource_Request_t), vector, &writeIndex, &data->u.Packet_Resource_Request); break; } - case MT_PACKET_MOBILE_TBF_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Mobile_TBF_Status_t), vector, &writeIndex, &data->u.Packet_Mobile_TBF_Status); break; } - case MT_PACKET_PSI_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_PSI_Status_t), vector, &writeIndex, &data->u.Packet_PSI_Status); break; } - case MT_EGPRS_PACKET_DOWNLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(EGPRS_PD_AckNack_t), vector, &writeIndex, &data->u.Egprs_Packet_Downlink_Ack_Nack); break; } - case MT_PACKET_PAUSE: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Pause_t), vector, &writeIndex, &data->u.Packet_Pause); break; } - case MT_PACKET_ENHANCED_MEASUREMENT_REPORT: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Enh_Measurement_Report_t), vector, &writeIndex, &data->u.Packet_Enh_Measurement_Report); break; } - case MT_ADDITIONAL_MS_RAC: + case OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Additional_MS_Rad_Access_Cap_t), vector, &writeIndex, &data->u.Additional_MS_Rad_Access_Cap); break; } - case MT_PACKET_CELL_CHANGE_NOTIFICATION: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Cell_Change_Notification_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Notification); break; } - case MT_PACKET_SI_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_SI_Status_t), vector, &writeIndex, &data->u.Packet_SI_Status); break; @@ -4975,132 +4920,132 @@ /* recursive osmo_csn1_stream_encode call uses LOGPC everywhere, so we need to start the log somewhere... */ - msg_type_name = get_value_string(rlcmac_dl_msg_names, data->u.MESSAGE_TYPE); + msg_type_name = get_value_string(osmo_gprs_rlcmac_dl_msg_type_names, data->u.MESSAGE_TYPE); LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_encode (type: %s (%d)): ", msg_type_name, data->u.MESSAGE_TYPE); switch (data->u.MESSAGE_TYPE) { - case MT_PACKET_ACCESS_REJECT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Access_Reject_t), vector, &writeIndex, &data->u.Packet_Access_Reject); break; } - case MT_PACKET_CELL_CHANGE_ORDER: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Cell_Change_Order_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Order); break; } - case MT_PACKET_CELL_CHANGE_CONTINUE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Cell_Change_Continue_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Continue); break; } - case MT_PACKET_DOWNLINK_ASSIGNMENT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Downlink_Assignment_t), vector, &writeIndex, &data->u.Packet_Downlink_Assignment); break; } - case MT_PACKET_MEASUREMENT_ORDER: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Measurement_Order_t), vector, &writeIndex, &data->u.Packet_Measurement_Order); break; } - case MT_PACKET_NEIGHBOUR_CELL_DATA: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Neighbour_Cell_Data_t), vector, &writeIndex, &data->u.Packet_Neighbour_Cell_Data); break; } - case MT_PACKET_SERVING_CELL_DATA: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Serving_Cell_Data_t), vector, &writeIndex, &data->u.Packet_Serving_Cell_Data); break; } - case MT_PACKET_PAGING_REQUEST: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Paging_Request_t), vector, &writeIndex, &data->u.Packet_Paging_Request); break; } - case MT_PACKET_PDCH_RELEASE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_PDCH_Release_t), vector, &writeIndex, &data->u.Packet_PDCH_Release); break; } - case MT_PACKET_POLLING_REQ: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Polling_Request_t), vector, &writeIndex, &data->u.Packet_Polling_Request); break; } - case MT_PACKET_POWER_CONTROL_TIMING_ADVANCE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Power_Control_Timing_Advance_t), vector, &writeIndex, &data->u.Packet_Power_Control_Timing_Advance); break; } - case MT_PACKET_PRACH_PARAMETERS: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_PRACH_Parameters_t), vector, &writeIndex, &data->u.Packet_PRACH_Parameters); break; } - case MT_PACKET_QUEUEING_NOTIFICATION: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Queueing_Notification_t), vector, &writeIndex, &data->u.Packet_Queueing_Notification); break; } - case MT_PACKET_TIMESLOT_RECONFIGURE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Timeslot_Reconfigure_t), vector, &writeIndex, &data->u.Packet_Timeslot_Reconfigure); break; } - case MT_PACKET_TBF_RELEASE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_TBF_Release_t), vector, &writeIndex, &data->u.Packet_TBF_Release); break; } - case MT_PACKET_UPLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Uplink_Ack_Nack_t), vector, &writeIndex, &data->u.Packet_Uplink_Ack_Nack); break; } - case MT_PACKET_UPLINK_ASSIGNMENT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Uplink_Assignment_t), vector, &writeIndex, &data->u.Packet_Uplink_Assignment); break; } - case MT_PACKET_HANDOVER_COMMAND: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Handover_Command_t), vector, &writeIndex, &data->u.Packet_Handover_Command); break; } - case MT_PACKET_PHYSICAL_INFORMATION: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_PhysicalInformation_t), vector, &writeIndex, &data->u.Packet_Handover_Command); break; } - case MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Downlink_Dummy_Control_Block_t), vector, &writeIndex, &data->u.Packet_Downlink_Dummy_Control_Block); break; } - case MT_PACKET_SYSTEM_INFO_1: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI1_t), vector, &writeIndex, &data->u.PSI1); break; } - case MT_PACKET_SYSTEM_INFO_2: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI2_t), vector, &writeIndex, &data->u.PSI2); break; } - case MT_PACKET_SYSTEM_INFO_3: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI3_t), vector, &writeIndex, &data->u.PSI3); break; } - case MT_PACKET_SYSTEM_INFO_5: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI5_t), vector, &writeIndex, &data->u.PSI5); break; } - case MT_PACKET_SYSTEM_INFO_13: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI13_t), vector, &writeIndex, &data->u.PSI13); break; diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c index 931c262..b803f61 100644 --- a/src/rlcmac/ts_44_060.c +++ b/src/rlcmac/ts_44_060.c @@ -35,3 +35,60 @@ { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING_IPA, "Signalling (by IPA capable MS)" }, { 0, NULL } }; + +const struct value_string osmo_gprs_rlcmac_dl_msg_type_names[] = { + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER, "Pkt Cell Change Order" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT, "Pkt DL ASS" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER, "Pkt Meas Order" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ, "Pkt Polling Req" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE, "Pkt PWR CTRL TA" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION, "Pkt Queueing Notification" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE, "Pkt TS Reconf" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE, "Pkt TBF Release" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK, "Pkt UL ACK/NACK" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT, "Pkt UL ASS" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE, "Pkt Cell Change Continue" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA, "Pkt Neightbour Cell Data" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA, "Pkt Serving Cell Data" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND, "Pkt Handover Cmd" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION, "Pkt Physical Info" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT, "Pkt Access Reject" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST, "Pkt Paging Request" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE, "Pkt PDCH Release" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS, "Pkt PRACH Params" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK, "Pkt DL Dummy Ctrl Block" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_6, "Pkt SI 6" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1, "Pkt SI 1" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2, "Pkt SI 2" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3, "Pkt SI 3" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_BIS, "Pkt SI 3bis" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_4, "Pkt SI 4" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5, "Pkt SI 5" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13, "Pkt SI 13" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_7, "Pkt SI 7" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_8, "Pkt SI 8" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_14, "Pkt SI 14" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_TER, "Pkt SI 3ter" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_QUATER, "Pkt SI 3quater" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_15, "Pkt SI 15" }, + { 0, NULL } +}; + +const struct value_string osmo_gprs_rlcmac_ul_msg_type_names[] = { + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE, "Pkt Cell Change Failure" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK, "Pkt Control Ack" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK , "Pkt DL ACK/NACK" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK, "Pkt UL Dummy Ctrl Block" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT, "Pkt Meas Report" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST, "Pkt Resource Req" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS, "Pkt Mobile TBF Status" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS, "Pkt PSI Status" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK, "EGPRS Pkt DL ACK/NACK" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE, "Pkt Pause" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT, "Pkt Enchanced Meas Report" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC, "Additional MS RAC" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION, "Pkt Cell Change Notification" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS, "Pkt SI Status" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_ENHANCED_MEASUREMENT_REPORT, "Enchanced Meas Report" }, + { 0, NULL } +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic55782d90c0d7876fc37d1da130b859857c11447 Gerrit-Change-Number: 31152 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Rename ts_*.c -> csn1_ts_*.c

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31150 ) Change subject: rlcmac: Rename ts_*.c -> csn1_ts_*.c ...................................................................... rlcmac: Rename ts_*.c -> csn1_ts_*.c Done for files containing mostly (99%) of CSN1 related structrs and encdec functions. File ts_44_064.c is kept as is since it's not CSN1 related. File csn1_ts_44_060.c still contains some enums and value_string which will be split into ts_44_060.c in a follow up commit. Change-Id: I93ad9f90e7496b81ccfe679a614589373f244166 --- M src/rlcmac/Makefile.am R src/rlcmac/csn1_ts_24_008.c R src/rlcmac/csn1_ts_44_018.c R src/rlcmac/csn1_ts_44_060.c 4 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/50/31150/1 diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index 47e88b6..4150f84 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -22,14 +22,14 @@ $(NULL) libosmo_gprs_rlcmac_la_SOURCES = \ + csn1_ts_24_008.c \ + csn1_ts_44_018.c \ + csn1_ts_44_060.c \ codel.c \ gre.c \ llc_queue.c \ rlcmac.c \ rlcmac_prim.c \ - ts_24_008.c \ - ts_44_018.c \ - ts_44_060.c \ ts_44_064.c \ misc.c \ $(NULL) diff --git a/src/rlcmac/ts_24_008.c b/src/rlcmac/csn1_ts_24_008.c similarity index 100% rename from src/rlcmac/ts_24_008.c rename to src/rlcmac/csn1_ts_24_008.c diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/csn1_ts_44_018.c similarity index 100% rename from src/rlcmac/ts_44_018.c rename to src/rlcmac/csn1_ts_44_018.c diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/csn1_ts_44_060.c similarity index 100% rename from src/rlcmac/ts_44_060.c rename to src/rlcmac/csn1_ts_44_060.c -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I93ad9f90e7496b81ccfe679a614589373f244166 Gerrit-Change-Number: 31150 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Rename gprs_rlcmac.h -> csn1_defs.h

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31149 ) Change subject: rlcmac: Rename gprs_rlcmac.h -> csn1_defs.h ...................................................................... rlcmac: Rename gprs_rlcmac.h -> csn1_defs.h That header is used (and should only be used) to contains CSN1 related code for the encoder/decoder. Hence rename it, otherwise it looks like a general placeholder for any kind of stuff. Change-Id: I84ea63ed0b804699fd995a2e0c07ced17b3ad4c8 --- M debian/copyright M include/osmocom/gprs/rlcmac/Makefile.am R include/osmocom/gprs/rlcmac/csn1_defs.h M src/rlcmac/ts_24_008.c M src/rlcmac/ts_44_018.c M src/rlcmac/ts_44_060.c M tests/rlcmac/ts_44_018_test.c M tests/rlcmac/ts_44_060_test.c 8 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/49/31149/1 diff --git a/debian/copyright b/debian/copyright index 2ff9bd6..1340b54 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,7 +11,7 @@ src/csn1/csn1_dec.c src/rlcmac/gprs_rlcmac.c include/osmocom/csn1/csn1.h - include/osmocom/gprs/rlcmac/gprs_rlcmac.h + include/osmocom/gprs/rlcmac/csn1_defs.h Copyright: 2011 Vincent Helfre 2011 ST-Ericsson (Jari Sassi) License: GPL-2.0+ diff --git a/include/osmocom/gprs/rlcmac/Makefile.am b/include/osmocom/gprs/rlcmac/Makefile.am index b8ff1e0..091882a 100644 --- a/include/osmocom/gprs/rlcmac/Makefile.am +++ b/include/osmocom/gprs/rlcmac/Makefile.am @@ -6,9 +6,9 @@ $(NULL) rlcmac_HEADERS = \ + csn1_defs.h \ rlcmac.h \ rlcmac_prim.h \ - gprs_rlcmac.h \ $(NULL) rlcmacdir = $(includedir)/osmocom/gprs/rlcmac diff --git a/include/osmocom/gprs/rlcmac/gprs_rlcmac.h b/include/osmocom/gprs/rlcmac/csn1_defs.h similarity index 100% rename from include/osmocom/gprs/rlcmac/gprs_rlcmac.h rename to include/osmocom/gprs/rlcmac/csn1_defs.h diff --git a/src/rlcmac/ts_24_008.c b/src/rlcmac/ts_24_008.c index 6dece2a..d38185d 100644 --- a/src/rlcmac/ts_24_008.c +++ b/src/rlcmac/ts_24_008.c @@ -25,7 +25,7 @@ #include <osmocom/core/logging.h> #include <osmocom/csn1/csn1.h> -#include <osmocom/gprs/rlcmac/gprs_rlcmac.h> +#include <osmocom/gprs/rlcmac/csn1_defs.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> /*< MS Classmark 3 IE >*/ diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/ts_44_018.c index c869ad8..cc62c62 100644 --- a/src/rlcmac/ts_44_018.c +++ b/src/rlcmac/ts_44_018.c @@ -25,7 +25,7 @@ #include <osmocom/core/logging.h> #include <osmocom/csn1/csn1.h> -#include <osmocom/gprs/rlcmac/gprs_rlcmac.h> +#include <osmocom/gprs/rlcmac/csn1_defs.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> CSN_DESCR_EXTERN(GPRS_Mobile_Allocation_t); diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c index 33514e9..0ebfbed 100644 --- a/src/rlcmac/ts_44_060.c +++ b/src/rlcmac/ts_44_060.c @@ -29,7 +29,7 @@ #include <osmocom/core/logging.h> #include <osmocom/csn1/csn1.h> -#include <osmocom/gprs/rlcmac/gprs_rlcmac.h> +#include <osmocom/gprs/rlcmac/csn1_defs.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> /* Payload type as defined in TS 44.060 / 10.4.7 */ diff --git a/tests/rlcmac/ts_44_018_test.c b/tests/rlcmac/ts_44_018_test.c index a5c4540..bef4e8b 100644 --- a/tests/rlcmac/ts_44_018_test.c +++ b/tests/rlcmac/ts_44_018_test.c @@ -23,7 +23,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/csn1/csn1.h> -#include <osmocom/gprs/rlcmac/gprs_rlcmac.h> +#include <osmocom/gprs/rlcmac/csn1_defs.h> static void *tall_ctx = NULL; diff --git a/tests/rlcmac/ts_44_060_test.c b/tests/rlcmac/ts_44_060_test.c index 781ea9a..1591102 100644 --- a/tests/rlcmac/ts_44_060_test.c +++ b/tests/rlcmac/ts_44_060_test.c @@ -23,7 +23,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/csn1/csn1.h> -#include <osmocom/gprs/rlcmac/gprs_rlcmac.h> +#include <osmocom/gprs/rlcmac/csn1_defs.h> static void testRlcMacDownlink(void *test_ctx) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I84ea63ed0b804699fd995a2e0c07ced17b3ad4c8 Gerrit-Change-Number: 31149 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Initial implementation of UL TBF assignment and scheduler

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31099 to look at the new patch set (#6). Change subject: rlcmac: Initial implementation of UL TBF assignment and scheduler ...................................................................... rlcmac: Initial implementation of UL TBF assignment and scheduler This patch is another towards a working RLC/MAC implementation. It adds: * An initial data model with MS (gprs_rlcmac_entity) and ul_tbf. * A UL_TBF state FSM from initial to FLOW status * A UL_TBF assignemnt FSM, covering both 1phase and 2phase assignments. * Triggering of UL_TBF allocation and assignment FSM when new LLC data is pushed from upper layers. * A scheduler generating some ctrl messages (PktResReq and UlDummyCtrlBlk) when indicated by the network. This patch is pushed as a WIP state since it already contains a considerable amount of code and lots of new files, which can be used/extended at a later point, making parallel contribution easier. Related: OS#5500 Change-Id: I420c57a9d0b63f9c2805a7c2ae8ce85532a48eef --- M include/osmocom/gprs/rlcmac/Makefile.am M include/osmocom/gprs/rlcmac/rlcmac.h A include/osmocom/gprs/rlcmac/rlcmac_enc.h M include/osmocom/gprs/rlcmac/rlcmac_private.h A include/osmocom/gprs/rlcmac/sched.h A include/osmocom/gprs/rlcmac/tbf.h A include/osmocom/gprs/rlcmac/tbf_ul.h A include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h A include/osmocom/gprs/rlcmac/tbf_ul_fsm.h A include/osmocom/gprs/rlcmac/types_private.h M src/rlcmac/Makefile.am M src/rlcmac/gre.c M src/rlcmac/misc.c M src/rlcmac/rlcmac.c A src/rlcmac/rlcmac_enc.c A src/rlcmac/sched.c A src/rlcmac/tbf.c A src/rlcmac/tbf_ul.c A src/rlcmac/tbf_ul_ass_fsm.c A src/rlcmac/tbf_ul_fsm.c 20 files changed, 1,272 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/99/31099/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I420c57a9d0b63f9c2805a7c2ae8ce85532a48eef Gerrit-Change-Number: 31099 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023