cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

lc15: cleanup board parameters reading 

* move common code into separate function
* print error similar to parameter reading code

Change-Id: Icf3285d7bb921d212cb8945e835be2c81189fb87
Related: SYS#3728
This commit is contained in:
Max 2017-07-17 17:32:03 +02:00
parent a59fb6220b
commit f690e5d45c
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/osmo-bts-litecell15/misc/lc15bts_bid.c
View File

@ -24,12 +24,13 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <stdbool.h>
#include "lc15bts_bid.h"
#define BOARD_REV_SYSFS "/var/lc15/platform/revision"
#define BOARD_OPT_SYSFS "/var/lc15/platform/option"
static const int option_type_mask[_NUM_OPTION_TYPES] = {
[LC15BTS_OPTION_OCXO] = 0x07,
[LC15BTS_OPTION_FPGA] = 0x03,
@ -72,6 +73,21 @@ static const int option_type_shift[_NUM_OPTION_TYPES] = {
static int board_rev = -1;
static int board_option = -1;
static inline bool read_board(const char *src, const char *spec, void *dst)
{
FILE *fp = fopen(src, "r");
if (!fp) {
fprintf(stderr, "Failed to open %s due to '%s' error\n", src, strerror(errno));
return false;
}
if (fscanf(fp, spec, dst) != 1) {
fclose(fp);
fprintf(stderr, "Failed to read %s due to '%s' error\n", src, strerror(errno));
return false;
}
fclose(fp);
}
int lc15bts_rev_get(void)
{
@ -82,14 +98,8 @@ int lc15bts_rev_get(void)
return board_rev;
}
fp = fopen(BOARD_REV_SYSFS, "r");
if (fp == NULL) return -1;
if (fscanf(fp, "%c", &rev) != 1) {
fclose( fp );
return -1;
}
fclose(fp);
if (!read_board(BOARD_REV_SYSFS, "%c", &rev))
return -1;
board_rev = rev;
return board_rev;
@ -99,22 +109,15 @@ int lc15bts_model_get(void)
{
FILE *fp;
int opt;
bool rc;
if (board_option != -1)
return board_option;
if (board_option == -1) {
fp = fopen(BOARD_OPT_SYSFS, "r");
if (fp == NULL) {
return -1;
}
if (fscanf(fp, "%X", &opt) != 1) {
fclose( fp );
return -1;
}
fclose(fp);
if (!read_board(BOARD_OPT_SYSFS, "%X", &opt))
return -1;
board_option = opt;
}
board_option = opt;
return board_option;
}