X-Git-Url: http://git.rot13.org/?p=osmocom-bb.git;a=blobdiff_plain;f=src%2Fgsm%2Fgsm48.c;h=44baec6057f0f1815855033cadb1d53447422d69;hp=4645af4d9a1a707a919d07027c6f46b884bc6f63;hb=94df39e905b9de424ecb40e9c54ddae0e7b6d4e3;hpb=2aee7b14ca17995fc311eb2d7d99c23f734adad6

diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index 4645af4..44baec6 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -31,6 +31,7 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/gsm48.h>
+#include <osmocom/gsm/gsm0502.h>
 
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/gsm/protocol/gsm_08_58.h>
@@ -418,11 +419,10 @@ int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid)
 /* From Table 10.5.33 of GSM 04.08 */
 int gsm48_number_of_paging_subchannels(struct gsm48_control_channel_descr *chan_desc)
 {
-	if (chan_desc->ccch_conf == RSL_BCCH_CCCH_CONF_1_C) {
-		return OSMO_MAX(1, (3 - chan_desc->bs_ag_blks_res))
-			* (chan_desc->bs_pa_mfrms + 2);
-	} else {
-		return (9 - chan_desc->bs_ag_blks_res)
-			* (chan_desc->bs_pa_mfrms + 2);
-	}
+	unsigned int n_pag_blocks = gsm0502_get_n_pag_blocks(chan_desc);
+
+	if (chan_desc->ccch_conf == RSL_BCCH_CCCH_CONF_1_C)
+		return OSMO_MAX(1, n_pag_blocks) * (chan_desc->bs_pa_mfrms + 2);
+	else
+		return n_pag_blocks * (chan_desc->bs_pa_mfrms + 2);
 }