cellular-infrastructure
/
osmo-trx
mirror of https://gerrit.osmocom.org/osmo-trx
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

dl works 

Change-Id: I3937d827e20728eaa6280f5750f059a0abf003e0
This commit is contained in:
Eric Wild 2022-07-25 02:48:43 +02:00
parent d027037c09
commit 53615c3ccd
3 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Transceiver52M/Transceiver.cpp
View File

@ -427,6 +427,8 @@ void Transceiver::pushRadioVector(GSM::Time &nowTime)
ratectr_changed = false;
zeros[i] = state->chanType[TN] == NONE || state->mMuted;
if(zeros[i])
LOGCHAN(i, DTRXDDL, FATAL) << "Z" << nowTime;
Mutex *mtx = mTxPriorityQueues[i].getMutex();
mtx->lock();
@ -455,6 +457,7 @@ void Transceiver::pushRadioVector(GSM::Time &nowTime)
} else {
modFN = nowTime.FN() % state->fillerModulus[TN];
bursts[i] = state->fillerTable[modFN][TN];
LOGCHAN(i, DTRXDDL, FATAL) << "F" << nowTime << ", retrans=" << state->mRetrans;
if (i == 0 && state->mFiller == FILLER_ZERO) {
LOGCHAN(i, DTRXDDL, INFO) << "No Tx burst available for " << nowTime
<< ", retrans=" << state->mRetrans;
@ -1137,7 +1140,7 @@ bool Transceiver::driveReceiveRadio()
if (rc < 0)
return false;
if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(216,0)) {
if (mForceClockInterface || mTransmitDeadlineClock > mLastClockUpdateTime + GSM::Time(3,0)) {
if (mForceClockInterface)
LOGC(DTRXCLK, NOTICE) << "Sending CLOCK indications";
mForceClockInterface = false;

2
Transceiver52M/device/ipc2/IPCDevice.cpp
View File

@ -205,7 +205,7 @@ TIMESTAMP IPCDevice2::initialReadTimestamp(void)
static timespec readtime, writetime;
static void wait_for_sample_time(timespec* last, unsigned int len) {
#if 0
#if 1
timespec ts, diff;
clock_gettime(CLOCK_MONOTONIC, &ts);
timespecsub(&ts, last, &diff);

37
Transceiver52M/ms/ipc_specific.h
View File

@ -74,8 +74,6 @@ template <typename T> struct ipc_hw {
// uhd::tx_streamer::sptr tx_stream;
blade_sample_type *one_pkt_buf;
std::vector<blade_sample_type *> pkt_ptrs;
size_t rx_spp;
double rxticks;
const unsigned int rxFullScale, txFullScale;
const int rxtxdelay;
float rxgain, txgain;
@ -85,7 +83,7 @@ template <typename T> struct ipc_hw {
{
delete[] one_pkt_buf;
}
ipc_hw() : rxFullScale(32767), txFullScale(32767), rxtxdelay(-67)
ipc_hw() : rxFullScale(32767), txFullScale(32767), rxtxdelay(0)
{
}
@ -154,34 +152,6 @@ template <typename T> struct ipc_hw {
int len = 508 * 2;
m.read_dl(508 * 2, &t, pbuf);
// auto len = ipc_shm_read(ios_tx_to_device[0], (uint16_t *)&pbuf, 508 * 2, &t, 1);
// if(len < 0) {
// std::cerr << "fuck, rx fail!" << std::endl;
// exit(0);
// }
// uhd::rx_metadata_t md;
// auto num_rx_samps = rx_stream->recv(pkt_ptrs.front(), rx_spp, md, 3.0, true);
// if (md.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT) {
// std::cerr << boost::format("Timeout while streaming") << std::endl;
// exit(0);
// }
// if (md.error_code == uhd::rx_metadata_t::ERROR_CODE_OVERFLOW) {
// std::cerr << boost::format("Got an overflow indication. Please consider the following:\n"
// " Your write medium must sustain a rate of %fMB/s.\n"
// " Dropped samples will not be written to the file.\n"
// " Please modify this example for your purposes.\n"
// " This message will not appear again.\n") %
// 1.f;
// exit(0);
// ;
// }
// if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE) {
// std::cerr << str(boost::format("Receiver error: %s") % md.strerror());
// exit(0);
// }
dev_buf_t rcd = { t, static_cast<uint32_t>(len), pbuf };
if (to_skip < 120) // prevents weird overflows on startup
@ -199,11 +169,6 @@ template <typename T> struct ipc_hw {
{
auto fn = [this, burst_handler] {
pthread_setname_np(pthread_self(), "rxrun");
// wait_for_shm_open();
// uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS);
// stream_cmd.stream_now = true;
// stream_cmd.time_spec = uhd::time_spec_t();
// rx_stream->issue_stream_cmd(stream_cmd);
while (1) {
rx_cb(burst_handler);