Mark/tetros
1
0
Fork 0
Code Actions Packages

Remove cfg arch

Browse Source
This commit is contained in:
Mark 2025-02-17 11:03:26 -08:00
parent 014babe444
commit eef831cb60
Signed by: Mark
GPG Key ID: C6D63995FE72FD80
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootloader/bootloader/src/arch/mod.rs
View File

@ -1,5 +1,2 @@
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
pub use self::x86::*; pub use self::x86::*;
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
mod x86; mod x86;

7
bootloader/bootloader/src/main.rs
View File

@ -579,13 +579,6 @@ fn main<D: Disk, V: Iterator<Item = OsVideoMode>>(os: &dyn Os<D, V>) -> (usize,
writeln!(w, "REDOXFS_PASSWORD_SIZE={:016x}", password.len()).unwrap(); writeln!(w, "REDOXFS_PASSWORD_SIZE={:016x}", password.len()).unwrap();
} }
#[cfg(target_arch = "riscv64")]
{
let boot_hartid = os::efi_get_boot_hartid()
.expect("Could not retrieve boot hart id from EFI implementation!");
writeln!(w, "BOOT_HART_ID={:016x}", boot_hartid).unwrap();
}
for output_i in 0..os.video_outputs() { for output_i in 0..os.video_outputs() {
if let Some(mut mode) = mode_opts[output_i] { if let Some(mut mode) = mode_opts[output_i] {
// Set mode to get updated values // Set mode to get updated values

3
bootloader/bootloader/src/os/mod.rs
View File

@ -1,9 +1,6 @@
use redoxfs::Disk; use redoxfs::Disk;
#[cfg(all(target_arch = "x86", target_os = "none"))]
pub use self::bios::*; pub use self::bios::*;
#[cfg(all(target_arch = "x86", target_os = "none"))]
#[macro_use] #[macro_use]
mod bios; mod bios;

2
bootloader/bootloader/src/serial_16550.rs
View File

@ -2,7 +2,6 @@ use bitflags::bitflags;
use core::convert::TryInto; use core::convert::TryInto;
use core::fmt; use core::fmt;
use core::ptr::{addr_of, addr_of_mut}; use core::ptr::{addr_of, addr_of_mut};
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
use syscall::io::Pio; use syscall::io::Pio;
use syscall::io::{Io, Mmio, ReadOnly}; use syscall::io::{Io, Mmio, ReadOnly};
@ -46,7 +45,6 @@ pub struct SerialPort<T: Io> {
modem_sts: ReadOnly<T>, modem_sts: ReadOnly<T>,
} }
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
impl SerialPort<Pio<u8>> { impl SerialPort<Pio<u8>> {
pub const fn new(base: u16) -> SerialPort<Pio<u8>> { pub const fn new(base: u16) -> SerialPort<Pio<u8>> {
SerialPort { SerialPort {