fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-04 07:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicting function names

Browse Source
This commit is contained in:
Peter van der Perk
2022-08-09 12:03:09 +02:00
parent 33b77d1498
commit 0aa8baa96d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/bootloaders/boot_app_shared.c
+5 -5
View File
@@ -54,7 +54,7 @@
#define CRC_H 1
#define CRC_L 0
inline static void read(bootloader_app_shared_t *pshared)
inline static void read_shared(bootloader_app_shared_t *pshared)
{
pshared->signature = getreg32(signature_LOC);
pshared->bus_speed = getreg32(bus_speed_LOC);
@@ -63,7 +63,7 @@ inline static void read(bootloader_app_shared_t *pshared)
pshared->crc.ul[CRC_H] = getreg32(crc_HiLOC);
}
inline static void write(bootloader_app_shared_t *pshared)
inline static void write_shared(bootloader_app_shared_t *pshared)
{
putreg32(pshared->signature, signature_LOC);
putreg32(pshared->bus_speed, bus_speed_LOC);
@@ -126,7 +126,7 @@ __EXPORT int bootloader_app_shared_read(bootloader_app_shared_t *shared, eRole_t
int rv = -EBADR;
bootloader_app_shared_t working;
read(&working);
read_shared(&working);
if ((role == App ? working.signature == BOOTLOADER_COMMON_APP_SIGNATURE
: working.signature == BOOTLOADER_COMMON_BOOTLOADER_SIGNATURE)
@@ -166,7 +166,7 @@ __EXPORT void bootloader_app_shared_write(bootloader_app_shared_t *shared, eRole
bootloader_app_shared_t working = *shared;
working.signature = (role == App ? BOOTLOADER_COMMON_APP_SIGNATURE : BOOTLOADER_COMMON_BOOTLOADER_SIGNATURE);
working.crc.ull = calulate_signature(&working);
write(&working);
write_shared(&working);
}
/****************************************************************************
@@ -190,5 +190,5 @@ __EXPORT void bootloader_app_shared_invalidate(void)
{
bootloader_app_shared_t working;
bootloader_app_shared_init(&working, Invalid);
write(&working);
write_shared(&working);
}