maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed uX, uX_t sX, sX_t to uinX_t

Browse Source 
Cleaned some PDCP/driver code

types parameters and vars

Please see openair2/COMMON/platform_types.h for simple coding rules.

please declare prototypes of functions in .h and include .h files in where the function is used and where it is implemented.



git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5096 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
2014-02-28 13:03:10 +00:00
parent 3ea520f70a
commit c60dc45b2b
405 changed files with 9403 additions and 9303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/FIFO/pad_list.c
+56 -56
View File
@@ -2,34 +2,34 @@
Job_list.c - description
-------------------
-------------------
AUTHOR : Lionel GAUTHIER, Mohamed Said MOSLI BOUKSIAA
AUTHOR : Mohamed Said MOSLI BOUKSIAA, Lionel GAUTHIER
COMPANY : EURECOM
EMAIL : Lionel.Gauthier@eurecom.fr, mosli@eurecom.fr
EMAIL : mosli@eurecom.fr, Lionel.Gauthier@eurecom.fr
***************************************************************************/
//#define LIST_C
//#define NULL 0
#include "pad_list.h"
#include <stdio.h>
#include <stdlib.h>
#include "pad_list.h"
//#include <mpi.h>
void job_list_init (Job_List * listP) {
void job_list_init (Job_List_t * listP) {
listP->tail = NULL;
listP->head = NULL;
listP->nb_elements = 0;
}
void event_list_init (Event_List * listP) {
void event_list_init (Event_List_t * listP) {
listP->tail = NULL;
listP->head = NULL;
listP->nb_elements = 0;
}
void pkt_list_init (Packet_OTG_List * listP) {
void pkt_list_init (Packet_OTG_List_t * listP) {
listP->tail = NULL;
listP->head = NULL;
@@ -38,24 +38,24 @@ void pkt_list_init (Packet_OTG_List * listP) {
//-----------------------------------------------------------------------------
void job_list_free (Job_List * listP) {
Job_elt *le;
void job_list_free (Job_List_t * listP) {
Job_elt_t *le;
while ((le = job_list_remove_head (listP))) {
free(le);
}
}
void event_list_free (Event_List * listP) {
Event_elt *le;
void event_list_free (Event_List_t * listP) {
Event_elt_t *le;
while ((le = event_list_remove_head (listP))) {
free(le);
}
}
void pkt_list_free (Packet_OTG_List * listP) {
Packet_otg_elt *le;
void pkt_list_free (Packet_OTG_List_t * listP) {
Packet_otg_elt_t *le;
while ((le = pkt_list_remove_head (listP))) {
free(le);
@@ -64,15 +64,15 @@ void pkt_list_free (Packet_OTG_List * listP) {
//-----------------------------------------------------------------------------
Job_elt * job_list_get_head (Job_List * listP) {
Job_elt_t * job_list_get_head (Job_List_t * listP) {
return listP->head;
}
Event_elt * event_list_get_head (Event_List * listP) {
Event_elt_t * event_list_get_head (Event_List_t * listP) {
return listP->head;
}
Packet_otg_elt * pkt_list_get_head (Packet_OTG_List * listP) {
Packet_otg_elt_t * pkt_list_get_head (Packet_OTG_List_t * listP) {
return listP->head;
}
@@ -81,12 +81,12 @@ Packet_otg_elt * pkt_list_get_head (Packet_OTG_List * listP) {
/*
* remove an element from head of a list
* @param pointer on targeted list
* @return pointer on removed Job_elt
* @return pointer on removed Job_elt_t
*/
Job_elt * job_list_remove_head (Job_List * listP) {
Job_elt_t * job_list_remove_head (Job_List_t * listP) {
// access optimisation
Job_elt *head;
Job_elt_t *head;
head = listP->head;
// almost one element
if (head != NULL) {
@@ -104,10 +104,10 @@ Job_elt * job_list_remove_head (Job_List * listP) {
return head;
}
Event_elt * event_list_remove_head (Event_List * listP) {
Event_elt_t * event_list_remove_head (Event_List_t * listP) {
// access optimisation
Event_elt *head;
Event_elt_t *head;
head = listP->head;
// almost one element
if (head != NULL) {
@@ -125,10 +125,10 @@ Event_elt * event_list_remove_head (Event_List * listP) {
return head;
}
Packet_otg_elt * pkt_list_remove_head (Packet_OTG_List * listP) {
Packet_otg_elt_t * pkt_list_remove_head (Packet_OTG_List_t * listP) {
// access optimisation
Packet_otg_elt *head;
Packet_otg_elt_t *head;
head = listP->head;
// almost one element
if (head != NULL) {
@@ -148,10 +148,10 @@ Packet_otg_elt * pkt_list_remove_head (Packet_OTG_List * listP) {
//-----------------------------------------------------------------------------
Job_elt * job_list_remove_element (Job_elt * elementP, Job_List * listP) {
Job_elt_t * job_list_remove_element (Job_elt_t * elementP, Job_List_t * listP) {
// access optimisation;
Job_elt *head;
Job_elt_t *head;
if (elementP != NULL) {
// test head
@@ -186,10 +186,10 @@ Job_elt * job_list_remove_element (Job_elt * elementP, Job_List * listP) {
return elementP;
}
Event_elt * event_list_remove_element (Event_elt * elementP, Event_List * listP) {
Event_elt_t * event_list_remove_element (Event_elt_t * elementP, Event_List_t * listP) {
// access optimisation;
Event_elt *head;
Event_elt_t *head;
if (elementP != NULL) {
// test head
@@ -224,10 +224,10 @@ Event_elt * event_list_remove_element (Event_elt * elementP, Event_List * listP)
return elementP;
}
Packet_otg_elt * pkt_list_remove_element (Packet_otg_elt * elementP, Packet_OTG_List * listP) {
Packet_otg_elt_t * pkt_list_remove_element (Packet_otg_elt_t * elementP, Packet_OTG_List_t * listP) {
// access optimisation;
Packet_otg_elt *head;
Packet_otg_elt_t *head;
if (elementP != NULL) {
// test head
@@ -266,13 +266,13 @@ Packet_otg_elt * pkt_list_remove_element (Packet_otg_elt * elementP, Packet_OTG_
/*
* add an element to the beginning of a list
* @param pointer on targeted list
* @return pointer on removed Job_elt
* @return pointer on removed Job_elt_t
*/
void job_list_add_head (Job_elt * elementP, Job_List * listP) {
void job_list_add_head (Job_elt_t * elementP, Job_List_t * listP) {
// access optimisation;
Job_elt *head;
Job_elt_t *head;
if (elementP != NULL) {
head = listP->head;
@@ -288,10 +288,10 @@ void job_list_add_head (Job_elt * elementP, Job_List * listP) {
}
}
void event_list_add_head (Event_elt * elementP, Event_List * listP) {
void event_list_add_head (Event_elt_t * elementP, Event_List_t * listP) {
// access optimisation;
Event_elt *head;
Event_elt_t *head;
if (elementP != NULL) {
head = listP->head;
@@ -307,10 +307,10 @@ void event_list_add_head (Event_elt * elementP, Event_List * listP) {
}
}
void pkt_list_add_head (Packet_otg_elt * elementP, Packet_OTG_List * listP) {
void pkt_list_add_head (Packet_otg_elt_t * elementP, Packet_OTG_List_t * listP) {
// access optimisation;
Packet_otg_elt *head;
Packet_otg_elt_t *head;
if (elementP != NULL) {
head = listP->head;
@@ -326,10 +326,10 @@ void pkt_list_add_head (Packet_otg_elt * elementP, Packet_OTG_List * listP) {
}
}
void event_list_add_element (Event_elt * elementP, Event_elt * previous, Event_List * listP) {
void event_list_add_element (Event_elt_t * elementP, Event_elt_t * previous, Event_List_t * listP) {
// access optimisation;
Event_elt *next;
Event_elt_t *next;
elementP->next = NULL;
if (elementP != NULL && previous != NULL) {
@@ -351,10 +351,10 @@ void event_list_add_element (Event_elt * elementP, Event_elt * previous, Event_L
/*
* add an element to the end of a list
* @param pointer on targeted list
* @return pointer on removed Job_elt
* @return pointer on removed Job_elt_t
*/
void job_list_add_tail_eurecom (Job_elt * elementP, Job_List * listP) {
Job_elt *tail;
void job_list_add_tail_eurecom (Job_elt_t * elementP, Job_List_t * listP) {
Job_elt_t *tail;
if (elementP != NULL) {
// access optimisation
@@ -373,8 +373,8 @@ void job_list_add_tail_eurecom (Job_elt * elementP, Job_List * listP) {
}
}
void event_list_add_tail_eurecom (Event_elt * elementP, Event_List * listP) {
Event_elt *tail;
void event_list_add_tail_eurecom (Event_elt_t * elementP, Event_List_t * listP) {
Event_elt_t *tail;
if (elementP != NULL) {
// access optimisation
@@ -393,8 +393,8 @@ void event_list_add_tail_eurecom (Event_elt * elementP, Event_List * listP) {
}
}
void pkt_list_add_tail_eurecom (Packet_otg_elt * elementP, Packet_OTG_List * listP) {
Packet_otg_elt *tail;
void pkt_list_add_tail_eurecom (Packet_otg_elt_t * elementP, Packet_OTG_List_t * listP) {
Packet_otg_elt_t *tail;
if (elementP != NULL) {
// access optimisation
@@ -414,12 +414,12 @@ void pkt_list_add_tail_eurecom (Packet_otg_elt * elementP, Packet_OTG_List * lis
}
//-----------------------------------------------------------------------------
void job_list_add_list (Job_List * sublistP, Job_List * listP) {
void job_list_add_list (Job_List_t * sublistP, Job_List_t * listP) {
if (sublistP) {
if (sublistP->head) {
// access optimisation
Job_elt *tail;
Job_elt_t *tail;
tail = listP->tail;
// almost one element
@@ -438,12 +438,12 @@ void job_list_add_list (Job_List * sublistP, Job_List * listP) {
}
}
void event_list_add_list (Event_List * sublistP, Event_List * listP) {
void event_list_add_list (Event_List_t * sublistP, Event_List_t * listP) {
if (sublistP) {
if (sublistP->head) {
// access optimisation
Event_elt *tail;
Event_elt_t *tail;
tail = listP->tail;
// almost one element
@@ -462,12 +462,12 @@ void event_list_add_list (Event_List * sublistP, Event_List * listP) {
}
}
void pkt_list_add_list (Packet_OTG_List * sublistP, Packet_OTG_List * listP) {
void pkt_list_add_list (Packet_OTG_List_t * sublistP, Packet_OTG_List_t * listP) {
if (sublistP) {
if (sublistP->head) {
// access optimisation
Packet_otg_elt *tail;
Packet_otg_elt_t *tail;
tail = listP->tail;
// almost one element
@@ -487,11 +487,11 @@ void pkt_list_add_list (Packet_OTG_List * sublistP, Packet_OTG_List * listP) {
}
//-----------------------------------------------------------------------------
void job_list_display (Job_List * listP) {
void job_list_display (Job_List_t * listP) {
//Correct the output once the content of struct Job is fixed
/*Job_elt *cursor;
/*Job_elt_t *cursor;
unsigned short nb_elements = 0;
if (listP) {
@@ -519,8 +519,8 @@ void job_list_display (Job_List * listP) {
}*/
}
void event_list_display (Event_List * listP) {
Event_elt *cursor;
void event_list_display (Event_List_t * listP) {
Event_elt_t *cursor;
unsigned short nb_elements = 0;
if (listP) {
@@ -541,8 +541,8 @@ void event_list_display (Event_List * listP) {
}
}
void pkt_list_display (Packet_OTG_List * listP) {
Packet_otg_elt *cursor;
void pkt_list_display (Packet_OTG_List_t * listP) {
Packet_otg_elt_t *cursor;
unsigned short nb_elements = 0;
if (listP) {
openair2/UTIL/FIFO/pad_list.h
+44 -48
View File
@@ -26,60 +26,56 @@
# define public_list2(x) extern x
# endif
//-----------------------------------------------------------------------------
//#include "platform_types.h"
//#include "platform_constants.h"
//#include "PHY/defs.h"
typedef struct Job_List_s {
Job_elt_t *head;
Job_elt_t *tail;
int nb_elements;
} Job_List_t;
typedef struct {
Job_elt *head;
Job_elt *tail;
int nb_elements;
} Job_List;
typedef struct Event_List_s{
Event_elt_t *head;
Event_elt_t *tail;
int nb_elements;
} Event_List_t;
typedef struct {
Event_elt *head;
Event_elt *tail;
int nb_elements;
} Event_List;
typedef struct {
Packet_otg_elt *head;
Packet_otg_elt *tail;
int nb_elements;
} Packet_OTG_List;
typedef struct Packet_OTG_List_s {
Packet_otg_elt_t *head;
Packet_otg_elt_t *tail;
int nb_elements;
} Packet_OTG_List_t;
//-----------------------------------------------------------------------------
public_list( void job_list_init (Job_List*);)
public_list( void job_list_free (Job_List* listP);)
public_list( Job_elt* job_list_get_head (Job_List*);)
public_list( Job_elt* job_list_remove_head (Job_List* );)
public_list( Job_elt* job_list_remove_element (Job_elt*, Job_List*);)
public_list( void job_list_add_head (Job_elt* , Job_List* );)
public_list( void job_list_add_tail_eurecom (Job_elt* , Job_List* );)
public_list( void job_list_add_list (Job_List* , Job_List* );)
public_list( void job_list_display (Job_List* );)
public_list( void job_list_init (Job_List_t*);)
public_list( void job_list_free (Job_List_t* listP);)
public_list( Job_elt_t* job_list_get_head (Job_List_t*);)
public_list( Job_elt_t* job_list_remove_head (Job_List_t* );)
public_list( Job_elt_t* job_list_remove_element (Job_elt_t*, Job_List_t*);)
public_list( void job_list_add_head (Job_elt_t* , Job_List_t* );)
public_list( void job_list_add_tail_eurecom (Job_elt_t* , Job_List_t* );)
public_list( void job_list_add_list (Job_List_t* , Job_List_t* );)
public_list( void job_list_display (Job_List_t* );)
public_list( void event_list_init (Event_List*);)
public_list( void event_list_free (Event_List* listP);)
public_list( Event_elt* event_list_get_head (Event_List*);)
public_list( Event_elt* event_list_remove_head (Event_List* );)
public_list( Event_elt* event_list_remove_element (Event_elt*, Event_List*);)
public_list( void event_list_add_head (Event_elt* , Event_List* );)
public_list( void event_list_add_element (Event_elt* , Event_elt* , Event_List* );)
public_list( void event_list_add_tail_eurecom (Event_elt* , Event_List* );)
public_list( void event_list_add_list (Event_List* , Event_List* );)
public_list( void event_list_display (Event_List* );)
public_list( void event_list_init (Event_List_t*);)
public_list( void event_list_free (Event_List_t* listP);)
public_list( Event_elt_t* event_list_get_head (Event_List_t*);)
public_list( Event_elt_t* event_list_remove_head (Event_List_t* );)
public_list( Event_elt_t* event_list_remove_element (Event_elt_t*, Event_List_t*);)
public_list( void event_list_add_head (Event_elt_t* , Event_List_t* );)
public_list( void event_list_add_element (Event_elt_t* , Event_elt_t* , Event_List_t* );)
public_list( void event_list_add_tail_eurecom (Event_elt_t* , Event_List_t* );)
public_list( void event_list_add_list (Event_List_t* , Event_List_t* );)
public_list( void event_list_display (Event_List_t* );)
public_list( void pkt_list_init (Packet_OTG_List*);)
public_list( void pkt_list_free (Packet_OTG_List* listP);)
public_list( Packet_otg_elt* pkt_list_get_head (Packet_OTG_List*);)
public_list( Packet_otg_elt* pkt_list_remove_head (Packet_OTG_List* );)
public_list( Packet_otg_elt* pkt_list_remove_element (Packet_otg_elt*, Packet_OTG_List*);)
public_list( void pkt_list_add_head (Packet_otg_elt* , Packet_OTG_List* );)
public_list( void pkt_list_add_element (Packet_otg_elt* , Packet_otg_elt* , Packet_OTG_List* );)
public_list( void pkt_list_add_tail_eurecom (Packet_otg_elt* , Packet_OTG_List* );)
public_list( void pkt_list_add_list (Packet_OTG_List* , Packet_OTG_List* );)
public_list( void pkt_list_display (Packet_OTG_List* );)
public_list( void pkt_list_init (Packet_OTG_List_t*);)
public_list( void pkt_list_free (Packet_OTG_List_t* listP);)
public_list( Packet_otg_elt_t* pkt_list_get_head (Packet_OTG_List_t*);)
public_list( Packet_otg_elt_t* pkt_list_remove_head (Packet_OTG_List_t* );)
public_list( Packet_otg_elt_t* pkt_list_remove_element (Packet_otg_elt_t*, Packet_OTG_List_t*);)
public_list( void pkt_list_add_head (Packet_otg_elt_t* , Packet_OTG_List_t* );)
public_list( void pkt_list_add_element (Packet_otg_elt_t* , Packet_otg_elt_t* , Packet_OTG_List_t* );)
public_list( void pkt_list_add_tail_eurecom (Packet_otg_elt_t* , Packet_OTG_List_t* );)
public_list( void pkt_list_add_list (Packet_OTG_List_t* , Packet_OTG_List_t* );)
public_list( void pkt_list_display (Packet_OTG_List_t* );)
#endif
openair2/UTIL/FIFO/types.h
+52 -49
View File
@@ -1,80 +1,83 @@
#ifndef __FIFO_TYPES_H__
#define __FIFO_TYPES_H__
#include "platform_types.h"
/* Types of events triggering the end of the simulation */
typedef enum End_Of_Sim_Event_Type {FRAME, TRAFFIC} End_Of_Sim_Event_Type;
typedef enum End_Of_Sim_Event_Type_e {FRAME, TRAFFIC} End_Of_Sim_Event_Type_t;
/* Types regrouping both user-defined and regular events */
typedef enum Event_Type {ET_DL, ET_UL, ET_S, ET_OMG, ET_OTG} Event_Type;
typedef enum Event_Type_e {ET_DL, ET_UL, ET_S, ET_OMG, ET_OTG} Event_Type_t;
/* decomposition of node functions into jobs for a given event */
typedef enum Job_type { JT_OTG, JT_PDCP, JT_PHY_MAC, JT_INIT_SYNC, JT_DL, JT_UL, RN_DL, RN_UL, JT_END} Job_Type;
typedef enum Job_type_e { JT_OTG, JT_PDCP, JT_PHY_MAC, JT_INIT_SYNC, JT_DL, JT_UL, RN_DL, RN_UL, JT_END} Job_Type_t;
typedef struct Job {
enum Job_type type;
int exe_time; /* execution time at the worker*/
int nid; /* node id*/
int eNB_flag;
int frame;
int last_slot;
int next_slot;
int ctime;
} Job;
typedef struct Job_s {
enum Job_type_e type;
int exe_time; /* execution time at the worker*/
int nid; /* node id*/
eNB_flag_t eNB_flag;
frame_t frame;
int last_slot;
int next_slot;
int ctime;
} Job_t;
typedef struct Signal_buffers { // (s = transmit, r,r0 = receive)
typedef struct Signal_buffers_s { // (s = transmit, r,r0 = receive)
double **s_re;
double **s_im;
double **r_re;
double **r_im;
double **r_re0;
double **r_im0;
} Signal_buffers;
} Signal_buffers_t;
/*!\brief sybframe type : DL, UL, SF, */
typedef struct Packet_otg {
unsigned int sdu_buffer_size;
unsigned char *sdu_buffer;
int module_id;
int rb_id;
int dst_id;
u8 is_ue;
u8 mode;
} Packet_otg;
typedef struct Packet_otg_s {
unsigned int sdu_buffer_size;
unsigned char *sdu_buffer;
module_id_t module_id;
rb_id_t rb_id;
module_id_t dst_id;
boolean_t is_ue;
pdcp_transmission_mode_t mode;
} Packet_otg_t;
typedef struct Event {
enum Event_Type type;
char * key;
void * value;
int frame;
} Event;
typedef struct Event_s {
enum Event_Type_e type;
char *key;
void *value;
frame_t frame;
} Event_t;
/*typedef struct Global_Time {
u32 frame;
s32 slot;
s32 last_slot;
s32 next_slot;
uint32_t frame;
int32_t slot;
int32_t last_slot;
int32_t next_slot;
double time_s;
double time_ms;
};*/
typedef struct End_Of_Sim_Event {
enum End_Of_Sim_Event_Type type;
typedef struct End_Of_Sim_Event_s {
enum End_Of_Sim_Event_Type_e type;
int value;
} End_Of_Sim_Event;
} End_Of_Sim_Event_t;
typedef struct Packet_otg_elt {
struct Packet_otg_elt *next;
struct Packet_otg_elt *previous;
Packet_otg otg_pkt;
} Packet_otg_elt;
typedef struct Packet_otg_elt_s {
struct Packet_otg_elt_s *next;
struct Packet_otg_elt_s *previous;
Packet_otg_t otg_pkt;
} Packet_otg_elt_t;
typedef struct Job_element {
struct Job_element *next;
Job job;
} Job_elt;
typedef struct Job_element_s {
struct Job_element_s *next;
Job_t job;
} Job_elt_t;
typedef struct Event_element {
typedef struct Event_element_s {
struct Event_element *next;
struct Event_element *previous;
Event event;
} Event_elt;
Event_t event;
} Event_elt_t;
#endif