Change in libosmo-gprs[master]: llc: separate enum osmo_gprs_llc_primitive to llc_prim.h
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29409 )
Change subject: llc: separate enum osmo_gprs_llc_primitive to llc_prim.h ......................................................................
llc: separate enum osmo_gprs_llc_primitive to llc_prim.h
Change-Id: Ida9ce56f48474313064d798ea7b9a72e9b99bb8d --- M include/osmocom/gprs/llc/Makefile.am M include/osmocom/gprs/llc/llc.h A include/osmocom/gprs/llc/llc_prim.h 3 files changed, 31 insertions(+), 29 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved
diff --git a/include/osmocom/gprs/llc/Makefile.am b/include/osmocom/gprs/llc/Makefile.am index 5f44218..f4b10a9 100644 --- a/include/osmocom/gprs/llc/Makefile.am +++ b/include/osmocom/gprs/llc/Makefile.am @@ -1,5 +1,6 @@ llc_HEADERS = \ llc.h \ + llc_prim.h \ $(NULL)
llcdir = $(includedir)/osmocom/gprs/llc diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index c2ec379..4723a4b 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -83,35 +83,6 @@ OSMO_GPRS_LLC_XID_T_RESET = 12, };
-/* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ -/* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ -enum osmo_gprs_llc_primitive { - /* GMM <-> LLME */ - OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ - OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ - OSMO_GPRS_LLC_LLGMM_TRIGGER, /* Req: TLLI, Cause */ - OSMO_GPRS_LLC_LLGMM_SUSPEND, /* Req: TLLI, Page */ - OSMO_GPRS_LLC_LLGMM_RESUME, /* Req: TLLI */ - OSMO_GPRS_LLC_LLGMM_PAGE, /* Ind: TLLI */ - OSMO_GPRS_LLC_LLGMM_IOV, /* Req: TLLI */ - OSMO_GPRS_LLC_LLGMM_STATUS, /* Ind: TLLI, Cause */ - OSMO_GPRS_LLC_LLGMM_PSHO, /* Req/Ind/Cnf: TLLI, Ciph, IOV-UI, Old XID */ - OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, /* Req: TLLI */ - /* LLE <-> (GMM/SNDCP/SMS/TOM) */ - OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ - OSMO_GPRS_LLC_LL_ESTABLISH, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_RELEASE, /* Req/Ind/Cnf: TLLI, Local, Cause */ - OSMO_GPRS_LLC_LL_XID, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ - OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ - OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ - /* LLE <-> RLC/MAC (MS side) */ - OSMO_GPRS_LLC_GRR_DATA, /* Req/Ind: TLLI, LL-PDU, SAPI, Cause, QoS, Radio Prio */ - OSMO_GPRS_LLC_GRR_UNITDATA, /* Req/Ind: TLLI, LL-PDU, SAPI, QoS, Radio Prio */ - /* LLE <-> BSSGP (SGSN side) */ - OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ -}; - /* Section 4.5.2 Logical Link States + Annex C.2 */ enum osmo_gprs_llc_lle_state { OSMO_GPRS_LLC_LLES_UNASSIGNED = 1, /* No TLLI yet */ diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h new file mode 100644 index 0000000..834c27a --- /dev/null +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -0,0 +1,30 @@ +#pragma once + +/* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ +/* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ +enum osmo_gprs_llc_primitive { + /* GMM <-> LLME */ + OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ + OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ + OSMO_GPRS_LLC_LLGMM_TRIGGER, /* Req: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_SUSPEND, /* Req: TLLI, Page */ + OSMO_GPRS_LLC_LLGMM_RESUME, /* Req: TLLI */ + OSMO_GPRS_LLC_LLGMM_PAGE, /* Ind: TLLI */ + OSMO_GPRS_LLC_LLGMM_IOV, /* Req: TLLI */ + OSMO_GPRS_LLC_LLGMM_STATUS, /* Ind: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_PSHO, /* Req/Ind/Cnf: TLLI, Ciph, IOV-UI, Old XID */ + OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, /* Req: TLLI */ + /* LLE <-> (GMM/SNDCP/SMS/TOM) */ + OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ + OSMO_GPRS_LLC_LL_ESTABLISH, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_RELEASE, /* Req/Ind/Cnf: TLLI, Local, Cause */ + OSMO_GPRS_LLC_LL_XID, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ + OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ + OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ + /* LLE <-> RLC/MAC (MS side) */ + OSMO_GPRS_LLC_GRR_DATA, /* Req/Ind: TLLI, LL-PDU, SAPI, Cause, QoS, Radio Prio */ + OSMO_GPRS_LLC_GRR_UNITDATA, /* Req/Ind: TLLI, LL-PDU, SAPI, QoS, Radio Prio */ + /* LLE <-> BSSGP (SGSN side) */ + OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ +};
1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.
-
fixeria