Add new bts_model_ctrl_cmds_install()
This is one step in making the main() functions of different BTS models more similar, so we can share one code rather than multiple copies of it.
This commit is contained in:
parent
ec3be11ec6
commit
a0192b859b
|
@ -42,4 +42,6 @@ int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)
|
|||
|
||||
void bts_model_abis_close(struct gsm_bts *bts);
|
||||
|
||||
int bts_model_ctrl_cmds_install(struct gsm_bts *bts);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -101,5 +101,12 @@ struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
rc = bts_model_ctrl_cmds_install(bts);
|
||||
if (rc) {
|
||||
/* FIXME: cleanup generic control commands */
|
||||
/* FIXME: close control interface */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return hdl;
|
||||
}
|
||||
|
|
|
@ -302,8 +302,6 @@ static int write_pid_file(char *procname)
|
|||
return 0;
|
||||
}
|
||||
|
||||
extern int sysmobts_ctrlif_inst_cmds(void);
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
struct stat st;
|
||||
|
@ -373,7 +371,6 @@ int main(int argc, char **argv)
|
|||
write_pid_file("osmo-bts");
|
||||
|
||||
bts_controlif_setup(bts);
|
||||
sysmobts_ctrlif_inst_cmds();
|
||||
|
||||
rc = telnet_init(tall_bts_ctx, NULL, OSMO_VTY_PORT_BTS);
|
||||
if (rc < 0) {
|
||||
|
|
|
@ -261,7 +261,7 @@ static int verify_clock_corr(struct ctrl_cmd *cmd, const char *value, void *data
|
|||
}
|
||||
#endif /* HW_SYSMOBTS_V1 */
|
||||
|
||||
int sysmobts_ctrlif_inst_cmds(void)
|
||||
int bts_model_ctrl_cmds_install(struct gsm_bts *bts)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(OPENBSC_INCDIR)
|
||||
AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(ORTP_CFLAGS)
|
||||
LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(ORTP_LIBS)
|
||||
AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(ORTP_CFLAGS)
|
||||
LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS)
|
||||
|
||||
EXTRA_DIST = trx_if.h l1_if.h scheduler.h gsm0503_parity.h gsm0503_conv.h gsm0503_interleaving.h gsm0503_mapping.h gsm0503_coding.h gsm0503_tables.h loops.h amr.h
|
||||
|
||||
|
|
|
@ -304,6 +304,8 @@ int main(int argc, char **argv)
|
|||
|
||||
write_pid_file("osmo-bts");
|
||||
|
||||
bts_controlif_setup(bts);
|
||||
|
||||
rc = telnet_init(tall_bts_ctx, NULL, 4241);
|
||||
if (rc < 0) {
|
||||
fprintf(stderr, "Error initializing telnet\n");
|
||||
|
|
|
@ -419,3 +419,8 @@ int bts_model_vty_init(struct gsm_bts *bts)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int bts_model_ctrl_cmds_install(struct gsm_bts *bts)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue