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
a2d790c9
Commit
a2d790c9
authored
7 years ago
by
Koen Zandberg
Browse files
Options
Downloads
Patches
Plain Diff
mrf24j40: Add tx_retries_needed netopt
parent
23f4f9be
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/include/mrf24j40.h
+1
-0
1 addition, 0 deletions
drivers/include/mrf24j40.h
drivers/mrf24j40/include/mrf24j40_registers.h
+8
-0
8 additions, 0 deletions
drivers/mrf24j40/include/mrf24j40_registers.h
drivers/mrf24j40/mrf24j40_netdev.c
+10
-0
10 additions, 0 deletions
drivers/mrf24j40/mrf24j40_netdev.c
with
19 additions
and
0 deletions
drivers/include/mrf24j40.h
+
1
−
0
View file @
a2d790c9
...
@@ -139,6 +139,7 @@ typedef struct {
...
@@ -139,6 +139,7 @@ typedef struct {
uint8_t
header_len
;
/**< length of the header */
uint8_t
header_len
;
/**< length of the header */
uint8_t
pending
;
/**< Flags for pending tasks */
uint8_t
pending
;
/**< Flags for pending tasks */
uint8_t
irq_flag
;
/**< Flags for IRQs */
uint8_t
irq_flag
;
/**< Flags for IRQs */
uint8_t
tx_retries
;
/**< Number of retries needed for last transmission */
}
mrf24j40_t
;
}
mrf24j40_t
;
/**
/**
...
...
This diff is collapsed.
Click to expand it.
drivers/mrf24j40/include/mrf24j40_registers.h
+
8
−
0
View file @
a2d790c9
...
@@ -267,6 +267,14 @@ extern "C" {
...
@@ -267,6 +267,14 @@ extern "C" {
#define MRF24J40_TXSTAT_TXNSTAT (0x01)
#define MRF24J40_TXSTAT_TXNSTAT (0x01)
/** @} */
/** @} */
/**
* @name Shift offsets for TXSTAT register (0x24)
* @{
*/
#define MRF24J40_TXSTAT_MAX_FRAME_RETRIES_SHIFT (6U)
#define MRF24J40_TXSTAT_CCAFAIL_SHIFT (5U)
/** @} */
/**
/**
* @name Bitfield definitions for the SOFTRST register (0x2A)
* @name Bitfield definitions for the SOFTRST register (0x2A)
* @{
* @{
...
...
This diff is collapsed.
Click to expand it.
drivers/mrf24j40/mrf24j40_netdev.c
+
10
−
0
View file @
a2d790c9
...
@@ -319,6 +319,15 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
...
@@ -319,6 +319,15 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
res
=
sizeof
(
int8_t
);
res
=
sizeof
(
int8_t
);
}
}
break
;
break
;
case
NETOPT_TX_RETRIES_NEEDED
:
if
(
max_len
<
sizeof
(
uint8_t
))
{
res
=
-
EOVERFLOW
;
}
else
{
*
((
uint8_t
*
)
val
)
=
dev
->
tx_retries
;
res
=
sizeof
(
int8_t
);
}
break
;
default:
default:
/* try netdev settings */
/* try netdev settings */
...
@@ -538,6 +547,7 @@ static void _isr(netdev_t *netdev)
...
@@ -538,6 +547,7 @@ static void _isr(netdev_t *netdev)
#ifdef MODULE_NETSTATS_L2
#ifdef MODULE_NETSTATS_L2
if
(
netdev
->
event_callback
&&
(
dev
->
netdev
.
flags
&
MRF24J40_OPT_TELL_TX_END
))
{
if
(
netdev
->
event_callback
&&
(
dev
->
netdev
.
flags
&
MRF24J40_OPT_TELL_TX_END
))
{
uint8_t
txstat
=
mrf24j40_reg_read_short
(
dev
,
MRF24J40_REG_TXSTAT
);
uint8_t
txstat
=
mrf24j40_reg_read_short
(
dev
,
MRF24J40_REG_TXSTAT
);
dev
->
tx_retries
=
(
txstat
>>
MRF24J40_TXSTAT_MAX_FRAME_RETRIES_SHIFT
);
/* transmision failed */
/* transmision failed */
if
(
txstat
&
MRF24J40_TXSTAT_TXNSTAT
)
{
if
(
txstat
&
MRF24J40_TXSTAT_TXNSTAT
)
{
/* TX_NOACK - CCAFAIL */
/* TX_NOACK - CCAFAIL */
...
...
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