Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
b9099963
Commit
b9099963
authored
Oct 02, 2022
by
jperaldi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moving to ACP version 1.1.30 for delivery to come
parent
285925ac
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
openair3/SS/Sidl/lib/acp/api/acpVer.h
openair3/SS/Sidl/lib/acp/api/acpVer.h
+2
-2
openair3/SS/Sidl/lib/acp/src/acp.c
openair3/SS/Sidl/lib/acp/src/acp.c
+1
-2
openair3/SS/Sidl/lib/adbg/api/adbg.h
openair3/SS/Sidl/lib/adbg/api/adbg.h
+3
-0
openair3/SS/Sidl/lib/adbg/src/adbg.c
openair3/SS/Sidl/lib/adbg/src/adbg.c
+6
-4
No files found.
openair3/SS/Sidl/lib/acp/api/acpVer.h
View file @
b9099963
...
@@ -22,5 +22,5 @@
...
@@ -22,5 +22,5 @@
#pragma once
#pragma once
#define ACP_VERSION "1.1.
29
"
#define ACP_VERSION "1.1.
30
"
#define ACP_VERSION_CKSM "
2aeae23993ec5f4b53cf4a40c313aec9
"
#define ACP_VERSION_CKSM "
fe1196c636726d0acaedfd8a3158d63c
"
openair3/SS/Sidl/lib/acp/src/acp.c
View file @
b9099963
...
@@ -247,8 +247,7 @@ int acpRecvMsg(acpCtx_t ctx, size_t* size, unsigned char* buffer)
...
@@ -247,8 +247,7 @@ int acpRecvMsg(acpCtx_t ctx, size_t* size, unsigned char* buffer)
return
-
ACP_ERR_SOCK_ERROR
;
return
-
ACP_ERR_SOCK_ERROR
;
}
}
// TODO commented this log until final fix
ACP_DEBUG_TRACE_CLOG
(
ctx
,
"Data on socket(s)"
);
//ACP_DEBUG_TRACE_CLOG(ctx, "Data on socket(s)");
if
(
ACP_CTX_CAST
(
ctx
)
->
isServer
&&
ACP_CTX_CAST
(
ctx
)
->
sock
==
sock
)
{
if
(
ACP_CTX_CAST
(
ctx
)
->
isServer
&&
ACP_CTX_CAST
(
ctx
)
->
sock
==
sock
)
{
int
peerSock
=
acpSocketAccept
(
sock
);
int
peerSock
=
acpSocketAccept
(
sock
);
...
...
openair3/SS/Sidl/lib/adbg/api/adbg.h
View file @
b9099963
...
@@ -91,6 +91,9 @@ SIDL_BEGIN_C_INTERFACE
...
@@ -91,6 +91,9 @@ SIDL_BEGIN_C_INTERFACE
/** Default size for log buffer. */
/** Default size for log buffer. */
#define ADBG_DEFAULT_LOG_BUFFER_SIZE (1 * 1024 * 1024) // 1MB
#define ADBG_DEFAULT_LOG_BUFFER_SIZE (1 * 1024 * 1024) // 1MB
/** Set null logger to disable adbg logs */
#define ADBG_NULL_LOGGER ((adbgLogger_t)-1)
/** Default global logger (printf). */
/** Default global logger (printf). */
void
adbgDefaultGlobalLogger
(
const
char
*
fmt
,
...);
void
adbgDefaultGlobalLogger
(
const
char
*
fmt
,
...);
...
...
openair3/SS/Sidl/lib/adbg/src/adbg.c
View file @
b9099963
...
@@ -73,16 +73,14 @@ void adbgSetLogger(acpCtx_t ctx, adbgLogger_t logger, size_t size)
...
@@ -73,16 +73,14 @@ void adbgSetLogger(acpCtx_t ctx, adbgLogger_t logger, size_t size)
}
}
if
(
logger
)
{
if
(
logger
)
{
if
(
ACP_CTX_CAST
(
ctx
)
->
logger
)
{
SIDL_ASSERT
(
!
ACP_CTX_CAST
(
ctx
)
->
logger
);
}
ACP_CTX_CAST
(
ctx
)
->
logger
=
logger
;
ACP_CTX_CAST
(
ctx
)
->
logger
=
logger
;
}
}
if
(
size
)
{
if
(
size
)
{
if
(
ACP_CTX_CAST
(
ctx
)
->
logBuf
)
{
if
(
ACP_CTX_CAST
(
ctx
)
->
logBuf
)
{
SIDL_ASSERT
(
!
ACP_CTX_CAST
(
ctx
)
->
logBuf
);
acpFree
(
ACP_CTX_CAST
(
ctx
)
->
logBuf
);
}
}
ACP_CTX_CAST
(
ctx
)
->
logBuf
=
(
unsigned
char
*
)
acpMalloc
(
size
);
ACP_CTX_CAST
(
ctx
)
->
logBuf
=
(
unsigned
char
*
)
acpMalloc
(
size
);
SIDL_ASSERT
(
ACP_CTX_CAST
(
ctx
)
->
logBuf
);
SIDL_ASSERT
(
ACP_CTX_CAST
(
ctx
)
->
logBuf
);
ACP_CTX_CAST
(
ctx
)
->
logBufMaxSize
=
size
;
ACP_CTX_CAST
(
ctx
)
->
logBufMaxSize
=
size
;
...
@@ -123,6 +121,10 @@ void adbgPrintLog(acpCtx_t ctx, const char* fmt, ...)
...
@@ -123,6 +121,10 @@ void adbgPrintLog(acpCtx_t ctx, const char* fmt, ...)
return
;
return
;
}
}
if
(
ACP_CTX_CAST
(
ctx
)
->
logger
==
ADBG_NULL_LOGGER
)
{
return
;
}
adbgCheckAndSetLogger
(
ctx
);
adbgCheckAndSetLogger
(
ctx
);
if
(
fmt
)
{
if
(
fmt
)
{
...
...
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