Skip to content

Fallback to COM1 port on azure #787

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

Open
praveen-pk wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −3
Open

Fallback to COM1 port on azure #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions litebox_platform_lvbs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ litebox_util_log = { version = "0.1.0", path = "../litebox_util_log" }
default = ["optee_syscall"]
optee_syscall = []
linux_syscall = []
devbox = []

[lints]
workspace = true
11 changes: 8 additions & 3 deletions litebox_platform_lvbs/src/arch/x86/ioport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@ use crate::mshv::ringbuffer::ringbuffer;
use core::{arch::asm, fmt};
use spin::{Mutex, Once};

// LVBS uses COM PORT 2 for printing out debug messages
const COM_PORT_2: u16 = 0x2F8;
// devbox uses COM PORT 2
#[cfg(feature = "devbox")]
const DEST_COM_PORT: u16 = 0x2F8;

// all other configurations use COM PORT 1
#[cfg(not(feature = "devbox"))]
const DEST_COM_PORT: u16 = 0x3F8;

const INTERRUPT_ENABLE_OFFSET: u16 = 1;
const OUT_FIFO_CONTROL_OFFSET: u16 = 2;
Expand Down Expand Up @@ -136,7 +141,7 @@ impl ComPort {
fn com() -> &'static Mutex<ComPort> {
static COM_ONCE: Once<Mutex<ComPort>> = Once::new();
COM_ONCE.call_once(|| {
let mut com_port = ComPort::new(COM_PORT_2);
let mut com_port = ComPort::new(DEST_COM_PORT);
com_port.init();
Mutex::new(com_port)
})
Expand Down
3 changes: 3 additions & 0 deletions litebox_runner_lvbs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@ once_cell = { version = "1.21.3", default-features = false, features = ["race",
[target.'cfg(target_arch = "x86_64")'.dependencies]
x86_64 = { version = "0.15.2", default-features = false, features = ["instructions"] }

[features]
devbox = ["litebox_platform_lvbs/devbox"]

[lints]
workspace = true