Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Embedded Rust
lpc43xx-hal
Merge requests
!22
Reapplies patch that removes the clear_bits macro
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
A Sundbom
requested to merge
can-regression
into
master
5 years ago
Overview
1
Commits
1
Pipelines
1
Changes
1
0
0
Compare
master
master (base)
and
latest version
latest version
2357f7da
1 commit,
5 years ago
1 file
+
0
−
22
Expand all files
Preferences
Preferences
File browser
List view
Tree view
Compare changes
Inline
Side-by-side
Show whitespace changes
Show one file at a time
src/can/bus.rs
+
0
−
22
Options
View file @ 2357f7da
Edit in single-file editor
Open in Web IDE
Show full file
@@ -287,28 +287,6 @@ macro_rules! hal {
if2_da2
,
if2_db2
,
if2_db2
),
};
macro_rules!
clear_bits
{
(
$cmdmsk
:
ident
,
$cmdmsk_r
:
ident
,
$cmdreq
:
ident
)
=>
{
// reset NEWDAT = 0
// reset INTPND = 0
unsafe
{
self
.can
.
$cmdmsk_r
()
.write
(|
w
|
w
.newdat
()
.bit
(
true
)
.clrintpnd
()
.bit
(
true
)
.wr_rd
()
.bit
(
true
));
// write MessageNum to CANIFx_CMDREQ
self
.can
.
$cmdreq
.write
(|
w
|
w
.messnum
()
.bits
(
message_num
));
while
self
.can
.
$cmdreq
.read
()
.busy
()
.bit
()
{}
}
}
}
// Reset newdata and intpnd
match
iface
{
MsgIface
::
Iface1
=>
clear_bits!
(
if1_cmdmsk
,
if1_cmdmsk_r
,
if1_cmdreq
),
MsgIface
::
Iface2
=>
clear_bits!
(
if2_cmdmsk
,
if2_cmdmsk_r
,
if2_cmdreq
),
};
if
!
newdat
{
// No data in the message
return
Ok
(
self
.data_buf
.clone
())
}
else
{
Menu
Explore
Projects
Groups
Topics
Snippets