mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
fix up formatting that changed due to the flag day
This commit is contained in:
parent
8931ad4dd9
commit
179e178e96
9 changed files with 15 additions and 16 deletions
|
|
@ -47,8 +47,7 @@ impl IframRange {
|
|||
// This constant is in fact hard-coded because we are trying to break a circular
|
||||
// dependency on the bao1x-hal-service crate and make this library "neutral" so it
|
||||
// can be included in any context.
|
||||
let conn =
|
||||
xns.request_connection("_bao1x-SoC HAL_").expect("Couldn't connect to bao1x HAL server");
|
||||
let conn = xns.request_connection("_bao1x-SoC HAL_").expect("Couldn't connect to bao1x HAL server");
|
||||
let bank_code = match bank {
|
||||
Some(IframBank::Bank0) => 0,
|
||||
Some(IframBank::Bank1) => 1,
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@ use core::fmt::Write;
|
|||
use std::collections::HashMap;
|
||||
|
||||
use String;
|
||||
#[cfg(feature = "bao1x")]
|
||||
use bao1x_hal_service::trng;
|
||||
#[cfg(feature = "hosted-baosec")]
|
||||
use bao1x_emu::trng;
|
||||
#[cfg(feature = "bao1x")]
|
||||
use bao1x_hal_service::trng;
|
||||
use xous::MessageEnvelope;
|
||||
|
||||
/////////////////////////// Common items to all commands
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use String;
|
||||
use bao1x_hal_service::I2c;
|
||||
use bao1x_api::I2cApi;
|
||||
use bao1x_api::I2cResult;
|
||||
use bao1x_hal_service::I2c;
|
||||
|
||||
use crate::{CommonEnv, ShellCmdApi};
|
||||
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ impl<'a> ShellCmdApi<'a> for Test {
|
|||
}
|
||||
#[cfg(feature = "bmp180")]
|
||||
"temp" => {
|
||||
use bao1x_hal_service::I2c;
|
||||
use bao1x_hal::bmp180::Bmp180;
|
||||
use bao1x_hal_service::I2c;
|
||||
let mut i2c = I2c::new();
|
||||
|
||||
match Bmp180::new(&mut i2c) {
|
||||
|
|
@ -58,8 +58,8 @@ impl<'a> ShellCmdApi<'a> for Test {
|
|||
}
|
||||
}
|
||||
"shutdown" => {
|
||||
use bao1x_hal_service::I2c;
|
||||
use bao1x_api::*;
|
||||
use bao1x_hal_service::I2c;
|
||||
let iox = bao1x_api::IoxHal::new();
|
||||
let mut i2c = I2c::new();
|
||||
iox.setup_pin(
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@ use core::sync::atomic::{AtomicBool, Ordering};
|
|||
use std::sync::Arc;
|
||||
use std::thread;
|
||||
|
||||
use blitstr2::ClipRect;
|
||||
use blitstr2::NULL_GLYPH_SPRITE;
|
||||
use bao1x_api::{EventChannel, IoxHal};
|
||||
use bao1x_hal::ifram::IframRange;
|
||||
use bao1x_hal::sh1107::{Mono, Oled128x128};
|
||||
use bao1x_hal::udma;
|
||||
use blitstr2::ClipRect;
|
||||
use blitstr2::NULL_GLYPH_SPRITE;
|
||||
/// THIS NEEDS SUBSTANTIAL REWORK, THE DRIVER HERE TARGETS A DIFFERENT DISPLAY THAN THE SH1107.
|
||||
|
||||
/// We can have no allocations inside this, and ideally, it's as minimal as possible.
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ use std::sync::{
|
|||
};
|
||||
use std::thread;
|
||||
|
||||
use cmds::*;
|
||||
use bao1x_hal_service::keyboard;
|
||||
use cmds::*;
|
||||
use graphics_server::Gid;
|
||||
use locales::t;
|
||||
use num_traits::*;
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ use std::cmp::max;
|
|||
#[cfg(feature = "ditherpunk")]
|
||||
use std::convert::TryInto;
|
||||
|
||||
#[cfg(feature = "bao1x")]
|
||||
use bao1x_hal_service::trng::Trng;
|
||||
#[cfg(feature = "hosted-baosec")]
|
||||
use bao1x_emu::trng::Trng;
|
||||
#[cfg(feature = "bao1x")]
|
||||
use bao1x_hal_service::trng::Trng;
|
||||
use bit_field::BitField;
|
||||
#[cfg(not(any(feature = "hosted-baosec", feature = "board-baosec")))]
|
||||
use gam::*;
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
/// a `TextResponseValid` message which pumps the work queue.
|
||||
mod api;
|
||||
use api::*;
|
||||
#[cfg(feature = "bao1x")]
|
||||
use bao1x_hal_service::trng::Trng;
|
||||
#[cfg(feature = "hosted-baosec")]
|
||||
use bao1x_emu::trng::Trng;
|
||||
#[cfg(feature = "bao1x")]
|
||||
use bao1x_hal_service::trng::Trng;
|
||||
use blitstr2::GlyphStyle;
|
||||
#[cfg(feature = "ditherpunk")]
|
||||
use gam::Bitmap;
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ use core::mem::size_of;
|
|||
use std::convert::TryInto;
|
||||
|
||||
use aes_gcm_siv::Nonce;
|
||||
#[cfg(all(feature = "bao1x-hal", not(feature = "hosted-baosec")))]
|
||||
use bao1x_hal_service::trng::Trng;
|
||||
#[cfg(feature = "hosted-baosec")]
|
||||
use bao1x_emu::trng::Trng;
|
||||
#[cfg(all(feature = "bao1x-hal", not(feature = "hosted-baosec")))]
|
||||
use bao1x_hal_service::trng::Trng;
|
||||
use rand_core::RngCore;
|
||||
#[cfg(all(not(feature = "bao1x-hal"), not(feature = "hosted-baosec")))]
|
||||
use trng::Trng;
|
||||
|
|
|
|||
Loading…
Reference in a new issue