diff --git a/bao1x-boot/boot1/src/main.rs b/bao1x-boot/boot1/src/main.rs index 21c2398a7..daa1e575c 100644 --- a/bao1x-boot/boot1/src/main.rs +++ b/bao1x-boot/boot1/src/main.rs @@ -56,6 +56,7 @@ pub unsafe extern "C" fn rust_entry() -> ! { let mut board_type = one_way.get_decoded::().expect("Board type coding error"); + crate::println_d!("TX_IDLE: {:?}", crate::platform::usb::TX_IDLE.load(Ordering::SeqCst)); board_type = crate::platform::early_init(board_type); crate::println!("\n~~Boot1 up!~~\n"); diff --git a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs index fede2a521..6af410bb6 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs @@ -198,7 +198,9 @@ pub fn early_init(mut board_type: bao1x_api::BoardTypeCoding) -> bao1x_api::Boar data_ptr.add(i).write_volatile(0); } for &(offset, data) in &statics_in_rom.poke_table[..statics_in_rom.valid_pokes as usize] { - data_ptr.add(offset as usize).write_volatile(data); + let offset = u16::from_le_bytes(offset) as usize; + let data = u32::from_le_bytes(data); + data_ptr.add(offset / size_of::()).write_volatile(data); } }