phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

introduce LAPDM entity flags for PH-EMPTY_FRAME.req and pollling 

polling means that we never try to proactively generate a PH-DATA.req
unless there was a PH-RTS.ind first.
This commit is contained in:
Harald Welte 2011-06-24 13:56:48 +02:00
parent 04190eabd3
commit ec71711ebf
2 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/host/layer23/include/osmocom/bb/common/lapdm.h
View File

@ -118,12 +118,16 @@ struct lapdm_cr_ent {
uint8_t resp;
};
#define LAPDM_ENT_F_EMPTY_FRAME 0x0001
#define LAPDM_ENT_F_POLLING_ONLY 0x0002
/* register message handler for messages that are sent from L2->L3 */
struct lapdm_entity {
struct lapdm_datalink datalink[_NR_DL_SAPI];
int last_tx_dequeue; /* last entity that was dequeued */
int tx_pending; /* currently a pending frame not confirmed by L1 */
enum lapdm_mode mode; /* are we in BTS mode or MS mode */
unsigned int flags;
struct {
/* filled-in once we set the lapdm_mode above */
@ -174,4 +178,7 @@ int lapdm_channel_set_mode(struct lapdm_channel *lc, enum lapdm_mode mode);
void lapdm_entity_reset(struct lapdm_entity *le);
void lapdm_channel_reset(struct lapdm_channel *lc);
void lapdm_entity_set_flags(struct lapdm_entity *le, unsigned int flags);
void lapdm_channel_set_flags(struct lapdm_channel *lc, unsigned int flags);
#endif /* _OSMOCOM_LAPDM_H */

57
src/host/layer23/src/common/lapdm.c
View File

@ -316,7 +316,7 @@ static int tx_ph_data_enqueue(struct lapdm_datalink *dl, struct msgb *msg,
pp.u.data.link_id = link_id;
/* if there is a pending message, queue it */
if (le->tx_pending) {
if (le->tx_pending || le->flags & LAPDM_ENT_F_POLLING_ONLY) {
*msgb_push(msg, 1) = n201;
*msgb_push(msg, 1) = link_id;
*msgb_push(msg, 1) = chan_nr;
@ -358,27 +358,37 @@ static int l2_ph_data_conf(struct msgb *msg, struct lapdm_entity *le)
break;
} while (i != last);
/* no message in all queues */
if (!msg)
return 0;
if (!msg) {
/* no message in all queues */
osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA,
PRIM_OP_REQUEST, msg);
/* If user didn't request PH-EMPTY_FRAME.req, abort */
if (!(le->flags & LAPDM_ENT_F_EMPTY_FRAME))
return 0;
/* Pull chan_nr and link_id */
pp.u.data.chan_nr = *msg->data;
msgb_pull(msg, 1);
pp.u.data.link_id = *msg->data;
msgb_pull(msg, 1);
n201 = *msg->data;
msgb_pull(msg, 1);
/* otherwise, send PH-EMPTY_FRAME.req */
osmo_prim_init(&pp.oph, SAP_GSM_PH,
PRIM_PH_EMPTY_FRAME,
PRIM_OP_REQUEST, NULL);
} else {
/* if we have a message, send PH-DATA.req */
osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA,
PRIM_OP_REQUEST, msg);
/* Set last dequeue position */
le->last_tx_dequeue = i;
/* Pull chan_nr and link_id */
pp.u.data.chan_nr = *msg->data;
msgb_pull(msg, 1);
pp.u.data.link_id = *msg->data;
msgb_pull(msg, 1);
n201 = *msg->data;
msgb_pull(msg, 1);
/* Pad the frame, we can transmit now */
le->tx_pending = 1;
lapdm_pad_msgb(msg, n201);
/* Set last dequeue position */
le->last_tx_dequeue = i;
/* Pad the frame, we can transmit now */
le->tx_pending = 1;
lapdm_pad_msgb(msg, n201);
}
return le->l1_prim_cb(&pp.oph, le->l1_ctx);
}
@ -2452,3 +2462,14 @@ void lapdm_channel_reset(struct lapdm_channel *lc)
lapdm_entity_reset(&lc->lapdm_dcch);
lapdm_entity_reset(&lc->lapdm_acch);
}
void lapdm_entity_set_flags(struct lapdm_entity *le, unsigned int flags)
{
le->flags = flags;
}
void lapdm_channel_set_flags(struct lapdm_channel *lc, unsigned int flags)
{
lapdm_entity_set_flags(&lc->lapdm_dcch, flags);
lapdm_entity_set_flags(&lc->lapdm_acch, flags);
}