diff --git a/public-trunk/GSM/OsmoLogicalChannel.cpp b/public-trunk/GSM/OsmoLogicalChannel.cpp index 9b169d9..83ff0b4 100644 --- a/public-trunk/GSM/OsmoLogicalChannel.cpp +++ b/public-trunk/GSM/OsmoLogicalChannel.cpp @@ -95,13 +95,13 @@ ostream& GSM::operator<<(ostream& os, const OsmoLogicalChannel& lchan) ss_nr = lchan.SSnr(); /* Just dump something like "(TRX,TS,SS)" identifying the lchan */ - os << "(" << trx_nr << "," << ts_nr << "," << ss_nr << ")"; + os << "(" << trx_nr << "," << ts_nr << "," << ss_nr << "," << lchan.type() << ")"; } void OsmoLogicalChannel::signalNextWtime(GSM::Time &time) { if (mTM) - mTM->signalNextWtime(time); + mTM->signalNextWtime(time, *this); } void OsmoLogicalChannel::downstream(ARFCNManager* radio) diff --git a/public-trunk/GSM/OsmoThreadMuxer.cpp b/public-trunk/GSM/OsmoThreadMuxer.cpp index fb28ea5..bc3bb32 100644 --- a/public-trunk/GSM/OsmoThreadMuxer.cpp +++ b/public-trunk/GSM/OsmoThreadMuxer.cpp @@ -42,9 +42,10 @@ void OsmoThreadMuxer::writeLowSide(const L2Frame& frame, /* build primitive that we can put into the up-queue */ } -void OsmoThreadMuxer::signalNextWtime(GSM::Time &time) +void OsmoThreadMuxer::signalNextWtime(GSM::Time &time, + OsmoLogicalChannel &lchan) { - OBJLOG(DEBUG) << "NextWriteTime: " << time; + OBJLOG(DEBUG) << lchan << " " << time; } // vim: ts=4 sw=4 diff --git a/public-trunk/GSM/OsmoThreadMuxer.h b/public-trunk/GSM/OsmoThreadMuxer.h index 5763dcb..5ca2695 100644 --- a/public-trunk/GSM/OsmoThreadMuxer.h +++ b/public-trunk/GSM/OsmoThreadMuxer.h @@ -80,7 +80,8 @@ public: /* L1 informs us about the next TDMA time for which it needs * data */ - virtual void signalNextWtime(GSM::Time &time); + virtual void signalNextWtime(GSM::Time &time, + OsmoLogicalChannel &lchan); }; }; // GSM