From 98cdb03713ea812dc2f66597c1a6731ee3f2e768 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 12 Nov 2011 17:54:47 +0100 Subject: [PATCH] GSM: Move BCCHL1Encoder::generate() into separate file BCCHL1Encoder actually belongs to layer3, but is implemented as part of Layer1. If we keep it linked into GSML1FEC.o, it will cause dependencies to higher layers (through gBTS) --- public-trunk/GSM/GSML1FEC.cpp | 21 ---------- public-trunk/GSM/GSML1FEC_BCCH.cpp | 63 ++++++++++++++++++++++++++++++ public-trunk/GSM/Makefile.am | 1 + 3 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 public-trunk/GSM/GSML1FEC_BCCH.cpp diff --git a/public-trunk/GSM/GSML1FEC.cpp b/public-trunk/GSM/GSML1FEC.cpp index 743eb7d..9d04b86 100644 --- a/public-trunk/GSM/GSML1FEC.cpp +++ b/public-trunk/GSM/GSML1FEC.cpp @@ -1012,27 +1012,6 @@ void NDCCHL1Encoder::serviceLoop() -void BCCHL1Encoder::generate() -{ - OBJLOG(DEEPDEBUG) << "BCCHL1Encoder " << mNextWriteTime; - // BCCH mapping, GSM 05.02 6.3.1.3 - // Since we're not doing GPRS or VGCS, it's just SI1-4 over and over. - switch (mNextWriteTime.TC()) { - case 0: writeHighSide(gBTS.SI1Frame()); return; - case 1: writeHighSide(gBTS.SI2Frame()); return; - case 2: writeHighSide(gBTS.SI3Frame()); return; - case 3: writeHighSide(gBTS.SI4Frame()); return; - case 4: writeHighSide(gBTS.SI3Frame()); return; - case 5: writeHighSide(gBTS.SI2Frame()); return; - case 6: writeHighSide(gBTS.SI3Frame()); return; - case 7: writeHighSide(gBTS.SI4Frame()); return; - default: assert(0); - } -} - - - - TCHFACCHL1Decoder::TCHFACCHL1Decoder( unsigned wTN, const TDMAMapping& wMapping, diff --git a/public-trunk/GSM/GSML1FEC_BCCH.cpp b/public-trunk/GSM/GSML1FEC_BCCH.cpp new file mode 100644 index 0000000..da984ba --- /dev/null +++ b/public-trunk/GSM/GSML1FEC_BCCH.cpp @@ -0,0 +1,63 @@ +/* +* Copyright 2008, 2009, 2010 Free Software Foundation, Inc. +* +* This software is distributed under the terms of the GNU Affero Public License. +* See the COPYING file in the main directory for details. +* +* This use of this software may be subject to additional restrictions. +* See the LEGAL file in the main directory for details. + + 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 . + +*/ + + +#define NDEBUG + + +#include "GSML1FEC.h" +#include "GSMCommon.h" +#include "GSMSAPMux.h" +#include "GSMConfig.h" +#include "GSMTDMA.h" +#include "GSMTAPDump.h" +#include +#include +#include +#include + +using namespace std; +using namespace GSM; + + + + + +void BCCHL1Encoder::generate() +{ + OBJLOG(DEEPDEBUG) << "BCCHL1Encoder " << mNextWriteTime; + // BCCH mapping, GSM 05.02 6.3.1.3 + // Since we're not doing GPRS or VGCS, it's just SI1-4 over and over. + switch (mNextWriteTime.TC()) { + case 0: writeHighSide(gBTS.SI1Frame()); return; + case 1: writeHighSide(gBTS.SI2Frame()); return; + case 2: writeHighSide(gBTS.SI3Frame()); return; + case 3: writeHighSide(gBTS.SI4Frame()); return; + case 4: writeHighSide(gBTS.SI3Frame()); return; + case 5: writeHighSide(gBTS.SI2Frame()); return; + case 6: writeHighSide(gBTS.SI3Frame()); return; + case 7: writeHighSide(gBTS.SI4Frame()); return; + default: assert(0); + } +} diff --git a/public-trunk/GSM/Makefile.am b/public-trunk/GSM/Makefile.am index 544a903..da5a7fa 100644 --- a/public-trunk/GSM/Makefile.am +++ b/public-trunk/GSM/Makefile.am @@ -36,6 +36,7 @@ libGSML1_la_SOURCES = \ libGSM_la_SOURCES = \ GSMConfig.cpp \ + GSML1FEC_BCCH.cpp \ GSML2LAPDm.cpp \ GSML3CCElements.cpp \ GSML3CCMessages.cpp \