Skip to content

Update OS to use new common crate. #53

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

Merged
thejpster merged 3 commits into from
Jul 15, 2023
Merged

Update OS to use new common crate. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b1ce2a
Update OS to use new common crate.
jonathanpallant Jul 14, 2023
b55463a
Use published version
thejpster Jul 15, 2023
758855e
Update CHANGELOG
thejpster Jul 15, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased changes

* Switch to neotron-common-bios 0.9

## v0.4.0

* The `load` command now takes ELF binaries, not raw binaries.
Expand Down
5 changes: 3 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ panic = "abort"
panic = "abort"

[dependencies]
neotron-common-bios = "0.8"
neotron-common-bios = "0.9"
pc-keyboard = "0.7"
r0 = "1.0"
postcard = "1.0"
Expand Down
8 changes: 4 additions & 4 deletions src/commands/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn lsblk(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:

println!("Block Devices:");
for dev_idx in 0..=255u8 {
if let bios::Option::Some(device_info) = (api.block_dev_get_info)(dev_idx) {
if let bios::FfiOption::Some(device_info) = (api.block_dev_get_info)(dev_idx) {
let (bsize, bunits, dsize, dunits) =
match device_info.num_blocks * u64::from(device_info.block_size) {
x if x < (1024 * 1024 * 1024) => {
Expand Down Expand Up @@ -91,9 +91,9 @@ fn read_block(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], _
dev_idx,
bios::block_dev::BlockIdx(block_idx),
1,
bios::ApiBuffer::new(&mut buffer),
bios::FfiBuffer::new(&mut buffer),
) {
bios::Result::Ok(_) => {
bios::ApiResult::Ok(_) => {
// Carry on
let mut count = 0;
for chunk in buffer.chunks(32) {
Expand All @@ -105,7 +105,7 @@ fn read_block(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], _
println!();
}
}
bios::Result::Err(e) => {
bios::ApiResult::Err(e) => {
println!("Failed to read: {:?}", e);
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/commands/hardware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fn lshw(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:

println!("Memory regions:");
for region_idx in 0..=255u8 {
if let bios::Option::Some(region) = (api.memory_get_region)(region_idx) {
if let bios::FfiOption::Some(region) = (api.memory_get_region)(region_idx) {
println!(" {}: {}", region_idx, region);
found = true;
}
Expand All @@ -31,7 +31,7 @@ fn lshw(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:

println!("Serial Devices:");
for dev_idx in 0..=255u8 {
if let bios::Option::Some(device_info) = (api.serial_get_info)(dev_idx) {
if let bios::FfiOption::Some(device_info) = (api.serial_get_info)(dev_idx) {
println!(
" {}: {} {:?}",
dev_idx, device_info.name, device_info.device_type
Expand All @@ -47,7 +47,7 @@ fn lshw(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:

println!("Block Devices:");
for dev_idx in 0..=255u8 {
if let bios::Option::Some(device_info) = (api.block_dev_get_info)(dev_idx) {
if let bios::FfiOption::Some(device_info) = (api.block_dev_get_info)(dev_idx) {
println!(
" {}: {} {:?} bs={} size={} MiB",
dev_idx,
Expand All @@ -67,7 +67,7 @@ fn lshw(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:

println!("I2C Buses:");
for dev_idx in 0..=255u8 {
if let bios::Option::Some(device_info) = (api.i2c_bus_get_info)(dev_idx) {
if let bios::FfiOption::Some(device_info) = (api.i2c_bus_get_info)(dev_idx) {
println!(" {}: {:?}", dev_idx, device_info);
found = true;
}
Expand All @@ -80,7 +80,7 @@ fn lshw(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:

println!("Neotron Bus Devices:");
for dev_idx in 0..=255u8 {
if let bios::Option::Some(device_info) = (api.bus_get_info)(dev_idx) {
if let bios::FfiOption::Some(device_info) = (api.bus_get_info)(dev_idx) {
println!(" {}: {:?}", dev_idx, device_info);
found = true;
}
Expand All @@ -93,7 +93,7 @@ fn lshw(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:

println!("Audio Mixers:");
for dev_idx in 0..=255u8 {
if let bios::Option::Some(device_info) = (api.audio_mixer_channel_get_info)(dev_idx) {
if let bios::FfiOption::Some(device_info) = (api.audio_mixer_channel_get_info)(dev_idx) {
println!(" {}: {:?}", dev_idx, device_info);
found = true;
}
Expand Down
12 changes: 7 additions & 5 deletions src/commands/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fn kbtest(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], ctx:
let api = API.get();
loop {
match (api.hid_get_event)() {
bios::Result::Ok(bios::Option::Some(bios::hid::HidEvent::KeyPress(code))) => {
bios::ApiResult::Ok(bios::FfiOption::Some(bios::hid::HidEvent::KeyPress(code))) => {
let pckb_ev = pc_keyboard::KeyEvent {
code,
state: pc_keyboard::KeyState::Down,
Expand All @@ -30,7 +30,7 @@ fn kbtest(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], ctx:
break;
}
}
bios::Result::Ok(bios::Option::Some(bios::hid::HidEvent::KeyRelease(code))) => {
bios::ApiResult::Ok(bios::FfiOption::Some(bios::hid::HidEvent::KeyRelease(code))) => {
let pckb_ev = pc_keyboard::KeyEvent {
code,
state: pc_keyboard::KeyState::Up,
Expand All @@ -41,11 +41,13 @@ fn kbtest(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], ctx:
println!("Code={code:?} State=Up Decoded=None");
}
}
bios::Result::Ok(bios::Option::Some(bios::hid::HidEvent::MouseInput(_ignore))) => {}
bios::Result::Ok(bios::Option::None) => {
bios::ApiResult::Ok(bios::FfiOption::Some(bios::hid::HidEvent::MouseInput(
_ignore,
))) => {}
bios::ApiResult::Ok(bios::FfiOption::None) => {
// Do nothing
}
bios::Result::Err(e) => {
bios::ApiResult::Err(e) => {
println!("Failed to get HID events: {:?}", e);
}
}
Expand Down
16 changes: 9 additions & 7 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,24 @@ impl Config {
pub fn load() -> Result<Config, &'static str> {
let api = API.get();
let mut buffer = [0u8; 64];
match (api.configuration_get)(bios::ApiBuffer::new(&mut buffer)) {
bios::Result::Ok(n) => {
match (api.configuration_get)(bios::FfiBuffer::new(&mut buffer)) {
bios::ApiResult::Ok(n) => {
postcard::from_bytes(&buffer[0..n]).map_err(|_e| "Failed to parse config")
}
bios::Result::Err(_e) => Err("Failed to load config"),
bios::ApiResult::Err(_e) => Err("Failed to load config"),
}
}

pub fn save(&self) -> Result<(), &'static str> {
let api = API.get();
let mut buffer = [0u8; 64];
let slice = postcard::to_slice(self, &mut buffer).map_err(|_e| "Failed to parse config")?;
match (api.configuration_set)(bios::ApiByteSlice::new(slice)) {
bios::Result::Ok(_) => Ok(()),
bios::Result::Err(bios::Error::Unimplemented) => Err("BIOS doesn't support this (yet)"),
bios::Result::Err(_) => Err("BIOS reported an error"),
match (api.configuration_set)(bios::FfiByteSlice::new(slice)) {
bios::ApiResult::Ok(_) => Ok(()),
bios::ApiResult::Err(bios::Error::Unimplemented) => {
Err("BIOS doesn't support this (yet)")
}
bios::ApiResult::Err(_) => Err("BIOS reported an error"),
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ impl embedded_sdmmc::BlockDevice for BiosBlock {
0,
bios::block_dev::BlockIdx(u64::from(start_block_idx.0)),
blocks.len() as u8,
bios::ApiBuffer::new(byte_slice),
bios::FfiBuffer::new(byte_slice),
) {
bios::Result::Ok(_) => Ok(()),
bios::Result::Err(e) => Err(e),
bios::ApiResult::Ok(_) => Ok(()),
bios::ApiResult::Err(e) => Err(e),
}
}

Expand All @@ -50,18 +50,18 @@ impl embedded_sdmmc::BlockDevice for BiosBlock {
0,
bios::block_dev::BlockIdx(u64::from(start_block_idx.0)),
blocks.len() as u8,
bios::ApiByteSlice::new(byte_slice),
bios::FfiByteSlice::new(byte_slice),
) {
bios::Result::Ok(_) => Ok(()),
bios::Result::Err(e) => Err(e),
bios::ApiResult::Ok(_) => Ok(()),
bios::ApiResult::Err(e) => Err(e),
}
}

fn num_blocks(&self) -> Result<embedded_sdmmc::BlockCount, Self::Error> {
let api = API.get();
match (api.block_dev_get_info)(0) {
bios::Option::Some(info) => Ok(embedded_sdmmc::BlockCount(info.num_blocks as u32)),
bios::Option::None => Err(bios::Error::InvalidDevice),
bios::FfiOption::Some(info) => Ok(embedded_sdmmc::BlockCount(info.num_blocks as u32)),
bios::FfiOption::None => Err(bios::Error::InvalidDevice),
}
}
}
Expand Down
32 changes: 17 additions & 15 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ impl SerialConsole {
// Which port
self.0,
// Data
bios::ApiByteSlice::new(data),
bios::FfiByteSlice::new(data),
// No timeout
bios::Option::None,
bios::FfiOption::None,
);
if !is_panic {
res.unwrap();
Expand All @@ -160,9 +160,9 @@ impl core::fmt::Write for SerialConsole {
// Which port
self.0,
// Data
bios::ApiByteSlice::new(data.as_bytes()),
bios::FfiByteSlice::new(data.as_bytes()),
// No timeout
bios::Option::None,
bios::FfiOption::None,
);
if !is_panic {
res.unwrap();
Expand Down Expand Up @@ -267,10 +267,10 @@ pub extern "C" fn os_main(api: &bios::Api) -> ! {
println!("Copyright © Jonathan 'theJPster' Pallant and the Neotron Developers, 2022");

let (tpa_start, tpa_size) = match (api.memory_get_region)(0) {
bios::Option::None => {
bios::FfiOption::None => {
panic!("No TPA offered by BIOS!");
}
bios::Option::Some(tpa) => {
bios::FfiOption::Some(tpa) => {
if tpa.length < 256 {
panic!("TPA not large enough");
}
Expand Down Expand Up @@ -305,7 +305,7 @@ pub extern "C" fn os_main(api: &bios::Api) -> ! {

loop {
match (api.hid_get_event)() {
bios::Result::Ok(bios::Option::Some(bios::hid::HidEvent::KeyPress(code))) => {
bios::ApiResult::Ok(bios::FfiOption::Some(bios::hid::HidEvent::KeyPress(code))) => {
let pckb_ev = pc_keyboard::KeyEvent {
code,
state: pc_keyboard::KeyState::Down,
Expand All @@ -323,7 +323,7 @@ pub extern "C" fn os_main(api: &bios::Api) -> ! {
}
}
}
bios::Result::Ok(bios::Option::Some(bios::hid::HidEvent::KeyRelease(code))) => {
bios::ApiResult::Ok(bios::FfiOption::Some(bios::hid::HidEvent::KeyRelease(code))) => {
let pckb_ev = pc_keyboard::KeyEvent {
code,
state: pc_keyboard::KeyState::Up,
Expand All @@ -338,23 +338,25 @@ pub extern "C" fn os_main(api: &bios::Api) -> ! {
}
}
}
bios::Result::Ok(bios::Option::Some(bios::hid::HidEvent::MouseInput(_ignore))) => {}
bios::Result::Ok(bios::Option::None) => {
bios::ApiResult::Ok(bios::FfiOption::Some(bios::hid::HidEvent::MouseInput(
_ignore,
))) => {}
bios::ApiResult::Ok(bios::FfiOption::None) => {
// Do nothing
}
bios::Result::Err(e) => {
bios::ApiResult::Err(e) => {
println!("Failed to get HID events: {:?}", e);
}
}
if let Some((uart_dev, _serial_conf)) = menu.context.config.get_serial_console() {
loop {
let mut buffer = [0u8; 8];
let wrapper = neotron_common_bios::ApiBuffer::new(&mut buffer);
match (api.serial_read)(uart_dev, wrapper, neotron_common_bios::Option::None) {
neotron_common_bios::Result::Ok(n) if n == 0 => {
let wrapper = neotron_common_bios::FfiBuffer::new(&mut buffer);
match (api.serial_read)(uart_dev, wrapper, neotron_common_bios::FfiOption::None) {
neotron_common_bios::ApiResult::Ok(n) if n == 0 => {
break;
}
neotron_common_bios::Result::Ok(n) => {
neotron_common_bios::ApiResult::Ok(n) => {
for b in &buffer[0..n] {
menu.input_byte(*b);
}
Expand Down