File tree Expand file tree Collapse file tree 9 files changed +1036
-351
lines changed
Expand file tree Collapse file tree 9 files changed +1036
-351
lines changed Original file line number Diff line number Diff line change @@ -41,3 +41,4 @@ neotron-common-bios = "0.7"
4141r0 = " 1.0"
4242postcard = " 0.5"
4343serde = { version = " 1.0" , default-features = false }
44+ menu = " 0.3"
Original file line number Diff line number Diff line change 11use std:: env;
22fn main ( ) {
3- match env:: var ( "CARGO_CFG_TARGET_OS" ) . as_deref ( ) {
4- Ok ( "none" ) => {
5- println ! ( "cargo:rustc-link-arg-bin=flash1002=-Tneotron-flash-1002.ld" ) ;
6- println ! ( "cargo:rustc-link-arg-bin=flash0802=-Tneotron-flash-0802.ld" ) ;
7- println ! ( "cargo:rustc-link-arg-bin=flash0002=-Tneotron-flash-0002.ld" ) ;
8- }
9- _ => {
10- // No args
11- }
3+ if let Ok ( "none" ) = env:: var ( "CARGO_CFG_TARGET_OS" ) . as_deref ( ) {
4+ println ! ( "cargo:rustc-link-arg-bin=flash1002=-Tneotron-flash-1002.ld" ) ;
5+ println ! ( "cargo:rustc-link-arg-bin=flash0802=-Tneotron-flash-0802.ld" ) ;
6+ println ! ( "cargo:rustc-link-arg-bin=flash0002=-Tneotron-flash-0002.ld" ) ;
127 }
138
149 if let Ok ( cmd_output) = std:: process:: Command :: new ( "git" )
Original file line number Diff line number Diff line change 1313/// of our portion of Flash.
1414#[ link_section = ".entry_point" ]
1515#[ used]
16- pub static ENTRY_POINT_ADDR : extern "C" fn ( & ' static neotron_common_bios:: Api ) -> ! =
17- neotron_os:: main;
16+ pub static ENTRY_POINT_ADDR : extern "C" fn ( * const neotron_common_bios:: Api ) -> ! = neotron_os:: main;
Original file line number Diff line number Diff line change 1313/// of our portion of Flash.
1414#[ link_section = ".entry_point" ]
1515#[ used]
16- pub static ENTRY_POINT_ADDR : extern "C" fn ( & ' static neotron_common_bios:: Api ) -> ! =
17- neotron_os:: main;
16+ pub static ENTRY_POINT_ADDR : extern "C" fn ( * const neotron_common_bios:: Api ) -> ! = neotron_os:: main;
Original file line number Diff line number Diff line change 1313/// of our portion of Flash.
1414#[ link_section = ".entry_point" ]
1515#[ used]
16- pub static ENTRY_POINT_ADDR : extern "C" fn ( & ' static neotron_common_bios:: Api ) -> ! =
17- neotron_os:: main;
16+ pub static ENTRY_POINT_ADDR : extern "C" fn ( * const neotron_common_bios:: Api ) -> ! = neotron_os:: main;
You can’t perform that action at this time.
0 commit comments