mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
incorporate the new APIs at the top level
also clean up crate names to conform with names used in other crates
This commit is contained in:
parent
0fbf1ecf22
commit
fa707646dc
4 changed files with 10 additions and 4 deletions
|
|
@ -9,8 +9,8 @@ edition = "2021"
|
||||||
utralib = { version = "0.1.24", optional = true, default-features = false, features = [
|
utralib = { version = "0.1.24", optional = true, default-features = false, features = [
|
||||||
"cramium-soc",
|
"cramium-soc",
|
||||||
] }
|
] }
|
||||||
xous-api-names = "0.9.58"
|
xous-names = { package = "xous-api-names", version = "0.9.58" }
|
||||||
xous-api-ticktimer = "0.9.56"
|
ticktimer = { package = "xous-api-ticktimer", version = "0.9.56" }
|
||||||
xous = "0.9.60"
|
xous = "0.9.60"
|
||||||
xous-ipc = "0.9.60"
|
xous-ipc = "0.9.60"
|
||||||
log-server = { package = "xous-api-log", version = "0.1.56" }
|
log-server = { package = "xous-api-log", version = "0.1.56" }
|
||||||
|
|
@ -25,6 +25,8 @@ xous-pio = { path = "../../libs/xous-pio", default-features = false, features =
|
||||||
] }
|
] }
|
||||||
pio-proc = "0.2.2"
|
pio-proc = "0.2.2"
|
||||||
pio = "0.2.1"
|
pio = "0.2.1"
|
||||||
|
rand_core = "0.6.4"
|
||||||
|
rand_chacha = "0.3.1"
|
||||||
|
|
||||||
num-derive = { version = "0.3.3", default-features = false }
|
num-derive = { version = "0.3.3", default-features = false }
|
||||||
num-traits = { version = "0.2.14", default-features = false }
|
num-traits = { version = "0.2.14", default-features = false }
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
|
pub mod keyboard;
|
||||||
use cramium_hal::iox;
|
use cramium_hal::iox;
|
||||||
|
pub use keyboard::*;
|
||||||
|
|
||||||
/// The Opcode numbers here should not be changed. You can add new ones,
|
/// The Opcode numbers here should not be changed. You can add new ones,
|
||||||
/// but do not re-use old numbers or repurpose them. This is because the
|
/// but do not re-use old numbers or repurpose them. This is because the
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ pub struct IoxHal {
|
||||||
impl IoxHal {
|
impl IoxHal {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
crate::REFCOUNT.fetch_add(1, Ordering::Relaxed);
|
crate::REFCOUNT.fetch_add(1, Ordering::Relaxed);
|
||||||
let xns = xous_api_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
let conn =
|
let conn =
|
||||||
xns.request_connection(SERVER_NAME_CRAM_HAL).expect("Couldn't connect to Cramium HAL server");
|
xns.request_connection(SERVER_NAME_CRAM_HAL).expect("Couldn't connect to Cramium HAL server");
|
||||||
IoxHal { conn }
|
IoxHal { conn }
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
pub mod api;
|
pub mod api;
|
||||||
pub mod iox_lib;
|
pub mod iox_lib;
|
||||||
|
pub mod keyboard;
|
||||||
|
pub mod trng;
|
||||||
|
|
||||||
pub use api::*;
|
pub use api::*;
|
||||||
use cramium_hal::udma::{EventChannel, PeriphEventType, PeriphId};
|
use cramium_hal::udma::{EventChannel, PeriphEventType, PeriphId};
|
||||||
|
|
@ -20,7 +22,7 @@ pub struct UdmaGlobal {
|
||||||
impl UdmaGlobal {
|
impl UdmaGlobal {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
REFCOUNT.fetch_add(1, Ordering::Relaxed);
|
REFCOUNT.fetch_add(1, Ordering::Relaxed);
|
||||||
let xns = xous_api_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
let conn =
|
let conn =
|
||||||
xns.request_connection(SERVER_NAME_CRAM_HAL).expect("Couldn't connect to Cramium HAL server");
|
xns.request_connection(SERVER_NAME_CRAM_HAL).expect("Couldn't connect to Cramium HAL server");
|
||||||
UdmaGlobal { conn }
|
UdmaGlobal { conn }
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue