lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lib][version] rename the global variable version to lk_version

Browse Source 
Avoids colliding with some things.
This commit is contained in:
Travis Geiselbrecht
2020-07-25 16:26:12 -07:00
parent 4edb93adde
commit 82b4d6ffdb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/buildsig/buildsig.c
View File

@@ -40,7 +40,7 @@ extern char __rom_end;
const struct buildsig buildsig __SECTION(".text.boot") = { const struct buildsig buildsig __SECTION(".text.boot") = {
.magic = MAGIC, .magic = MAGIC,
.version = &version, .version = &lk_version,
.magic2 = MAGIC2, .magic2 = MAGIC2,
#if WITH_APP_BOOTLOADER #if WITH_APP_BOOTLOADER
.buildtype = 1, /* TODO: pull from systemwide headers */ .buildtype = 1, /* TODO: pull from systemwide headers */

2
lib/version/include/lib/version.h
View File

@@ -22,7 +22,7 @@ typedef struct {
const char *buildid; const char *buildid;
} lk_version_t; } lk_version_t;
extern const lk_version_t version; extern const lk_version_t lk_version;
void print_version(void); void print_version(void);

12
lib/version/version.c
View File

@@ -22,7 +22,7 @@
#define BUILDID "" #define BUILDID ""
#endif #endif
const lk_version_t version = { const lk_version_t lk_version = {
.struct_version = VERSION_STRUCT_VERSION, .struct_version = VERSION_STRUCT_VERSION,
.arch = ARCH, .arch = ARCH,
.platform = PLATFORM, .platform = PLATFORM,
@@ -33,11 +33,11 @@ const lk_version_t version = {
void print_version(void) { void print_version(void) {
printf("version:\n"); printf("version:\n");
printf("\tarch: %s\n", version.arch); printf("\tarch: %s\n", lk_version.arch);
printf("\tplatform: %s\n", version.platform); printf("\tplatform: %s\n", lk_version.platform);
printf("\ttarget: %s\n", version.target); printf("\ttarget: %s\n", lk_version.target);
printf("\tproject: %s\n", version.project); printf("\tproject: %s\n", lk_version.project);
printf("\tbuildid: %s\n", version.buildid); printf("\tbuildid: %s\n", lk_version.buildid);
} }
static int cmd_version(int argc, const console_cmd_args *argv) { static int cmd_version(int argc, const console_cmd_args *argv) {