diff options
Diffstat (limited to 'include/osmocom')
-rw-r--r-- | include/osmocom/gprs/gprs_ns.h | 5 | ||||
-rw-r--r-- | include/osmocom/gsm/l1sap.h | 125 | ||||
-rw-r--r-- | include/osmocom/gsm/lapdm.h | 50 | ||||
-rw-r--r-- | include/osmocom/gsm/protocol/gsm_04_08.h | 6 |
4 files changed, 133 insertions, 53 deletions
diff --git a/include/osmocom/gprs/gprs_ns.h b/include/osmocom/gprs/gprs_ns.h index 8fca70cb..8ca5a887 100644 --- a/include/osmocom/gprs/gprs_ns.h +++ b/include/osmocom/gprs/gprs_ns.h @@ -129,7 +129,10 @@ struct gprs_nsvc { /* Create a new NS protocol instance */ struct gprs_ns_inst *gprs_ns_instantiate(gprs_ns_cb_t *cb, void *ctx); -/* Destroy a NS protocol instance */ +/* Close a NS protocol instance */ +void gprs_ns_close(struct gprs_ns_inst *nsi); + +/* Close and Destroy a NS protocol instance */ void gprs_ns_destroy(struct gprs_ns_inst *nsi); /* Listen for incoming GPRS packets via NS/UDP */ diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h new file mode 100644 index 00000000..c21abe5e --- /dev/null +++ b/include/osmocom/gsm/l1sap.h @@ -0,0 +1,125 @@ +#ifndef _OSMOCOM_L1SAP_H +#define _OSMOCOM_L1SAP_H + +#include <osmocom/core/prim.h> + +/*! \brief PH-SAP related primitives (L1<->L2 SAP) */ +enum osmo_ph_prim { + PRIM_PH_DATA, /*!< \brief PH-DATA */ + PRIM_PH_RACH, /*!< \brief PH-RANDOM_ACCESS */ + PRIM_PH_CONN, /*!< \brief PH-CONNECT */ + PRIM_PH_EMPTY_FRAME, /*!< \brief PH-EMPTY_FRAME */ + PRIM_PH_RTS, /*!< \brief PH-RTS */ + PRIM_MPH_INFO, /*!< \brief MPH-INFO */ + PRIM_TCH, /*!< \brief TCH */ + PRIM_TCH_RTS, /*!< \brief TCH */ +}; + +/*! \brief PH-SAP related primitives (L1<->L2 SAP) */ +enum osmo_mph_info_type { + PRIM_INFO_TIME, /*!< \brief Current GSM time */ + PRIM_INFO_MEAS, /*!< \brief Measurement indication */ + PRIM_INFO_ACTIVATE, /*!< \brief Activation of channel */ + PRIM_INFO_DEACTIVATE, /*!< \brief Deactivation of channel */ + PRIM_INFO_MODIFY, /*!< \brief Mode Modify of channel */ + PRIM_INFO_ACT_CIPH, /*!< \brief Activation of ciphering */ + PRIM_INFO_DEACT_CIPH, /*!< \brief Deactivation of ciphering */ +}; + +/*! \brief for PH-RANDOM_ACCESS.req */ +struct ph_rach_req_param { + uint8_t ra; /*!< \brief Random Access */ + uint8_t ta; /*!< \brief Timing Advance */ + uint8_t tx_power; /*!< \brief Transmit Power */ + uint8_t is_combined_ccch;/*!< \brief Are we using a combined CCCH? */ + uint16_t offset; /*!< \brief Timing Offset */ +}; + +/*! \brief for PH-RANDOM_ACCESS.ind */ +struct ph_rach_ind_param { + uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ + uint8_t ra; /*!< \brief Random Access */ + uint8_t acc_delay; /*!< \brief Delay in bit periods */ + uint32_t fn; /*!< \brief GSM Frame Number at time of RA */ +}; + +/*! \brief for PH-[UNIT]DATA.{req,ind} | PH-RTS.ind */ +struct ph_data_param { + uint8_t link_id; /*!< \brief Link Identifier (Like RSL) */ + uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ + uint32_t fn; /*!< \brief GSM Frame Number */ + int8_t rssi; /*!< \brief RSSI of receivedindication */ +}; + +/*! \brief for TCH.{req,ind} | TCH-RTS.ind */ +struct ph_tch_param { + uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ + uint32_t fn; /*!< \brief GSM Frame Number */ + int8_t rssi; /*!< \brief RSSI of received indication */ +}; + +/*! \brief for PH-CONN.ind */ +struct ph_conn_ind_param { + uint32_t fn; /*!< \brief GSM Frame Number */ +}; + +/*! \brief for TIME MPH-INFO.ind */ +struct info_time_ind_param { + uint32_t fn; /*!< \brief GSM Frame Number */ +}; + +/*! \brief for MEAS MPH-INFO.ind */ +struct info_meas_ind_param { + uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ + uint16_t ber10k; /*!< \brief BER in units of 0.01% */ + int16_t ta_offs_qbits; /*!< \brief timing advance offset (in qbits) */ + int16_t c_i_cb; /*!< \brief C/I ratio in 0.1 dB */ + uint8_t is_sub:1; /*!< \brief flags */ + uint8_t inv_rssi; /*!< \brief RSSI in dBm * -1 */ +}; + +/*! \brief for {ACTIVATE,DEACTIVATE,MODIFY} MPH-INFO.req */ +struct info_act_req_param { + uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ + uint8_t sacch_only; /*!< \breif Only deactivate SACCH */ +}; + +/*! \brief for {ACTIVATE,DEACTIVATE} MPH-INFO.cnf */ +struct info_act_cnf_param { + uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ + uint8_t cause; /*!< \brief RSL cause in case of nack */ +}; + +/*! \brief for {ACTIVATE,DEACTIVATE} MPH-INFO.{req,cnf} */ +struct info_ciph_req_param { + uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ + uint8_t downlink; /*!< \brief Apply to downlink */ + uint8_t uplink; /*!< \brief Apply to uplink */ +}; + +/*! \brief for MPH-INFO.ind */ +struct mph_info_param { + enum osmo_mph_info_type type; /*!< \brief Info message type */ + union { + struct info_time_ind_param time_ind; + struct info_meas_ind_param meas_ind; + struct info_act_req_param act_req; + struct info_act_cnf_param act_cnf; + struct info_ciph_req_param ciph_req; + } u; +}; + +/*! \brief primitive header for PH-SAP primitives */ +struct osmo_phsap_prim { + struct osmo_prim_hdr oph; /*!< \brief generic primitive header */ + union { + struct ph_data_param data; + struct ph_tch_param tch; + struct ph_rach_req_param rach_req; + struct ph_rach_ind_param rach_ind; + struct ph_conn_ind_param conn_ind; + struct mph_info_param info; + } u; /*!< \brief request-specific data */ +}; + +#endif /* _OSMOCOM_L1SAP_H */ diff --git a/include/osmocom/gsm/lapdm.h b/include/osmocom/gsm/lapdm.h index 571fd460..a6e4ad72 100644 --- a/include/osmocom/gsm/lapdm.h +++ b/include/osmocom/gsm/lapdm.h @@ -1,6 +1,7 @@ #ifndef _OSMOCOM_LAPDM_H #define _OSMOCOM_LAPDM_H +#include <osmocom/gsm/l1sap.h> #include <osmocom/gsm/lapd_core.h> /*! \defgroup lapdm LAPDm implementation according to GSM TS 04.06 @@ -9,55 +10,6 @@ /*! \file lapdm.h */ -/* primitive related sutff */ - -/*! \brief LAPDm related primitives (L1<->L2 SAP) */ -enum osmo_ph_prim { - PRIM_PH_DATA, /*!< \brief PH-DATA */ - PRIM_PH_RACH, /*!< \brief PH-RANDOM_ACCESS */ - PRIM_PH_CONN, /*!< \brief PH-CONNECT */ - PRIM_PH_EMPTY_FRAME, /*!< \brief PH-EMPTY_FRAME */ - PRIM_PH_RTS, /*!< \brief PH-RTS */ -}; - -/*! \brief for PH-RANDOM_ACCESS.req */ -struct ph_rach_req_param { - uint8_t ra; /*!< \brief Random Access */ - uint8_t ta; /*!< \brief Timing Advance */ - uint8_t tx_power; /*!< \brief Transmit Power */ - uint8_t is_combined_ccch;/*!< \brief Are we using a combined CCCH? */ - uint16_t offset; /*!< \brief Timing Offset */ -}; - -/*! \brief for PH-RANDOM_ACCESS.ind */ -struct ph_rach_ind_param { - uint8_t ra; /*!< \brief Random Access */ - uint8_t acc_delay; /*!< \brief Delay in bit periods */ - uint32_t fn; /*!< \brief GSM Frame Number at time of RA */ -}; - -/*! \brief for PH-[UNIT]DATA.{req,ind} */ -struct ph_data_param { - uint8_t link_id; /*!< \brief Link Identifier (Like RSL) */ - uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ -}; - -/*! \brief for PH-CONN.ind */ -struct ph_conn_ind_param { - uint32_t fn; /*!< \brief GSM Frame Number */ -}; - -/*! \brief primitive header for LAPDm PH-SAP primitives */ -struct osmo_phsap_prim { - struct osmo_prim_hdr oph; /*!< \brief generic primitive header */ - union { - struct ph_data_param data; - struct ph_rach_req_param rach_req; - struct ph_rach_ind_param rach_ind; - struct ph_conn_ind_param conn_ind; - } u; /*!< \brief request-specific data */ -}; - /*! \brief LAPDm mode/role */ enum lapdm_mode { LAPDM_MODE_MS, /*!< \brief behave like a MS (mobile phone) */ diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index bb8a87ed..bd6d707a 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1052,9 +1052,9 @@ enum gsm48_rr_cause { GSM48_RR_CAUSE_ABNORMAL_TIMER = 0x03, GSM48_RR_CAUSE_ABNORMAL_NOACT = 0x04, GSM48_RR_CAUSE_PREMPTIVE_REL = 0x05, - GSM48_RR_CAUSE_HNDOVER_IMP = 0x06, - GSM48_RR_CAUSE_CHAN_MODE_UNACCT = 0x07, - GSM48_RR_CAUSE_FREQ_NOT_IMPL = 0x08, + GSM48_RR_CAUSE_HNDOVER_IMP = 0x08, + GSM48_RR_CAUSE_CHAN_MODE_UNACCT = 0x09, + GSM48_RR_CAUSE_FREQ_NOT_IMPL = 0x0a, GSM48_RR_CAUSE_CALL_CLEARED = 0x41, GSM48_RR_CAUSE_SEMANT_INCORR = 0x5f, GSM48_RR_CAUSE_INVALID_MAND_INF = 0x60, |