diff options
Diffstat (limited to 'openbsc/src/libbsc')
-rw-r--r-- | openbsc/src/libbsc/abis_nm.c | 296 | ||||
-rw-r--r-- | openbsc/src/libbsc/abis_nm_ipaccess.c | 8 | ||||
-rw-r--r-- | openbsc/src/libbsc/abis_om2000.c | 2 | ||||
-rw-r--r-- | openbsc/src/libbsc/abis_rsl.c | 166 | ||||
-rw-r--r-- | openbsc/src/libbsc/bsc_api.c | 6 | ||||
-rw-r--r-- | openbsc/src/libbsc/bsc_msc.c | 2 | ||||
-rw-r--r-- | openbsc/src/libbsc/bsc_rll.c | 12 | ||||
-rw-r--r-- | openbsc/src/libbsc/bts_ipaccess_nanobts.c | 10 | ||||
-rw-r--r-- | openbsc/src/libbsc/bts_siemens_bs11.c | 14 | ||||
-rw-r--r-- | openbsc/src/libbsc/chan_alloc.c | 6 | ||||
-rw-r--r-- | openbsc/src/libbsc/gsm_04_08_utils.c | 38 | ||||
-rw-r--r-- | openbsc/src/libbsc/handover_decision.c | 4 | ||||
-rw-r--r-- | openbsc/src/libbsc/handover_logic.c | 4 | ||||
-rw-r--r-- | openbsc/src/libbsc/paging.c | 4 | ||||
-rw-r--r-- | openbsc/src/libbsc/rest_octets.c | 8 | ||||
-rw-r--r-- | openbsc/src/libbsc/system_information.c | 24 | ||||
-rw-r--r-- | openbsc/src/libbsc/transaction.c | 10 |
17 files changed, 307 insertions, 307 deletions
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 1d86ffa3b..408d56ea8 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -190,7 +190,7 @@ static const struct value_string nack_cause_names[] = { { 0, NULL } }; -static const char *nack_cause_name(u_int8_t cause) +static const char *nack_cause_name(uint8_t cause) { return get_value_string(nack_cause_names, cause); } @@ -205,7 +205,7 @@ static const struct value_string event_type_names[] = { { 0, NULL } }; -static const char *event_type_name(u_int8_t cause) +static const char *event_type_name(uint8_t cause) { return get_value_string(event_type_names, cause); } @@ -221,7 +221,7 @@ static const struct value_string severity_names[] = { { 0, NULL } }; -static const char *severity_name(u_int8_t cause) +static const char *severity_name(uint8_t cause) { return get_value_string(severity_names, cause); } @@ -343,7 +343,7 @@ int abis_nm_chcomb4pchan(enum gsm_phys_chan_config pchan) return -EINVAL; } -int abis_nm_tlv_parse(struct tlv_parsed *tp, struct gsm_bts *bts, const u_int8_t *buf, int len) +int abis_nm_tlv_parse(struct tlv_parsed *tp, struct gsm_bts *bts, const uint8_t *buf, int len) { if (!bts->model) return -EIO; @@ -379,7 +379,7 @@ static int is_report(enum abis_nm_msgtype mt) #define MT_ACK(x) (x+1) #define MT_NACK(x) (x+2) -static void fill_om_hdr(struct abis_om_hdr *oh, u_int8_t len) +static void fill_om_hdr(struct abis_om_hdr *oh, uint8_t len) { oh->mdisc = ABIS_OM_MDISC_FOM; oh->placement = ABIS_OM_PLACEMENT_ONLY; @@ -387,9 +387,9 @@ static void fill_om_hdr(struct abis_om_hdr *oh, u_int8_t len) oh->length = len; } -static void fill_om_fom_hdr(struct abis_om_hdr *oh, u_int8_t len, - u_int8_t msg_type, u_int8_t obj_class, - u_int8_t bts_nr, u_int8_t trx_nr, u_int8_t ts_nr) +static void fill_om_fom_hdr(struct abis_om_hdr *oh, uint8_t len, + uint8_t msg_type, uint8_t obj_class, + uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr) { struct abis_om_fom_hdr *foh = (struct abis_om_fom_hdr *) oh->data; @@ -459,12 +459,12 @@ const struct value_string abis_nm_obj_class_names[] = { { 0, NULL } }; -static const char *obj_class_name(u_int8_t oc) +static const char *obj_class_name(uint8_t oc) { return get_value_string(abis_nm_obj_class_names, oc); } -const char *nm_opstate_name(u_int8_t os) +const char *nm_opstate_name(uint8_t os) { switch (os) { case NM_OPSTATE_DISABLED: @@ -492,7 +492,7 @@ static const struct value_string avail_names[] = { { 0, NULL } }; -const char *nm_avail_name(u_int8_t avail) +const char *nm_avail_name(uint8_t avail) { return get_value_string(avail_names, avail); } @@ -517,7 +517,7 @@ const struct value_string abis_nm_adm_state_names[] = { { 0, NULL } }; -const char *nm_adm_name(u_int8_t adm) +const char *nm_adm_name(uint8_t adm) { return get_value_string(abis_nm_adm_state_names, adm); } @@ -539,7 +539,7 @@ static void debugp_foh(struct abis_om_fom_hdr *foh) /* obtain the gsm_nm_state data structure for a given object instance */ static struct gsm_nm_state * -objclass2nmstate(struct gsm_bts *bts, u_int8_t obj_class, +objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, struct abis_om_obj_inst *obj_inst) { struct gsm_bts_trx *trx; @@ -623,7 +623,7 @@ objclass2nmstate(struct gsm_bts *bts, u_int8_t obj_class, /* obtain the in-memory data structure of a given object instance */ static void * -objclass2obj(struct gsm_bts *bts, u_int8_t obj_class, +objclass2obj(struct gsm_bts *bts, uint8_t obj_class, struct abis_om_obj_inst *obj_inst) { struct gsm_bts_trx *trx; @@ -679,8 +679,8 @@ objclass2obj(struct gsm_bts *bts, u_int8_t obj_class, /* Update the administrative state of a given object in our in-memory data * structures and send an event to the higher layer */ -static int update_admstate(struct gsm_bts *bts, u_int8_t obj_class, - struct abis_om_obj_inst *obj_inst, u_int8_t adm_state) +static int update_admstate(struct gsm_bts *bts, uint8_t obj_class, + struct abis_om_obj_inst *obj_inst, uint8_t adm_state) { struct gsm_nm_state *nm_state, new_state; struct nm_statechg_signal_data nsd; @@ -816,7 +816,7 @@ static int rx_fail_evt_rep(struct msgb *mb) static int abis_nm_rcvmsg_report(struct msgb *mb) { struct abis_om_fom_hdr *foh = msgb_l3(mb); - u_int8_t mt = foh->msg_type; + uint8_t mt = foh->msg_type; debugp_foh(foh); @@ -848,13 +848,13 @@ static int abis_nm_rcvmsg_report(struct msgb *mb) } /* Activate the specified software into the BTS */ -static int ipacc_sw_activate(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i0, u_int8_t i1, - u_int8_t i2, const u_int8_t *sw_desc, u_int8_t swdesc_len) +static int ipacc_sw_activate(struct gsm_bts *bts, uint8_t obj_class, uint8_t i0, uint8_t i1, + uint8_t i2, const uint8_t *sw_desc, uint8_t swdesc_len) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t len = swdesc_len; - u_int8_t *trailer; + uint8_t len = swdesc_len; + uint8_t *trailer; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, len, NM_MT_ACTIVATE_SW, obj_class, i0, i1, i2); @@ -865,7 +865,7 @@ static int ipacc_sw_activate(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i return abis_nm_sendmsg(bts, msg); } -static int abis_nm_parse_sw_descr(const u_int8_t *sw_descr, int sw_descr_len) +static int abis_nm_parse_sw_descr(const uint8_t *sw_descr, int sw_descr_len) { static const struct tlv_definition sw_descr_def = { .def = { @@ -874,9 +874,9 @@ static int abis_nm_parse_sw_descr(const u_int8_t *sw_descr, int sw_descr_len) }, }; - u_int8_t tag; - u_int16_t tag_len; - const u_int8_t *val; + uint8_t tag; + uint16_t tag_len; + const uint8_t *val; int ofs = 0, len; /* Classic TLV parsing doesn't work well with SW_DESCR because of it's @@ -913,7 +913,7 @@ static int abis_nm_rx_sw_act_req(struct msgb *mb) struct abis_om_hdr *oh = msgb_l2(mb); struct abis_om_fom_hdr *foh = msgb_l3(mb); struct tlv_parsed tp; - const u_int8_t *sw_config; + const uint8_t *sw_config; int ret, sw_config_len, sw_descr_len; debugp_foh(foh); @@ -956,7 +956,7 @@ static int abis_nm_rx_chg_adm_state_ack(struct msgb *mb) struct abis_om_hdr *oh = msgb_l2(mb); struct abis_om_fom_hdr *foh = msgb_l3(mb); struct tlv_parsed tp; - u_int8_t adm_state; + uint8_t adm_state; abis_nm_tlv_parse(&tp, mb->trx->bts, foh->data, oh->length-sizeof(*foh)); if (!TLVP_PRESENT(&tp, NM_ATT_ADM_STATE)) @@ -977,12 +977,12 @@ static int abis_nm_rx_lmt_event(struct msgb *mb) abis_nm_tlv_parse(&tp, mb->trx->bts, foh->data, oh->length-sizeof(*foh)); if (TLVP_PRESENT(&tp, NM_ATT_BS11_LMT_LOGON_SESSION) && TLVP_LEN(&tp, NM_ATT_BS11_LMT_LOGON_SESSION) >= 1) { - u_int8_t onoff = *TLVP_VAL(&tp, NM_ATT_BS11_LMT_LOGON_SESSION); + uint8_t onoff = *TLVP_VAL(&tp, NM_ATT_BS11_LMT_LOGON_SESSION); DEBUGPC(DNM, "LOG%s ", onoff ? "ON" : "OFF"); } if (TLVP_PRESENT(&tp, NM_ATT_BS11_LMT_USER_ACC_LEV) && TLVP_LEN(&tp, NM_ATT_BS11_LMT_USER_ACC_LEV) >= 1) { - u_int8_t level = *TLVP_VAL(&tp, NM_ATT_BS11_LMT_USER_ACC_LEV); + uint8_t level = *TLVP_VAL(&tp, NM_ATT_BS11_LMT_USER_ACC_LEV); DEBUGPC(DNM, "Level=%u ", level); } if (TLVP_PRESENT(&tp, NM_ATT_BS11_LMT_USER_NAME) && @@ -1017,7 +1017,7 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb) { struct abis_om_hdr *oh = msgb_l2(mb); struct abis_om_fom_hdr *foh = msgb_l3(mb); - u_int8_t mt = foh->msg_type; + uint8_t mt = foh->msg_type; int ret = 0; /* check for unsolicited message */ @@ -1138,7 +1138,7 @@ int abis_nm_rcvmsg(struct msgb *msg) return -EINVAL; } #if 0 - unsigned int l2_len = msg->tail - (u_int8_t *)msgb_l2(msg); + unsigned int l2_len = msg->tail - (uint8_t *)msgb_l2(msg); unsigned int hlen = sizeof(*oh) + sizeof(struct abis_om_fom_hdr); if (oh->length + hlen > l2_len) { LOGP(DNM, LOGL_ERROR, "ABIS OML truncated message (%u > %u)\n", @@ -1219,17 +1219,17 @@ struct abis_nm_sw { int forced; /* this will become part of the SW LOAD INITIATE */ - u_int8_t obj_class; - u_int8_t obj_instance[3]; + uint8_t obj_class; + uint8_t obj_instance[3]; - u_int8_t file_id[255]; - u_int8_t file_id_len; + uint8_t file_id[255]; + uint8_t file_id_len; - u_int8_t file_version[255]; - u_int8_t file_version_len; + uint8_t file_version[255]; + uint8_t file_version_len; - u_int8_t window_size; - u_int8_t seg_in_window; + uint8_t window_size; + uint8_t seg_in_window; int fd; FILE *stream; @@ -1260,7 +1260,7 @@ static int sw_load_init(struct abis_nm_sw *sw) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t len = 3*2 + sw->file_id_len + sw->file_version_len; + uint8_t len = 3*2 + sw->file_id_len + sw->file_version_len; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, len, NM_MT_LOAD_INIT, sw->obj_class, @@ -1297,7 +1297,7 @@ static int sw_load_segment(struct abis_nm_sw *sw) char seg_buf[256]; char *line_buf = seg_buf+2; unsigned char *tlv; - u_int8_t len; + uint8_t len; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); @@ -1318,7 +1318,7 @@ static int sw_load_segment(struct abis_nm_sw *sw) len = strlen(line_buf) + 2; tlv = msgb_put(msg, TLV_GROSS_LEN(len)); - tlv_put(tlv, NM_ATT_BS11_FILE_DATA, len, (u_int8_t *)seg_buf); + tlv_put(tlv, NM_ATT_BS11_FILE_DATA, len, (uint8_t *)seg_buf); /* BS11 wants CR + LF in excess of the TLV length !?! */ tlv[1] -= 2; @@ -1337,7 +1337,7 @@ static int sw_load_segment(struct abis_nm_sw *sw) sw->last_seg = 1; ++sw->seg_in_window; - msgb_tl16v_put(msg, NM_ATT_IPACC_FILE_DATA, len, (const u_int8_t *) seg_buf); + msgb_tl16v_put(msg, NM_ATT_IPACC_FILE_DATA, len, (const uint8_t *) seg_buf); len += 3; break; } @@ -1359,7 +1359,7 @@ static int sw_load_end(struct abis_nm_sw *sw) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t len = 2*2 + sw->file_id_len + sw->file_version_len; + uint8_t len = 2*2 + sw->file_id_len + sw->file_version_len; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, len, NM_MT_LOAD_END, sw->obj_class, @@ -1375,7 +1375,7 @@ static int sw_activate(struct abis_nm_sw *sw) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t len = 2*2 + sw->file_id_len + sw->file_version_len; + uint8_t len = 2*2 + sw->file_id_len + sw->file_version_len; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, len, NM_MT_ACTIVATE_SW, sw->obj_class, @@ -1675,7 +1675,7 @@ static int abis_nm_rcvmsg_sw(struct msgb *mb) /* Load the specified software into the BTS */ int abis_nm_software_load(struct gsm_bts *bts, int trx_nr, const char *fname, - u_int8_t win_size, int forced, + uint8_t win_size, int forced, gsm_cbfn *cbfn, void *cb_data) { struct abis_nm_sw *sw = &g_sw; @@ -1776,8 +1776,8 @@ int abis_nm_software_activate(struct gsm_bts *bts, const char *fname, return sw_activate(sw); } -static void fill_nm_channel(struct abis_nm_channel *ch, u_int8_t bts_port, - u_int8_t ts_nr, u_int8_t subslot_nr) +static void fill_nm_channel(struct abis_nm_channel *ch, uint8_t bts_port, + uint8_t ts_nr, uint8_t subslot_nr) { ch->attrib = NM_ATT_ABIS_CHANNEL; ch->bts_port = bts_port; @@ -1785,13 +1785,13 @@ static void fill_nm_channel(struct abis_nm_channel *ch, u_int8_t bts_port, ch->subslot = subslot_nr; } -int abis_nm_establish_tei(struct gsm_bts *bts, u_int8_t trx_nr, - u_int8_t e1_port, u_int8_t e1_timeslot, u_int8_t e1_subslot, - u_int8_t tei) +int abis_nm_establish_tei(struct gsm_bts *bts, uint8_t trx_nr, + uint8_t e1_port, uint8_t e1_timeslot, uint8_t e1_subslot, + uint8_t tei) { struct abis_om_hdr *oh; struct abis_nm_channel *ch; - u_int8_t len = sizeof(*ch) + 2; + uint8_t len = sizeof(*ch) + 2; struct msgb *msg = nm_msgb_alloc(); oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); @@ -1808,7 +1808,7 @@ int abis_nm_establish_tei(struct gsm_bts *bts, u_int8_t trx_nr, /* connect signalling of one (BTS,TRX) to a particular timeslot on the E1 */ int abis_nm_conn_terr_sign(struct gsm_bts_trx *trx, - u_int8_t e1_port, u_int8_t e1_timeslot, u_int8_t e1_subslot) + uint8_t e1_port, uint8_t e1_timeslot, uint8_t e1_subslot) { struct gsm_bts *bts = trx->bts; struct abis_om_hdr *oh; @@ -1833,8 +1833,8 @@ int abis_nm_disc_terr_sign(struct abis_nm_h *h, struct abis_om_obj_inst *inst, #endif int abis_nm_conn_terr_traf(struct gsm_bts_trx_ts *ts, - u_int8_t e1_port, u_int8_t e1_timeslot, - u_int8_t e1_subslot) + uint8_t e1_port, uint8_t e1_timeslot, + uint8_t e1_subslot) { struct gsm_bts *bts = ts->trx->bts; struct abis_om_hdr *oh; @@ -1858,17 +1858,17 @@ int abis_nm_conn_terr_traf(struct gsm_bts_trx_ts *ts, #if 0 int abis_nm_disc_terr_traf(struct abis_nm_h *h, struct abis_om_obj_inst *inst, struct abis_nm_abis_channel *chan, - u_int8_t subchan) + uint8_t subchan) { } #endif /* Chapter 8.6.1 */ -int abis_nm_set_bts_attr(struct gsm_bts *bts, u_int8_t *attr, int attr_len) +int abis_nm_set_bts_attr(struct gsm_bts *bts, uint8_t *attr, int attr_len) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t *cur; + uint8_t *cur; DEBUGP(DNM, "Set BTS Attr (bts=%d)\n", bts->nr); @@ -1881,11 +1881,11 @@ int abis_nm_set_bts_attr(struct gsm_bts *bts, u_int8_t *attr, int attr_len) } /* Chapter 8.6.2 */ -int abis_nm_set_radio_attr(struct gsm_bts_trx *trx, u_int8_t *attr, int attr_len) +int abis_nm_set_radio_attr(struct gsm_bts_trx *trx, uint8_t *attr, int attr_len) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t *cur; + uint8_t *cur; DEBUGP(DNM, "Set TRX Attr (bts=%d,trx=%d)\n", trx->bts->nr, trx->nr); @@ -1898,7 +1898,7 @@ int abis_nm_set_radio_attr(struct gsm_bts_trx *trx, u_int8_t *attr, int attr_len return abis_nm_sendmsg(trx->bts, msg); } -static int verify_chan_comb(struct gsm_bts_trx_ts *ts, u_int8_t chan_comb) +static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb) { int i; @@ -2033,13 +2033,13 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, u_int8_t chan_comb) } /* Chapter 8.6.3 */ -int abis_nm_set_channel_attr(struct gsm_bts_trx_ts *ts, u_int8_t chan_comb) +int abis_nm_set_channel_attr(struct gsm_bts_trx_ts *ts, uint8_t chan_comb) { struct gsm_bts *bts = ts->trx->bts; struct abis_om_hdr *oh; - u_int8_t zero = 0x00; + uint8_t zero = 0x00; struct msgb *msg = nm_msgb_alloc(); - u_int8_t len = 2 + 2; + uint8_t len = 2 + 2; if (bts->type == GSM_BTS_TYPE_BS11) len += 4 + 2 + 2 + 3; @@ -2086,13 +2086,13 @@ int abis_nm_set_channel_attr(struct gsm_bts_trx_ts *ts, u_int8_t chan_comb) return abis_nm_sendmsg(bts, msg); } -int abis_nm_sw_act_req_ack(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i1, - u_int8_t i2, u_int8_t i3, int nack, u_int8_t *attr, int att_len) +int abis_nm_sw_act_req_ack(struct gsm_bts *bts, uint8_t obj_class, uint8_t i1, + uint8_t i2, uint8_t i3, int nack, uint8_t *attr, int att_len) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t msgtype = NM_MT_SW_ACT_REQ_ACK; - u_int8_t len = att_len; + uint8_t msgtype = NM_MT_SW_ACT_REQ_ACK; + uint8_t len = att_len; if (nack) { len += 2; @@ -2103,7 +2103,7 @@ int abis_nm_sw_act_req_ack(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i1, fill_om_fom_hdr(oh, att_len, msgtype, obj_class, i1, i2, i3); if (attr) { - u_int8_t *ptr = msgb_put(msg, att_len); + uint8_t *ptr = msgb_put(msg, att_len); memcpy(ptr, attr, att_len); } if (nack) @@ -2112,11 +2112,11 @@ int abis_nm_sw_act_req_ack(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i1, return abis_nm_sendmsg_direct(bts, msg); } -int abis_nm_raw_msg(struct gsm_bts *bts, int len, u_int8_t *rawmsg) +int abis_nm_raw_msg(struct gsm_bts *bts, int len, uint8_t *rawmsg) { struct msgb *msg = nm_msgb_alloc(); struct abis_om_hdr *oh; - u_int8_t *data; + uint8_t *data; oh = (struct abis_om_hdr *) msgb_put(msg, sizeof(*oh)); fill_om_hdr(oh, len); @@ -2127,7 +2127,7 @@ int abis_nm_raw_msg(struct gsm_bts *bts, int len, u_int8_t *rawmsg) } /* Siemens specific commands */ -static int __simple_cmd(struct gsm_bts *bts, u_int8_t msg_type) +static int __simple_cmd(struct gsm_bts *bts, uint8_t msg_type) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2140,7 +2140,7 @@ static int __simple_cmd(struct gsm_bts *bts, u_int8_t msg_type) } /* Chapter 8.9.2 */ -int abis_nm_opstart(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i0, u_int8_t i1, u_int8_t i2) +int abis_nm_opstart(struct gsm_bts *bts, uint8_t obj_class, uint8_t i0, uint8_t i1, uint8_t i2) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2155,8 +2155,8 @@ int abis_nm_opstart(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i0, u_int8 } /* Chapter 8.8.5 */ -int abis_nm_chg_adm_state(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i0, - u_int8_t i1, u_int8_t i2, enum abis_nm_adm_state adm_state) +int abis_nm_chg_adm_state(struct gsm_bts *bts, uint8_t obj_class, uint8_t i0, + uint8_t i1, uint8_t i2, enum abis_nm_adm_state adm_state) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2168,12 +2168,12 @@ int abis_nm_chg_adm_state(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t i0, return abis_nm_sendmsg(bts, msg); } -int abis_nm_conn_mdrop_link(struct gsm_bts *bts, u_int8_t e1_port0, u_int8_t ts0, - u_int8_t e1_port1, u_int8_t ts1) +int abis_nm_conn_mdrop_link(struct gsm_bts *bts, uint8_t e1_port0, uint8_t ts0, + uint8_t e1_port1, uint8_t ts1) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t *attr; + uint8_t *attr; DEBUGP(DNM, "CONNECT MDROP LINK E1=(%u,%u) -> E1=(%u, %u)\n", e1_port0, ts0, e1_port1, ts1); @@ -2196,9 +2196,9 @@ int abis_nm_conn_mdrop_link(struct gsm_bts *bts, u_int8_t e1_port0, u_int8_t ts0 } /* Chapter 8.7.1 */ -int abis_nm_perform_test(struct gsm_bts *bts, u_int8_t obj_class, - u_int8_t bts_nr, u_int8_t trx_nr, u_int8_t ts_nr, - u_int8_t test_nr, u_int8_t auton_report, struct msgb *msg) +int abis_nm_perform_test(struct gsm_bts *bts, uint8_t obj_class, + uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr, + uint8_t test_nr, uint8_t auton_report, struct msgb *msg) { struct abis_om_hdr *oh; @@ -2241,12 +2241,12 @@ int abis_nm_bs11_restart(struct gsm_bts *bts) struct bs11_date_time { - u_int16_t year; - u_int8_t month; - u_int8_t day; - u_int8_t hour; - u_int8_t min; - u_int8_t sec; + uint16_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t min; + uint8_t sec; } __attribute__((packed)); @@ -2279,12 +2279,12 @@ int abis_nm_bs11_db_transmission(struct gsm_bts *bts, int begin) } int abis_nm_bs11_create_object(struct gsm_bts *bts, - enum abis_bs11_objtype type, u_int8_t idx, - u_int8_t attr_len, const u_int8_t *attr) + enum abis_bs11_objtype type, uint8_t idx, + uint8_t attr_len, const uint8_t *attr) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t *cur; + uint8_t *cur; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, attr_len, NM_MT_BS11_CREATE_OBJ, @@ -2296,7 +2296,7 @@ int abis_nm_bs11_create_object(struct gsm_bts *bts, } int abis_nm_bs11_delete_object(struct gsm_bts *bts, - enum abis_bs11_objtype type, u_int8_t idx) + enum abis_bs11_objtype type, uint8_t idx) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2308,11 +2308,11 @@ int abis_nm_bs11_delete_object(struct gsm_bts *bts, return abis_nm_sendmsg(bts, msg); } -int abis_nm_bs11_create_envaBTSE(struct gsm_bts *bts, u_int8_t idx) +int abis_nm_bs11_create_envaBTSE(struct gsm_bts *bts, uint8_t idx) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t zero = 0x00; + uint8_t zero = 0x00; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 3, NM_MT_BS11_CREATE_OBJ, @@ -2322,7 +2322,7 @@ int abis_nm_bs11_create_envaBTSE(struct gsm_bts *bts, u_int8_t idx) return abis_nm_sendmsg(bts, msg); } -int abis_nm_bs11_create_bport(struct gsm_bts *bts, u_int8_t idx) +int abis_nm_bs11_create_bport(struct gsm_bts *bts, uint8_t idx) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2334,7 +2334,7 @@ int abis_nm_bs11_create_bport(struct gsm_bts *bts, u_int8_t idx) return abis_nm_sendmsg(bts, msg); } -int abis_nm_bs11_delete_bport(struct gsm_bts *bts, u_int8_t idx) +int abis_nm_bs11_delete_bport(struct gsm_bts *bts, uint8_t idx) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2346,7 +2346,7 @@ int abis_nm_bs11_delete_bport(struct gsm_bts *bts, u_int8_t idx) return abis_nm_sendmsg(bts, msg); } -static const u_int8_t sm_attr[] = { NM_ATT_TEI, NM_ATT_ABIS_CHANNEL }; +static const uint8_t sm_attr[] = { NM_ATT_TEI, NM_ATT_ABIS_CHANNEL }; int abis_nm_bs11_get_oml_tei_ts(struct gsm_bts *bts) { struct abis_om_hdr *oh; @@ -2361,9 +2361,9 @@ int abis_nm_bs11_get_oml_tei_ts(struct gsm_bts *bts) } /* like abis_nm_conn_terr_traf + set_tei */ -int abis_nm_bs11_conn_oml_tei(struct gsm_bts *bts, u_int8_t e1_port, - u_int8_t e1_timeslot, u_int8_t e1_subslot, - u_int8_t tei) +int abis_nm_bs11_conn_oml_tei(struct gsm_bts *bts, uint8_t e1_port, + uint8_t e1_timeslot, uint8_t e1_subslot, + uint8_t tei) { struct abis_om_hdr *oh; struct abis_nm_channel *ch; @@ -2380,7 +2380,7 @@ int abis_nm_bs11_conn_oml_tei(struct gsm_bts *bts, u_int8_t e1_port, return abis_nm_sendmsg(bts, msg); } -int abis_nm_bs11_set_trx_power(struct gsm_bts_trx *trx, u_int8_t level) +int abis_nm_bs11_set_trx_power(struct gsm_bts_trx *trx, uint8_t level) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2397,7 +2397,7 @@ int abis_nm_bs11_get_trx_power(struct gsm_bts_trx *trx) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t attr = NM_ATT_BS11_TXPWR; + uint8_t attr = NM_ATT_BS11_TXPWR; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 2+sizeof(attr), NM_MT_GET_ATTR, @@ -2411,7 +2411,7 @@ int abis_nm_bs11_get_pll_mode(struct gsm_bts *bts) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t attr[] = { NM_ATT_BS11_PLL_MODE }; + uint8_t attr[] = { NM_ATT_BS11_PLL_MODE }; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 2+sizeof(attr), NM_MT_GET_ATTR, @@ -2425,7 +2425,7 @@ int abis_nm_bs11_get_cclk(struct gsm_bts *bts) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t attr[] = { NM_ATT_BS11_CCLK_ACCURACY, + uint8_t attr[] = { NM_ATT_BS11_CCLK_ACCURACY, NM_ATT_BS11_CCLK_TYPE }; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); @@ -2437,7 +2437,7 @@ int abis_nm_bs11_get_cclk(struct gsm_bts *bts) } -//static const u_int8_t bs11_logon_c7[] = { 0x07, 0xd9, 0x01, 0x11, 0x0d, 0x10, 0x20 }; +//static const uint8_t bs11_logon_c7[] = { 0x07, 0xd9, 0x01, 0x11, 0x0d, 0x10, 0x20 }; int abis_nm_bs11_factory_logon(struct gsm_bts *bts, int on) { @@ -2449,7 +2449,7 @@ int abis_nm_bs11_infield_logon(struct gsm_bts *bts, int on) return abis_nm_bs11_logon(bts, 0x03, "FIELD ", on); } -int abis_nm_bs11_logon(struct gsm_bts *bts, u_int8_t level, const char *name, int on) +int abis_nm_bs11_logon(struct gsm_bts *bts, uint8_t level, const char *name, int on) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2459,16 +2459,16 @@ int abis_nm_bs11_logon(struct gsm_bts *bts, u_int8_t level, const char *name, in oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); if (on) { - u_int8_t len = 3*2 + sizeof(bdt) + uint8_t len = 3*2 + sizeof(bdt) + 1 + strlen(name); fill_om_fom_hdr(oh, len, NM_MT_BS11_LMT_LOGON, NM_OC_BS11_BTSE, 0xff, 0xff, 0xff); msgb_tlv_put(msg, NM_ATT_BS11_LMT_LOGIN_TIME, - sizeof(bdt), (u_int8_t *) &bdt); + sizeof(bdt), (uint8_t *) &bdt); msgb_tlv_put(msg, NM_ATT_BS11_LMT_USER_ACC_LEV, 1, &level); msgb_tlv_put(msg, NM_ATT_BS11_LMT_USER_NAME, - strlen(name), (u_int8_t *)name); + strlen(name), (uint8_t *)name); } else { fill_om_fom_hdr(oh, 0, NM_MT_BS11_LMT_LOGOFF, NM_OC_BS11_BTSE, 0xff, 0xff, 0xff); @@ -2489,7 +2489,7 @@ int abis_nm_bs11_set_trx1_pw(struct gsm_bts *bts, const char *password) oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 2+strlen(password), NM_MT_BS11_SET_ATTR, NM_OC_BS11, BS11_OBJ_TRX1, 0x00, 0x00); - msgb_tlv_put(msg, NM_ATT_BS11_PASSWORD, 10, (const u_int8_t *)password); + msgb_tlv_put(msg, NM_ATT_BS11_PASSWORD, 10, (const uint8_t *)password); return abis_nm_sendmsg(bts, msg); } @@ -2499,7 +2499,7 @@ int abis_nm_bs11_set_pll_locked(struct gsm_bts *bts, int locked) { struct abis_om_hdr *oh; struct msgb *msg; - u_int8_t tlv_value; + uint8_t tlv_value; msg = nm_msgb_alloc(); oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); @@ -2522,7 +2522,7 @@ int abis_nm_bs11_set_pll(struct gsm_bts *bts, int value) { struct abis_om_hdr *oh; struct msgb *msg; - u_int8_t tlv_value[2]; + uint8_t tlv_value[2]; msg = nm_msgb_alloc(); oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); @@ -2549,7 +2549,7 @@ void *tall_fle_ctx; struct abis_nm_bs11_sw { struct gsm_bts *bts; char swl_fname[PATH_MAX]; - u_int8_t win_size; + uint8_t win_size; int forced; struct llist_head file_list; gsm_cbfn *user_cb; /* specified by the user */ @@ -2675,7 +2675,7 @@ static int bs11_swload_cbfn(unsigned int hook, unsigned int event, * files that are part of a software release. We need to upload first * the list file, and then each file that is listed in the list file */ int abis_nm_bs11_load_swl(struct gsm_bts *bts, const char *fname, - u_int8_t win_size, int forced, gsm_cbfn *cbfn) + uint8_t win_size, int forced, gsm_cbfn *cbfn) { struct abis_nm_bs11_sw *bs11_sw = g_bs11_sw; struct file_list_entry *fle; @@ -2705,7 +2705,7 @@ int abis_nm_bs11_load_swl(struct gsm_bts *bts, const char *fname, } #if 0 -static u_int8_t req_attr_btse[] = { +static uint8_t req_attr_btse[] = { NM_ATT_ADM_STATE, NM_ATT_BS11_LMT_LOGON_SESSION, NM_ATT_BS11_LMT_LOGIN_TIME, NM_ATT_BS11_LMT_USER_ACC_LEV, NM_ATT_BS11_LMT_USER_NAME, @@ -2716,14 +2716,14 @@ static u_int8_t req_attr_btse[] = { NM_ATT_BS11_SW_LOAD_STORED }; -static u_int8_t req_attr_btsm[] = { +static uint8_t req_attr_btsm[] = { NM_ATT_ABIS_CHANNEL, NM_ATT_TEI, NM_ATT_BS11_ABIS_EXT_TIME, NM_ATT_ADM_STATE, NM_ATT_AVAIL_STATUS, 0xce, NM_ATT_FILE_ID, NM_ATT_FILE_VERSION, NM_ATT_OPER_STATE, 0xe8, NM_ATT_BS11_ALL_TEST_CATG, NM_ATT_SW_DESCR, NM_ATT_GET_ARI }; #endif -static u_int8_t req_attr[] = { +static uint8_t req_attr[] = { NM_ATT_ADM_STATE, NM_ATT_AVAIL_STATUS, 0xa8, NM_ATT_OPER_STATE, 0xd5, 0xa1, NM_ATT_BS11_ESN_FW_CODE_NO, NM_ATT_BS11_ESN_HW_CODE_NO, 0x42, NM_ATT_BS11_ESN_PCB_SERIAL, NM_ATT_BS11_PLL }; @@ -2753,16 +2753,16 @@ int abis_nm_bs11_set_ext_time(struct gsm_bts *bts) /* SiemensHW CCTRL object */ fill_om_fom_hdr(oh, 2+sizeof(aet), NM_MT_BS11_SET_ATTR, NM_OC_SITE_MANAGER, 0xff, 0xff, 0xff); - msgb_tlv_put(msg, NM_ATT_BS11_ABIS_EXT_TIME, sizeof(aet), (u_int8_t *) &aet); + msgb_tlv_put(msg, NM_ATT_BS11_ABIS_EXT_TIME, sizeof(aet), (uint8_t *) &aet); return abis_nm_sendmsg(bts, msg); } -int abis_nm_bs11_get_bport_line_cfg(struct gsm_bts *bts, u_int8_t bport) +int abis_nm_bs11_get_bport_line_cfg(struct gsm_bts *bts, uint8_t bport) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); - u_int8_t attr = NM_ATT_BS11_LINE_CFG; + uint8_t attr = NM_ATT_BS11_LINE_CFG; oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 2+sizeof(attr), NM_MT_GET_ATTR, @@ -2772,7 +2772,7 @@ int abis_nm_bs11_get_bport_line_cfg(struct gsm_bts *bts, u_int8_t bport) return abis_nm_sendmsg(bts, msg); } -int abis_nm_bs11_set_bport_line_cfg(struct gsm_bts *bts, u_int8_t bport, enum abis_bs11_line_cfg line_cfg) +int abis_nm_bs11_set_bport_line_cfg(struct gsm_bts *bts, uint8_t bport, enum abis_bs11_line_cfg line_cfg) { struct abis_om_hdr *oh; struct msgb *msg = nm_msgb_alloc(); @@ -2796,7 +2796,7 @@ static int abis_nm_rx_ipacc(struct msgb *msg) struct in_addr addr; struct abis_om_hdr *oh = msgb_l2(msg); struct abis_om_fom_hdr *foh; - u_int8_t idstrlen = oh->data[0]; + uint8_t idstrlen = oh->data[0]; struct tlv_parsed tp; struct ipacc_ack_signal_data signal; @@ -2823,7 +2823,7 @@ static int abis_nm_rx_ipacc(struct msgb *msg) } if (TLVP_PRESENT(&tp, NM_ATT_IPACC_DST_IP_PORT)) DEBUGPC(DNM, "PORT=%u ", - ntohs(*((u_int16_t *) + ntohs(*((uint16_t *) TLVP_VAL(&tp, NM_ATT_IPACC_DST_IP_PORT)))); if (TLVP_PRESENT(&tp, NM_ATT_IPACC_STREAM_ID)) DEBUGPC(DNM, "STREAM=0x%02x ", @@ -2900,15 +2900,15 @@ static int abis_nm_rx_ipacc(struct msgb *msg) } /* send an ip-access manufacturer specific message */ -int abis_nm_ipaccess_msg(struct gsm_bts *bts, u_int8_t msg_type, - u_int8_t obj_class, u_int8_t bts_nr, - u_int8_t trx_nr, u_int8_t ts_nr, - u_int8_t *attr, int attr_len) +int abis_nm_ipaccess_msg(struct gsm_bts *bts, uint8_t msg_type, + uint8_t obj_class, uint8_t bts_nr, + uint8_t trx_nr, uint8_t ts_nr, + uint8_t *attr, int attr_len) { struct msgb *msg = nm_msgb_alloc(); struct abis_om_hdr *oh; struct abis_om_fom_hdr *foh; - u_int8_t *data; + uint8_t *data; /* construct the 12.21 OM header, observe the erroneous length */ oh = (struct abis_om_hdr *) msgb_put(msg, sizeof(*oh)); @@ -2937,7 +2937,7 @@ int abis_nm_ipaccess_msg(struct gsm_bts *bts, u_int8_t msg_type, } /* set some attributes in NVRAM */ -int abis_nm_ipaccess_set_nvattr(struct gsm_bts_trx *trx, u_int8_t *attr, +int abis_nm_ipaccess_set_nvattr(struct gsm_bts_trx *trx, uint8_t *attr, int attr_len) { return abis_nm_ipaccess_msg(trx->bts, NM_MT_IPACC_SET_NVATTR, @@ -2946,10 +2946,10 @@ int abis_nm_ipaccess_set_nvattr(struct gsm_bts_trx *trx, u_int8_t *attr, } int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, - u_int32_t ip, u_int16_t port, u_int8_t stream) + uint32_t ip, uint16_t port, uint8_t stream) { struct in_addr ia; - u_int8_t attr[] = { NM_ATT_IPACC_STREAM_ID, 0, + uint8_t attr[] = { NM_ATT_IPACC_STREAM_ID, 0, NM_ATT_IPACC_DST_IP_PORT, 0, 0, NM_ATT_IPACC_DST_IP, 0, 0, 0, 0 }; @@ -2959,7 +2959,7 @@ int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, attr[1] = stream; attr[3] = port >> 8; attr[4] = port & 0xff; - *(u_int32_t *)(attr+6) = ia.s_addr; + *(uint32_t *)(attr+6) = ia.s_addr; /* if ip == 0, we use the default IP */ if (ip == 0) @@ -2986,21 +2986,21 @@ int abis_nm_ipaccess_restart(struct gsm_bts_trx *trx) return abis_nm_sendmsg(trx->bts, msg); } -int abis_nm_ipaccess_set_attr(struct gsm_bts *bts, u_int8_t obj_class, - u_int8_t bts_nr, u_int8_t trx_nr, u_int8_t ts_nr, - u_int8_t *attr, u_int8_t attr_len) +int abis_nm_ipaccess_set_attr(struct gsm_bts *bts, uint8_t obj_class, + uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr, + uint8_t *attr, uint8_t attr_len) { return abis_nm_ipaccess_msg(bts, NM_MT_IPACC_SET_ATTR, obj_class, bts_nr, trx_nr, ts_nr, attr, attr_len); } -void abis_nm_ipaccess_cgi(u_int8_t *buf, struct gsm_bts *bts) +void abis_nm_ipaccess_cgi(uint8_t *buf, struct gsm_bts *bts) { /* we simply reuse the GSM48 function and overwrite the RAC * with the Cell ID */ gsm48_ra_id_by_bts(buf, bts); - *((u_int16_t *)(buf + 5)) = htons(bts->cell_identity); + *((uint16_t *)(buf + 5)) = htons(bts->cell_identity); } void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked) @@ -3025,12 +3025,12 @@ static const struct value_string ipacc_testres_names[] = { { 0, NULL } }; -const char *ipacc_testres_name(u_int8_t res) +const char *ipacc_testres_name(uint8_t res) { return get_value_string(ipacc_testres_names, res); } -void ipac_parse_cgi(struct cell_global_id *cid, const u_int8_t *buf) +void ipac_parse_cgi(struct cell_global_id *cid, const uint8_t *buf) { cid->mcc = (buf[0] & 0xf) * 100; cid->mcc += (buf[0] >> 4) * 10; @@ -3045,15 +3045,15 @@ void ipac_parse_cgi(struct cell_global_id *cid, const u_int8_t *buf) cid->mnc += (buf[1] >> 4) * 1; } - cid->lac = ntohs(*((u_int16_t *)&buf[3])); - cid->ci = ntohs(*((u_int16_t *)&buf[5])); + cid->lac = ntohs(*((uint16_t *)&buf[3])); + cid->ci = ntohs(*((uint16_t *)&buf[5])); } /* parse BCCH information IEI from wire format to struct ipac_bcch_info */ -int ipac_parse_bcch_info(struct ipac_bcch_info *binf, u_int8_t *buf) +int ipac_parse_bcch_info(struct ipac_bcch_info *binf, uint8_t *buf) { - u_int8_t *cur = buf; - u_int16_t len; + uint8_t *cur = buf; + uint16_t len; memset(binf, 0, sizeof(*binf)); @@ -3061,10 +3061,10 @@ int ipac_parse_bcch_info(struct ipac_bcch_info *binf, u_int8_t *buf) return -EINVAL; cur++; - len = ntohs(*(u_int16_t *)cur); + len = ntohs(*(uint16_t *)cur); cur += 2; - binf->info_type = ntohs(*(u_int16_t *)cur); + binf->info_type = ntohs(*(uint16_t *)cur); cur += 2; if (binf->info_type & IPAC_BINF_FREQ_ERR_QUAL) @@ -3082,15 +3082,15 @@ int ipac_parse_bcch_info(struct ipac_bcch_info *binf, u_int8_t *buf) cur++; if (binf->info_type & IPAC_BINF_FREQ_ERR_QUAL) - binf->freq_err = ntohs(*(u_int16_t *)cur); + binf->freq_err = ntohs(*(uint16_t *)cur); cur += 2; if (binf->info_type & IPAC_BINF_FRAME_OFFSET) - binf->frame_offset = ntohs(*(u_int16_t *)cur); + binf->frame_offset = ntohs(*(uint16_t *)cur); cur += 2; if (binf->info_type & IPAC_BINF_FRAME_NR_OFFSET) - binf->frame_nr_offset = ntohl(*(u_int32_t *)cur); + binf->frame_nr_offset = ntohl(*(uint32_t *)cur); cur += 4; #if 0 diff --git a/openbsc/src/libbsc/abis_nm_ipaccess.c b/openbsc/src/libbsc/abis_nm_ipaccess.c index 754efe28d..b8225383a 100644 --- a/openbsc/src/libbsc/abis_nm_ipaccess.c +++ b/openbsc/src/libbsc/abis_nm_ipaccess.c @@ -63,12 +63,12 @@ enum ipa_embedded_att { }; /* append an ip.access channel list to the given msgb */ -static int ipa_chan_list_append(struct msgb *msg, u_int8_t ie, - u_int16_t *arfcns, int arfcn_count) +static int ipa_chan_list_append(struct msgb *msg, uint8_t ie, + uint16_t *arfcns, int arfcn_count) { int i; - u_int8_t *u8; - u_int16_t *u16; + uint8_t *u8; + uint16_t *u16; /* tag */ u8 = msgb_push(msg, 1); diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c index c1aef9f78..7743cd803 100644 --- a/openbsc/src/libbsc/abis_om2000.c +++ b/openbsc/src/libbsc/abis_om2000.c @@ -631,7 +631,7 @@ static struct msgb *om2k_msgb_alloc(void) "OM2000"); } -static int abis_om2k_tlv_parse(struct tlv_parsed *tp, const u_int8_t *buf, int len) +static int abis_om2k_tlv_parse(struct tlv_parsed *tp, const uint8_t *buf, int len) { return tlv_parse(tp, &om2k_att_tlvdef, buf, len, 0, 0); } diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index 8cac83285..70a4e9938 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -59,7 +59,7 @@ static void send_lchan_signal(int sig_no, struct gsm_lchan *lchan, dispatch_signal(SS_LCHAN, sig_no, &sig); } -static u_int8_t mdisc_by_msgtype(u_int8_t msg_type) +static uint8_t mdisc_by_msgtype(uint8_t msg_type) { /* mask off the transparent bit ? */ msg_type &= 0xfe; @@ -79,7 +79,7 @@ static u_int8_t mdisc_by_msgtype(u_int8_t msg_type) } static inline void init_dchan_hdr(struct abis_rsl_dchan_hdr *dh, - u_int8_t msg_type) + uint8_t msg_type) { dh->c.msg_discr = mdisc_by_msgtype(msg_type); dh->c.msg_type = msg_type; @@ -87,12 +87,12 @@ static inline void init_dchan_hdr(struct abis_rsl_dchan_hdr *dh, } /* determine logical channel based on TRX and channel number IE */ -struct gsm_lchan *lchan_lookup(struct gsm_bts_trx *trx, u_int8_t chan_nr) +struct gsm_lchan *lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr) { struct gsm_lchan *lchan; - u_int8_t ts_nr = chan_nr & 0x07; - u_int8_t cbits = chan_nr >> 3; - u_int8_t lch_idx; + uint8_t ts_nr = chan_nr & 0x07; + uint8_t cbits = chan_nr >> 3; + uint8_t lch_idx; struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; if (cbits == 0x01) { @@ -138,9 +138,9 @@ struct gsm_lchan *lchan_lookup(struct gsm_bts_trx *trx, u_int8_t chan_nr) } /* See Table 10.5.25 of GSM04.08 */ -static u_int8_t ts2chan_nr(const struct gsm_bts_trx_ts *ts, uint8_t lchan_nr) +static uint8_t ts2chan_nr(const struct gsm_bts_trx_ts *ts, uint8_t lchan_nr) { - u_int8_t cbits, chan_nr; + uint8_t cbits, chan_nr; switch (ts->pchan) { case GSM_PCHAN_TCH_F: @@ -171,15 +171,15 @@ static u_int8_t ts2chan_nr(const struct gsm_bts_trx_ts *ts, uint8_t lchan_nr) return chan_nr; } -u_int8_t lchan2chan_nr(const struct gsm_lchan *lchan) +uint8_t lchan2chan_nr(const struct gsm_lchan *lchan) { return ts2chan_nr(lchan->ts, lchan->nr); } /* As per TS 03.03 Section 2.2, the IMSI has 'not more than 15 digits' */ -u_int64_t str_to_imsi(const char *imsi_str) +uint64_t str_to_imsi(const char *imsi_str) { - u_int64_t ret; + uint64_t ret; ret = strtoull(imsi_str, NULL, 10); @@ -196,14 +196,14 @@ unsigned int n_pag_blocks(int bs_ccch_sdcch_comb, unsigned int bs_ag_blks_res) } /* Chapter 6.5.2 of TS 05.02 */ -unsigned int get_ccch_group(u_int64_t imsi, unsigned int bs_cc_chans, +unsigned int get_ccch_group(uint64_t imsi, unsigned int bs_cc_chans, unsigned int n_pag_blocks) { return (imsi % 1000) % (bs_cc_chans * n_pag_blocks) / n_pag_blocks; } /* Chapter 6.5.2 of TS 05.02 */ -unsigned int get_paging_group(u_int64_t imsi, unsigned int bs_cc_chans, +unsigned int get_paging_group(uint64_t imsi, unsigned int bs_cc_chans, int n_pag_blocks) { return (imsi % 1000) % (bs_cc_chans * n_pag_blocks) % n_pag_blocks; @@ -216,7 +216,7 @@ static struct msgb *rsl_msgb_alloc(void) } #define MACBLOCK_SIZE 23 -static void pad_macblock(u_int8_t *out, const u_int8_t *in, int len) +static void pad_macblock(uint8_t *out, const uint8_t *in, int len) { memcpy(out, in, len); @@ -225,7 +225,7 @@ static void pad_macblock(u_int8_t *out, const u_int8_t *in, int len) } /* Chapter 9.3.7: Encryption Information */ -static int build_encr_info(u_int8_t *out, struct gsm_lchan *lchan) +static int build_encr_info(uint8_t *out, struct gsm_lchan *lchan) { *out++ = lchan->encr.alg_id & 0xff; if (lchan->encr.key_len) @@ -233,7 +233,7 @@ static int build_encr_info(u_int8_t *out, struct gsm_lchan *lchan) return lchan->encr.key_len + 1; } -static void print_rsl_cause(int lvl, const u_int8_t *cause_v, u_int8_t cause_len) +static void print_rsl_cause(int lvl, const uint8_t *cause_v, uint8_t cause_len) { int i; @@ -244,8 +244,8 @@ static void print_rsl_cause(int lvl, const u_int8_t *cause_v, u_int8_t cause_len } /* Send a BCCH_INFO message as per Chapter 8.5.1 */ -int rsl_bcch_info(struct gsm_bts_trx *trx, u_int8_t type, - const u_int8_t *data, int len) +int rsl_bcch_info(struct gsm_bts_trx *trx, uint8_t type, + const uint8_t *data, int len) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg = rsl_msgb_alloc(); @@ -262,8 +262,8 @@ int rsl_bcch_info(struct gsm_bts_trx *trx, u_int8_t type, return abis_rsl_sendmsg(msg); } -int rsl_sacch_filling(struct gsm_bts_trx *trx, u_int8_t type, - const u_int8_t *data, int len) +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, + const uint8_t *data, int len) { struct abis_rsl_common_hdr *ch; struct msgb *msg = rsl_msgb_alloc(); @@ -280,12 +280,12 @@ int rsl_sacch_filling(struct gsm_bts_trx *trx, u_int8_t type, return abis_rsl_sendmsg(msg); } -int rsl_sacch_info_modify(struct gsm_lchan *lchan, u_int8_t type, - const u_int8_t *data, int len) +int rsl_sacch_info_modify(struct gsm_lchan *lchan, uint8_t type, + const uint8_t *data, int len) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg = rsl_msgb_alloc(); - u_int8_t chan_nr = lchan2chan_nr(lchan); + uint8_t chan_nr = lchan2chan_nr(lchan); dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); init_dchan_hdr(dh, RSL_MT_SACCH_INFO_MODIFY); @@ -303,7 +303,7 @@ int rsl_chan_bs_power_ctrl(struct gsm_lchan *lchan, unsigned int fpc, int db) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg; - u_int8_t chan_nr = lchan2chan_nr(lchan); + uint8_t chan_nr = lchan2chan_nr(lchan); db = abs(db); if (db > 30) @@ -330,7 +330,7 @@ int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan, unsigned int fpc, int dbm) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg; - u_int8_t chan_nr = lchan2chan_nr(lchan); + uint8_t chan_nr = lchan2chan_nr(lchan); int ctl_lvl; ctl_lvl = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, dbm); @@ -421,12 +421,12 @@ static int channel_mode_from_lchan(struct rsl_ie_chan_mode *cm, /* Chapter 8.4.1 */ #if 0 -int rsl_chan_activate(struct gsm_bts_trx *trx, u_int8_t chan_nr, - u_int8_t act_type, +int rsl_chan_activate(struct gsm_bts_trx *trx, uint8_t chan_nr, + uint8_t act_type, struct rsl_ie_chan_mode *chan_mode, struct rsl_ie_chan_ident *chan_ident, - u_int8_t bs_power, u_int8_t ms_power, - u_int8_t ta) + uint8_t bs_power, uint8_t ms_power, + uint8_t ta) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg = rsl_msgb_alloc(); @@ -438,12 +438,12 @@ int rsl_chan_activate(struct gsm_bts_trx *trx, u_int8_t chan_nr, msgb_tv_put(msg, RSL_IE_ACT_TYPE, act_type); /* For compatibility with Phase 1 */ msgb_tlv_put(msg, RSL_IE_CHAN_MODE, sizeof(*chan_mode), - (u_int8_t *) chan_mode); + (uint8_t *) chan_mode); msgb_tlv_put(msg, RSL_IE_CHAN_IDENT, 4, - (u_int8_t *) chan_ident); + (uint8_t *) chan_ident); #if 0 msgb_tlv_put(msg, RSL_IE_ENCR_INFO, 1, - (u_int8_t *) &encr_info); + (uint8_t *) &encr_info); #endif msgb_tv_put(msg, RSL_IE_BS_POWER, bs_power); msgb_tv_put(msg, RSL_IE_MS_POWER, ms_power); @@ -455,15 +455,15 @@ int rsl_chan_activate(struct gsm_bts_trx *trx, u_int8_t chan_nr, } #endif -int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type, - u_int8_t ta, u_int8_t ho_ref) +int rsl_chan_activate_lchan(struct gsm_lchan *lchan, uint8_t act_type, + uint8_t ta, uint8_t ho_ref) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg; int rc; uint8_t *len; - u_int8_t chan_nr = lchan2chan_nr(lchan); + uint8_t chan_nr = lchan2chan_nr(lchan); struct rsl_ie_chan_mode cm; struct gsm48_chan_desc cd; @@ -481,7 +481,7 @@ int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type, msgb_tv_put(msg, RSL_IE_ACT_TYPE, act_type); msgb_tlv_put(msg, RSL_IE_CHAN_MODE, sizeof(cm), - (u_int8_t *) &cm); + (uint8_t *) &cm); /* * The Channel Identification is needed for Phase1 phones @@ -505,7 +505,7 @@ int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type, *len = msgb_l3len(msg); if (lchan->encr.alg_id > RSL_ENC_ALG_A5(0)) { - u_int8_t encr_info[MAX_A5_KEY_LEN+2]; + uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) msgb_tlv_put(msg, RSL_IE_ENCR_INFO, rc, encr_info); @@ -526,7 +526,7 @@ int rsl_chan_activate_lchan(struct gsm_lchan *lchan, u_int8_t act_type, if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) msgb_tlv_put(msg, RSL_IE_MR_CONFIG, sizeof(lchan->mr_conf), - (u_int8_t *) &lchan->mr_conf); + (uint8_t *) &lchan->mr_conf); msg->trx = lchan->ts->trx; @@ -540,7 +540,7 @@ int rsl_chan_mode_modify_req(struct gsm_lchan *lchan) struct msgb *msg; int rc; - u_int8_t chan_nr = lchan2chan_nr(lchan); + uint8_t chan_nr = lchan2chan_nr(lchan); struct rsl_ie_chan_mode cm; rc = channel_mode_from_lchan(&cm, lchan); @@ -553,10 +553,10 @@ int rsl_chan_mode_modify_req(struct gsm_lchan *lchan) dh->chan_nr = chan_nr; msgb_tlv_put(msg, RSL_IE_CHAN_MODE, sizeof(cm), - (u_int8_t *) &cm); + (uint8_t *) &cm); if (lchan->encr.alg_id > RSL_ENC_ALG_A5(0)) { - u_int8_t encr_info[MAX_A5_KEY_LEN+2]; + uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) msgb_tlv_put(msg, RSL_IE_ENCR_INFO, rc, encr_info); @@ -564,7 +564,7 @@ int rsl_chan_mode_modify_req(struct gsm_lchan *lchan) if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) { msgb_tlv_put(msg, RSL_IE_MR_CONFIG, sizeof(lchan->mr_conf), - (u_int8_t *) &lchan->mr_conf); + (uint8_t *) &lchan->mr_conf); } msg->trx = lchan->ts->trx; @@ -577,9 +577,9 @@ int rsl_encryption_cmd(struct msgb *msg) { struct abis_rsl_dchan_hdr *dh; struct gsm_lchan *lchan = msg->lchan; - u_int8_t chan_nr = lchan2chan_nr(lchan); - u_int8_t encr_info[MAX_A5_KEY_LEN+2]; - u_int8_t l3_len = msg->len; + uint8_t chan_nr = lchan2chan_nr(lchan); + uint8_t encr_info[MAX_A5_KEY_LEN+2]; + uint8_t l3_len = msg->len; int rc; /* First push the L3 IE tag and length */ @@ -704,8 +704,8 @@ static int rsl_rx_rf_chan_rel_ack(struct gsm_lchan *lchan) return 0; } -int rsl_paging_cmd(struct gsm_bts *bts, u_int8_t paging_group, u_int8_t len, - u_int8_t *ms_ident, u_int8_t chan_needed) +int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group, uint8_t len, + uint8_t *ms_ident, uint8_t chan_needed) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg = rsl_msgb_alloc(); @@ -723,7 +723,7 @@ int rsl_paging_cmd(struct gsm_bts *bts, u_int8_t paging_group, u_int8_t len, return abis_rsl_sendmsg(msg); } -int imsi_str2bcd(u_int8_t *bcd_out, const char *str_in) +int imsi_str2bcd(uint8_t *bcd_out, const char *str_in) { int i, len = strlen(str_in); @@ -741,11 +741,11 @@ int imsi_str2bcd(u_int8_t *bcd_out, const char *str_in) } /* Chapter 8.5.6 */ -int rsl_imm_assign_cmd(struct gsm_bts *bts, u_int8_t len, u_int8_t *val) +int rsl_imm_assign_cmd(struct gsm_bts *bts, uint8_t len, uint8_t *val) { struct msgb *msg = rsl_msgb_alloc(); struct abis_rsl_dchan_hdr *dh; - u_int8_t buf[MACBLOCK_SIZE]; + uint8_t buf[MACBLOCK_SIZE]; dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); init_dchan_hdr(dh, RSL_MT_IMMEDIATE_ASSIGN_CMD); @@ -777,10 +777,10 @@ int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci) init_dchan_hdr(dh, RSL_MT_SIEMENS_MRPCI); dh->c.msg_discr = ABIS_RSL_MDISC_DED_CHAN; dh->chan_nr = lchan2chan_nr(lchan); - msgb_tv_put(msg, RSL_IE_SIEMENS_MRPCI, *(u_int8_t *)mrpci); + msgb_tv_put(msg, RSL_IE_SIEMENS_MRPCI, *(uint8_t *)mrpci); DEBUGP(DRSL, "%s TX Siemens MRPCI 0x%02x\n", - gsm_lchan_name(lchan), *(u_int8_t *)mrpci); + gsm_lchan_name(lchan), *(uint8_t *)mrpci); msg->trx = lchan->ts->trx; @@ -790,7 +790,7 @@ int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci) /* Send "DATA REQUEST" message with given L3 Info payload */ /* Chapter 8.3.1 */ -int rsl_data_request(struct msgb *msg, u_int8_t link_id) +int rsl_data_request(struct msgb *msg, uint8_t link_id) { if (msg->lchan == NULL) { LOGP(DRSL, LOGL_ERROR, "cannot send DATA REQUEST to unknown lchan\n"); @@ -807,7 +807,7 @@ int rsl_data_request(struct msgb *msg, u_int8_t link_id) /* Send "ESTABLISH REQUEST" message with given L3 Info payload */ /* Chapter 8.3.1 */ -int rsl_establish_request(struct gsm_lchan *lchan, u_int8_t link_id) +int rsl_establish_request(struct gsm_lchan *lchan, uint8_t link_id) { struct msgb *msg; @@ -823,7 +823,7 @@ int rsl_establish_request(struct gsm_lchan *lchan, u_int8_t link_id) RELEASE CONFIRM, which we in turn use to trigger RSL CHANNEL RELEASE, which in turn is acknowledged by RSL CHANNEL RELEASE ACK, which calls lchan_free() */ -int rsl_release_request(struct gsm_lchan *lchan, u_int8_t link_id, u_int8_t reason) +int rsl_release_request(struct gsm_lchan *lchan, uint8_t link_id, uint8_t reason) { struct msgb *msg; @@ -889,7 +889,7 @@ static int rsl_rx_chan_act_nack(struct msgb *msg) rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); if (TLVP_PRESENT(&tp, RSL_IE_CAUSE)) { - const u_int8_t *cause = TLVP_VAL(&tp, RSL_IE_CAUSE); + const uint8_t *cause = TLVP_VAL(&tp, RSL_IE_CAUSE); print_rsl_cause(LOGL_ERROR, cause, TLVP_LEN(&tp, RSL_IE_CAUSE)); if (*cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) @@ -982,8 +982,8 @@ static int rsl_rx_meas_res(struct msgb *msg) struct abis_rsl_dchan_hdr *dh = msgb_l2(msg); struct tlv_parsed tp; struct gsm_meas_rep *mr = lchan_next_meas_rep(msg->lchan); - u_int8_t len; - const u_int8_t *val; + uint8_t len; + const uint8_t *val; int rc; /* check if this channel is actually active */ @@ -1034,7 +1034,7 @@ static int rsl_rx_meas_res(struct msgb *msg) mr->ms_l1.ta = val[1]; } if (TLVP_PRESENT(&tp, RSL_IE_L3_INFO)) { - msg->l3h = (u_int8_t *) TLVP_VAL(&tp, RSL_IE_L3_INFO); + msg->l3h = (uint8_t *) TLVP_VAL(&tp, RSL_IE_L3_INFO); rc = gsm48_parse_meas_rep(mr, msg); if (rc < 0) return rc; @@ -1247,11 +1247,11 @@ static int rsl_rx_chan_rqd(struct msgb *msg) enum gsm_chan_t lctype; enum gsm_chreq_reason_t chreq_reason; struct gsm_lchan *lchan; - u_int8_t rqd_ta; + uint8_t rqd_ta; int is_lu; - u_int16_t arfcn; - u_int8_t ts_number, subch; + uint16_t arfcn; + uint8_t ts_number, subch; /* parse request reference to be used in immediate assign */ if (rqd_hdr->data[0] != RSL_IE_REQ_REFERENCE) @@ -1329,7 +1329,7 @@ static int rsl_rx_chan_rqd(struct msgb *msg) static int rsl_send_imm_assignment(struct gsm_lchan *lchan) { struct gsm_bts *bts = lchan->ts->trx->bts; - u_int8_t buf[GSM_MACBLOCK_LEN]; + uint8_t buf[GSM_MACBLOCK_LEN]; struct gsm48_imm_ass *ia = (struct gsm48_imm_ass *) buf; /* create IMMEDIATE ASSIGN 04.08 messge */ @@ -1358,17 +1358,17 @@ static int rsl_send_imm_assignment(struct gsm_lchan *lchan) bsc_schedule_timer(&lchan->T3101, bts->network->T3101, 0); /* send IMMEDIATE ASSIGN CMD on RSL to BTS (to send on CCCH to MS) */ - return rsl_imm_assign_cmd(bts, sizeof(*ia)+ia->mob_alloc_len, (u_int8_t *) ia); + return rsl_imm_assign_cmd(bts, sizeof(*ia)+ia->mob_alloc_len, (uint8_t *) ia); } /* MS has requested a channel on the RACH */ static int rsl_rx_ccch_load(struct msgb *msg) { struct abis_rsl_dchan_hdr *rslh = msgb_l2(msg); - u_int16_t pg_buf_space; - u_int16_t rach_slot_count = -1; - u_int16_t rach_busy_count = -1; - u_int16_t rach_access_count = -1; + uint16_t pg_buf_space; + uint16_t rach_slot_count = -1; + uint16_t rach_busy_count = -1; + uint16_t rach_access_count = -1; switch (rslh->data[0]) { case RSL_IE_PAGING_LOAD: @@ -1428,7 +1428,7 @@ static int abis_rsl_rx_cchan(struct msgb *msg) static int rsl_rx_rll_err_ind(struct msgb *msg) { struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); - u_int8_t *rlm_cause = rllh->data; + uint8_t *rlm_cause = rllh->data; LOGP(DRLL, LOGL_ERROR, "%s ERROR INDICATION cause=%s\n", gsm_lchan_name(msg->lchan), @@ -1481,7 +1481,7 @@ static int abis_rsl_rx_rll(struct msgb *msg) struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); int rc = 0; char *ts_name; - u_int8_t sapi = rllh->link_id & 7; + uint8_t sapi = rllh->link_id & 7; msg->lchan = lchan_lookup(msg->trx, rllh->chan_nr); ts_name = gsm_lchan_name(msg->lchan); @@ -1546,7 +1546,7 @@ static int abis_rsl_rx_rll(struct msgb *msg) return rc; } -static u_int8_t ipa_smod_s_for_lchan(struct gsm_lchan *lchan) +static uint8_t ipa_smod_s_for_lchan(struct gsm_lchan *lchan) { switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: @@ -1583,7 +1583,7 @@ static u_int8_t ipa_smod_s_for_lchan(struct gsm_lchan *lchan) return 0; } -static u_int8_t ipa_rtp_pt_for_lchan(struct gsm_lchan *lchan) +static uint8_t ipa_rtp_pt_for_lchan(struct gsm_lchan *lchan) { struct gsm_network *net = lchan->ts->trx->bts->network; @@ -1631,23 +1631,23 @@ static u_int8_t ipa_rtp_pt_for_lchan(struct gsm_lchan *lchan) static void ipac_parse_rtp(struct gsm_lchan *lchan, struct tlv_parsed *tv) { struct in_addr ip; - u_int16_t port, conn_id; + uint16_t port, conn_id; if (TLVP_PRESENT(tv, RSL_IE_IPAC_LOCAL_IP)) { - ip.s_addr = *((u_int32_t *) TLVP_VAL(tv, RSL_IE_IPAC_LOCAL_IP)); + ip.s_addr = *((uint32_t *) TLVP_VAL(tv, RSL_IE_IPAC_LOCAL_IP)); DEBUGPC(DRSL, "LOCAL_IP=%s ", inet_ntoa(ip)); lchan->abis_ip.bound_ip = ntohl(ip.s_addr); } if (TLVP_PRESENT(tv, RSL_IE_IPAC_LOCAL_PORT)) { - port = *((u_int16_t *) TLVP_VAL(tv, RSL_IE_IPAC_LOCAL_PORT)); + port = *((uint16_t *) TLVP_VAL(tv, RSL_IE_IPAC_LOCAL_PORT)); port = ntohs(port); DEBUGPC(DRSL, "LOCAL_PORT=%u ", port); lchan->abis_ip.bound_port = port; } if (TLVP_PRESENT(tv, RSL_IE_IPAC_CONN_ID)) { - conn_id = *((u_int16_t *) TLVP_VAL(tv, RSL_IE_IPAC_CONN_ID)); + conn_id = *((uint16_t *) TLVP_VAL(tv, RSL_IE_IPAC_CONN_ID)); conn_id = ntohs(conn_id); DEBUGPC(DRSL, "CON_ID=%u ", conn_id); lchan->abis_ip.conn_id = conn_id; @@ -1668,13 +1668,13 @@ static void ipac_parse_rtp(struct gsm_lchan *lchan, struct tlv_parsed *tv) } if (TLVP_PRESENT(tv, RSL_IE_IPAC_REMOTE_IP)) { - ip.s_addr = *((u_int32_t *) TLVP_VAL(tv, RSL_IE_IPAC_REMOTE_IP)); + ip.s_addr = *((uint32_t *) TLVP_VAL(tv, RSL_IE_IPAC_REMOTE_IP)); DEBUGPC(DRSL, "REMOTE_IP=%s ", inet_ntoa(ip)); lchan->abis_ip.connect_ip = ntohl(ip.s_addr); } if (TLVP_PRESENT(tv, RSL_IE_IPAC_REMOTE_PORT)) { - port = *((u_int16_t *) TLVP_VAL(tv, RSL_IE_IPAC_REMOTE_PORT)); + port = *((uint16_t *) TLVP_VAL(tv, RSL_IE_IPAC_REMOTE_PORT)); port = ntohs(port); DEBUGPC(DRSL, "REMOTE_PORT=%u ", port); lchan->abis_ip.connect_port = port; @@ -1706,12 +1706,12 @@ int rsl_ipacc_crcx(struct gsm_lchan *lchan) return abis_rsl_sendmsg(msg); } -int rsl_ipacc_mdcx(struct gsm_lchan *lchan, u_int32_t ip, u_int16_t port, - u_int8_t rtp_payload2) +int rsl_ipacc_mdcx(struct gsm_lchan *lchan, uint32_t ip, uint16_t port, + uint8_t rtp_payload2) { struct msgb *msg = rsl_msgb_alloc(); struct abis_rsl_dchan_hdr *dh; - u_int32_t *att_ip; + uint32_t *att_ip; struct in_addr ia; dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); @@ -1736,7 +1736,7 @@ int rsl_ipacc_mdcx(struct gsm_lchan *lchan, u_int32_t ip, u_int16_t port, msgb_tv16_put(msg, RSL_IE_IPAC_CONN_ID, lchan->abis_ip.conn_id); msgb_v_put(msg, RSL_IE_IPAC_REMOTE_IP); - att_ip = (u_int32_t *) msgb_put(msg, sizeof(ip)); + att_ip = (uint32_t *) msgb_put(msg, sizeof(ip)); *att_ip = ia.s_addr; msgb_tv16_put(msg, RSL_IE_IPAC_REMOTE_PORT, port); msgb_tv_put(msg, RSL_IE_IPAC_SPEECH_MODE, lchan->abis_ip.speech_mode); @@ -1767,7 +1767,7 @@ int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act) { struct msgb *msg = rsl_msgb_alloc(); struct abis_rsl_dchan_hdr *dh; - u_int8_t msg_type; + uint8_t msg_type; if (act) msg_type = RSL_MT_IPAC_PDCH_ACT; diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index bbd9b5841..4b48ec69b 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -47,9 +47,9 @@ static void handle_chan_ack(struct gsm_subscriber_connection *conn, struct bsc_a static void handle_chan_nack(struct gsm_subscriber_connection *conn, struct bsc_api *bsc, struct gsm_lchan *lchan); /* GSM 08.08 3.2.2.33 */ -static u_int8_t lchan_to_chosen_channel(struct gsm_lchan *lchan) +static uint8_t lchan_to_chosen_channel(struct gsm_lchan *lchan) { - u_int8_t channel_mode = 0, channel = 0; + uint8_t channel_mode = 0, channel = 0; switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: @@ -95,7 +95,7 @@ static u_int8_t lchan_to_chosen_channel(struct gsm_lchan *lchan) return channel_mode << 4 | channel; } -static u_int8_t chan_mode_to_speech(struct gsm_lchan *lchan) +static uint8_t chan_mode_to_speech(struct gsm_lchan *lchan) { int mode = 0; diff --git a/openbsc/src/libbsc/bsc_msc.c b/openbsc/src/libbsc/bsc_msc.c index e9a51131b..aa084b83e 100644 --- a/openbsc/src/libbsc/bsc_msc.c +++ b/openbsc/src/libbsc/bsc_msc.c @@ -254,6 +254,6 @@ struct msgb *bsc_msc_id_get_resp(const char *token) msg->l2h = msgb_v_put(msg, IPAC_MSGT_ID_RESP); msgb_l16tv_put(msg, strlen(token) + 1, - IPAC_IDTAG_UNITNAME, (u_int8_t *) token); + IPAC_IDTAG_UNITNAME, (uint8_t *) token); return msg; } diff --git a/openbsc/src/libbsc/bsc_rll.c b/openbsc/src/libbsc/bsc_rll.c index f3eef99da..b02394a59 100644 --- a/openbsc/src/libbsc/bsc_rll.c +++ b/openbsc/src/libbsc/bsc_rll.c @@ -37,9 +37,9 @@ struct bsc_rll_req { struct timer_list timer; struct gsm_lchan *lchan; - u_int8_t link_id; + uint8_t link_id; - void (*cb)(struct gsm_lchan *lchan, u_int8_t link_id, + void (*cb)(struct gsm_lchan *lchan, uint8_t link_id, void *data, enum bsc_rllr_ind); void *data; }; @@ -64,13 +64,13 @@ static void timer_cb(void *_rllr) } /* establish a RLL connection with given SAPI / priority */ -int rll_establish(struct gsm_lchan *lchan, u_int8_t sapi, - void (*cb)(struct gsm_lchan *, u_int8_t, void *, +int rll_establish(struct gsm_lchan *lchan, uint8_t sapi, + void (*cb)(struct gsm_lchan *, uint8_t, void *, enum bsc_rllr_ind), void *data) { struct bsc_rll_req *rllr = talloc_zero(tall_bsc_ctx, struct bsc_rll_req); - u_int8_t link_id; + uint8_t link_id; if (!rllr) return -ENOMEM; @@ -100,7 +100,7 @@ int rll_establish(struct gsm_lchan *lchan, u_int8_t sapi, /* Called from RSL code in case we have received an indication regarding * any RLL link */ -void rll_indication(struct gsm_lchan *lchan, u_int8_t link_id, u_int8_t type) +void rll_indication(struct gsm_lchan *lchan, uint8_t link_id, uint8_t type) { struct bsc_rll_req *rllr, *rllr2; diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c index e4d9a0421..c579c7580 100644 --- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c +++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c @@ -182,8 +182,8 @@ static void patch_32(uint8_t *data, const uint32_t val) */ static void patch_nm_tables(struct gsm_bts *bts) { - u_int8_t arfcn_low = bts->c0->arfcn & 0xff; - u_int8_t arfcn_high = (bts->c0->arfcn >> 8) & 0x0f; + uint8_t arfcn_low = bts->c0->arfcn & 0xff; + uint8_t arfcn_high = (bts->c0->arfcn >> 8) & 0x0f; /* patch ARFCN into BTS Attributes */ nanobts_attr_bts[42] &= 0xf0; @@ -196,8 +196,8 @@ static void patch_nm_tables(struct gsm_bts *bts) } if (bts->rach_ldavg_slots != -1) { - u_int8_t avg_high = bts->rach_ldavg_slots & 0xff; - u_int8_t avg_low = (bts->rach_ldavg_slots >> 8) & 0x0f; + uint8_t avg_high = bts->rach_ldavg_slots & 0xff; + uint8_t avg_low = (bts->rach_ldavg_slots >> 8) & 0x0f; nanobts_attr_bts[35] = avg_high; nanobts_attr_bts[36] = avg_low; @@ -249,7 +249,7 @@ static void patch_nm_tables(struct gsm_bts *bts) /* Callback function to be called whenever we get a GSM 12.21 state change event */ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) { - u_int8_t obj_class = nsd->obj_class; + uint8_t obj_class = nsd->obj_class; void *obj = nsd->obj; struct gsm_nm_state *new_state = nsd->new_state; diff --git a/openbsc/src/libbsc/bts_siemens_bs11.c b/openbsc/src/libbsc/bts_siemens_bs11.c index 0ab42e89a..0a4c24717 100644 --- a/openbsc/src/libbsc/bts_siemens_bs11.c +++ b/openbsc/src/libbsc/bts_siemens_bs11.c @@ -346,8 +346,8 @@ static unsigned char bs11_attr_radio[] = */ static void patch_nm_tables(struct gsm_bts *bts) { - u_int8_t arfcn_low = bts->c0->arfcn & 0xff; - u_int8_t arfcn_high = (bts->c0->arfcn >> 8) & 0x0f; + uint8_t arfcn_low = bts->c0->arfcn & 0xff; + uint8_t arfcn_high = (bts->c0->arfcn >> 8) & 0x0f; /* patch ARFCN into BTS Attributes */ bs11_attr_bts[69] &= 0xf0; @@ -364,8 +364,8 @@ static void patch_nm_tables(struct gsm_bts *bts) bs11_attr_bts[33] = bts->rach_b_thresh & 0xff; if (bts->rach_ldavg_slots != -1) { - u_int8_t avg_high = bts->rach_ldavg_slots & 0xff; - u_int8_t avg_low = (bts->rach_ldavg_slots >> 8) & 0x0f; + uint8_t avg_high = bts->rach_ldavg_slots & 0xff; + uint8_t avg_low = (bts->rach_ldavg_slots >> 8) & 0x0f; bs11_attr_bts[35] = avg_high; bs11_attr_bts[36] = avg_low; @@ -425,9 +425,9 @@ static void nm_reconfig_trx(struct gsm_bts_trx *trx) abis_nm_set_radio_attr(trx, bs11_attr_radio, sizeof(bs11_attr_radio)); else { - u_int8_t trx1_attr_radio[sizeof(bs11_attr_radio)]; - u_int8_t arfcn_low = trx->arfcn & 0xff; - u_int8_t arfcn_high = (trx->arfcn >> 8) & 0x0f; + uint8_t trx1_attr_radio[sizeof(bs11_attr_radio)]; + uint8_t arfcn_low = trx->arfcn & 0xff; + uint8_t arfcn_high = (trx->arfcn >> 8) & 0x0f; memcpy(trx1_attr_radio, bs11_attr_radio, sizeof(trx1_attr_radio)); diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index f12e21b7b..b794132a6 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -143,7 +143,7 @@ void ts_free(struct gsm_bts_trx_ts *ts) ts->pchan = GSM_PCHAN_NONE; } -static const u_int8_t subslots_per_pchan[] = { +static const uint8_t subslots_per_pchan[] = { [GSM_PCHAN_NONE] = 0, [GSM_PCHAN_CCCH] = 0, [GSM_PCHAN_CCCH_SDCCH4] = 4, @@ -370,7 +370,7 @@ static int _lchan_release_next_sapi(struct gsm_lchan *lchan) int sapi; for (sapi = 1; sapi < ARRAY_SIZE(lchan->sapis); ++sapi) { - u_int8_t link_id; + uint8_t link_id; if (lchan->sapis[sapi] == LCHAN_SAPI_UNUSED) continue; @@ -401,7 +401,7 @@ static void _lchan_handle_release(struct gsm_lchan *lchan) } /* called from abis rsl */ -int rsl_lchan_rll_release(struct gsm_lchan *lchan, u_int8_t link_id) +int rsl_lchan_rll_release(struct gsm_lchan *lchan, uint8_t link_id) { if (lchan->state != LCHAN_S_REL_REQ) return -1; diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c index 1aab2eed4..1cff1d9c2 100644 --- a/openbsc/src/libbsc/gsm_04_08_utils.c +++ b/openbsc/src/libbsc/gsm_04_08_utils.c @@ -52,8 +52,8 @@ static int gsm48_sendmsg(struct msgb *msg) /* Section 9.1.8 / Table 9.9 */ struct chreq { - u_int8_t val; - u_int8_t mask; + uint8_t val; + uint8_t mask; enum chreq_type type; }; @@ -166,7 +166,7 @@ void gsm_net_update_ctype(struct gsm_network *network) } } -enum gsm_chan_t get_ctype_by_chreq(struct gsm_network *network, u_int8_t ra) +enum gsm_chan_t get_ctype_by_chreq(struct gsm_network *network, uint8_t ra) { int i; int length; @@ -190,7 +190,7 @@ enum gsm_chan_t get_ctype_by_chreq(struct gsm_network *network, u_int8_t ra) return GSM_LCHAN_SDCCH; } -enum gsm_chreq_reason_t get_reason_by_chreq(u_int8_t ra, int neci) +enum gsm_chreq_reason_t get_reason_by_chreq(uint8_t ra, int neci) { int i; int length; @@ -218,7 +218,7 @@ int gsm48_send_rr_release(struct gsm_lchan *lchan) { struct msgb *msg = gsm48_msgb_alloc(); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); - u_int8_t *cause; + uint8_t *cause; msg->lchan = lchan; gh->proto_discr = GSM48_PDISC_RR; @@ -239,7 +239,7 @@ int gsm48_send_rr_release(struct gsm_lchan *lchan) } int send_siemens_mrpci(struct gsm_lchan *lchan, - u_int8_t *classmark2_lv) + uint8_t *classmark2_lv) { struct rsl_mrpci mrpci; @@ -260,7 +260,7 @@ int gsm48_extract_mi(uint8_t *classmark2_lv, int length, char *mi_string, uint8_ if (length < 1 + *classmark2_lv) return -1; - u_int8_t *mi_lv = classmark2_lv + *classmark2_lv + 1; + uint8_t *mi_lv = classmark2_lv + *classmark2_lv + 1; if (length < 2 + *classmark2_lv + mi_lv[0]) return -2; @@ -269,11 +269,11 @@ int gsm48_extract_mi(uint8_t *classmark2_lv, int length, char *mi_string, uint8_ } int gsm48_paging_extract_mi(struct gsm48_pag_resp *resp, int length, - char *mi_string, u_int8_t *mi_type) + char *mi_string, uint8_t *mi_type) { static const uint32_t classmark_offset = offsetof(struct gsm48_pag_resp, classmark2); - u_int8_t *classmark2_lv = (uint8_t *) &resp->classmark2; + uint8_t *classmark2_lv = (uint8_t *) &resp->classmark2; return gsm48_extract_mi(classmark2_lv, length - classmark_offset, mi_string, mi_type); } @@ -283,7 +283,7 @@ int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn, { struct gsm_bts *bts = msg->lchan->ts->trx->bts; struct gsm48_hdr *gh = msgb_l3(msg); - u_int8_t *classmark2_lv = gh->data + 1; + uint8_t *classmark2_lv = gh->data + 1; if (is_siemens_bts(bts)) send_siemens_mrpci(msg->lchan, classmark2_lv); @@ -312,7 +312,7 @@ int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv) { struct msgb *msg = gsm48_msgb_alloc(); struct gsm48_hdr *gh; - u_int8_t ciph_mod_set; + uint8_t ciph_mod_set; msg->lchan = lchan; @@ -343,7 +343,7 @@ static void gsm48_cell_desc(struct gsm48_cell_desc *cd, void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan) { - u_int16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; + uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff; cd->chan_nr = lchan2chan_nr(lchan); if (!lchan->ts->hopping.enabled) { @@ -364,7 +364,7 @@ void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, /* Chapter 9.1.15: Handover Command */ int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, - u_int8_t power_command, u_int8_t ho_ref) + uint8_t power_command, uint8_t ho_ref) { struct msgb *msg = gsm48_msgb_alloc(); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); @@ -403,7 +403,7 @@ int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, } /* Chapter 9.1.2: Assignment Command */ -int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, u_int8_t power_command) +int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, uint8_t power_command) { struct msgb *msg = gsm48_msgb_alloc(); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); @@ -443,7 +443,7 @@ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, LOGP(DRR, LOGL_ERROR, "BUG: Using multirate codec " "without multirate config.\n"); } else { - u_int8_t *data = msgb_put(msg, 4); + uint8_t *data = msgb_put(msg, 4); data[0] = GSM48_IE_MUL_RATE_CFG; data[1] = 0x2; memcpy(&data[2], &lchan->mr_conf, 2); @@ -454,7 +454,7 @@ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, } /* 9.1.5 Channel mode modify: Modify the mode on the MS side */ -int gsm48_tx_chan_mode_modify(struct gsm_lchan *lchan, u_int8_t mode) +int gsm48_tx_chan_mode_modify(struct gsm_lchan *lchan, uint8_t mode) { struct msgb *msg = gsm48_msgb_alloc(); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); @@ -479,7 +479,7 @@ int gsm48_tx_chan_mode_modify(struct gsm_lchan *lchan, u_int8_t mode) LOGP(DRR, LOGL_ERROR, "BUG: Using multirate codec " "without multirate config.\n"); } else { - u_int8_t *data = msgb_put(msg, 4); + uint8_t *data = msgb_put(msg, 4); data[0] = GSM48_IE_MUL_RATE_CFG; data[1] = 0x2; memcpy(&data[2], &lchan->mr_conf, 2); @@ -489,7 +489,7 @@ int gsm48_tx_chan_mode_modify(struct gsm_lchan *lchan, u_int8_t mode) return gsm48_sendmsg(msg); } -int gsm48_lchan_modify(struct gsm_lchan *lchan, u_int8_t lchan_mode) +int gsm48_lchan_modify(struct gsm_lchan *lchan, uint8_t lchan_mode) { int rc; @@ -547,7 +547,7 @@ int gsm48_rx_rr_modif_ack(struct msgb *msg) int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); - u_int8_t *data = gh->data; + uint8_t *data = gh->data; struct gsm_bts *bts = msg->lchan->ts->trx->bts; struct bitvec *nbv = &bts->si_common.neigh_list; struct gsm_meas_rep_cell *mrc; diff --git a/openbsc/src/libbsc/handover_decision.c b/openbsc/src/libbsc/handover_decision.c index 3b81dde56..31fd6107a 100644 --- a/openbsc/src/libbsc/handover_decision.c +++ b/openbsc/src/libbsc/handover_decision.c @@ -35,7 +35,7 @@ /* issue handover to a cell identified by ARFCN and BSIC */ static int handover_to_arfcn_bsic(struct gsm_lchan *lchan, - u_int16_t arfcn, u_int8_t bsic) + uint16_t arfcn, uint8_t bsic) { struct gsm_bts *new_bts; @@ -53,7 +53,7 @@ static int handover_to_arfcn_bsic(struct gsm_lchan *lchan, /* did we get a RXLEV for a given cell in the given report? */ static int rxlev_for_cell_in_rep(struct gsm_meas_rep *mr, - u_int16_t arfcn, u_int8_t bsic) + uint16_t arfcn, uint8_t bsic) { int i; diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c index ad79f8a3e..976a7fd00 100644 --- a/openbsc/src/libbsc/handover_logic.c +++ b/openbsc/src/libbsc/handover_logic.c @@ -49,7 +49,7 @@ struct bsc_handover { struct timer_list T3103; - u_int8_t ho_ref; + uint8_t ho_ref; }; static LLIST_HEAD(bsc_handovers); @@ -85,7 +85,7 @@ int bsc_handover_start(struct gsm_lchan *old_lchan, struct gsm_bts *bts) { struct gsm_lchan *new_lchan; struct bsc_handover *ho; - static u_int8_t ho_ref; + static uint8_t ho_ref; int rc; /* don't attempt multiple handovers for the same lchan at diff --git a/openbsc/src/libbsc/paging.c b/openbsc/src/libbsc/paging.c index c5425441a..2de098bdb 100644 --- a/openbsc/src/libbsc/paging.c +++ b/openbsc/src/libbsc/paging.c @@ -81,7 +81,7 @@ static void paging_remove_request(struct gsm_bts_paging_state *paging_bts, static void page_ms(struct gsm_paging_request *request) { - u_int8_t mi[128]; + uint8_t mi[128]; unsigned int mi_len; unsigned int page_group; @@ -387,7 +387,7 @@ void paging_request_stop(struct gsm_bts *_bts, struct gsm_subscriber *subscr, } while (1); } -void paging_update_buffer_space(struct gsm_bts *bts, u_int16_t free_slots) +void paging_update_buffer_space(struct gsm_bts *bts, uint16_t free_slots) { bsc_del_timer(&bts->paging.credit_timer); bts->paging.available_slots = free_slots; diff --git a/openbsc/src/libbsc/rest_octets.c b/openbsc/src/libbsc/rest_octets.c index c040d2684..0545426c0 100644 --- a/openbsc/src/libbsc/rest_octets.c +++ b/openbsc/src/libbsc/rest_octets.c @@ -30,7 +30,7 @@ #include <openbsc/rest_octets.h> /* generate SI1 rest octets */ -int rest_octets_si1(u_int8_t *data, u_int8_t *nch_pos) +int rest_octets_si1(uint8_t *data, uint8_t *nch_pos) { struct bitvec bv; @@ -88,7 +88,7 @@ static void append_gprs_ind(struct bitvec *bv, /* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */ -int rest_octets_si3(u_int8_t *data, const struct gsm48_si_ro_info *si3) +int rest_octets_si3(uint8_t *data, const struct gsm48_si_ro_info *si3) { struct bitvec bv; @@ -136,7 +136,7 @@ static int append_lsa_params(struct bitvec *bv, } /* Generate SI4 Rest Octets (Chapter 10.5.2.35) */ -int rest_octets_si4(u_int8_t *data, const struct gsm48_si_ro_info *si4) +int rest_octets_si4(uint8_t *data, const struct gsm48_si_ro_info *si4) { struct bitvec bv; @@ -366,7 +366,7 @@ static void append_gprs_pwr_ctrl_pars(struct bitvec *bv, } /* Generate SI13 Rest Octests (04.08 Chapter 10.5.2.37b) */ -int rest_octets_si13(u_int8_t *data, const struct gsm48_si13_info *si13) +int rest_octets_si13(uint8_t *data, const struct gsm48_si13_info *si13) { struct bitvec bv; diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index 1cbbcc93a..0cae71687 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -56,7 +56,7 @@ static_assert(sizeof(struct gsm48_system_information_type_13) == 3, _si13_size); /* Frequency Lists as per TS 04.08 10.5.2.13 */ /* 10.5.2.13.2: Bit map 0 format */ -static int freq_list_bm0_set_arfcn(u_int8_t *chan_list, unsigned int arfcn) +static int freq_list_bm0_set_arfcn(uint8_t *chan_list, unsigned int arfcn) { unsigned int byte, bit; @@ -77,7 +77,7 @@ static int freq_list_bm0_set_arfcn(u_int8_t *chan_list, unsigned int arfcn) } /* 10.5.2.13.7: Variable bit map format */ -static int freq_list_bmrel_set_arfcn(u_int8_t *chan_list, unsigned int arfcn) +static int freq_list_bmrel_set_arfcn(uint8_t *chan_list, unsigned int arfcn) { unsigned int byte, bit; unsigned int min_arfcn; @@ -110,7 +110,7 @@ static int freq_list_bmrel_set_arfcn(u_int8_t *chan_list, unsigned int arfcn) } /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */ -static int bitvec2freq_list(u_int8_t *chan_list, struct bitvec *bv, +static int bitvec2freq_list(uint8_t *chan_list, struct bitvec *bv, const struct gsm_bts *bts) { int i, rc, min = 1024, max = -1; @@ -171,7 +171,7 @@ static int bitvec2freq_list(u_int8_t *chan_list, struct bitvec *bv, } /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */ -static int generate_cell_chan_list(u_int8_t *chan_list, struct gsm_bts *bts) +static int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts) { struct gsm_bts_trx *trx; struct bitvec *bv = &bts->si_common.cell_alloc; @@ -199,7 +199,7 @@ static int generate_cell_chan_list(u_int8_t *chan_list, struct gsm_bts *bts) } /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */ -static int generate_bcch_chan_list(u_int8_t *chan_list, struct gsm_bts *bts, int si5) +static int generate_bcch_chan_list(uint8_t *chan_list, struct gsm_bts *bts, int si5) { struct gsm_bts *cur_bts; struct bitvec *bv; @@ -226,7 +226,7 @@ static int generate_bcch_chan_list(u_int8_t *chan_list, struct gsm_bts *bts, int return bitvec2freq_list(chan_list, bv, bts); } -static int generate_si1(u_int8_t *output, struct gsm_bts *bts) +static int generate_si1(uint8_t *output, struct gsm_bts *bts) { int rc; struct gsm48_system_information_type_1 *si1 = @@ -251,7 +251,7 @@ static int generate_si1(u_int8_t *output, struct gsm_bts *bts) return sizeof(*si1) + rc; } -static int generate_si2(u_int8_t *output, struct gsm_bts *bts) +static int generate_si2(uint8_t *output, struct gsm_bts *bts) { int rc; struct gsm48_system_information_type_2 *si2 = @@ -298,7 +298,7 @@ static struct gsm48_si_ro_info si_info = { .break_ind = 0, }; -static int generate_si3(u_int8_t *output, struct gsm_bts *bts) +static int generate_si3(uint8_t *output, struct gsm_bts *bts) { int rc; struct gsm48_system_information_type_3 *si3 = @@ -329,7 +329,7 @@ static int generate_si3(u_int8_t *output, struct gsm_bts *bts) return sizeof(*si3) + rc; } -static int generate_si4(u_int8_t *output, struct gsm_bts *bts) +static int generate_si4(uint8_t *output, struct gsm_bts *bts) { int rc; struct gsm48_system_information_type_4 *si4 = @@ -362,7 +362,7 @@ static int generate_si4(u_int8_t *output, struct gsm_bts *bts) return sizeof(*si4) + rc; } -static int generate_si5(u_int8_t *output, struct gsm_bts *bts) +static int generate_si5(uint8_t *output, struct gsm_bts *bts) { struct gsm48_system_information_type_5 *si5; int rc, l2_plen = 18; @@ -394,7 +394,7 @@ static int generate_si5(u_int8_t *output, struct gsm_bts *bts) return l2_plen; } -static int generate_si6(u_int8_t *output, struct gsm_bts *bts) +static int generate_si6(uint8_t *output, struct gsm_bts *bts) { struct gsm48_system_information_type_6 *si6; int l2_plen = 11; @@ -468,7 +468,7 @@ static struct gsm48_si13_info si13_default = { }, }; -static int generate_si13(u_int8_t *output, struct gsm_bts *bts) +static int generate_si13(uint8_t *output, struct gsm_bts *bts) { struct gsm48_system_information_type_13 *si13 = (struct gsm48_system_information_type_13 *) output; diff --git a/openbsc/src/libbsc/transaction.c b/openbsc/src/libbsc/transaction.c index 180f9f96b..0c72c03ee 100644 --- a/openbsc/src/libbsc/transaction.c +++ b/openbsc/src/libbsc/transaction.c @@ -34,7 +34,7 @@ void *tall_trans_ctx; void _gsm48_cc_trans_free(struct gsm_trans *trans); struct gsm_trans *trans_find_by_id(struct gsm_subscriber *subscr, - u_int8_t proto, u_int8_t trans_id) + uint8_t proto, uint8_t trans_id) { struct gsm_trans *trans; struct gsm_network *net = subscr->net; @@ -49,7 +49,7 @@ struct gsm_trans *trans_find_by_id(struct gsm_subscriber *subscr, } struct gsm_trans *trans_find_by_callref(struct gsm_network *net, - u_int32_t callref) + uint32_t callref) { struct gsm_trans *trans; @@ -61,8 +61,8 @@ struct gsm_trans *trans_find_by_callref(struct gsm_network *net, } struct gsm_trans *trans_alloc(struct gsm_subscriber *subscr, - u_int8_t protocol, u_int8_t trans_id, - u_int32_t callref) + uint8_t protocol, uint8_t trans_id, + uint32_t callref) { struct gsm_trans *trans; @@ -118,7 +118,7 @@ void trans_free(struct gsm_trans *trans) /* allocate an unused transaction ID for the given subscriber * in the given protocol using the ti_flag specified */ int trans_assign_trans_id(struct gsm_subscriber *subscr, - u_int8_t protocol, u_int8_t ti_flag) + uint8_t protocol, uint8_t ti_flag) { struct gsm_network *net = subscr->net; struct gsm_trans *trans; |