Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
b8419d48
Commit
b8419d48
authored
10 years ago
by
René Kijewski
Browse files
Options
Downloads
Patches
Plain Diff
ccnl: remove type warning
parent
1dedfc60
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
sys/net/ccn_lite/ccnl-riot-compat.c
+1
-1
1 addition, 1 deletion
sys/net/ccn_lite/ccnl-riot-compat.c
sys/net/ccn_lite/ccnl-riot-compat.h
+1
-1
1 addition, 1 deletion
sys/net/ccn_lite/ccnl-riot-compat.h
sys/net/include/ccn_lite/ccnl-riot.h
+7
-12
7 additions, 12 deletions
sys/net/include/ccn_lite/ccnl-riot.h
with
9 additions
and
14 deletions
sys/net/ccn_lite/ccnl-riot-compat.c
+
1
−
1
View file @
b8419d48
...
@@ -90,7 +90,7 @@ void riot_send_nack(uint16_t to)
...
@@ -90,7 +90,7 @@ void riot_send_nack(uint16_t to)
msg_send
(
&
m
,
to
,
0
);
msg_send
(
&
m
,
to
,
0
);
}
}
char
*
riot_ccnl_event_to_string
(
ccnl_riot_event_
t
event
)
char
*
riot_ccnl_event_to_string
(
in
t
event
)
{
{
switch
(
event
)
{
switch
(
event
)
{
case
PKT_PENDING
:
case
PKT_PENDING
:
...
...
This diff is collapsed.
Click to expand it.
sys/net/ccn_lite/ccnl-riot-compat.h
+
1
−
1
View file @
b8419d48
...
@@ -30,4 +30,4 @@ typedef struct riot_ccnl_msg {
...
@@ -30,4 +30,4 @@ typedef struct riot_ccnl_msg {
int
riot_send_transceiver
(
uint8_t
*
buf
,
uint16_t
size
,
uint16_t
to
);
int
riot_send_transceiver
(
uint8_t
*
buf
,
uint16_t
size
,
uint16_t
to
);
int
riot_send_msg
(
uint8_t
*
buf
,
uint16_t
size
,
uint16_t
to
);
int
riot_send_msg
(
uint8_t
*
buf
,
uint16_t
size
,
uint16_t
to
);
void
riot_send_nack
(
uint16_t
to
);
void
riot_send_nack
(
uint16_t
to
);
char
*
riot_ccnl_event_to_string
(
ccnl_riot_event_
t
event
);
char
*
riot_ccnl_event_to_string
(
in
t
event
);
This diff is collapsed.
Click to expand it.
sys/net/include/ccn_lite/ccnl-riot.h
+
7
−
12
View file @
b8419d48
...
@@ -41,16 +41,13 @@
...
@@ -41,16 +41,13 @@
#define TRANSCEIVER TRANSCEIVER_DEFAULT
#define TRANSCEIVER TRANSCEIVER_DEFAULT
#define CCNL_RIOT_EVENT_NUMBER_OFFSET (1 << 8)
#define CCNL_RIOT_EVENT_NUMBER_OFFSET (1 << 8)
typedef
enum
ccnl_riot_event
{
#define CCNL_RIOT_MSG (CCNL_RIOT_EVENT_NUMBER_OFFSET + 0)
CCNL_RIOT_MSG
=
CCNL_RIOT_EVENT_NUMBER_OFFSET
+
1
,
#define CCNL_RIOT_HALT (CCNL_RIOT_EVENT_NUMBER_OFFSET + 1)
CCNL_RIOT_HALT
,
#define CCNL_RIOT_POPULATE (CCNL_RIOT_EVENT_NUMBER_OFFSET + 2)
CCNL_RIOT_POPULATE
,
#define CCNL_RIOT_PRINT_STAT (CCNL_RIOT_EVENT_NUMBER_OFFSET + 3)
CCNL_RIOT_PRINT_STAT
,
#define CCNL_RIOT_TIMEOUT (CCNL_RIOT_EVENT_NUMBER_OFFSET + 4)
CCNL_RIOT_TIMEOUT
,
#define CCNL_RIOT_NACK (CCNL_RIOT_EVENT_NUMBER_OFFSET + 5)
CCNL_RIOT_NACK
,
#define CCNL_RIOT_RESERVED (CCNL_RIOT_EVENT_NUMBER_OFFSET + 6)
CCNL_RIOT_RESERVED
}
ccnl_riot_event_t
;
#define CCNL_HEADER_SIZE (40)
#define CCNL_HEADER_SIZE (40)
...
@@ -65,8 +62,6 @@ typedef enum ccnl_riot_event {
...
@@ -65,8 +62,6 @@ typedef enum ccnl_riot_event {
# define CCNL_RIOT_CHUNK_SIZE (PAYLOAD_SIZE - CCNL_HEADER_SIZE)
# define CCNL_RIOT_CHUNK_SIZE (PAYLOAD_SIZE - CCNL_HEADER_SIZE)
#endif
#endif
/**
/**
* @brief starts the ccnl relay
* @brief starts the ccnl relay
*
*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment