Merge branch 'raspi-fix' into 'main'
randd: Fix ARM hardware seed detection, raspi: Fix bcm driver init See merge request redox-os/base!299
This commit is contained in:
@@ -26,6 +26,7 @@ fn main() {
|
||||
}
|
||||
|
||||
fn daemon(daemon: daemon::Daemon) -> ! {
|
||||
common::init();
|
||||
let dtb_data = get_dtb();
|
||||
println!("read from OS, len = {}", dtb_data.len());
|
||||
if dtb_data.len() == 0 {
|
||||
|
||||
+3
-2
@@ -58,11 +58,12 @@ fn create_rdrand_seed() -> [u8; SEED_BYTES] {
|
||||
{
|
||||
fn is_cpu_feature_detected(feature: &str) -> bool {
|
||||
if let Ok(cpu) = std::fs::read_to_string("/scheme/sys/cpu") {
|
||||
return cpu
|
||||
let found = cpu
|
||||
.lines()
|
||||
.find_map(|s| s.strip_prefix("Features:"))
|
||||
.map(|s| s.split(" ").find(|s| s == &feature))
|
||||
.and_then(|s| s.split(" ").find(|s| s == &feature))
|
||||
.is_some();
|
||||
return found;
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user