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

sysmobts: Use the uc connection on both slave and master 

We can use this on both slave and master. But only have the
master switch on the PA.
This commit is contained in:
Holger Hans Peter Freyther 2014-08-22 00:02:07 +02:00
parent 3a54b7aa30
commit 15f899f89e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osmo-bts-sysmo/misc/sysmobts_mgr_2050.c
View File

@ -309,7 +309,7 @@ int sbts2050_uc_check_temp(int *temp_pa, int *temp_board)
void sbts2050_uc_initialize(void)
{
if (!is_sbts2050_master())
if (!is_sbts2050())
return;
ucontrol0.fd = osmo_serial_init(ucontrol0.path, 115200);
@ -319,8 +319,10 @@ void sbts2050_uc_initialize(void)
return;
}
LOGP(DTEMP, LOGL_NOTICE, "Going to enable the PA.\n");
sbts2050_uc_set_pa_power(1);
if (is_sbts2050_master()) {
LOGP(DTEMP, LOGL_NOTICE, "Going to enable the PA.\n");
sbts2050_uc_set_pa_power(1);
}
}
int sbts2050_uc_set_pa_power(int on_off)

4
src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c
View File

@ -99,7 +99,7 @@ static void execute_critical_act(struct sysmobts_mgr_instance *manager)
/* switch off the PA */
if (manager->action_crit & TEMP_ACT_PA_OFF) {
if (!is_sbts2050_master()) {
if (!is_sbts2050()) {
LOGP(DTEMP, LOGL_NOTICE,
"PA can only be switched-off on the master\n");
} else if (sbts2050_uc_set_pa_power(0) != 0) {
@ -185,7 +185,7 @@ static void temp_ctrl_check()
LOGP(DTEMP, LOGL_DEBUG, "RF temperature is: %d\n", temp);
}
if (is_sbts2050_master()) {
if (is_sbts2050()) {
int temp_pa, temp_board;
rc = sbts2050_uc_check_temp(&temp_pa, &temp_board);

5
src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c
View File

@ -271,10 +271,13 @@ DEFUN(show_mgr, show_mgr_cmd, "show manager",
sysmobts_temp_get(SYSMOBTS_TEMP_RF,
SYSMOBTS_TEMP_INPUT) / 1000.0f,
VTY_NEWLINE);
if (is_sbts2050_master()) {
if (is_sbts2050()) {
int temp_pa, temp_board;
struct sbts2050_power_status status;
vty_out(vty, " sysmoBTS 2050 is %s%s",
is_sbts2050_master() ? "master" : "slave", VTY_NEWLINE);
sbts2050_uc_check_temp(&temp_pa, &temp_board);
vty_out(vty, " sysmoBTS 2050 PA: %d Celcius%s", temp_pa, VTY_NEWLINE);
vty_out(vty, " sysmoBTS 2050 PA: %d Celcius%s", temp_board, VTY_NEWLINE);