From 0aa8baa96d5dfc69730aa4600e5d295f487c87e1 Mon Sep 17 00:00:00 2001 From: Peter van der Perk Date: Tue, 9 Aug 2022 12:03:09 +0200 Subject: [PATCH] Fix conflicting function names --- src/drivers/bootloaders/boot_app_shared.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drivers/bootloaders/boot_app_shared.c b/src/drivers/bootloaders/boot_app_shared.c index cdee0d4649..19127402a2 100644 --- a/src/drivers/bootloaders/boot_app_shared.c +++ b/src/drivers/bootloaders/boot_app_shared.c @@ -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); }