paulmataruso/osmo-trx
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-trx.git synced 2025-11-03 21:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce structs to encode TRXD packets

Browse Source 
This will ease adding new protocol versions in the future.

Related: OS#4006
Change-Id: I67ffede171eddde436f9057191ed76015a8ea6eb
This commit is contained in:
Pau Espin Pedrol
2019-06-28 13:27:24 +02:00
parent e9ce77b871
commit 778b30a530
3 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Transceiver52M/Transceiver.cpp
View File

@@ -29,6 +29,9 @@
extern "C" {
#include "osmo_signal.h"
#include "proto_trxd.h"
#include <osmocom/core/bits.h>
}
#ifdef HAVE_CONFIG_H
@@ -950,22 +953,24 @@ void Transceiver::driveReceiveFIFO(size_t chan)
TOAint = (int) (TOA * 256.0 + 0.5); // round to closest integer
char burstString[nbits + 10];
burstString[0] = burstTime.TN();
for (int i = 0; i < 4; i++)
burstString[1+i] = (burstTime.FN() >> ((3-i)*8)) & 0x0ff;
burstString[5] = (int)dBm;
burstString[6] = (TOAint >> 8) & 0x0ff;
burstString[7] = TOAint & 0x0ff;
char burstString[sizeof(struct trxd_hdr_v0) + nbits + 2];
struct trxd_hdr_v0* pkt = (struct trxd_hdr_v0*)burstString;
pkt->common.version = 0;
pkt->common.reserved = 0;
pkt->common.tn = burstTime.TN();
osmo_store32be(burstTime.FN(), &pkt->common.fn);
pkt->v0.rssi = dBm;
osmo_store16be(TOAint, &pkt->v0.toa);
SoftVector::iterator burstItr = rxBurst->begin();
for (unsigned i = 0; i < nbits; i++)
burstString[8 + i] = (char) round((*burstItr++) * 255.0);
pkt->soft_bits[i] = (char) round((*burstItr++) * 255.0);
burstString[nbits + 9] = '\0';
/* +1: Historical reason. There's an uninitizalied byte in there: pkt->soft_bits[bi.nbits] */
pkt->soft_bits[nbits + 1] = '\0';
delete rxBurst;
mDataSockets[chan]->write(burstString, nbits + 10);
mDataSockets[chan]->write(burstString, sizeof(struct trxd_hdr_v0) + nbits + 2);
}
void Transceiver::driveTxFIFO()