add gsm48_number_of_paging_subchannels() function

[osmocom-bb.git] / src / gsm / gsm48.c

diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index 436bf14..4645af4 100644 (file)
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -33,6 +33,7 @@
 #include <osmocom/gsm/gsm48.h>
 
 #include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_08_58.h>
 
 const struct tlv_definition gsm48_att_tlvdef = {
        .def = {
@@ -301,7 +302,7 @@ int gsm48_generate_mid_from_imsi(uint8_t *buf, const char *imsi)
        uint8_t odd = (length & 0x1) == 1;
 
        buf[0] = GSM48_IE_MOBILE_ID;
-       buf[2] = char2bcd(imsi[0]) << 4 | GSM_MI_TYPE_IMSI | (odd << 3);
+       buf[2] = osmo_char2bcd(imsi[0]) << 4 | GSM_MI_TYPE_IMSI | (odd << 3);
 
        /* if the length is even we will fill half of the last octet */
        if (odd)
@@ -312,11 +313,11 @@ int gsm48_generate_mid_from_imsi(uint8_t *buf, const char *imsi)
        for (i = 1; i < buf[1]; ++i) {
                uint8_t lower, upper;
 
-               lower = char2bcd(imsi[++off]);
+               lower = osmo_char2bcd(imsi[++off]);
                if (!odd && off + 1 == length)
                        upper = 0x0f;
                else
-                       upper = char2bcd(imsi[++off]) & 0x0f;
+                       upper = osmo_char2bcd(imsi[++off]) & 0x0f;
 
                buf[2 + i] = (upper << 4) | lower;
        }
@@ -349,15 +350,15 @@ int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi,
        case GSM_MI_TYPE_IMSI:
        case GSM_MI_TYPE_IMEI:
        case GSM_MI_TYPE_IMEISV:
-               *str_cur++ = bcd2char(mi[0] >> 4);
+               *str_cur++ = osmo_bcd2char(mi[0] >> 4);
 
                 for (i = 1; i < mi_len; i++) {
                        if (str_cur + 2 >= string + str_len)
                                return str_cur - string;
-                       *str_cur++ = bcd2char(mi[i] & 0xf);
+                       *str_cur++ = osmo_bcd2char(mi[i] & 0xf);
                        /* skip last nibble in last input byte when GSM_EVEN */
                        if( (i != mi_len-1) || (mi[0] & GSM_MI_ODD))
-                               *str_cur++ = bcd2char(mi[i] >> 4);
+                               *str_cur++ = osmo_bcd2char(mi[i] >> 4);
                }
                break;
        default:
@@ -413,3 +414,15 @@ int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid)
 
        return 6;
 }
+
+/* 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);
+       }
+}