aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bts.cpp12
-rw-r--r--src/gprs_rlcmac_sched.cpp14
-rw-r--r--src/tbf.cpp14
3 files changed, 20 insertions, 20 deletions
diff --git a/src/bts.cpp b/src/bts.cpp
index 36150d7b..c00ab6a4 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -408,14 +408,14 @@ int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta)
#warning "Copy and pate with other routines.."
tfi = tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx, -1);
if (tfi < 0) {
- LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH ressource\n");
+ LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
/* FIXME: send reject */
return -EBUSY;
}
/* set class to 0, since we don't know the multislot class yet */
tbf = tbf_alloc(&m_bts, NULL, GPRS_RLCMAC_UL_TBF, tfi, trx, 0, 1);
if (!tbf) {
- LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH ressource\n");
+ LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
/* FIXME: send reject */
return -EBUSY;
}
@@ -1038,12 +1038,12 @@ int gprs_rlcmac_pdch::rcv_control_block(
tbf_free(dl_tbf);
}
LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF "
- "in packet ressource request of single "
+ "in packet resource request of single "
"block, so we provide one:\n");
sba = bts()->sba()->find(this, fn);
if (!sba) {
LOGP(DRLCMAC, LOGL_NOTICE, "MS requests UL TBF "
- "in packet ressource request of single "
+ "in packet resource request of single "
"block, but there is no resource request "
"scheduled!\n");
rc = bts()->timing_advance()->recall(tlli);
@@ -1090,13 +1090,13 @@ int gprs_rlcmac_pdch::rcv_control_block(
}
tlli = tbf->tlli;
}
- LOGP(DRLCMAC, LOGL_ERROR, "RX: [PCU <- BTS] %s TFI: %u TLLI: 0x%08x FIXME: Packet ressource request\n", (tbf->direction == GPRS_RLCMAC_UL_TBF) ? "UL" : "DL", tbf->tfi, tbf->tlli);
+ LOGP(DRLCMAC, LOGL_ERROR, "RX: [PCU <- BTS] %s TFI: %u TLLI: 0x%08x FIXME: Packet resource request\n", (tbf->direction == GPRS_RLCMAC_UL_TBF) ? "UL" : "DL", tbf->tfi, tbf->tlli);
break;
case MT_PACKET_MEASUREMENT_REPORT:
sba = bts()->sba()->find(this, fn);
if (!sba) {
LOGP(DRLCMAC, LOGL_NOTICE, "MS send measurement "
- "in packet ressource request of single "
+ "in packet resource request of single "
"block, but there is no resource request "
"scheduled!\n");
} else {
diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp
index b411e2ff..0a290c45 100644
--- a/src/gprs_rlcmac_sched.cpp
+++ b/src/gprs_rlcmac_sched.cpp
@@ -78,7 +78,7 @@ uint8_t sched_select_uplink(uint8_t trx, uint8_t ts, uint32_t fn,
uint8_t usf = 0x07;
uint8_t i, tfi;
- /* select uplink ressource */
+ /* select uplink resource */
for (i = 0, tfi = pdch->next_ul_tfi; i < 32;
i++, tfi = (tfi + 1) & 31) {
tbf = pdch->ul_tbf[tfi];
@@ -96,9 +96,9 @@ uint8_t sched_select_uplink(uint8_t trx, uint8_t ts, uint32_t fn,
usf = tbf->dir.ul.usf[ts];
LOGP(DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: TRX=%d "
"TS=%d FN=%d block_nr=%d scheduling USF=%d for "
- "required uplink ressource of UL TBF=%d\n", trx, ts, fn,
+ "required uplink resource of UL TBF=%d\n", trx, ts, fn,
block_nr, usf, tfi);
- /* next TBF to handle ressource is the next one */
+ /* next TBF to handle resource is the next one */
pdch->next_ul_tfi = (tfi + 1) & 31;
break;
}
@@ -158,7 +158,7 @@ static struct msgb *sched_select_downlink(struct gprs_rlcmac_bts *bts,
struct gprs_rlcmac_tbf *tbf = NULL;
uint8_t i, tfi;
- /* select downlink ressource */
+ /* select downlink resource */
for (i = 0, tfi = pdch->next_dl_tfi; i < 32;
i++, tfi = (tfi + 1) & 31) {
tbf = pdch->dl_tbf[tfi];
@@ -179,7 +179,7 @@ static struct msgb *sched_select_downlink(struct gprs_rlcmac_bts *bts,
LOGP(DRLCMACSCHED, LOGL_DEBUG, "Scheduling data message at "
"RTS for DL TBF=%d (TRX=%d, TS=%d)\n", tfi, trx, ts);
- /* next TBF to handle ressource is the next one */
+ /* next TBF to handle resource is the next one */
pdch->next_dl_tfi = (tfi + 1) & 31;
/* generate DL data block */
msg = tbf->create_dl_acked_block(fn, ts);
@@ -236,7 +236,7 @@ int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts,
poll_fn = sched_poll(bts, trx, ts, fn, block_nr, &poll_tbf, &ul_ass_tbf,
&dl_ass_tbf, &ul_ack_tbf);
- /* check uplink ressource for polling */
+ /* check uplink resource for polling */
if (poll_tbf)
LOGP(DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: TRX=%d "
"TS=%d FN=%d block_nr=%d scheduling free USF for "
@@ -252,7 +252,7 @@ int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts,
"single block allocation at FN=%d\n", trx, ts, fn,
block_nr, sba_fn);
/* use free USF */
- /* else, we search for uplink ressource */
+ /* else, we search for uplink resource */
else
usf = sched_select_uplink(trx, ts, fn, block_nr, pdch);
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 1fa7c6e3..0a703a18 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -190,7 +190,7 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts,
/* set number of downlink slots according to multislot class */
tbf = tbf_alloc(bts, tbf, GPRS_RLCMAC_DL_TBF, tfi, trx, ms_class, ss);
if (!tbf) {
- LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH ressource\n");
+ LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
/* FIXME: send reject */
return -EBUSY;
}
@@ -252,14 +252,14 @@ struct gprs_rlcmac_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts,
/* create new TBF, use sme TRX as DL TBF */
tfi = bts->bts->tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx, use_trx);
if (tfi < 0) {
- LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH ressource\n");
+ LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
/* FIXME: send reject */
return NULL;
}
/* use multislot class of downlink TBF */
tbf = tbf_alloc(bts, dl_tbf, GPRS_RLCMAC_UL_TBF, tfi, trx, ms_class, 0);
if (!tbf) {
- LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH ressource\n");
+ LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
/* FIXME: send reject */
return NULL;
}
@@ -360,9 +360,9 @@ int gprs_rlcmac_tbf::update()
tbf_unlink_pdch(this);
rc = bts_data->alloc_algorithm(bts_data, ul_tbf, this, bts_data->alloc_algorithm_curst, 0);
- /* if no ressource */
+ /* if no resource */
if (rc < 0) {
- LOGP(DRLCMAC, LOGL_ERROR, "No ressource after update???\n");
+ LOGP(DRLCMAC, LOGL_ERROR, "No resource after update???\n");
return -rc;
}
@@ -590,7 +590,7 @@ next_diagram:
/* select algorithm */
rc = bts->alloc_algorithm(bts, old_tbf, tbf, bts->alloc_algorithm_curst,
single_slot);
- /* if no ressource */
+ /* if no resource */
if (rc < 0) {
talloc_free(tbf);
return NULL;
@@ -598,7 +598,7 @@ next_diagram:
/* assign control ts */
tbf->control_ts = 0xff;
rc = tbf_assign_control_ts(tbf);
- /* if no ressource */
+ /* if no resource */
if (rc < 0) {
talloc_free(tbf);
return NULL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 17:07:56 +0000