cleanup se0 pin setting

there is a circular dependency that has to be broken: the board
type wants to be set via USB, but you can't set the board type
until the USB enumerates. USB enumeration can be unreliable on
baosec because the SE0 pin isn't mapped as the board type defaults
to dabao.

The baosec SE0 pin is PF5 - this is inaccesible in dabao. Thus
the decision was mode to pull both possibilities during the boot1
initialization phase.

This could cause some trouble for OEM configurations that are relying
on these pins to be e.g. inputs or some other value, but this will
need to be documented as a hazard for OEM designers.
This commit is contained in:
bunnie 2025-12-19 14:27:41 +08:00
parent 9334f22788
commit ae32be5e09

View file

@ -175,11 +175,12 @@ pub unsafe extern "C" fn rust_entry() -> ! {
None
};
let (se0_port, se0_pin) = match board_type {
BoardTypeCoding::Baosec => bao1x_hal::board::setup_usb_pins(&iox),
_ => crate::platform::setup_dabao_se0_pin(&iox),
};
iox.set_gpio_pin(se0_port, se0_pin, bao1x_api::IoxValue::Low); // put the USB port into SE0
// put both options for USB port switch into SE0 - at this point we may not know what board
// type we have. This works for both dabao and for baosec.
let se0_baosec = bao1x_hal::board::setup_usb_pins(&iox);
let se0_dabao = crate::platform::setup_dabao_se0_pin(&iox);
iox.set_gpio_pin(se0_baosec.0, se0_baosec.1, bao1x_api::IoxValue::Low);
iox.set_gpio_pin(se0_dabao.0, se0_dabao.1, bao1x_api::IoxValue::Low);
delay(100);
// use the USB disconnect time to initialize the display - at least 100ms is
// needed after reset for the display to initialize
@ -197,8 +198,10 @@ pub unsafe extern "C" fn rust_entry() -> ! {
// remainder of the 1-second total wait target time for USB disconnect
delay(500);
// release SE0
iox.set_gpio_pin(se0_port, se0_pin, bao1x_api::IoxValue::High);
iox.set_gpio_pin(se0_baosec.0, se0_baosec.1, bao1x_api::IoxValue::High);
iox.set_gpio_pin(se0_dabao.0, se0_dabao.1, bao1x_api::IoxValue::High);
// return the pin to an input
match board_type {
BoardTypeCoding::Dabao | BoardTypeCoding::Oem => {
@ -219,8 +222,7 @@ pub unsafe extern "C" fn rust_entry() -> ! {
crate::glue::setup_spim(perclk);
}
// provide some feedback on the run state of the BIO by peeking at the program counter
// value, and provide feedback on the CPU operation by flashing the RGB LEDs.
// it's in this loop that the board type would be set after initial boot
let mut repl = crate::repl::Repl::new();
let mut new_key: Option<KeyPress>;
loop {
@ -314,6 +316,18 @@ pub unsafe extern "C" fn rust_entry() -> ! {
bollard!(die, 4);
check_pll();
// se0 exact mapping should be known by now. Set the off-target mapping to an input - this is the safest
// option - and then pass the on-target mapping into the boot() routine
let (se0_port, se0_pin) = match board_type {
BoardTypeCoding::Baosec => {
iox.set_gpio_dir(se0_dabao.0, se0_dabao.1, bao1x_api::IoxDir::Input);
(se0_baosec.0, se0_baosec.1)
}
_ => {
iox.set_gpio_dir(se0_baosec.0, se0_baosec.1, bao1x_api::IoxDir::Input);
(se0_dabao.0, se0_dabao.1)
}
};
boot(&iox, oled, se0_port, se0_pin, &mut csprng)
}