Change in ...osmo-bts[master]: L1SAP: use RSL_CHAN_* definitions from libosmogsm
fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bts/+/15707 ) Change subject: L1SAP: use RSL_CHAN_* definitions from libosmogsm .. L1SAP: use RSL_CHAN_* definitions from libosmogsm Change-Id: I2708b5d5bb6b92f90766ac752bafd28cff2549b0 --- M include/osmo-bts/l1sap.h 1 file changed, 21 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 70b4564..ccfcacc 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -2,6 +2,7 @@ #define L1SAP_H #include +#include /* lchan link ID */ #define LID_SACCH 0x40 @@ -15,16 +16,26 @@ #define L1SAP_CHAN2SS_BCCH(chan_nr) (CCCH_LCHAN) /* logical channel from chan_nr + link_id */ -#define L1SAP_IS_LINK_SACCH(link_id) ((link_id & 0xC0) == LID_SACCH) -#define L1SAP_IS_CHAN_TCHF(chan_nr) ((chan_nr & 0xf8) == 0x08) -#define L1SAP_IS_CHAN_TCHH(chan_nr) ((chan_nr & 0xf0) == 0x10) -#define L1SAP_IS_CHAN_SDCCH4(chan_nr) ((chan_nr & 0xe0) == 0x20) -#define L1SAP_IS_CHAN_SDCCH8(chan_nr) ((chan_nr & 0xc0) == 0x40) -#define L1SAP_IS_CHAN_BCCH(chan_nr) ((chan_nr & 0xf8) == 0x80) -#define L1SAP_IS_CHAN_RACH(chan_nr) ((chan_nr & 0xf8) == 0x88) -#define L1SAP_IS_CHAN_AGCH_PCH(chan_nr) ((chan_nr & 0xf8) == 0x90) -#define L1SAP_IS_CHAN_PDCH(chan_nr) ((chan_nr & 0xf8) == 0xc0) -#define L1SAP_IS_CHAN_CBCH(chan_nr) ((chan_nr & 0xf8) == 0xc8) +#define L1SAP_IS_LINK_SACCH(link_id) \ + ((link_id & 0xC0) == LID_SACCH) +#define L1SAP_IS_CHAN_TCHF(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_Bm_ACCHs) +#define L1SAP_IS_CHAN_TCHH(chan_nr) \ + ((chan_nr & 0xf0) == RSL_CHAN_Lm_ACCHs) +#define L1SAP_IS_CHAN_SDCCH4(chan_nr) \ + ((chan_nr & 0xe0) == RSL_CHAN_SDCCH4_ACCH) +#define L1SAP_IS_CHAN_SDCCH8(chan_nr) \ + ((chan_nr & 0xc0) == RSL_CHAN_SDCCH8_ACCH) +#define L1SAP_IS_CHAN_BCCH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_BCCH) +#define L1SAP_IS_CHAN_RACH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_RACH) +#define L1SAP_IS_CHAN_AGCH_PCH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_PCH_AGCH) +#define L1SAP_IS_CHAN_PDCH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_OSMO_PDCH) +#define L1SAP_IS_CHAN_CBCH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH4) /* rach type from ra */ #define L1SAP_IS_PACKET_RACH(ra) ((ra & 0xf0) == 0x70 && (ra & 0x0f) != 0x0f) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2708b5d5bb6b92f90766ac752bafd28cff2549b0 Gerrit-Change-Number: 15707 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-bts[master]: L1SAP: use RSL_CHAN_* definitions from libosmogsm
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15707 ) Change subject: L1SAP: use RSL_CHAN_* definitions from libosmogsm .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2708b5d5bb6b92f90766ac752bafd28cff2549b0 Gerrit-Change-Number: 15707 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Oct 2019 10:56:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: L1SAP: use RSL_CHAN_* definitions from libosmogsm
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15707 ) Change subject: L1SAP: use RSL_CHAN_* definitions from libosmogsm .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2708b5d5bb6b92f90766ac752bafd28cff2549b0 Gerrit-Change-Number: 15707 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 08 Oct 2019 20:26:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: L1SAP: use RSL_CHAN_* definitions from libosmogsm
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/15707 Change subject: L1SAP: use RSL_CHAN_* definitions from libosmogsm .. L1SAP: use RSL_CHAN_* definitions from libosmogsm Change-Id: I2708b5d5bb6b92f90766ac752bafd28cff2549b0 --- M include/osmo-bts/l1sap.h 1 file changed, 21 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/15707/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 70b4564..ccfcacc 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -2,6 +2,7 @@ #define L1SAP_H #include +#include /* lchan link ID */ #define LID_SACCH 0x40 @@ -15,16 +16,26 @@ #define L1SAP_CHAN2SS_BCCH(chan_nr) (CCCH_LCHAN) /* logical channel from chan_nr + link_id */ -#define L1SAP_IS_LINK_SACCH(link_id) ((link_id & 0xC0) == LID_SACCH) -#define L1SAP_IS_CHAN_TCHF(chan_nr) ((chan_nr & 0xf8) == 0x08) -#define L1SAP_IS_CHAN_TCHH(chan_nr) ((chan_nr & 0xf0) == 0x10) -#define L1SAP_IS_CHAN_SDCCH4(chan_nr) ((chan_nr & 0xe0) == 0x20) -#define L1SAP_IS_CHAN_SDCCH8(chan_nr) ((chan_nr & 0xc0) == 0x40) -#define L1SAP_IS_CHAN_BCCH(chan_nr) ((chan_nr & 0xf8) == 0x80) -#define L1SAP_IS_CHAN_RACH(chan_nr) ((chan_nr & 0xf8) == 0x88) -#define L1SAP_IS_CHAN_AGCH_PCH(chan_nr) ((chan_nr & 0xf8) == 0x90) -#define L1SAP_IS_CHAN_PDCH(chan_nr) ((chan_nr & 0xf8) == 0xc0) -#define L1SAP_IS_CHAN_CBCH(chan_nr) ((chan_nr & 0xf8) == 0xc8) +#define L1SAP_IS_LINK_SACCH(link_id) \ + ((link_id & 0xC0) == LID_SACCH) +#define L1SAP_IS_CHAN_TCHF(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_Bm_ACCHs) +#define L1SAP_IS_CHAN_TCHH(chan_nr) \ + ((chan_nr & 0xf0) == RSL_CHAN_Lm_ACCHs) +#define L1SAP_IS_CHAN_SDCCH4(chan_nr) \ + ((chan_nr & 0xe0) == RSL_CHAN_SDCCH4_ACCH) +#define L1SAP_IS_CHAN_SDCCH8(chan_nr) \ + ((chan_nr & 0xc0) == RSL_CHAN_SDCCH8_ACCH) +#define L1SAP_IS_CHAN_BCCH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_BCCH) +#define L1SAP_IS_CHAN_RACH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_RACH) +#define L1SAP_IS_CHAN_AGCH_PCH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_PCH_AGCH) +#define L1SAP_IS_CHAN_PDCH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_OSMO_PDCH) +#define L1SAP_IS_CHAN_CBCH(chan_nr) \ + ((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH4) /* rach type from ra */ #define L1SAP_IS_PACKET_RACH(ra) ((ra & 0xf0) == 0x70 && (ra & 0x0f) != 0x0f) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2708b5d5bb6b92f90766ac752bafd28cff2549b0 Gerrit-Change-Number: 15707 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
