astyle --recursive --indent=spaces=2 --style=kr --indent-col1-comments --break-blocks --convert-tabs --max-code-length=200

This is done for better merging branch/LG_PRE_RELEASE_0.3 into trunk (same process is applied on this branch)

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7073 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
2015-04-09 09:29:12 +00:00
parent f0a8a0b3b5
commit 059a0a3fdc
2044 changed files with 1182666 additions and 1145123 deletions
+8 -7
View File
@@ -75,7 +75,7 @@ in a suspended state or to indicate the current buffer occupancy to MAC.
// primitives definition
//----------------------------------------------------------
# define UE_ID_TYPE_U_RNTI 0xFF
// should not be used ?
// should not be used ?
# define UE_ID_TYPE_C_RNTI 0xCC
# define MAC_TX_STATUS_SUCCESSFUL 0x0F
@@ -192,9 +192,10 @@ that RLC would use this primitive to indicate that it has nothing to send or tha
in a suspended state or to indicate the current buffer occupancy to MAC.
*/
struct mac_status_resp {
unsigned int buffer_occupancy_in_bytes; /*!< \brief the parameter Buffer Occupancy (BO) indicates for each logical channel the amount of data in number of bytes that is available for transmission and retransmission in RLC layer. */
unsigned int
buffer_occupancy_in_bytes; /*!< \brief the parameter Buffer Occupancy (BO) indicates for each logical channel the amount of data in number of bytes that is available for transmission and retransmission in RLC layer. */
unsigned short buffer_occupancy_in_pdus; /*!< xxx*/
uint32_t head_sdu_creation_time;
uint32_t head_sdu_creation_time;
uint32_t head_sdu_remaining_size_to_send;
unsigned char head_sdu_is_segmented;
struct rlc_entity_info rlc_info; /*!< xxx*/
@@ -224,11 +225,11 @@ struct mac_data_req {
transmitted but not negatively acknowledged by the peer entity shall not be included in the BO.*/
unsigned short buffer_occupancy_in_pdus; /*!< xxx*/
struct rlc_entity_info rlc_info; /*!< indicates to MAC the configuration parameters that are critical to TFC selection depending
on its mode and the amount of data that could be transmitted at the next TTI. This primitive
is meant to insure that MAC can perform TFC selection.*/
on its mode and the amount of data that could be transmitted at the next TTI. This primitive
is meant to insure that MAC can perform TFC selection.*/
unsigned char ue_id_type_indicator; /*!< indicates the UE-ID type to be included in MAC for a DCCH when it is mapped onto a common
transport channel (i.e. FACH, RACH, DSCH in FDD or CPCH). On the UE side UE-ID Type Indicator
shall always be set to C-RNTI.*/
transport channel (i.e. FACH, RACH, DSCH in FDD or CPCH). On the UE side UE-ID Type Indicator
shall always be set to C-RNTI.*/
};
//---------------------
/*! \brief MAC-DATA-Ind primitive indicates the arrival of upper layer PDUs received within one