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

board_name.c: remove the file and HW_ARCH macro, use px4_board_name() instead

Browse Source 
boards define BOARD_NAME, so board_name() is not necessary. HW_ARCH was
just a wrapper around board_name().

This patch simplifies to having only one common method px4_board_name().
This commit is contained in:
Beat Küng
2016-12-21 11:35:10 +01:00
committed by Lorenz Meier
parent 3d1f240351
commit c662113527
17 changed files with 39 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/version/version.h
+28 -18
View File
@@ -40,36 +40,46 @@
* @author Anton Babushkin <anton.babushkin@me.com>
*/
#ifndef VERSION_H_
#define VERSION_H_
#pragma once
/* The preferred method for publishing a board name up is to
* provide board_name()
*
*/
__BEGIN_DECLS
__EXPORT const char *board_name(void);
__END_DECLS
#define FREEZE_STR(s) #s
#define STRINGIFY(s) FREEZE_STR(s)
#define FW_GIT STRINGIFY(GIT_VERSION)
#define FW_BUILD_URI STRINGIFY(BUILD_URI)
/* The preferred method for publishing a board name is to
* define it in board_config.h as BOARD_NAME
*/
#if defined(CONFIG_ARCH_BOARD_SITL)
# define HW_ARCH "SITL"
# define BOARD_NAME "SITL"
#elif defined(CONFIG_ARCH_BOARD_EAGLE)
# define HW_ARCH "EAGLE"
# define BOARD_NAME "EAGLE"
#elif defined(CONFIG_ARCH_BOARD_EXCELSIOR)
# define HW_ARCH "EXCELSIOR"
# define BOARD_NAME "EXCELSIOR"
#elif defined(CONFIG_ARCH_BOARD_RPI)
# define HW_ARCH "RPI"
# define BOARD_NAME "RPI"
#elif defined(CONFIG_ARCH_BOARD_BEBOP)
# define HW_ARCH "BEBOP"
# define BOARD_NAME "BEBOP"
#else
#define HW_ARCH (board_name())
# include "board_config.h"
# ifndef BOARD_NAME
# error "board_config.h must define BOARD_NAME"
# endif
#endif
#endif /* VERSION_H_ */
__BEGIN_DECLS
/**
* get the board name as string (including the version if there are multiple)
*/
static inline const char *px4_board_name(void)
{
return BOARD_NAME;
}
__END_DECLS