Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
M
Mock Turtle
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Mock Turtle
Commits
e1a0f210
Commit
e1a0f210
authored
Dec 17, 2014
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib: use same patter for hmq function name
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
345b6a12
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
18 deletions
+14
-18
libwrtd-input.c
applications/wrtd/lib/libwrtd-input.c
+3
-5
libwrtd-output.c
applications/wrtd/lib/libwrtd-output.c
+2
-4
libwrnc.c
lib/libwrnc.c
+6
-6
libwrnc.h
lib/libwrnc.h
+3
-3
No files found.
applications/wrtd/lib/libwrtd-input.c
View file @
e1a0f210
...
...
@@ -25,10 +25,8 @@ static inline int wrtd_in_send_and_receive_sync(struct wrtd_desc *wrtd,
return
-
1
;
/* Send the message and get answer */
err
=
wrnc_slot_send_and_receive_sync
(
hmq
,
WRTD_OUT_TDC_CONTROL
,
msg
,
WRTD_DEFAULT_TIMEOUT
);
err
=
wrnc_hmq_send_and_receive_sync
(
hmq
,
WRTD_OUT_TDC_CONTROL
,
msg
,
WRTD_DEFAULT_TIMEOUT
);
wrnc_hmq_close
(
hmq
);
return
err
;
...
...
@@ -541,7 +539,7 @@ int wrtd_in_read_log(struct wrtd_node *dev, struct wrtd_log_entry *log,
struct wrnc_msg *msg;
while (remaining) {
msg = wrnc_
slot
_receive(wrtd->wrnc, WRTD_OUT_FD_LOGGING);
msg = wrnc_
hmq
_receive(wrtd->wrnc, WRTD_OUT_FD_LOGGING);
if (!msg)
break;
...
...
applications/wrtd/lib/libwrtd-output.c
View file @
e1a0f210
...
...
@@ -24,10 +24,8 @@ static inline int wrtd_out_send_and_receive_sync(struct wrtd_desc *wrtd,
if
(
!
hmq
)
return
-
1
;
err
=
wrnc_slot_send_and_receive_sync
(
hmq
,
WRTD_OUT_FD_CONTROL
,
msg
,
WRTD_DEFAULT_TIMEOUT
);
err
=
wrnc_hmq_send_and_receive_sync
(
hmq
,
WRTD_OUT_FD_CONTROL
,
msg
,
WRTD_DEFAULT_TIMEOUT
);
wrnc_hmq_close
(
hmq
);
...
...
lib/libwrnc.c
View file @
e1a0f210
...
...
@@ -614,10 +614,10 @@ void wrnc_hmq_close(struct wrnc_hmq *hmq)
* @param[in] timeout_ms maximum ms to wait for an answer
* @return 0 on success, -1 on error and errno is set appropriately
*/
int
wrnc_
slot
_send_and_receive_sync
(
struct
wrnc_hmq
*
hmq
,
unsigned
int
index_out
,
struct
wrnc_msg
*
msg
,
unsigned
int
timeout_ms
)
int
wrnc_
hmq
_send_and_receive_sync
(
struct
wrnc_hmq
*
hmq
,
unsigned
int
index_out
,
struct
wrnc_msg
*
msg
,
unsigned
int
timeout_ms
)
{
struct
wrnc_msg_sync
smsg
;
int
err
;
...
...
@@ -815,7 +815,7 @@ int wrnc_cpu_disable(struct wrnc_dev *wrnc, unsigned int index)
* @param[in] hmq HMQ device descriptor
* @return a WRNC message, NULL on error and errno is set appropriately
*/
struct
wrnc_msg
*
wrnc_
slot
_receive
(
struct
wrnc_hmq
*
hmq
)
struct
wrnc_msg
*
wrnc_
hmq
_receive
(
struct
wrnc_hmq
*
hmq
)
{
struct
wrnc_msg
*
msg
;
int
n
;
...
...
@@ -846,7 +846,7 @@ struct wrnc_msg *wrnc_slot_receive(struct wrnc_hmq *hmq)
* @param[in] msg message to send
* @return 0 on success, -1 otherwise and errno is set appropriately
*/
int
wrnc_
slot
_send
(
struct
wrnc_hmq
*
hmq
,
struct
wrnc_msg
*
msg
)
int
wrnc_
hmq
_send
(
struct
wrnc_hmq
*
hmq
,
struct
wrnc_msg
*
msg
)
{
int
n
;
...
...
lib/libwrnc.h
View file @
e1a0f210
...
...
@@ -129,9 +129,9 @@ extern struct wrnc_hmq *wrnc_hmq_open(struct wrnc_dev *wrnc,
unsigned
int
index
,
unsigned
long
flags
);
extern
void
wrnc_hmq_close
(
struct
wrnc_hmq
*
hmq
);
extern
struct
wrnc_msg
*
wrnc_
slot
_receive
(
struct
wrnc_hmq
*
hmq
);
extern
int
wrnc_
slot
_send
(
struct
wrnc_hmq
*
hmq
,
struct
wrnc_msg
*
msg
);
extern
int
wrnc_
slot
_send_and_receive_sync
(
struct
wrnc_hmq
*
hmq
,
extern
struct
wrnc_msg
*
wrnc_
hmq
_receive
(
struct
wrnc_hmq
*
hmq
);
extern
int
wrnc_
hmq
_send
(
struct
wrnc_hmq
*
hmq
,
struct
wrnc_msg
*
msg
);
extern
int
wrnc_
hmq
_send_and_receive_sync
(
struct
wrnc_hmq
*
hmq
,
unsigned
int
index_out
,
struct
wrnc_msg
*
msg
,
unsigned
int
timeout_ms
);
...
...
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