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
38e5bd62
Unverified
Commit
38e5bd62
authored
6 years ago
by
Koen Zandberg
Browse files
Options
Downloads
Patches
Plain Diff
mrf24j40: Don't propagate address to 802154 layer
parent
e6ace9c0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/mrf24j40/mrf24j40_getset.c
+3
-6
3 additions, 6 deletions
drivers/mrf24j40/mrf24j40_getset.c
drivers/mrf24j40/mrf24j40_netdev.c
+2
-2
2 additions, 2 deletions
drivers/mrf24j40/mrf24j40_netdev.c
with
5 additions
and
8 deletions
drivers/mrf24j40/mrf24j40_getset.c
+
3
−
6
View file @
38e5bd62
...
...
@@ -131,14 +131,12 @@ void mrf24j40_set_addr_short(mrf24j40_t *dev, uint16_t addr)
#ifdef MODULE_SIXLOWPAN
/* https://tools.ietf.org/html/rfc4944#section-12 requires the first bit to
* 0 for unicast addresses */
dev
->
netdev
.
short_
addr
[
0
]
&=
0x7F
;
addr
&=
0x
FF
7F
;
#endif
dev
->
netdev
.
short_addr
[
0
]
=
(
uint8_t
)(
addr
);
dev
->
netdev
.
short_addr
[
1
]
=
(
uint8_t
)(
addr
>>
8
);
mrf24j40_reg_write_short
(
dev
,
MRF24J40_REG_SADRL
,
dev
->
netdev
.
short_addr
[
1
]
);
(
uint8_t
)(
addr
>>
8
)
);
mrf24j40_reg_write_short
(
dev
,
MRF24J40_REG_SADRH
,
dev
->
netdev
.
short_
addr
[
0
]
);
(
uint8_t
)
addr
);
}
uint64_t
mrf24j40_get_addr_long
(
mrf24j40_t
*
dev
)
...
...
@@ -156,7 +154,6 @@ uint64_t mrf24j40_get_addr_long(mrf24j40_t *dev)
void
mrf24j40_set_addr_long
(
mrf24j40_t
*
dev
,
uint64_t
addr
)
{
for
(
int
i
=
0
;
i
<
8
;
i
++
)
{
dev
->
netdev
.
long_addr
[
i
]
=
(
uint8_t
)(
addr
>>
(
i
*
8
));
mrf24j40_reg_write_short
(
dev
,
(
MRF24J40_REG_EADR0
+
i
),
(
addr
>>
((
7
-
i
)
*
8
)));
}
...
...
This diff is collapsed.
Click to expand it.
drivers/mrf24j40/mrf24j40_netdev.c
+
2
−
2
View file @
38e5bd62
...
...
@@ -371,7 +371,7 @@ static int _set(netdev_t *netdev, netopt_t opt, const void *val, size_t len)
}
else
{
mrf24j40_set_addr_short
(
dev
,
*
((
const
uint16_t
*
)
val
));
/* don't set res to set netdev_ieee802154_t::short_addr */
res
=
sizeof
(
uint16_t
);
}
break
;
...
...
@@ -381,7 +381,7 @@ static int _set(netdev_t *netdev, netopt_t opt, const void *val, size_t len)
}
else
{
mrf24j40_set_addr_long
(
dev
,
*
((
const
uint64_t
*
)
val
));
/* don't set res to set netdev_ieee802154_t::long_addr */
res
=
sizeof
(
uint64_t
);
}
break
;
...
...
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