mikros/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable IPC logging to serial port

Browse Source
This commit is contained in:
pjht 2024-09-06 10:44:44 -05:00
parent 01a0ee9631
commit 3b2cf8bbb5
Signed by: pjht
GPG Key ID: 7B5F6AFBEC7EE78E
2 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/interrupts.rs
View File

@ -414,43 +414,43 @@ extern "C" fn syscall_handler() {
let len = usize(regs.rsi); let len = usize(regs.rsi);
assert!(len <= buffer.len()); assert!(len <= buffer.len());
if TASKING.message_queue_mut(pid, |_| ()).is_ok() { if TASKING.message_queue_mut(pid, |_| ()).is_ok() {
#[expect( //#[expect(
clippy::unwrap_used, // clippy::unwrap_used,
reason = "The min call guarantees that the value is in the range of a u32 before the cast" // reason = "The min call guarantees that the value is in the range of a u32 before the cast"
)] //)]
let trunc_len: u32 = usize::min(len, 4096).try_into().unwrap(); //let trunc_len: u32 = usize::min(len, 4096).try_into().unwrap();
#[expect( //#[expect(
clippy::arithmetic_side_effects, // clippy::arithmetic_side_effects,
reason = "Can't underflow, as x % 4 < 4 no matter the x" // reason = "Can't underflow, as x % 4 < 4 no matter the x"
)] //)]
let padding = if (trunc_len % 4) != 0 { 4 - (trunc_len % 4) } else { 0 }; //let padding = if (trunc_len % 4) != 0 { 4 - (trunc_len % 4) } else { 0 };
#[expect( //#[expect(
clippy::arithmetic_side_effects, // clippy::arithmetic_side_effects,
reason = "Can't overflow, as padding is no more than 4 and trunc_len is no more than 4096." // reason = "Can't overflow, as padding is no more than 4 and trunc_len is no more than 4096."
)] //)]
let padded_len = trunc_len + padding; //let padded_len = trunc_len + padding;
#[expect( //#[expect(
clippy::arithmetic_side_effects, // clippy::arithmetic_side_effects,
reason = "Can't overflow, as padded_len is no more than 4096 and 4096+24 < u32::MAX" // reason = "Can't overflow, as padded_len is no more than 4096 and 4096+24 < u32::MAX"
)] //)]
let total_len = padded_len + 8 + (4 * 4); //let total_len = padded_len + 8 + (4 * 4);
SECOND_PORT.write_u32s(&[ //SECOND_PORT.write_u32s(&[
0x3, // SPB type // 0x3, // SPB type
total_len, // Total block length // total_len, // Total block length
len.saturating_cast::<u32>().saturating_add(8), // Packet length // len.saturating_cast::<u32>().saturating_add(8), // Packet length
]); //]);
SECOND_PORT.write_bytes(&pid.to_ne_bytes()); //SECOND_PORT.write_bytes(&pid.to_ne_bytes());
#[expect( //#[expect(
clippy::indexing_slicing, // clippy::indexing_slicing,
reason = "The truncated length is always <= the buffer's length" // reason = "The truncated length is always <= the buffer's length"
)] //)]
SECOND_PORT.write_bytes(&buffer[0..usize(trunc_len)]); //SECOND_PORT.write_bytes(&buffer[0..usize(trunc_len)]);
for _ in 0..padding { //for _ in 0..padding {
SECOND_PORT.write_bytes(&[0]); // SECOND_PORT.write_bytes(&[0]);
} //}
SECOND_PORT.write_u32s(&[ //SECOND_PORT.write_u32s(&[
total_len, // Total block length // total_len, // Total block length
]); //]);
let buf_num_pages = buffer.len() / 4096; let buf_num_pages = buffer.len() / 4096;
let buffer = Box::into_raw(buffer); let buffer = Box::into_raw(buffer);
let buf_start_page = let buf_start_page =

30
src/main.rs
View File

@ -270,21 +270,21 @@ pub fn main() {
} }
} }
// Before starting init, write the pcapng section header + interface description to the second serial port //// Before starting init, write the pcapng section header + interface description to the second serial port
SECOND_PORT.write_u32s(&[ //SECOND_PORT.write_u32s(&[
0x0A0D_0D0A, // SHB type // 0x0A0D_0D0A, // SHB type
7 * 4, // Total block length // 7 * 4, // Total block length
0x1A2B_3C4D, // Byte order magic // 0x1A2B_3C4D, // Byte order magic
0x0000_0001, // Version (1.0) // 0x0000_0001, // Version (1.0)
0xFFFF_FFFF, // Length upper (-1) across both // 0xFFFF_FFFF, // Length upper (-1) across both
0xFFFF_FFFF, // Length lower // 0xFFFF_FFFF, // Length lower
7 * 4, // Total block length // 7 * 4, // Total block length
0x1, // IDB type // 0x1, // IDB type
5 * 4, // Total block length // 5 * 4, // Total block length
147, // Link type // 147, // Link type
4096 + 8, // Packet length limit, // 4096 + 8, // Packet length limit,
5 * 4, // Total block length // 5 * 4, // Total block length
]); //]);
#[expect( #[expect(
clippy::unwrap_used, clippy::unwrap_used,