Skip to content

Commit c8a0c04

Browse files
committed
Remove some printlns
1 parent a958a2b commit c8a0c04

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

bios/second_stage/src/disk.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub struct DiskAccess {
1010

1111
impl Read for DiskAccess {
1212
fn read_exact(&mut self, input_buf: &mut [u8]) {
13-
writeln!(screen::Writer, "read {} bytes", input_buf.len()).unwrap();
1413
static mut TMP_BUF: [u8; 512] = [0; 512];
1514
let tmp_buf = unsafe { &mut TMP_BUF[..] };
1615
let (buf, copy_needed) = if input_buf.len() >= tmp_buf.len() {
@@ -35,7 +34,6 @@ impl Read for DiskAccess {
3534
(target_addr & 0b1111) as u16,
3635
(target_addr >> 4).try_into().unwrap(),
3736
);
38-
writeln!(screen::Writer, "dap: {dap:?}").unwrap();
3937
unsafe {
4038
dap.perform_load(self.disk_number);
4139
}
@@ -57,14 +55,11 @@ impl Read for DiskAccess {
5755
input_buf[i] = tmp_buf[i];
5856
}
5957
}
60-
61-
writeln!(screen::Writer, "read {} bytes done", input_buf.len()).unwrap();
6258
}
6359
}
6460

6561
impl Seek for DiskAccess {
6662
fn seek(&mut self, pos: SeekFrom) -> u64 {
67-
writeln!(screen::Writer, "seek to {pos:?}").unwrap();
6863
match pos {
6964
SeekFrom::Start(offset) => {
7065
self.current_offset = offset;

bios/second_stage/src/main.rs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn second_stage_end() -> *const u8 {
2727
#[no_mangle]
2828
#[link_section = ".start"]
2929
pub extern "C" fn _start(disk_number: u16, partition_table_start: *const u8) {
30-
write!(screen::Writer, "\nSECOND STAGE: ").unwrap();
30+
writeln!(screen::Writer, " -> SECOND STAGE").unwrap();
3131

3232
// parse partition table
3333
let partitions = {
@@ -59,28 +59,33 @@ pub extern "C" fn _start(disk_number: u16, partition_table_start: *const u8) {
5959
fat_partition.partition_type,
6060
PartitionType::Fat12(_) | PartitionType::Fat16(_) | PartitionType::Fat32(_)
6161
));
62-
writeln!(screen::Writer, "1").unwrap();
6362

6463
// load fat partition
6564
let mut disk = disk::DiskAccess {
6665
disk_number,
6766
base_offset: u64::from(fat_partition.logical_block_address) * 512,
6867
current_offset: 0,
6968
};
70-
writeln!(screen::Writer, "2").unwrap();
7169

7270
let mut fs = fat::FileSystem::parse(disk.clone());
73-
writeln!(screen::Writer, "3").unwrap();
7471

7572
let kernel = fs
7673
.find_file_in_root_dir("kernel-x86_64")
7774
.expect("no `kernel-x86_64` file found");
78-
writeln!(screen::Writer, "4").unwrap();
7975

8076
for cluster in fs.file_clusters(&kernel) {
81-
writeln!(screen::Writer, "kernel cluster: {cluster:?}").unwrap();
77+
let cluster = cluster.unwrap();
78+
writeln!(
79+
screen::Writer,
80+
"kernel cluster: start: {:#x}, len: {}",
81+
cluster.start_offset,
82+
cluster.len_bytes
83+
)
84+
.unwrap();
8285
}
8386

87+
writeln!(screen::Writer, "DONE").unwrap();
88+
8489
// TODO: Retrieve memory map
8590

8691
// TODO: Set up protected mode, or unreal mode

0 commit comments

Comments
 (0)