laforge
/
openbts-osmo
Archived
1
0
Fork 0

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)
master
Harald Welte 11 years ago
parent 7a2026ab44
commit 98cdb03713
  1. 21
      public-trunk/GSM/GSML1FEC.cpp
  2. 63
      public-trunk/GSM/GSML1FEC_BCCH.cpp
  3. 1
      public-trunk/GSM/Makefile.am

@ -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,

@ -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 <http://www.gnu.org/licenses/>.
*/
#define NDEBUG
#include "GSML1FEC.h"
#include "GSMCommon.h"
#include "GSMSAPMux.h"
#include "GSMConfig.h"
#include "GSMTDMA.h"
#include "GSMTAPDump.h"
#include <TRXManager.h>
#include <Logger.h>
#include <assert.h>
#include <math.h>
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);
}
}

@ -36,6 +36,7 @@ libGSML1_la_SOURCES = \
libGSM_la_SOURCES = \
GSMConfig.cpp \
GSML1FEC_BCCH.cpp \
GSML2LAPDm.cpp \
GSML3CCElements.cpp \
GSML3CCMessages.cpp \