Projects
osmocom:latest
osmo-bsc
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 6
View file
osmo-bsc.spec
Changed
@@ -18,13 +18,13 @@ Name: osmo-bsc Requires: osmocom-latest -Version: 1.11.0 +Version: 1.11.1 Release: 0 Summary: OsmoBSC: Osmocom's Base Station Controller for 2G CS mobile networks License: AGPL-3.0-or-later AND GPL-2.0-or-later Group: Hardware/Mobile URL: https://osmocom.org/projects/osmobsc -Source: osmo-bsc_1.11.0.tar.xz +Source: osmo-bsc_1.11.1.tar.xz Source1: rpmlintrc BuildRequires: automake >= 1.9 BuildRequires: libtool >= 2
View file
osmo-bsc_1.11.0.dsc -> osmo-bsc_1.11.1.dsc
Changed
@@ -2,7 +2,7 @@ Source: osmo-bsc Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc Architecture: any all -Version: 1.11.0 +Version: 1.11.1 Maintainer: Osmocom team <openbsc@lists.osmocom.org> Homepage: https://projects.osmocom.org/projects/osmo-bsc Standards-Version: 3.9.8 @@ -18,8 +18,8 @@ osmo-bsc-ipaccess-utils deb net extra arch=any osmo-bsc-meas-utils deb net extra arch=any Checksums-Sha1: - a09d63142aa52451b05081f75275f1ca0fce427e 616788 osmo-bsc_1.11.0.tar.xz + 1fe619c22b7d81a3831a602ed57d3997926ee4e4 616988 osmo-bsc_1.11.1.tar.xz Checksums-Sha256: - 5f8fee07b7bbd3ad3115b19d75552cba50cd698ba9780e840b41e795291c2427 616788 osmo-bsc_1.11.0.tar.xz + 80f4eab03e584022238d22a8c90cd25197b487a5a76b0be827238c2b86488b15 616988 osmo-bsc_1.11.1.tar.xz Files: - a13ff42ac8182b8c59f9b60501ea7bb4 616788 osmo-bsc_1.11.0.tar.xz + 0305d2e39a0912de82e478c989038508 616988 osmo-bsc_1.11.1.tar.xz
View file
osmo-bsc_1.11.0.tar.xz/.tarball-version -> osmo-bsc_1.11.1.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -1.11.0 +1.11.1
View file
osmo-bsc_1.11.0.tar.xz/debian/changelog -> osmo-bsc_1.11.1.tar.xz/debian/changelog
Changed
@@ -1,3 +1,12 @@ +osmo-bsc (1.11.1) unstable; urgency=medium + + Philipp Maier + * pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY + * pcuif_proto: clean up last remains of old PCUIF v10 + * pcuif_proto: signal BTS model via PCUIF + + -- Oliver Smith <osmith@sysmocom.de> Tue, 12 Dec 2023 16:53:00 +0100 + osmo-bsc (1.11.0) unstable; urgency=medium Max
View file
osmo-bsc_1.11.0.tar.xz/include/osmocom/bsc/pcuif_proto.h -> osmo-bsc_1.11.1.tar.xz/include/osmocom/bsc/pcuif_proto.h
Changed
@@ -8,12 +8,11 @@ #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x0b +#define PCU_IF_VERSION 0x0c #define TXT_MAX_LEN 128 /* msg_type */ #define PCU_IF_MSG_DATA_REQ 0x00 /* send data to given channel */ -#define PCU_IF_MSG_DATA_CNF 0x01 /* confirm (e.g. transmission on PCH) */ #define PCU_IF_MSG_DATA_IND 0x02 /* receive data from given channel */ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ #define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ @@ -35,8 +34,6 @@ /* sapi */ #define PCU_IF_SAPI_RACH 0x01 /* channel request on CCCH */ -#define PCU_IF_SAPI_AGCH 0x02 /* assignment on AGCH */ -#define PCU_IF_SAPI_PCH 0x03 /* paging/assignment on PCH */ #define PCU_IF_SAPI_BCCH 0x04 /* SI on BCCH */ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ @@ -46,7 +43,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1 (1 << 16) #define PCU_IF_FLAG_CS2 (1 << 17) #define PCU_IF_FLAG_CS3 (1 << 18) @@ -66,6 +63,17 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +/* BTS model */ +enum gsm_pcuif_bts_model { + PCU_IF_BTS_MODEL_UNSPEC, + PCU_IF_BTS_MODEL_LC15, + PCU_IF_BTS_MODEL_OC2G, + PCU_IF_BTS_MODEL_OCTPHY, + PCU_IF_BTS_MODEL_SYSMO, + PCU_IF_BTS_MODEL_TRX, + PCU_IF_BTS_MODEL_RBS, +}; + #define PCU_IF_NUM_NSVC 2 #define PCU_IF_NUM_TRX 8 @@ -179,6 +187,7 @@ struct in_addr v4; struct in6_addr v6; } remote_ipPCU_IF_NUM_NSVC; + uint8_t bts_model; /* enum gsm_pcuif_bts_model */ } __attribute__ ((packed)); /* E1 CCU connection parameters */ @@ -297,7 +306,6 @@ union { struct gsm_pcu_if_data data_req; - struct gsm_pcu_if_data data_cnf; struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req;
View file
osmo-bsc_1.11.0.tar.xz/src/osmo-bsc/pcu_sock.c -> osmo-bsc_1.11.1.tar.xz/src/osmo-bsc/pcu_sock.c
Changed
@@ -50,8 +50,6 @@ static const char *sapi_string = { PCU_IF_SAPI_RACH = "RACH", - PCU_IF_SAPI_AGCH = "AGCH", - PCU_IF_SAPI_PCH = "PCH", PCU_IF_SAPI_BCCH = "BCCH", PCU_IF_SAPI_PDTCH = "PDTCH", PCU_IF_SAPI_PRACH = "PRACH", @@ -200,7 +198,7 @@ info_ind = &pcu_prim->u.info_ind; info_ind->version = PCU_IF_VERSION; info_ind->flags |= PCU_IF_FLAG_ACTIVE; - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_DIRECT_PHY; /* RAI */ info_ind->mcc = bts->network->plmn.mcc; @@ -302,6 +300,14 @@ info_ind_fill_trx(&info_ind->trxtrx->nr, trx); } + switch (bts->type) { + case GSM_BTS_TYPE_RBS2000: + info_ind->bts_model = PCU_IF_BTS_MODEL_RBS; + break; + default: + info_ind->bts_model = PCU_IF_BTS_MODEL_UNSPEC; + } + return pcu_sock_send(bts->network, msg); }
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.