mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-16 08:38:26 +00:00
Merge branch 'main' into nto-work
This commit is contained in:
commit
89f92c28a2
12 changed files with 95 additions and 13 deletions
|
|
@ -40,6 +40,9 @@ armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "upd
|
|||
xous-kernel = { package = "xous", version = "0.9.63", features = ["v2p"] }
|
||||
critical-section = "1.1.1"
|
||||
|
||||
[lints.rust]
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(ci)', 'cfg(baremetal)'] }
|
||||
|
||||
[features]
|
||||
cramium-soc = ["utralib/cramium-soc", "cramium-hal", "rand_chacha", "raw-trng"]
|
||||
cramium-fpga = ["utralib/cramium-fpga"]
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ impl MemoryManager {
|
|||
owned_bytes
|
||||
}
|
||||
|
||||
#[cfg(all(baremetal, feature = "print-debug"))]
|
||||
#[cfg(all(baremetal, feature = "debug-print"))]
|
||||
pub fn print_ownership(&self) {
|
||||
println!("Ownership ({} bytes in all):", unsafe {
|
||||
MEMORY_ALLOCATIONS.len() + EXTRA_ALLOCATIONS.len()
|
||||
|
|
|
|||
|
|
@ -75,6 +75,9 @@ optional = true
|
|||
# git = "https://github.com/betrusted-io/engine25519-as.git"
|
||||
# rev = "274b82899d28535ac6d4b7869e26eef2039578d5"
|
||||
|
||||
[lints.rust]
|
||||
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(ci)', 'cfg(rustdoc)'] }
|
||||
|
||||
[features]
|
||||
nightly = ["subtle/nightly"]
|
||||
default = ["std", "u32_backend"]
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ description = "AES library for Xous"
|
|||
cipher = "0.4.2"
|
||||
zeroize = { version = "1.6.0", optional = true, default-features = false }
|
||||
|
||||
[lints.rust.unexpected_cfgs]
|
||||
level = "warn"
|
||||
check-cfg = ["cfg(aes_compact)", "cfg(aes_force_soft)"]
|
||||
|
||||
[features]
|
||||
hazmat = [] # Expose cryptographically hazardous APIs
|
||||
cramium-soc = []
|
||||
|
|
|
|||
|
|
@ -40,4 +40,5 @@ utralib = { version = "0.1.24", optional = true, default-features = false }
|
|||
precursor = ["utralib/precursor"]
|
||||
hosted = ["utralib/hosted"]
|
||||
renode = ["utralib/renode"]
|
||||
minimal-testing = []
|
||||
default = []
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
#![cfg_attr(baremetal, no_main)]
|
||||
#![cfg_attr(baremetal, no_std)]
|
||||
|
||||
mod api;
|
||||
use api::*;
|
||||
mod canvas;
|
||||
|
|
|
|||
|
|
@ -484,12 +484,19 @@ impl Modals {
|
|||
/// frequent updates. For example, instead of once every iteration of a loop, once every ten
|
||||
/// iterations. This will improve performance of the code and reduce UI churn as well. If this is not
|
||||
/// possible, you can add a sleep by doing something like the code below. This will reduce the rate at
|
||||
/// which your loop runs, as well as at which the UI updates. Example:
|
||||
/// `std::thread::sleep(std::time::Duration::from_millis(100));`
|
||||
///
|
||||
/// which your loop runs, as well as at which the UI updates.
|
||||
/// ```
|
||||
/// std::thread::sleep(std::time::Duration::from_millis(100)); // This comment needed to pass formatting checks
|
||||
/// ```
|
||||
/// - An alternative "softer" solution is to call yield. This will cause the producer to yield its time
|
||||
/// slice to other processes in the OS, which can give the progress bar a chance to catch up. Example:
|
||||
/// `xous::yield_slice();`
|
||||
/// slice to other processes in the OS, which can give the progress bar a chance to catch up.
|
||||
/// ```
|
||||
/// xous::yield_slice(); // This comment needed to pass formatting checks
|
||||
/// ```
|
||||
/// The comments above are necessary because rustfmt puts trailing whitespace after the code if there
|
||||
/// isn't a comment. We have a requirement to have no trailing whitespace *and* for code to be
|
||||
/// auto-formatted. So, the dummy comment is there simply to resolve the two conflicting requirements
|
||||
/// in the face of a buggy rust format (as of 1.81).
|
||||
///
|
||||
/// # Example
|
||||
/// ```
|
||||
|
|
|
|||
|
|
@ -153,4 +153,6 @@ rand-api = []
|
|||
locktests = [
|
||||
] # for debugging some specific `std` tests cherry-picked out of the test suite
|
||||
simple-tls = ["rustls", "webpki-roots"]
|
||||
clifford-bench = []
|
||||
nettype = [] # takes a file from a URL and emits it as keystrokes
|
||||
default = [] # "debugprint"
|
||||
|
|
|
|||
|
|
@ -151,6 +151,64 @@ impl<'a> ShellCmdApi<'a> for Usb {
|
|||
write!(ret, "USB debug port unlocked: portions of the device are readable via USB!")
|
||||
.unwrap();
|
||||
}
|
||||
#[cfg(feature = "nettype")]
|
||||
"nettype" => {
|
||||
use std::io::{Read, Write};
|
||||
use std::net::TcpStream;
|
||||
use std::time::Duration;
|
||||
if let Some(url) = tokens.next() {
|
||||
match url.split_once('/') {
|
||||
Some((host, path)) => match TcpStream::connect((host, 80)) {
|
||||
Ok(mut stream) => {
|
||||
stream.set_read_timeout(Some(Duration::from_millis(10_000))).unwrap();
|
||||
stream.set_write_timeout(Some(Duration::from_millis(10_000))).unwrap();
|
||||
log::info!("sending GET request");
|
||||
match write!(stream, "GET /{} HTTP/1.1\r\n", path) {
|
||||
Ok(_) => log::trace!("sent GET"),
|
||||
Err(e) => {
|
||||
log::error!("GET err {:?}", e);
|
||||
write!(ret, "Error sending GET: {:?}", e).unwrap();
|
||||
}
|
||||
}
|
||||
write!(
|
||||
stream,
|
||||
"Host: {}\r\nAccept: */*\r\nUser-Agent: Precursor/0.9.16\r\n",
|
||||
host
|
||||
)
|
||||
.expect("stream error");
|
||||
write!(stream, "Connection: close\r\n").expect("stream error");
|
||||
write!(stream, "\r\n").expect("stream error");
|
||||
log::info!("fetching response....");
|
||||
let mut buf = [0u8; 4096];
|
||||
match stream.read(&mut buf) {
|
||||
Ok(len) => {
|
||||
let s = std::string::String::from_utf8_lossy(
|
||||
&buf[..len.min(buf.len())],
|
||||
);
|
||||
let mut parts = s.splitn(2, "\r\n\r\n");
|
||||
let _header = parts.next().unwrap_or("");
|
||||
let body = parts.next().unwrap_or("");
|
||||
match self.usb_dev.send_str(&body) {
|
||||
Ok(n) => write!(ret, "Sent {} chars", n).unwrap(),
|
||||
Err(_e) => {
|
||||
write!(ret, "Can't send: are we connected to a host?")
|
||||
.unwrap()
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
write!(ret, "Didn't get response from host: {:?}", e).unwrap()
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => write!(ret, "Couldn't connect to {}:80: {:?}", host, e).unwrap(),
|
||||
},
|
||||
_ => write!(ret, "Usage: nettype bunniefoo.com/bunnie/test.txt").unwrap(),
|
||||
}
|
||||
} else {
|
||||
write!(ret, "Usage: nettype bunniefoo.com/bunnie/test.txt").unwrap();
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
write!(ret, "{}", helpstring).unwrap();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,5 +30,8 @@ rand_chacha = "0.3.1"
|
|||
precursor = ["utralib/precursor"]
|
||||
hosted = ["utralib/hosted"]
|
||||
renode = ["utralib/renode"]
|
||||
urandomtest = []
|
||||
ringosctest = []
|
||||
avalanchetest = []
|
||||
debugprint = []
|
||||
default = [] # "debugprint"
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ utralib = { version = "0.1.24", optional = true, default-features = false }
|
|||
|
||||
[features]
|
||||
#atsama5d27 = ["utralib/atsama5d27"]
|
||||
atsama5d27 = []
|
||||
|
||||
# you may want to remove the watchdog feature if you're debugging a crash, as it will force the system to reboot automatically
|
||||
precursor = ["utralib/precursor", "susres/precursor", "watchdog"]
|
||||
|
|
|
|||
|
|
@ -548,10 +548,13 @@ def get_with_progress(url, name='Downloading'):
|
|||
return ret
|
||||
|
||||
def get_usb_interface(config=False, peek=None, override_csr=None, force=False):
|
||||
dev = usb.core.find(idProduct=0x5bf0, idVendor=0x1209)
|
||||
try:
|
||||
dev = usb.core.find(idProduct=0x5bf0, idVendor=0x1209)
|
||||
except usb.core.NoBackendError:
|
||||
raise ValueError('No USB library backend available (eg Libusb, OpenUSB, etc).\nSee: https://github.com/pyusb/pyusb/blob/master/docs/faq.rst#how-do-i-fix-no-backend-available-errors')
|
||||
|
||||
if dev is None:
|
||||
raise ValueError('Precursor device not found')
|
||||
raise ValueError('Precursor device not found. Please check the USB cable and ensure that `usb debug` was run in Shellchat')
|
||||
|
||||
dev.set_configuration()
|
||||
if config:
|
||||
|
|
@ -658,8 +661,8 @@ def main():
|
|||
# initial check to see if the Precursor device is there
|
||||
try:
|
||||
(locs, pc_usb) = get_usb_interface(args.config, args.peek, args.override_csr, args.force)
|
||||
except ValueError:
|
||||
print("Precursor device not found. Please check the USB cable and ensure that `usb debug` was run in Shellchat")
|
||||
except ValueError as e:
|
||||
print(str(e))
|
||||
exit(1)
|
||||
|
||||
if args.config:
|
||||
|
|
|
|||
Loading…
Reference in a new issue