fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 11:38:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

UAVCAN bootloader merge duplicate boot_app_shared

Browse Source
This commit is contained in:
Daniel Agar
2021-01-26 10:21:29 -08:00
committed by David Sidrane
parent e656c9c13f
commit 347c185967
11 changed files with 21 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/bootloaders/boot_app_shared.c
+7 -66
View File
@@ -34,10 +34,6 @@
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdint.h>
@@ -47,17 +43,14 @@
#include "stm32.h"
#include <errno.h>
#include "boot_app_shared.h"
#include "systemlib/crc.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#include "boot_app_shared.h"
#include <lib/systemlib/crc.h>
#define BOOTLOADER_COMMON_APP_SIGNATURE 0xB0A04150u
#define BOOTLOADER_COMMON_BOOTLOADER_SIGNATURE 0xB0A0424Cu
/* CAN_FiRx where (i=0..27|13, x=1, 2)
* STM32_CAN1_FIR(i,x)
* Using i = 2 does not requier there block
@@ -73,30 +66,6 @@
#define CRC_H 1
#define CRC_L 0
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: read
****************************************************************************/
inline static void read(bootloader_app_shared_t *pshared)
{
pshared->signature = getreg32(signature_LOC);
@@ -104,13 +73,8 @@ inline static void read(bootloader_app_shared_t *pshared)
pshared->node_id = getreg32(node_id_LOC);
pshared->crc.ul[CRC_L] = getreg32(crc_LoLOC);
pshared->crc.ul[CRC_H] = getreg32(crc_HiLOC);
}
/****************************************************************************
* Name: write
****************************************************************************/
inline static void write(bootloader_app_shared_t *pshared)
{
putreg32(pshared->signature, signature_LOC);
@@ -118,13 +82,8 @@ inline static void write(bootloader_app_shared_t *pshared)
putreg32(pshared->node_id, node_id_LOC);
putreg32(pshared->crc.ul[CRC_L], crc_LoLOC);
putreg32(pshared->crc.ul[CRC_H], crc_HiLOC);
}
/****************************************************************************
* Name: calulate_signature
****************************************************************************/
static uint64_t calulate_signature(bootloader_app_shared_t *pshared)
{
uint64_t crc;
@@ -135,9 +94,6 @@ static uint64_t calulate_signature(bootloader_app_shared_t *pshared)
return crc;
}
/****************************************************************************
* Name: bootloader_app_shared_init
****************************************************************************/
static void bootloader_app_shared_init(bootloader_app_shared_t *pshared, eRole_t role)
{
memset(pshared, 0, sizeof(bootloader_app_shared_t));
@@ -148,12 +104,8 @@ static void bootloader_app_shared_init(bootloader_app_shared_t *pshared, eRole_t
App ? BOOTLOADER_COMMON_APP_SIGNATURE :
BOOTLOADER_COMMON_BOOTLOADER_SIGNATURE);
}
}
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: bootloader_app_shared_read
*
@@ -181,10 +133,7 @@ static void bootloader_app_shared_init(bootloader_app_shared_t *pshared, eRole_t
* did not occur.
*
****************************************************************************/
__EXPORT
int bootloader_app_shared_read(bootloader_app_shared_t *shared,
eRole_t role)
__EXPORT int bootloader_app_shared_read(bootloader_app_shared_t *shared, eRole_t role)
{
int rv = -EBADR;
bootloader_app_shared_t working;
@@ -224,18 +173,12 @@ int bootloader_app_shared_read(bootloader_app_shared_t *shared,
* None.
*
****************************************************************************/
__EXPORT
void bootloader_app_shared_write(bootloader_app_shared_t *shared,
eRole_t role)
__EXPORT void bootloader_app_shared_write(bootloader_app_shared_t *shared, eRole_t role)
{
bootloader_app_shared_t working = *shared;
working.signature =
(role ==
App ? BOOTLOADER_COMMON_APP_SIGNATURE :
BOOTLOADER_COMMON_BOOTLOADER_SIGNATURE);
working.signature = (role == App ? BOOTLOADER_COMMON_APP_SIGNATURE : BOOTLOADER_COMMON_BOOTLOADER_SIGNATURE);
working.crc.ull = calulate_signature(&working);
write(&working);
}
/****************************************************************************
@@ -255,9 +198,7 @@ void bootloader_app_shared_write(bootloader_app_shared_t *shared,
* None.
*
****************************************************************************/
__EXPORT
void bootloader_app_shared_invalidate(void)
__EXPORT void bootloader_app_shared_invalidate(void)
{
bootloader_app_shared_t working;
bootloader_app_shared_init(&working, Invalid);
src/drivers/bootloaders/boot_app_shared.h
+2 -23
View File
@@ -36,18 +36,10 @@
#pragma once
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/compiler.h>
__BEGIN_DECLS
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Define the signature for the Application descriptor as 'APDesc' and a
* revision number of 00 used in app_descriptor_t
*/
@@ -59,10 +51,6 @@ __BEGIN_DECLS
/* N.B. the .ld file must emit this sections */
# define boot_app_shared_section __attribute__((section(".app_descriptor")))
/****************************************************************************
* Public Type Definitions
****************************************************************************/
/* eRole defines the role of the bootloader_app_shared_t structure */
typedef enum eRole {
@@ -149,13 +137,6 @@ typedef begin_packed_struct struct app_descriptor_t {
} end_packed_struct app_descriptor_t;
#pragma GCC diagnostic pop
/****************************************************************************
* Global Variables
****************************************************************************/
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Name: bootloader_app_shared_read
*
@@ -184,8 +165,7 @@ typedef begin_packed_struct struct app_descriptor_t {
*
****************************************************************************/
int bootloader_app_shared_read(bootloader_app_shared_t *shared,
eRole_t role);
int bootloader_app_shared_read(bootloader_app_shared_t *shared, eRole_t role);
/****************************************************************************
* Name: bootloader_app_shared_write
@@ -211,8 +191,7 @@ int bootloader_app_shared_read(bootloader_app_shared_t *shared,
*
****************************************************************************/
void bootloader_app_shared_write(bootloader_app_shared_t *shared,
eRole_t role);
void bootloader_app_shared_write(bootloader_app_shared_t *shared, eRole_t role);
/****************************************************************************
* Name: bootloader_app_shared_invalidate