sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parameterize flash_inner

Browse Source
This commit is contained in:
Jeremy Soller 2020-02-27 13:21:59 -07:00
parent a24f9ed3ae
commit e8dd295daa
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tool/src/main.rs
View File

@ -74,11 +74,11 @@ unsafe fn console() -> Result<(), Error> {
} }
} }
unsafe fn flash_inner(ec: &mut Ec<StdTimeout>, firmware: &Firmware) -> Result<(), Error> { unsafe fn flash_inner(ec: &mut Ec<StdTimeout>, firmware: &Firmware, target: SpiTarget, scratch: bool) -> Result<(), Error> {
let rom_size = 128 * 1024; let rom_size = 128 * 1024;
let sector_size = 1024; let sector_size = 1024;
let mut spi_bus = ec.spi(SpiTarget::Main, true)?; let mut spi_bus = ec.spi(target, scratch)?;
let mut spi = SpiRom::new( let mut spi = SpiRom::new(
&mut spi_bus, &mut spi_bus,
StdTimeout::new(Duration::new(1, 0)) StdTimeout::new(Duration::new(1, 0))
@ -167,6 +167,9 @@ unsafe fn flash_inner(ec: &mut Ec<StdTimeout>, firmware: &Firmware) -> Result<()
} }
unsafe fn flash(path: &str) -> Result<(), Error> { unsafe fn flash(path: &str) -> Result<(), Error> {
let target = SpiTarget::Backup;
let scratch = true;
//TODO: remove unwraps //TODO: remove unwraps
let firmware_data = fs::read(path).unwrap(); let firmware_data = fs::read(path).unwrap();
let firmware = Firmware::new(&firmware_data).unwrap(); let firmware = Firmware::new(&firmware_data).unwrap();
@ -199,19 +202,22 @@ unsafe fn flash(path: &str) -> Result<(), Error> {
println!("ec version: {:?}", str::from_utf8(ec_version)); println!("ec version: {:?}", str::from_utf8(ec_version));
} }
if scratch {
// Wait for any key releases // Wait for any key releases
eprintln!("Waiting 5 seconds for all keys to be released"); eprintln!("Waiting 5 seconds for all keys to be released");
thread::sleep(Duration::new(5, 0)); thread::sleep(Duration::new(5, 0));
}
eprintln!("Sync"); eprintln!("Sync");
let _ = process::Command::new("sync").status(); let _ = process::Command::new("sync").status();
let res = flash_inner(&mut ec, &firmware); let res = flash_inner(&mut ec, &firmware, target, scratch);
eprintln!("Result: {:X?}", res); eprintln!("Result: {:X?}", res);
eprintln!("Sync"); eprintln!("Sync");
let _ = process::Command::new("sync").status(); let _ = process::Command::new("sync").status();
if scratch {
eprintln!("System will shut off in 5 seconds"); eprintln!("System will shut off in 5 seconds");
thread::sleep(Duration::new(5, 0)); thread::sleep(Duration::new(5, 0));
@ -219,6 +225,7 @@ unsafe fn flash(path: &str) -> Result<(), Error> {
let _ = process::Command::new("sync").status(); let _ = process::Command::new("sync").status();
ec.reset()?; ec.reset()?;
}
res res
} }