alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2025-01-10 04:21:32 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from rp-rs/rom-functions

Browse source 
rom: Make rom_funcs functions call function instead of returning it
This commit is contained in:
Evan Older 2021-02-03 16:56:29 -05:00 committed by GitHub
parent 2972cfebcb 913c5fb0b2
commit be7dd11057
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rp2040-hal/src/rom_data.rs
View file

@ -35,8 +35,9 @@ macro_rules! rom_funcs {
) => { ) => {
$( $(
$(#[$outer])* $(#[$outer])*
pub fn $name() -> extern "C" fn( $( $aname : $aty ),* ) -> $ret { pub fn $name($( $aname:$aty ),*) -> $ret{
rom_table_lookup(FUNC_TABLE, *$c) let func: extern "C" fn( $( $aty ),* ) -> $ret = rom_table_lookup(FUNC_TABLE, *$c);
func($( $aname ),*)
} }
)* )*
} }
@ -90,7 +91,7 @@ rom_funcs! {
/// Program data to a range of flash addresses starting at addr (offset from the start of flash) /// Program data to a range of flash addresses starting at addr (offset from the start of flash)
/// and count bytesin size. addr must be aligned to a 256-byte boundary, and count must be a /// and count bytesin size. addr must be aligned to a 256-byte boundary, and count must be a
/// multiple of 256. /// multiple of 256.
b"RP" flash_range_program(addr: u32, data: *mut u8, count: usize) -> (); b"RP" flash_range_program(addr: u32, data: *const u8, count: usize) -> ();
/// Flush and enable the XIP cache. Also clears the IO forcing on QSPI CSn, so that the SSI can /// Flush and enable the XIP cache. Also clears the IO forcing on QSPI CSn, so that the SSI can
/// drive the flashchip select as normal. /// drive the flashchip select as normal.