From c42ad8b68619b58bfbc98a0409d74a86b603aebf Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 18 Apr 2011 17:04:00 +0200 Subject: misc: Move from u_int to uint types of stdint.h This was done with sed on the files. --- openbsc/src/libbsc/abis_rsl.c | 166 +++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 83 deletions(-) (limited to 'openbsc/src/libbsc/abis_rsl.c') 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; -- cgit v1.2.3