Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
20
Merge Requests
20
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
3f8c74ca
Commit
3f8c74ca
authored
Mar 25, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoid duplicate #define
parent
a56b0a1f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
6 deletions
+19
-6
common/utils/itti/memory_pools.c
common/utils/itti/memory_pools.c
+2
-0
openair1/PHY/defs.h
openair1/PHY/defs.h
+6
-4
openair2/COMMON/openair_defs.h
openair2/COMMON/openair_defs.h
+7
-1
openair2/RRC/LITE/rrc_eNB_S1AP.c
openair2/RRC/LITE/rrc_eNB_S1AP.c
+1
-0
openair2/UTIL/OMV/structures.h
openair2/UTIL/OMV/structures.h
+3
-1
No files found.
common/utils/itti/memory_pools.c
View file @
3f8c74ca
...
...
@@ -54,7 +54,9 @@ uint64_t vcd_mp_free;
#endif
/*------------------------------------------------------------------------------*/
#ifndef CHARS_TO_UINT32
#define CHARS_TO_UINT32(c1, c2, c3, c4) (((c1) << 24) | ((c2) << 16) | ((c3) << 8) | (c4))
#endif
#define MEMORY_POOL_ITEM_INFO_NUMBER 2
...
...
openair1/PHY/defs.h
View file @
3f8c74ca
...
...
@@ -65,10 +65,12 @@
//use msg in the real-time thread context
#define msg_nrt printf
//use msg_nrt in the non real-time context (for initialization, ...)
#ifdef __AVX2__
#define malloc16(x) memalign(32,x)
#else
#define malloc16(x) memalign(16,x)
#ifndef malloc16
# ifdef __AVX2__
# define malloc16(x) memalign(32,x)
# else
# define malloc16(x) memalign(16,x)
# endif
#endif
#define free16(y,x) free(y)
#define bigmalloc malloc
...
...
openair2/COMMON/openair_defs.h
View file @
3f8c74ca
...
...
@@ -41,7 +41,13 @@
#if !defined (msg)
# define msg(aRGS...) LOG_D(PHY, ##aRGS)
#endif
#define malloc16(x) memalign(16,x) //malloc(x)
#ifndef malloc16
# ifdef __AVX2__
# define malloc16(x) memalign(32,x)
# else
# define malloc16(x) memalign(16,x)
# endif
#endif
#define free16(y,x) free(y)
#define bigmalloc malloc
#define bigmalloc16 malloc16
...
...
openair2/RRC/LITE/rrc_eNB_S1AP.c
View file @
3f8c74ca
...
...
@@ -392,6 +392,7 @@ rrc_pdcp_config_security(
#define DEBUG_SECURITY 1
#if defined (DEBUG_SECURITY)
#undef msg
#define msg printf
if
(
print_keys
==
1
)
{
...
...
openair2/UTIL/OMV/structures.h
View file @
3f8c74ca
...
...
@@ -44,7 +44,9 @@
#define Maxneighbor 64
#define NUMBER_OF_UE_MAX 64
#define NUMBER_OF_eNB_MAX 3
#define NB_ANTENNAS_RX 4
#ifndef NB_ANTENNAS_RX
# define NB_ANTENNAS_RX 4
#endif
#endif
//
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment