Change in osmo-bsc[master]: Split GSM_BTS_TYPE_OSMOBTS to individual BTS types

2021-04-04 Thread fixeria 
fixeria has abandoned this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/18616 )

Change subject: Split GSM_BTS_TYPE_OSMOBTS to individual BTS types
..


Abandoned

See https://gerrit.osmocom.org/c/osmo-bsc/+/23625.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18616
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I00a815cfa6daab126742d27843e700c07c1db183
Gerrit-Change-Number: 18616
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: abandon

Change in osmo-bsc[master]: Split GSM_BTS_TYPE_OSMOBTS to individual BTS types

2020-06-02 Thread pespin 
pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/18616 )

Change subject: Split GSM_BTS_TYPE_OSMOBTS to individual BTS types
..


Patch Set 1: Code-Review-1

Agree with laforge:
* Fine moving sysmobts->osmo-bts (and keep support for sysmobts for backward 
compatibility)
* Handle differences between osmo-bts implementations by means of features.


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18616
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I00a815cfa6daab126742d27843e700c07c1db183
Gerrit-Change-Number: 18616
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Tue, 02 Jun 2020 10:10:07 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in osmo-bsc[master]: Split GSM_BTS_TYPE_OSMOBTS to individual BTS types

2020-05-31 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/18616 )

Change subject: Split GSM_BTS_TYPE_OSMOBTS to individual BTS types
..


Patch Set 1: Code-Review-1

why do you want to do this? I think it just complicates things for the user.  
The important part is whether or not the BTS is osmo-bts on the remote end.  
Everything else can and should be automatically detected by menas of 
(extensions of) OML.

So yes, we should accept 'osmo-bts' as synonym for 'sysmobts', but beyond that 
I'm not convinced, particularly as the commitlog doesn't give any statement why/


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18616
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I00a815cfa6daab126742d27843e700c07c1db183
Gerrit-Change-Number: 18616
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Sun, 31 May 2020 18:47:20 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in osmo-bsc[master]: Split GSM_BTS_TYPE_OSMOBTS to individual BTS types

2020-05-30 Thread Vadim Yanitskiy 
Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/18616 )


Change subject: Split GSM_BTS_TYPE_OSMOBTS to individual BTS types
..

Split GSM_BTS_TYPE_OSMOBTS to individual BTS types

Change-Id: I00a815cfa6daab126742d27843e700c07c1db183
---
M doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
M doc/examples/osmo-bsc/osmo-bsc.cfg
M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
M doc/manuals/vty/bsc_vty_reference.xml
M include/osmocom/bsc/bss.h
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/Makefile.am
M src/osmo-bsc/abis_nm.c
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts_init.c
A src/osmo-bsc/bts_osmobts.c
D src/osmo-bsc/bts_sysmobts.c
M src/osmo-bsc/e1_config.c
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/system_information.c
M tests/neighbor_ident.vty
17 files changed, 160 insertions(+), 155 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/18616/1

diff --git a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg 
b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
index b8cd78d..30eadcc 100644
--- a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
@@ -2,7 +2,8 @@
  network country code 901
  mobile network code 70
  bts 0
-  type sysmobts
+  ! Change this to your specific model (e.g. osmo-bts-sysmo)
+  type osmo-bts
   band GSM-1800
   location_area_code 23
   ipa unit-id 1800 0
diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg 
b/doc/examples/osmo-bsc/osmo-bsc.cfg
index 57000ae..7b3438a 100644
--- a/doc/examples/osmo-bsc/osmo-bsc.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc.cfg
@@ -20,7 +20,8 @@
  dyn_ts_allow_tch_f 0
  periodic location update 30
  bts 0
-  type sysmobts
+  ! Change this to your specific model (e.g. osmo-bts-sysmo)
+  type osmo-bts
   band DCS1800
   cell_identity 6969
   location_area_code 1
diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg 
b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
index c250fac..e6977f2 100644
--- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
@@ -19,7 +19,8 @@
  dyn_ts_allow_tch_f 0
  periodic location update 30
  bts 0
-  type sysmobts
+  ! Change this to your specific model (e.g. osmo-bts-sysmo)
+  type osmo-bts
   band DCS1800
   cell_identity 0
   location_area_code 1
diff --git a/doc/manuals/vty/bsc_vty_reference.xml 
b/doc/manuals/vty/bsc_vty_reference.xml
index 8f3edf9..f3f67c6 100644
--- a/doc/manuals/vty/bsc_vty_reference.xml
+++ b/doc/manuals/vty/bsc_vty_reference.xml
@@ -3025,7 +3025,7 @@
   
   
 config-net-bts
-
+
   
 
 
@@ -3033,7 +3033,11 @@
 
 
 
-
+
+
+
+
+
   
 
 
diff --git a/include/osmocom/bsc/bss.h b/include/osmocom/bsc/bss.h
index b8945db..0de4423 100644
--- a/include/osmocom/bsc/bss.h
+++ b/include/osmocom/bsc/bss.h
@@ -16,5 +16,5 @@
 extern int bts_model_rbs2k_init(void);
 extern int bts_model_nanobts_init(void);
 extern int bts_model_nokia_site_init(void);
-extern int bts_model_sysmobts_init(void);
+extern int osmo_bts_model_init(enum gsm_bts_type type);
 #endif
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 1e7e88f..6f6c279 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -782,19 +782,14 @@
GSM_BTS_TYPE_NANOBTS,
GSM_BTS_TYPE_RBS2000,
GSM_BTS_TYPE_NOKIA_SITE,
-   GSM_BTS_TYPE_OSMOBTS,
+   GSM_BTS_TYPE_OSMOBTS_GENERIC,   /* osmo-bts-{virtual,omldummy} */
+   GSM_BTS_TYPE_OSMOBTS_LC15,
+   GSM_BTS_TYPE_OSMOBTS_OCTPHY,
+   GSM_BTS_TYPE_OSMOBTS_SYSMO,
+   GSM_BTS_TYPE_OSMOBTS_TRX,
_NUM_GSM_BTS_TYPE
 };

-enum gsm_bts_type_variant {
-   BTS_UNKNOWN,
-   BTS_OSMO_LITECELL15,
-   BTS_OSMO_OCTPHY,
-   BTS_OSMO_SYSMO,
-   BTS_OSMO_TRX,
-   _NUM_BTS_VARIANT
-};
-
 /* Used by OML layer for BTS Attribute reporting */
 enum bts_attribute {
BTS_TYPE_VARIANT,
@@ -808,7 +803,6 @@
struct llist_head list;

enum gsm_bts_type type;
-   enum gsm_bts_type_variant variant;
const char *name;

bool started;
@@ -1024,7 +1018,6 @@
uint8_t bsic;
/* type of BTS */
enum gsm_bts_type type;
-   enum gsm_bts_type_variant variant;
struct gsm_bts_model *model;
enum gsm_band band;
char version[MAX_VERSION_LENGTH];
@@ -1309,9 +1302,6 @@
 enum bts_attribute str2btsattr(const char *s);
 const char *btsatttr2str(enum bts_attribute v);

-enum gsm_bts_type_variant str2btsvariant(const char *arg);
-const char *btsvariant2str(enum gsm_bts_type_variant v);
-
 extern const struct value_string gsm_chreq_descs[];
 extern const struct value_string gsm_pchant_names[];
 extern const struct value_string gsm_pchant_descs[];
@@ -1726,12 +1716,31 @@

 extern void *tall_bsc_ctx;

+static