8000 fix the typos by howjmay · Pull Request #4425 · tock/tock · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix the typos #4425

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.

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 1 commit into from
May 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
8000
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions arch/cortex-m/src/dwt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ register_structs! {
// Comparator Register0
(0x20 => comp0: ReadWrite<u32, Comparator0::Register>),

// Mask Regsiter0
// Mask Register0
// The maximum mask size is 32KB
(0x24 => mask0: ReadWrite<u32, Comparator0Mask::Register>),

Expand All @@ -55,7 +55,7 @@ register_structs! {
// Comparator Register1
(0x30 => comp1: ReadWrite<u32, Comparator1::Register>),

// Mask Regsiter1
// Mask Register1
// The maximum mask size is 32KB
(0x34 => mask1: ReadWrite<u32, Comparator1Mask::Register>),

Expand All @@ -67,7 +67,7 @@ register_structs! {
// Comparator Register2
(0x40 => comp2: ReadWrite<u32, Comparator2::Register>),

// Mask Regsiter2
// Mask Register2
// The maximum mask size is 32KB
(0x44 => mask2: ReadWrite<u32, Comparator2Mask::Register>),

Expand All @@ -79,7 +79,7 @@ register_structs! {
// Comparator Register3
(0x50 => comp3: ReadWrite<u32, Comparator3::Register>),

// Mask Regsiter3
// Mask Register3
// The maximum mask size is 33KB
(0x54 => mask3: ReadWrite<u32, Comparator3Mask::Register>),

Expand Down Expand Up @@ -220,12 +220,12 @@ register_bitfields![u32,
],

LsuCount[
/// Counts additional cycles required to excecute all load store instructions
/// Counts additional cycles required to execute all load store instructions
LSUCNT OFFSET(0) NUMBITS(8),
],

FoldedInstructionCount[
/// Increments by one for each instruction that takes 0 cycles to excecute.
/// Increments by one for each instruction that takes 0 cycles to execute.
FOLDCNT OFFSET(0) NUMBITS(8),
],

Expand All @@ -241,7 +241,7 @@ register_bitfields![u32,
],

Comparator0Mask[
/// Size of ignore mask aplied to the access address for address range matching by comparator 0.
/// Size of ignore mask applied to the access address for address range matching by comparator 0.
/// WARN: Maximum Mask size is IMPLEMENTATION DEFINED.
MASK OFFSET(0) NUMBITS(5),
],
Expand All @@ -261,7 +261,7 @@ register_bitfields![u32,
/// RW.
DATAVADDR0 OFFSET(12) NUMBITS(4),

/// Size of data comparision (Byte, Halfword, Word).
/// Size of data comparison (Byte, Halfword, Word).
/// RW.
DATAVSIZE OFFSET(10) NUMBITS(2),

Expand All @@ -273,7 +273,7 @@ register_bitfields![u32,
/// RW.
DATAVMATCH OFFSET(8) NUMBITS(1),

/// Enable cycle count comparision for comparator 0.
/// Enable cycle count comparison for comparator 0.
/// WARN: Only supported by FUNCTION0
/// RW.
CYCMATCH OFFSET(7) NUMBITS(1),
Expand All @@ -295,7 +295,7 @@ register_bitfields![u32,
],

Comparator1Mask[
/// Size of ignore mask aplied to the access address for address range matching by comparator 0.
/// Size of ignore mask applied to the access address for address range matching by comparator 0.
/// WARN: Maximum Mask size is IMPLEMENTATION DEFINED.
MASK OFFSET(0) NUMBITS(5),
],
Expand All @@ -315,7 +315,7 @@ register_bitfields![u32,
/// RW.
DATAVADDR0 OFFSET(12) NUMBITS(4),

/// Size of data comparision (Byte, Halfword, Word).
/// Size of data comparison (Byte, Halfword, Word).
/// RW.
DATAVSIZE OFFSET(10) NUMBITS(2),

Expand Down Expand Up @@ -344,7 +344,7 @@ register_bitfields![u32,
],

Comparator2Mask[
/// Size of ignore mask aplied to the access address for address range matching by comparator 0.
/// Size of ignore mask applied to the access address for address range matching by comparator 0.
/// WARN: Maximum Mask size is IMPLEMENTATION DEFINED.
MASK OFFSET(0) NUMBITS(5),
],
Expand All @@ -364,7 +364,7 @@ register_bitfields![u32,
/// RW.
DATAVADDR0 OFFSET(12) NUMBITS(4),

/// Size of data comparision (Byte, Halfword, Word).
/// Size of data comparison (Byte, Halfword, Word).
/// RW.
DATAVSIZE OFFSET(10) NUMBITS(2),

Expand Down Expand Up @@ -393,7 +393,7 @@ register_bitfields![u32,
],

Comparator3Mask[
/// Size of ignore mask aplied to the access address for address range matching by comparator 0.
/// Size of ignore mask applied to the access address for address range matching by comparator 0.
/// WARN: Maximum Mask size is IMPLEMENTATION DEFINED.
MASK OFFSET(0) NUMBITS(5),
],
Expand All @@ -413,7 +413,7 @@ register_bitfields![u32,
/// RW.
DATAVADDR0 OFFSET(12) NUMBITS(4),

/// Size of data comparision (Byte, Halfword, Word).
/// Size of data comparison (Byte, Halfword, Word).
/// RW.
DATAVSIZE OFFSET(10) NUMBITS(2),

Expand Down
2 changes: 1 addition & 1 deletion kernel/src/hil/i2c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub trait I2CMaster<'a> {
}

/// Interface for an SMBus Master hardware driver.
/// The device implementing this will also seperately implement
/// The device implementing this will also separately implement
/// I2CMaster.
pub trait SMBusMaster<'a>: I2CMaster<'a> {
/// Write data then read data via the I2C Master device in an SMBus
Expand Down
4 changes: 2 additions & 2 deletions libraries/tock-register-interface/src/fields.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! To conveniently access and manipulate fields of a register, this
//! library provides types and macros to describe and access bitfields
//! of a register. This can be especially useful in conjuction with
//! of a register. This can be especially useful in conjunction with
//! the APIs defined in [`interfaces`](crate::interfaces), which make
//! use of these types and hence allow to access and manipulate
//! bitfields of proper registers directly.
Expand Down Expand Up @@ -375,7 +375,7 @@ macro_rules! register_bitmasks {
$offset:expr, $numbits:expr,
[$( $(#[$inner:meta])* $valname:ident = $value:expr ),+ $(,)?]
} => { // this match arm is duplicated below with an allowance for 0 elements in the valname -> value array,
// to seperately support the case of zero-variant enums not supporting non-default
// to separately support the case of zero-variant enums not supporting non-default
// representations.
#[allow(non_upper_case_globals)]
#[allow(unused)]
Expand Down
2 changes: 1 addition & 1 deletion libraries/tock-register-interface/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ pub trait UIntLike:
fn zero() -> Self;
}

// Helper macro for implementing the UIntLike trait on differrent
// Helper macro for implementing the UIntLike trait on different
// types.
macro_rules! UIntLike_impl_for {
($type:ty) => {
Expand Down
0