Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
contiki-ng
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
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
NATAF Emmanuel
contiki-ng
Commits
388c5d42
Commit
388c5d42
authored
15 years ago
by
adamdunkels
Browse files
Options
Downloads
Patches
Plain Diff
Made the sicslowpan MAC layer reachable from outside modules
parent
da3a7ffb
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/net/sicslowpan.c
+6
-6
6 additions, 6 deletions
core/net/sicslowpan.c
core/net/sicslowpan.h
+2
-1
2 additions, 1 deletion
core/net/sicslowpan.h
with
8 additions
and
7 deletions
core/net/sicslowpan.c
+
6
−
6
View file @
388c5d42
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
*
*
* This file is part of the Contiki operating system.
* This file is part of the Contiki operating system.
*
*
* $Id: sicslowpan.c,v 1.1
0
20
09/11/02
1
1
:5
8
:5
6
adamdunkels Exp $
* $Id: sicslowpan.c,v 1.1
1
20
10/01/28
1
3
:5
0
:5
1
adamdunkels Exp $
*/
*/
/**
/**
* \file
* \file
...
@@ -142,7 +142,7 @@ void uip_log(char *msg);
...
@@ -142,7 +142,7 @@ void uip_log(char *msg);
* @{
* @{
*/
*/
/** A pointer to the mac driver */
/** A pointer to the mac driver */
static
const
struct
mac_driver
*
mac
;
const
struct
mac_driver
*
sicslowpan_
mac
;
/**
/**
* A pointer to the rime buffer.
* A pointer to the rime buffer.
...
@@ -1109,10 +1109,10 @@ send_packet(rimeaddr_t *dest)
...
@@ -1109,10 +1109,10 @@ send_packet(rimeaddr_t *dest)
*/
*/
packetbuf_set_addr
(
PACKETBUF_ADDR_RECEIVER
,
dest
);
packetbuf_set_addr
(
PACKETBUF_ADDR_RECEIVER
,
dest
);
if
(
mac
!=
NULL
)
{
if
(
sicslowpan_
mac
!=
NULL
)
{
/** \todo: Fix sending delays so they aren't blocking, or even better would
/** \todo: Fix sending delays so they aren't blocking, or even better would
* be to figure out how to get rid of delays entirely */
* be to figure out how to get rid of delays entirely */
mac
->
send
();
sicslowpan_
mac
->
send
();
}
}
}
}
...
@@ -1466,10 +1466,10 @@ void
...
@@ -1466,10 +1466,10 @@ void
sicslowpan_init
(
const
struct
mac_driver
*
m
)
sicslowpan_init
(
const
struct
mac_driver
*
m
)
{
{
/* remember the mac driver */
/* remember the mac driver */
mac
=
m
;
sicslowpan_
mac
=
m
;
/* Set our input function as the receive function of the MAC. */
/* Set our input function as the receive function of the MAC. */
mac
->
set_receive_function
(
input
);
sicslowpan_
mac
->
set_receive_function
(
input
);
/*
/*
* Set out output function as the function to be called from uIP to
* Set out output function as the function to be called from uIP to
...
...
This diff is collapsed.
Click to expand it.
core/net/sicslowpan.h
+
2
−
1
View file @
388c5d42
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
*
*
* This file is part of the Contiki operating system.
* This file is part of the Contiki operating system.
*
*
* $Id: sicslowpan.h,v 1.
4
20
09/04/06 13:11:20 nifi
Exp $
* $Id: sicslowpan.h,v 1.
5
20
10/01/28 13:50:51 adamdunkels
Exp $
*/
*/
/**
/**
* \file
* \file
...
@@ -255,5 +255,6 @@ struct sicslowpan_addr_context {
...
@@ -255,5 +255,6 @@ struct sicslowpan_addr_context {
*/
*/
void
sicslowpan_init
(
const
struct
mac_driver
*
m
);
void
sicslowpan_init
(
const
struct
mac_driver
*
m
);
extern
const
struct
mac_driver
*
sicslowpan_mac
;
#endif
/* __SICSLOWPAN_H__ */
#endif
/* __SICSLOWPAN_H__ */
/** @} */
/** @} */
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