From 25dfc4723de192a41e0d35c38e2a852ba4cc1c6a Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 2 Feb 2025 07:02:35 +0800 Subject: [PATCH] refactor loader to use ux-api --- loader/Cargo.toml | 2 ++ loader/src/platform/cramium/bootlogo.rs | 2 +- loader/src/platform/cramium/cramium.rs | 4 ++-- loader/src/platform/cramium/gfx.rs | 3 ++- loader/src/platform/cramium/update.rs | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 66fda4db1..f00972b09 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -18,6 +18,7 @@ armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "upd atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master", optional = true } sha2-loader = { path = "./sha2-loader", default-features = false, optional = true } cramium-hal = { path = "../libs/cramium-hal", optional = true, default-features = false } +ux-api = { path = "../libs/ux-api", optional = true, default-features = false } xous-pl230 = { path = "../libs/xous-pl230", optional = true, features = [ "tests", "pio", @@ -80,6 +81,7 @@ cramium-soc = [ "utralib/cramium-soc", "debug-print", "cramium-hal", + "ux-api", "rand_chacha", "sram-margin", # "boot-delay", diff --git a/loader/src/platform/cramium/bootlogo.rs b/loader/src/platform/cramium/bootlogo.rs index 8d6d6ec2a..20af3461f 100644 --- a/loader/src/platform/cramium/bootlogo.rs +++ b/loader/src/platform/cramium/bootlogo.rs @@ -1,5 +1,5 @@ -use cramium_hal::minigfx::{FrameBuffer, Point}; use cramium_hal::sh1107::{Mono, Oled128x128}; +use ux_api::minigfx::{FrameBuffer, Point}; pub fn show_logo(sh1107: &mut Oled128x128) { /* // pattern test for debugging pixel orientations - done with this now, I think? diff --git a/loader/src/platform/cramium/cramium.rs b/loader/src/platform/cramium/cramium.rs index 341afca1c..130a724c6 100644 --- a/loader/src/platform/cramium/cramium.rs +++ b/loader/src/platform/cramium/cramium.rs @@ -370,7 +370,7 @@ pub fn early_init() -> u32 { #[cfg(any(feature = "board-baosec", feature = "board-baosor"))] { // show the boot logo - use cramium_hal::minigfx::FrameBuffer; + use ux_api::minigfx::FrameBuffer; let mut sh1107 = cramium_hal::sh1107::Oled128x128::new(perclk, &mut iox, &mut udma_global); sh1107.init(); @@ -384,8 +384,8 @@ pub fn early_init() -> u32 { // makes things a little bit cleaner for JTAG ops, it seems. #[cfg(feature = "board-bringup")] { - use cramium_hal::minigfx::{Line, Point}; use cramium_hal::{iox::IoxValue, minigfx::ColorNative, sh1107::Mono, udma::Udma}; + use ux_api::minigfx::{Line, Point}; use crate::platform::cramium::gfx; //------------- test I2C ------------ diff --git a/loader/src/platform/cramium/gfx.rs b/loader/src/platform/cramium/gfx.rs index 19c8cc7cc..59b924689 100644 --- a/loader/src/platform/cramium/gfx.rs +++ b/loader/src/platform/cramium/gfx.rs @@ -1,4 +1,5 @@ -use cramium_hal::{minigfx::*, sh1107::Mono}; +use cramium_hal::sh1107::Mono; +use ux_api::minigfx::*; // The discipline for all the APIs in this module are that they act on a FrameBuffer which is // passed to the function. This allows us to bind the drawing computation on the caller-side of diff --git a/loader/src/platform/cramium/update.rs b/loader/src/platform/cramium/update.rs index 0fa2638b4..ad1c1ce51 100644 --- a/loader/src/platform/cramium/update.rs +++ b/loader/src/platform/cramium/update.rs @@ -8,7 +8,6 @@ use cramium_hal::mbox::{ MBOX_PROTOCOL_REV, Mbox, MboxError, MboxToCm7Pkt, PAYLOAD_LEN_WORDS, RERAM_PAGE_SIZE_BYTES, ToCm7Op, ToRvOp, }; -use cramium_hal::minigfx::{FrameBuffer, Point}; use cramium_hal::sh1107::{Mono, Oled128x128}; use cramium_hal::udma; use cramium_hal::udma::*; @@ -17,6 +16,7 @@ use ed25519_dalek::{Digest, Signature, VerifyingKey}; use sha2::Sha512; use simple_fatfs::PathBuf; use utralib::generated::*; +use ux_api::minigfx::{FrameBuffer, Point}; use crate::SIGBLOCK_SIZE; use crate::platform::cramium::gfx;