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/include/openbsc/rest_octets.h | 84 +++++++++++++++++------------------ 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'openbsc/include/openbsc/rest_octets.h') diff --git a/openbsc/include/openbsc/rest_octets.h b/openbsc/include/openbsc/rest_octets.h index 6d9011963..5ad590833 100644 --- a/openbsc/include/openbsc/rest_octets.h +++ b/openbsc/include/openbsc/rest_octets.h @@ -5,10 +5,10 @@ #include /* 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 gsm48_si_selection_params { - u_int16_t penalty_time:5, + uint16_t penalty_time:5, temp_offs:3, cell_resel_off:6, cbq:1, @@ -16,18 +16,18 @@ struct gsm48_si_selection_params { }; struct gsm48_si_power_offset { - u_int8_t power_offset:2, + uint8_t power_offset:2, present:1; }; struct gsm48_si3_gprs_ind { - u_int8_t si13_position:1, + uint8_t si13_position:1, ra_colour:3, present:1; }; struct gsm48_lsa_params { - u_int32_t prio_thr:3, + uint32_t prio_thr:3, lsa_offset:3, mcc:12, mnc:12; @@ -37,26 +37,26 @@ struct gsm48_lsa_params { struct gsm48_si_ro_info { struct gsm48_si_selection_params selection_params; struct gsm48_si_power_offset power_offset; - u_int8_t si2ter_indicator; - u_int8_t early_cm_ctrl; + uint8_t si2ter_indicator; + uint8_t early_cm_ctrl; struct { - u_int8_t where:3, + uint8_t where:3, present:1; } scheduling; struct gsm48_si3_gprs_ind gprs_ind; /* SI 4 specific */ struct gsm48_lsa_params lsa_params; - u_int16_t cell_id; - u_int8_t break_ind; /* do we have SI7 + SI8 ? */ + uint16_t cell_id; + uint8_t break_ind; /* do we have SI7 + SI8 ? */ }; /* 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); /* 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); enum pbcch_carrier_type { PBCCH_BCCH, @@ -75,59 +75,59 @@ enum gprs_nmo { struct gprs_cell_options { enum gprs_nmo nmo; /* T3168: wait for packet uplink assignment message */ - u_int32_t t3168; /* in milliseconds */ + uint32_t t3168; /* in milliseconds */ /* T3192: wait for release of the TBF after reception of the final block */ - u_int32_t t3192; /* in milliseconds */ - u_int32_t drx_timer_max;/* in seconds */ - u_int32_t bs_cv_max; + uint32_t t3192; /* in milliseconds */ + uint32_t drx_timer_max;/* in seconds */ + uint32_t bs_cv_max; - u_int8_t ext_info_present; + uint8_t ext_info_present; struct { - u_int8_t egprs_supported; - u_int8_t use_egprs_p_ch_req; - u_int8_t bep_period; - u_int8_t pfc_supported; - u_int8_t dtm_supported; - u_int8_t bss_paging_coordination; + uint8_t egprs_supported; + uint8_t use_egprs_p_ch_req; + uint8_t bep_period; + uint8_t pfc_supported; + uint8_t dtm_supported; + uint8_t bss_paging_coordination; } ext_info; }; /* TS 04.60 Table 12.9.2 */ struct gprs_power_ctrl_pars { - u_int8_t alpha; - u_int8_t t_avg_w; - u_int8_t t_avg_t; - u_int8_t pc_meas_chan; - u_int8_t n_avg_i; + uint8_t alpha; + uint8_t t_avg_w; + uint8_t t_avg_t; + uint8_t pc_meas_chan; + uint8_t n_avg_i; }; struct gsm48_si13_info { struct gprs_cell_options cell_opts; struct gprs_power_ctrl_pars pwr_ctrl_pars; - u_int8_t bcch_change_mark; - u_int8_t si_change_field; - u_int8_t pbcch_present; + uint8_t bcch_change_mark; + uint8_t si_change_field; + uint8_t pbcch_present; union { struct { - u_int8_t rac; - u_int8_t spgc_ccch_sup; - u_int8_t net_ctrl_ord; - u_int8_t prio_acc_thr; + uint8_t rac; + uint8_t spgc_ccch_sup; + uint8_t net_ctrl_ord; + uint8_t prio_acc_thr; } no_pbcch; struct { - u_int8_t psi1_rep_per; - u_int8_t pb; - u_int8_t tsc; - u_int8_t tn; + uint8_t psi1_rep_per; + uint8_t pb; + uint8_t tsc; + uint8_t tn; enum pbcch_carrier_type carrier_type; - u_int16_t arfcn; - u_int8_t maio; + uint16_t arfcn; + uint8_t maio; } pbcch; }; }; /* Generate SI13 Rest Octests (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); #endif /* _REST_OCTETS_H */ -- cgit v1.2.3