Skip to content

Commit

Permalink
Merge pull request tock#4217 from siddharthkumarjha/master
Browse files Browse the repository at this point in the history
doc: Fix `make doc` exiting with errors
  • Loading branch information
lschuermann authored Oct 28, 2024
2 parents abf7669 + 12e45d4 commit 40e0422
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
18 changes: 5 additions & 13 deletions arch/riscv/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,10 @@

pub mod csr;

#[cfg(target_arch = "riscv32")]
pub const XLEN: usize = 32;
#[cfg(target_arch = "riscv64")]
pub const XLEN: usize = 64;

// Default to 32 bit if no architecture is specified of if this is being
// compiled for docs or testing on a different architecture.
#[cfg(any(
doc,
not(all(
any(target_arch = "riscv32", target_arch = "riscv64"),
target_os = "none"
))
))]
pub const XLEN: usize = 32;
pub const XLEN: usize = if cfg!(target_arch = "riscv64") {
64
} else {
32
};
2 changes: 2 additions & 0 deletions capsules/extra/src/servo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//! Usage
//! -----
//!
//! ```ignore
//! use kernel::static_init;
//! let mux_pwm = components::pwm::PwmMuxComponent::new(&peripherals.pwm)
//! .finalize(components::pwm_mux_component_static!(rp2040::pwm::Pwm));
Expand All @@ -32,6 +33,7 @@
//! capsules_extra::servo::Servo<'static, 2>,
//! capsules_extra::servo::Servo::new(multi_servo)
//! );
//! ```
use kernel::hil;
use kernel::syscall::{CommandReturn, SyscallDriver};
Expand Down

0 comments on commit 40e0422

Please sign in to comment.