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
32543afd
Commit
32543afd
authored
10 years ago
by
Oleg Hahm
Browse files
Options
Downloads
Patches
Plain Diff
ieee802154: make use of frame_type enum all over
parent
74a53e82
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
drivers/at86rf231/at86rf231_rx.c
+1
-1
1 addition, 1 deletion
drivers/at86rf231/at86rf231_rx.c
drivers/cc2420/cc2420_rx.c
+1
-1
1 addition, 1 deletion
drivers/cc2420/cc2420_rx.c
sys/net/link_layer/net_if/net_if.c
+2
-2
2 additions, 2 deletions
sys/net/link_layer/net_if/net_if.c
with
4 additions
and
4 deletions
drivers/at86rf231/at86rf231_rx.c
+
1
−
1
View file @
32543afd
...
@@ -70,7 +70,7 @@ void at86rf231_rx_handler(void)
...
@@ -70,7 +70,7 @@ void at86rf231_rx_handler(void)
at86rf231_rx_buffer
[
rx_buffer_next
].
length
);
at86rf231_rx_buffer
[
rx_buffer_next
].
length
);
/* if packet is no ACK */
/* if packet is no ACK */
if
(
at86rf231_rx_buffer
[
rx_buffer_next
].
frame
.
fcf
.
frame_type
!=
2
)
{
if
(
at86rf231_rx_buffer
[
rx_buffer_next
].
frame
.
fcf
.
frame_type
!=
IEEE_802154_ACK_FRAME
)
{
#ifdef DEBUG_ENABLED
#ifdef DEBUG_ENABLED
ieee802154_frame_print_fcf_frame
(
&
at86rf231_rx_buffer
[
rx_buffer_next
].
frame
);
ieee802154_frame_print_fcf_frame
(
&
at86rf231_rx_buffer
[
rx_buffer_next
].
frame
);
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
drivers/cc2420/cc2420_rx.c
+
1
−
1
View file @
32543afd
...
@@ -72,7 +72,7 @@ void cc2420_rx_handler(void)
...
@@ -72,7 +72,7 @@ void cc2420_rx_handler(void)
cc2420_rx_buffer
[
rx_buffer_next
].
length
);
cc2420_rx_buffer
[
rx_buffer_next
].
length
);
/* follow-up to transceiver module if adequate */
/* follow-up to transceiver module if adequate */
if
(
cc2420_rx_buffer
[
rx_buffer_next
].
frame
.
fcf
.
frame_type
!=
2
)
{
if
(
cc2420_rx_buffer
[
rx_buffer_next
].
frame
.
fcf
.
frame_type
!=
IEEE_802154_ACK_FRAME
)
{
#ifdef DEBUG
#ifdef DEBUG
ieee802154_frame_print_fcf_frame
(
&
cc2420_rx_buffer
[
rx_buffer_next
].
frame
);
ieee802154_frame_print_fcf_frame
(
&
cc2420_rx_buffer
[
rx_buffer_next
].
frame
);
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
sys/net/link_layer/net_if/net_if.c
+
2
−
2
View file @
32543afd
...
@@ -331,7 +331,7 @@ int net_if_send_packet(int if_id, uint16_t target, const void *payload,
...
@@ -331,7 +331,7 @@ int net_if_send_packet(int if_id, uint16_t target, const void *payload,
p
.
frame
.
fcf
.
dest_addr_m
=
IEEE_802154_SHORT_ADDR_M
;
p
.
frame
.
fcf
.
dest_addr_m
=
IEEE_802154_SHORT_ADDR_M
;
p
.
frame
.
fcf
.
ack_req
=
0
;
p
.
frame
.
fcf
.
ack_req
=
0
;
p
.
frame
.
fcf
.
sec_enb
=
0
;
p
.
frame
.
fcf
.
sec_enb
=
0
;
p
.
frame
.
fcf
.
frame_type
=
1
;
p
.
frame
.
fcf
.
frame_type
=
IEEE_802154_DATA_FRAME
;
p
.
frame
.
fcf
.
frame_pend
=
0
;
p
.
frame
.
fcf
.
frame_pend
=
0
;
p
.
frame
.
dest_pan_id
=
net_if_get_pan_id
(
if_id
);
p
.
frame
.
dest_pan_id
=
net_if_get_pan_id
(
if_id
);
...
@@ -375,7 +375,7 @@ int net_if_send_packet_long(int if_id, net_if_eui64_t *target,
...
@@ -375,7 +375,7 @@ int net_if_send_packet_long(int if_id, net_if_eui64_t *target,
p
.
frame
.
fcf
.
dest_addr_m
=
IEEE_802154_LONG_ADDR_M
;
p
.
frame
.
fcf
.
dest_addr_m
=
IEEE_802154_LONG_ADDR_M
;
p
.
frame
.
fcf
.
ack_req
=
0
;
p
.
frame
.
fcf
.
ack_req
=
0
;
p
.
frame
.
fcf
.
sec_enb
=
0
;
p
.
frame
.
fcf
.
sec_enb
=
0
;
p
.
frame
.
fcf
.
frame_type
=
1
;
p
.
frame
.
fcf
.
frame_type
=
IEEE_802154_DATA_FRAME
;
p
.
frame
.
fcf
.
frame_pend
=
0
;
p
.
frame
.
fcf
.
frame_pend
=
0
;
p
.
frame
.
dest_pan_id
=
net_if_get_pan_id
(
if_id
);
p
.
frame
.
dest_pan_id
=
net_if_get_pan_id
(
if_id
);
memcpy
(
p
.
frame
.
dest_addr
,
target
,
8
);
memcpy
(
p
.
frame
.
dest_addr
,
target
,
8
);
...
...
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