refactor loader to use ux-api

This commit is contained in:
bunnie 2025-02-02 07:02:35 +08:00
parent e4646013d0
commit 25dfc4723d
5 changed files with 8 additions and 5 deletions

View file

@ -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",

View file

@ -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?

View file

@ -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 ------------

View file

@ -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

View file

@ -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;