mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
cleanup excess space in Tokens
This commit is contained in:
parent
d1eff9e052
commit
dd4042f315
1 changed files with 6 additions and 8 deletions
|
|
@ -1,5 +1,3 @@
|
||||||
use xous_ipc::String;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Authentication tokens to the GAM are created on a first-come, first-serve basis,
|
Authentication tokens to the GAM are created on a first-come, first-serve basis,
|
||||||
under the following assumptions:
|
under the following assumptions:
|
||||||
|
|
@ -24,10 +22,10 @@ const EXPECTED_BOOT_CONTEXTS: [&'static str; TOKEN_SLOTS] = [
|
||||||
"shared modal",
|
"shared modal",
|
||||||
];
|
];
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub(crate) struct NamedToken {
|
pub(crate) struct NamedToken {
|
||||||
token: [u32; 4],
|
token: [u32; 4],
|
||||||
name: String::<128>,
|
name: String,
|
||||||
}
|
}
|
||||||
pub(crate) struct TokenManager {
|
pub(crate) struct TokenManager {
|
||||||
tokens: [Option<NamedToken>; TOKEN_SLOTS],
|
tokens: [Option<NamedToken>; TOKEN_SLOTS],
|
||||||
|
|
@ -36,7 +34,7 @@ pub(crate) struct TokenManager {
|
||||||
impl<'a> TokenManager {
|
impl<'a> TokenManager {
|
||||||
pub(crate) fn new(xns: &xous_names::XousNames) -> TokenManager {
|
pub(crate) fn new(xns: &xous_names::XousNames) -> TokenManager {
|
||||||
TokenManager {
|
TokenManager {
|
||||||
tokens: [None; TOKEN_SLOTS],
|
tokens: Default::default(),
|
||||||
trng: trng::Trng::new(&xns).unwrap(),
|
trng: trng::Trng::new(&xns).unwrap(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -78,7 +76,7 @@ impl<'a> TokenManager {
|
||||||
for maybe_token in self.tokens.iter() {
|
for maybe_token in self.tokens.iter() {
|
||||||
match maybe_token {
|
match maybe_token {
|
||||||
Some(token) => {
|
Some(token) => {
|
||||||
if name.eq(token.name.as_str().unwrap()) {
|
if name.eq(token.name.as_str()) {
|
||||||
registered = true;
|
registered = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -96,7 +94,7 @@ impl<'a> TokenManager {
|
||||||
if maybe_token.is_none() {
|
if maybe_token.is_none() {
|
||||||
*maybe_token = Some(NamedToken {
|
*maybe_token = Some(NamedToken {
|
||||||
token,
|
token,
|
||||||
name: String::<128>::from_str(name),
|
name: String::from(name),
|
||||||
});
|
});
|
||||||
log::trace!("token table after registration is {:x?}", self.tokens);
|
log::trace!("token table after registration is {:x?}", self.tokens);
|
||||||
return Some(token)
|
return Some(token)
|
||||||
|
|
@ -123,7 +121,7 @@ impl<'a> TokenManager {
|
||||||
pub(crate) fn find_token(&self, name: &str) -> Option<[u32; 4]> {
|
pub(crate) fn find_token(&self, name: &str) -> Option<[u32; 4]> {
|
||||||
for maybe_token in self.tokens.iter() {
|
for maybe_token in self.tokens.iter() {
|
||||||
if let Some(token) = maybe_token {
|
if let Some(token) = maybe_token {
|
||||||
if token.name == String::<128>::from_str(name) {
|
if token.name == String::from(name) {
|
||||||
return Some(token.token)
|
return Some(token.token)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue