Thanks to visit codestin.com
Credit goes to github.com

Skip to content

nRF52: update usb with new variant #3438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 8, 2023
Merged

nRF52: update usb with new variant #3438

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b20309
chips: nrf52: usb: add kernel::debug
bradjc May 19, 2023
af0291d
nrf52: usb: update revisions, errata check
bradjc May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions chips/nrf52/src/usbd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@ use crate::power;
// replaced with better error handling.
macro_rules! debug_events {
[ $( $arg:expr ),+ ] => {
{} // debug!($( $arg ),+)
{} // kernel::debug!($( $arg ),+)
};
}

macro_rules! debug_tasks {
[ $( $arg:expr ),+ ] => {
{} // debug!($( $arg ),+)
{} // kernel::debug!($( $arg ),+)
};
}

macro_rules! debug_packets {
[ $( $arg:expr ),+ ] => {
{} // debug!($( $arg ),+)
{} // kernel::debug!($( $arg ),+)
};
}

macro_rules! debug_info {
[ $( $arg:expr ),+ ] => {
{} // debug!($( $arg ),+)
{} // kernel::debug!($( $arg ),+)
};
}

macro_rules! internal_warn {
[ $( $arg:expr ),+ ] => {
{} // debug!($( $arg ),+)
{} // kernel::debug!($( $arg ),+)
};
}

Expand Down Expand Up @@ -607,7 +607,9 @@ register_bitfields! [u32,
REVA = 0,
REVB = 1,
REVC = 2,
REVD = 3
REVD = 3,
REVE = 4,
REVF = 5,
]
]
];
Expand Down Expand Up @@ -743,6 +745,15 @@ impl<'a> Usbd<'a> {
self.power.set(power);
}

// ERRATA
//
// There are known issues with nRF52840 USB hardware, and we check if
// specific errata apply given different versions of the chip.
//
// Reference
// https://github.com/NordicSemiconductor/nrfx/blob/master/mdk/nrf52_erratas.h
// for how the different errata apply.

fn has_errata_166(&self) -> bool {
true
}
Expand All @@ -758,7 +769,9 @@ impl<'a> Usbd<'a> {
&& match CHIPINFO_BASE.chip_revision.read_as_enum(ChipRevision::REV) {
Some(ChipRevision::REV::Value::REVB)
| Some(ChipRevision::REV::Value::REVC)
| Some(ChipRevision::REV::Value::REVD) => true,
| Some(ChipRevision::REV::Value::REVD)
| Some(ChipRevision::REV::Value::REVE)
| Some(ChipRevision::REV::Value::REVF) => true,
Some(ChipRevision::REV::Value::REVA) | None => false,
}
}
Expand Down Expand Up @@ -916,7 +929,10 @@ impl<'a> Usbd<'a> {
chip_revision.get()
);
}
Some(ChipRevision::REV::Value::REVC) | Some(ChipRevision::REV::Value::REVD) => {
Some(ChipRevision::REV::Value::REVC)
| Some(ChipRevision::REV::Value::REVD)
| Some(ChipRevision::REV::Value::REVE)
| Some(ChipRevision::REV::Value::REVF) => {
debug_info!(
"Your chip is NRF52840 revision {}. The USB stack was tested on your chip :)",
chip_revision.get()
Expand Down