OpenBSC March 2014

openbsc@lists.osmocom.org

27 participants
69 discussions

[osmo-bts PATCH v4] misc/sysmobts_misc: function for switching off/on and requesting status power

by Alvaro Neira

From: Álvaro Neira Ayuso <anayuso(a)sysmocom.de> I have extended the principal function that we use for requesting information to the microcontroller for switching off/on the board and the PA. And i have extended too with a function for requesting the power status information of the board and the PA. Signed-off-by: Alvaro Neira Ayuso <anayuso(a)sysmocom.de> --- v4: Fixed the msgb_free in the function status. With the return, we never use it src/osmo-bts-sysmo/misc/sysmobts_misc.c | 81 +++++++++++++++++++++++++++++++ src/osmo-bts-sysmo/misc/sysmobts_misc.h | 10 ++++ 2 files changed, 91 insertions(+) diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.c b/src/osmo-bts-sysmo/misc/sysmobts_misc.c index 55a7a2a..897d605 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_misc.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.c @@ -120,6 +120,12 @@ static struct msgb *sbts2050_ucinfo_get(struct uc *ucontrol, struct ucinfo info) case SBTS2050_TEMP_RQT: num = sizeof(command->cmd.tempGet); break; + case SBTS2050_PWR_RQT: + num = sizeof(command->cmd.pwrSetState); + break; + case SBTS2050_PWR_STATUS: + num = sizeof(command->cmd.pwrGetStatus); + break; default: return NULL; } @@ -138,6 +144,17 @@ static struct msgb *sbts2050_ucinfo_get(struct uc *ucontrol, struct ucinfo info) command->u8Id = info.id; command->u8Len = sizeof(command->cmd.tempGet); break; + case SBTS2050_PWR_RQT: + command->u8Id = info.id; + command->u8Len = sizeof(command->cmd.pwrSetState); + command->cmd.pwrSetState.u1MasterEn = !!info.master; + command->cmd.pwrSetState.u1SlaveEn = !!info.slave; + command->cmd.pwrSetState.u1PwrAmpEn = !!info.pa; + break; + case SBTS2050_PWR_STATUS: + command->u8Id = info.id; + command->u8Len = sizeof(command->cmd.pwrGetStatus); + break; default: goto err; } @@ -182,6 +199,70 @@ err: #endif /********************************************************************** + * Get power status function + *********************************************************************/ +int sbts2050_uc_status(struct uc *ucontrol, enum sbts2050_status_rqt status) +{ + struct msgb *msg; + struct ucinfo info = { + .id = SBTS2050_PWR_STATUS, + }; + rsppkt_t *response; + + msg = sbts2050_ucinfo_get(ucontrol, info); + + if (msg == NULL) { + LOGP(DTEMP, LOGL_ERROR, "Error switching off some unit"); + return -1; + } + + response = (rsppkt_t *)msg->data; + + msgb_free(msg); + switch (status) { + case SBTS2050_STATUS_MASTER: + return response->rsp.pwrGetStatus.u1MasterEn; + case SBTS2050_STATUS_SLAVE: + return response->rsp.pwrGetStatus.u1SlaveEn; + case SBTS2050_STATUS_PA: + return response->rsp.pwrGetStatus.u1PwrAmpEn; + default: + return -1; + } +} + +/********************************************************************** + * Uc Power Switching handling + *********************************************************************/ +void sbts2050_uc_power(struct uc *ucontrol, int pmaster, int pslave, int ppa) +{ + struct msgb *msg; + struct ucinfo info = { + .id = 0x00, + .master = pmaster, + .slave = pslave, + .pa = ppa + }; + + msg = sbts2050_ucinfo_get(ucontrol, info); + + if (msg == NULL) { + LOGP(DTEMP, LOGL_ERROR, "Error switching off some unit"); + return; + } + + LOGP(DTEMP, LOGL_DEBUG, "Switch off/on success:\n" + "MASTER %s\n" + "SLAVE %s\n" + "PA %s\n", + pmaster ? "ON" : "OFF", + pslave ? "ON" : "OFF", + ppa ? "ON" : "OFF"); + + msgb_free(msg); +} + +/********************************************************************** * Uc temperature handling *********************************************************************/ void sbts2050_uc_check_temp(struct uc *ucontrol, int *temp_pa, int *temp_board) diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.h b/src/osmo-bts-sysmo/misc/sysmobts_misc.h index 3c6513e..01878f2 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_misc.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.h @@ -13,6 +13,12 @@ enum sysmobts_temp_type { _NUM_TEMP_TYPES }; +enum sbts2050_status_rqt { + SBTS2050_STATUS_MASTER, + SBTS2050_STATUS_SLAVE, + SBTS2050_STATUS_PA +}; + struct uc { int id; int fd; @@ -33,6 +39,10 @@ void sysmobts_check_temp(int no_eeprom_write); void sbts2050_uc_check_temp(struct uc *ucontrol, int *temp_pa, int *temp_board); +void sbts2050_uc_power(struct uc *ucontrol, int pmaster, int pslave, int ppa); + +int sbts2050_uc_status(struct uc *ucontrol, enum sbts2050_status_rqt status); + int sysmobts_update_hours(int no_epprom_write); enum sysmobts_firmware_type {

11 years, 3 months

ipaccess-telnet authentication problem

by Odd Trandem

Got a problem with ipacces-telnet. My goal is to run osmo-nitb, and do some experimenting. After a factory default reset, the following commands are given: (192.168.1.11 is ip-address of the nanoBTS) ./ipaccess-config 192.168.1.11 -u 1808/0/0 ./ipaccess-config 192.168.1.11 -o 192.168.1.1 ./ipaccess-config 192.168.1.11 -r (wait) ./ipaccess-config -n 0x400/0x400 192.168.1.11 Then I start ipaccess-telnet : ipaccess-telnet 192.168.1.11 3210 And I start osmo-ntib: osmo-nitb --config-file openbsc900.cfg ========================================================== The biggest problem, that makes debugging difficult, is that I after having run osmo-nitb, I cannot use ipaccess-telnet anymore. I have put in some additional prints into ip-access-auth.c to monitor the nanoBTS response: Two examples of OK response, before osmo-nitb is run: response: 3C 31 25 01 7C 3B B2 23 D6 7D 5D 84 17 62 9A 2E 9D 3E = "<1% |;?#?}]? b?.?>" (length = 18) response: 3C 76 B9 88 4C 43 D8 E3 1E 9A 2A 81 DD A0 C7 AC A5 3E = "<v??LC?? ?*??O?>" (length = 18) Two examples of response when nanoBTS refuse connection after having run osmo-nitb: response: 7B 58 0D 7C A4 50 75 83 2B FB 38 F2 66 AD B0 B6 AA 7D = {X?|?Pu?+?8?f????}" (length = 18) response: 7B 43 4A E6 5B A7 E2 1D 1C 8D F4 88 FF FB 26 F6 69 7D = "{CJ?[?? ?????&?i}" (length = 18) Only a factory default reset will make ipaccess-telnet working again. ========================================================== Output from osmo-nitb: <0019> input/ipaccess.c:945 enabling ipaccess BSC mode DB: Database initialized. DB: Database prepared. <001d> sms_queue.c:220 Attempting to send 20 SMS <0019> input/ipa.c:308 accept()ed new link from 192.168.1.11 to port 3002 <0019> input/ipaccess.c:422 Sign link vanished, dead socket <0019> input/ipaccess.c:260 Forcing socket shutdown with no signal link set <0019> input/ipa.c:308 accept()ed new link from 192.168.1.11 to port 3002 <0019> input/ipa.c:308 accept()ed new link from 192.168.1.11 to port 3003 <0004> bsc_init.c:265 bootstrapping RSL for BTS/TRX (0/0) on ARFCN 33 using MCC=1 MNC=1 LAC=1 CID=0 BSIC=63 TSC=7 Failure Event Report Type=processing failure Severity=warning level failure Probable cause= 03 00 01 Additional Text=40065:WARN:DHCP:dhcp_msg.c#692:Router Address not not valid: clearing it Failure Event Report Type=processing failure Severity=warning level failure Probable cause= 03 00 01 Additional Text=20233:WARN:DHCP:dhcp_msg.c#692:Router Address not not valid: clearing it ========================================================== Output from ipaccess-telnet: (NOT sure if this is exactly same run as shown in the osmo-nitb ouput) nanoBTS (c) ip.access Ltd 2001 30351:DBG:CLI_SKT:Remote client 192.168.1.1 connected 3525:DBG:TIB:OCXO is now WARM 4032:DBG:IP_CHANNEL:Assigning RX Client A 4032:DBG:IP_CHAN_RX_A:4711:ipChanConn: EVENT 0x00001742 rxd in STATE notconnected 4032:DBG:IP_CHAN_RX_A:Attempting connection to 192.168.1.1:3002 4033:DBG:IP_CHAN_RX_A:4712:ipChanConn: EVENT 0x00001741 rxd in STATE outgoingconnecting 6198:DBG:IP_CHAN_RX_A:4789:ipChanConn: EVENT 0x00001744 rxd in STATE outgoingconnecting 19151:DBG:DHCP:Event 4 received in State 3 19151:DBG:DHCP:T1 expired, sending Request 19154:DBG:DHCP:Tr Timer started with period 112 secs 19155:DBG:DHCP:Event 2 received in State 4 19155:DBG:DHCP:ACK received 19155:WARN:DHCP:dhcp_msg.c#696:Router Address not not valid: clearing it 19161:DBG:DB_EE:Writing 232 bytes of DBX data to block 3 19161:DBG:DB_EE:Re-using existing DBX block 19200:DBG:DB_EE:NV block 3 - wrote block to NV, main and backup OK. 19200:DBG:DB_EE:EE update complete. 28158:DBG:IP_CHANNEL:Assigning RX Client A 28158:DBG:IP_CHAN_RX_A:5541:ipChanConn: EVENT 0x00001742 rxd in STATE notconnected 28158:DBG:IP_CHAN_RX_A:Attempting connection to 192.168.1.1:3002 28158:DBG:IP_CHAN_RX_A:5542:ipChanConn: EVENT 0x00001747 rxd in STATE outgoingconnecting 28593:DBG:OAM_IM:Changing SYSTEM LINK from 0.0 to 73.255 28650:DBG:DB_EE:EE update complete. 29719:DBG:OAM_IM:Stopping "Primary OML Fallback Client" 29719:DBG:OAM_IM:Stopping "Secondary OML Server" 29719:DBG:OAM_IM:Not stopping "Secure Secondary OML Server" - has not been started 29719:DBG:OAM_IM:Not stopping "IML Site Server" - has not been started 29719:DBG:OAM_IM:Not stopping "Secure IML Site Server" - has not been started 29719:DBG:OAM_IM:Stopping "IML Bts Server" 29719:DBG:OAM_IM:Not stopping "Secure IML Bts Server" - has not been started 29719:DBG:OAM_IM:Stopping "IRL Patched Routing Link" 29719:DBG:OAM_IM:Failed to inject event=1="STOP" into link source (token=7) 29744:DBG:IP_CHAN_SERVER:Closed server listening on port 3006 29745:DBG:IP_CHAN_SERVER:Closed server listening on port 3014 29935:DBG:IP_CHAN_RX_A:5705:ipChanConn: EVENT 0x00001743 rxd in STATE connected 29935:DBG:IP_CHAN_RX_A:5706:ipChanConn: EVENT 0x00001741 rxd in STATE disconnectclosing ========================================================== Content of config file, openbsc900.cfg: ! ! OpenBSC configuration saved from vty ! ! password foo ! log stderr logging filter all 1 line vty no login ! e1_input e1_line 0 driver ipa network network country code 1 mobile network code 1 short name OpenBSC long name OpenBSC auth policy closed location updating reject cause 13 encryption a5 0 neci 1 rrlp mode none mm info 1 handover 0 handover window rxlev averaging 10 handover window rxqual averaging 1 handover window rxlev neighbor averaging 10 handover power budget interval 6 handover power budget hysteresis 3 handover maximum distance 9999 timer t3101 10 timer t3103 0 timer t3105 0 timer t3107 0 timer t3109 4 timer t3111 0 timer t3113 60 timer t3115 0 timer t3117 0 timer t3119 0 timer t3141 0 bts 0 type nanobts band DCS900 cell_identity 0 location_area_code 1 training_sequence_code 7 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 channel allocator ascending rach tx integer 9 rach max transmission 7 ip.access unit_id 1808 0 oml ip.access stream_id 255 line 0 gprs mode none trx 0 rf_locked 0 arfcn 33 nominal power 23 max_power_red 20 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 timeslot 1 phys_chan_config SDCCH8 timeslot 2 phys_chan_config TCH/F timeslot 3 phys_chan_config TCH/F timeslot 4 phys_chan_config TCH/F timeslot 5 phys_chan_config TCH/F timeslot 6 phys_chan_config TCH/F timeslot 7 phys_chan_config TCH/F Odd Trandem SINTEF ICT

11 years, 3 months

[osmo-bts PATCH] misc/sysmobts_mgr: Added new header created in the configure

by Alvaro Neira

From: Álvaro Neira Ayuso <anayuso(a)sysmocom.de> Signed-off-by: Alvaro Neira Ayuso <anayuso(a)sysmocom.de> --- src/osmo-bts-sysmo/misc/sysmobts_mgr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c index 3a2c10c..6c64d0f 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c @@ -39,6 +39,7 @@ #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> +#include "btsconfig.h" #include "misc/sysmobts_misc.h" #include "misc/sysmobts_mgr.h" #include "misc/sysmobts_nl.h"

11 years, 3 months

[PATCH] libmsc,sms: Properly calculate and store validity and received timestamps for incoming SMS.

by Alexander Chemeris

This is a continuation of the patch series for the SMS validity fixes in libosmocore. Note, that this patch is based on top of the SMS DB change to remove receiver ID. It is also available in the achemeris/sms-validity-fix-master branch in the git repo. -- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co

11 years, 3 months

[osmo-bts PATCH v4] misc/sysmobts_misc.c: Read temperature from microcontroller

by Alvaro Neira

From: Álvaro Neira Ayuso <anayuso(a)sysmocom.de> Add function for requesting the temperature information to the microcontroller. I have added a function that we can extend for requesting more information but in this case we only need to know the temperature. I have added to a microcontroller temperature handling function in the manager for monitoring this information. Signed-off-by: Alvaro Neira Ayuso <anayuso(a)sysmocom.de> --- v4: Fixed the configure for considering if we are in a sbts2050 or not and compile the code that we will use. configure.ac | 10 ++ src/osmo-bts-sysmo/misc/sysmobts_mgr.c | 56 ++++++++++ src/osmo-bts-sysmo/misc/sysmobts_misc.c | 172 +++++++++++++++++++++++++++++++ src/osmo-bts-sysmo/misc/sysmobts_misc.h | 15 +++ 4 files changed, 253 insertions(+) diff --git a/configure.ac b/configure.ac index 3411017..fa75274 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,16 @@ AC_CHECK_HEADER([openbsc/gsm_data_shared.h],[], []) CPPFLAGS=$oldCPPFLAGS +# Check for the sbts2050_header.h that was added after the 3.6 release +AC_CHECK_HEADER([sysmocom/femtobts/sbts2050_header.h], + [sysmo_uc_header="yes"],[]) + +if test "$sysmo_uc_header" = "yes" ; then + AC_DEFINE(BUILD_SBTS2050, 1, [Define if we want to build SBTS2050]) +fi +AM_CONDITIONAL(BUILD_SBTS2050, test "x$sysmo_uc_header" = "xyes") +AM_CONFIG_HEADER(btsconfig.h) + AC_OUTPUT( src/Makefile src/common/Makefile diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c index 171f79b..3a2c10c 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c @@ -35,6 +35,7 @@ #include <osmocom/core/application.h> #include <osmocom/core/timer.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/serial.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> @@ -53,6 +54,58 @@ void *tall_mgr_ctx; /* every 1 hours means 365*24 = 8760 EEprom writes per year (max) */ #define HOURS_TIMER_SECS (1 * 3600) +#ifdef BUILD_SBTS2050 +static struct osmo_timer_list temp_uc_timer; +static void check_uctemp_timer_cb(void *data) +{ + int temp_pa = 0, temp_board = 0; + struct uc *ucontrol0 = data; + + sbts2050_uc_check_temp(ucontrol0, &temp_pa, &temp_board); + + osmo_timer_schedule(&temp_uc_timer, TEMP_TIMER_SECS, 0); +} +#endif + +static void initialize_sbts2050(void) +{ +#ifdef BUILD_SBTS2050 + static struct uc ucontrol0 = { + .id = 0, + .path = "/dev/ttyS0" + }; + int val; + + if (sysmobts_par_get_int(SYSMOBTS_PAR_MODEL_NR, &val) < 0) { + LOGP(DFIND, LOGL_ERROR, + "Failed to get Model number\n"); + return; + } + + if (val == 2050) { + if (sysmobts_par_get_int(SYSMOBTS_PAR_TRX_NR, &val) < 0) { + LOGP(DFIND, LOGL_ERROR, + "Failed to get the TRX number\n"); + return; + } + + if (val != 0) + return; + } + + ucontrol0.fd = osmo_serial_init(ucontrol0.path, 115200); + if (ucontrol0.fd < 0) { + LOGP(DFIND, LOGL_ERROR, + "Failed to open the serial interface\n"); + return; + } + + temp_uc_timer.cb = check_uctemp_timer_cb; + temp_uc_timer.data = &ucontrol0; + check_uctemp_timer_cb(&ucontrol0); +#endif +} + static struct osmo_timer_list temp_timer; static void check_temp_timer_cb(void *unused) { @@ -309,6 +362,9 @@ int main(int argc, char **argv) hours_timer.cb = hours_timer_cb; hours_timer_cb(NULL); + /* start uc temperature check timer */ + initialize_sbts2050(); + /* handle broadcast messages for ipaccess-find */ fd.cb = ipaccess_bcast; rc = osmo_sock_init_ofd(&fd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.c b/src/osmo-bts-sysmo/misc/sysmobts_misc.c index c043045..55a7a2a 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_misc.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.c @@ -32,14 +32,186 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> #include <osmocom/core/application.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> +#include "btsconfig.h" #include "sysmobts_misc.h" #include "sysmobts_par.h" #include "sysmobts_mgr.h" +#ifdef BUILD_SBTS2050 +#include <sysmocom/femtobts/sbts2050_header.h> +#endif + +#define SERIAL_ALLOC_SIZE 300 +#define SIZE_HEADER_RSP 5 +#define SIZE_HEADER_CMD 4 + + +#ifdef BUILD_SBTS2050 +/********************************************************************** + * Functions read/write from serial interface + *********************************************************************/ +static int hand_serial_read(int fd, struct msgb *msg, int numbytes) +{ + int rc, bread = 0; + + if (numbytes > msgb_tailroom(msg)) + return -ENOSPC; + + while (bread < numbytes) { + rc = read(fd, msg->tail, numbytes - bread); + if (rc < 0) + return -1; + if (rc == 0) + break; + + bread += rc; + msgb_put(msg, rc); + } + + return bread; +} + +static int hand_serial_write(int fd, struct msgb *msg) +{ + int rc, bwritten = 0; + + while (msg->len > 0) { + rc = write(fd, msg->data, msg->len); + if (rc <= 0) + return -1; + + msgb_pull(msg, rc); + bwritten += rc; + } + + return bwritten; +} + +/********************************************************************** + * Functions request information to Microcontroller + *********************************************************************/ +static void add_parity(cmdpkt_t *command) +{ + int n; + uint8_t parity = 0x00; + for (n = 0; n < SIZE_HEADER_CMD+command->u8Len; n++) + parity ^= ((uint8_t *)command)[n]; + + command->cmd.raw[command->u8Len] = parity; +} + +static struct msgb *sbts2050_ucinfo_get(struct uc *ucontrol, struct ucinfo info) +{ + int num, rc; + cmdpkt_t *command; + rsppkt_t *response; + struct msgb *msg; + fd_set fdread; + struct timeval tout = { + .tv_sec = 10, + }; + + switch (info.id) { + case SBTS2050_TEMP_RQT: + num = sizeof(command->cmd.tempGet); + break; + default: + return NULL; + } + num = num + SIZE_HEADER_CMD+1; + + msg = msgb_alloc(SERIAL_ALLOC_SIZE, "Message Microcontroller"); + if (msg == NULL) { + LOGP(DTEMP, LOGL_ERROR, "Error creating msg\n"); + return NULL; + } + command = (cmdpkt_t *) msgb_put(msg, num); + + command->u16Magic = 0xCAFE; + switch (info.id) { + case SBTS2050_TEMP_RQT: + command->u8Id = info.id; + command->u8Len = sizeof(command->cmd.tempGet); + break; + default: + goto err; + } + + add_parity(command); + + if (hand_serial_write(ucontrol->fd, msg) < 0) + goto err; + + msgb_reset(msg); + + FD_ZERO(&fdread); + FD_SET(ucontrol->fd, &fdread); + + num = SIZE_HEADER_RSP; + while (1) { + rc = select(ucontrol->fd+1, &fdread, NULL, NULL, &tout); + if (rc > 0) { + if (hand_serial_read(ucontrol->fd, msg, num) < 0) + goto err; + + response = (rsppkt_t *)msg->data; + + if (response->u8Id != info.id || msg->len <= 0 || + response->i8Error != RQT_SUCCESS) + goto err; + + if (msg->len == SIZE_HEADER_RSP + response->u8Len + 1) + break; + + num = response->u8Len + 1; + } else + goto err; + } + + return msg; + +err: + msgb_free(msg); + return NULL; +} +#endif + +/********************************************************************** + * Uc temperature handling + *********************************************************************/ +void sbts2050_uc_check_temp(struct uc *ucontrol, int *temp_pa, int *temp_board) +{ +#ifdef BUILD_SBTS2050 + rsppkt_t *response; + struct msgb *msg; + struct ucinfo info = { + .id = SBTS2050_TEMP_RQT, + }; + + msg = sbts2050_ucinfo_get(ucontrol, info); + + if (msg == NULL) { + LOGP(DTEMP, LOGL_ERROR, "Error reading temperature\n"); + return; + } + + response = (rsppkt_t *)msg->data; + + *temp_board = response->rsp.tempGet.i8BrdTemp; + *temp_pa = response->rsp.tempGet.i8PaTemp; + + LOGP(DTEMP, LOGL_DEBUG, "Temperature Board: %+3d C\n" + "Tempeture PA: %+3d C\n", + response->rsp.tempGet.i8BrdTemp, + response->rsp.tempGet.i8PaTemp); + msgb_free(msg); +#endif +} /********************************************************************* * Temperature handling diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.h b/src/osmo-bts-sysmo/misc/sysmobts_misc.h index 8f7da47..3c6513e 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_misc.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.h @@ -13,11 +13,26 @@ enum sysmobts_temp_type { _NUM_TEMP_TYPES }; +struct uc { + int id; + int fd; + const char *path; +}; + +struct ucinfo { + uint16_t id; + int master; + int slave; + int pa; +}; + int sysmobts_temp_get(enum sysmobts_temp_sensor sensor, enum sysmobts_temp_type type); void sysmobts_check_temp(int no_eeprom_write); +void sbts2050_uc_check_temp(struct uc *ucontrol, int *temp_pa, int *temp_board); + int sysmobts_update_hours(int no_epprom_write); enum sysmobts_firmware_type {

11 years, 3 months

[osmo-bts PATCH v3 1/2] misc/sysmobts_misc.c: Read temperature from microcontroller

by Alvaro Neira

From: Álvaro Neira Ayuso <anayuso(a)sysmocom.de> Add function for requesting the temperature information to the microcontroller. I have added a function that we can extend for requesting more information but in this case we only need to know the temperature. I have added to a microcontroller temperature handling function in the manager for monitoring this information. Signed-off-by: Alvaro Neira Ayuso <anayuso(a)sysmocom.de> --- v3: Added check in the configure if the header exist. Fixed the initialization of the serial interface for doing after test if we are in a sbts2050. Removed the close descriptor in case of error in the request info function and added the function log for knowing the cause of the error. configure.ac | 4 + src/osmo-bts-sysmo/misc/sysmobts_mgr.c | 52 ++++++++++ src/osmo-bts-sysmo/misc/sysmobts_misc.c | 163 +++++++++++++++++++++++++++++++ src/osmo-bts-sysmo/misc/sysmobts_misc.h | 17 +++ 4 files changed, 236 insertions(+) diff --git a/configure.ac b/configure.ac index 3411017..e52b38c 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,10 @@ AC_CHECK_HEADER([openbsc/gsm_data_shared.h],[], []) CPPFLAGS=$oldCPPFLAGS +# Check for the sbts2050_header.h that was added after the 3.6 release +AC_CHECK_HEADER([sysmocom/femtobts/sbts2050_header.h], + [echo "Found"], [echo "Not found"]) + AC_OUTPUT( src/Makefile src/common/Makefile diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c index 171f79b..3895d4e 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.c @@ -35,6 +35,7 @@ #include <osmocom/core/application.h> #include <osmocom/core/timer.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/serial.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> @@ -53,6 +54,54 @@ void *tall_mgr_ctx; /* every 1 hours means 365*24 = 8760 EEprom writes per year (max) */ #define HOURS_TIMER_SECS (1 * 3600) +static struct osmo_timer_list temp_uc_timer; +static void check_uctemp_timer_cb(void *data) +{ + int temp_pa = 0, temp_board = 0; + struct uc *ucontrol0 = data; + + sbts2050_uc_check_temp(ucontrol0, &temp_pa, &temp_board); + + osmo_timer_schedule(&temp_uc_timer, TEMP_TIMER_SECS, 0); +} + +static void initialize_sbts2050(void) +{ + static struct uc ucontrol0 = { + .id = 0, + .path = "/dev/ttyS0" + }; + int val; + + if (sysmobts_par_get_int(SYSMOBTS_PAR_MODEL_NR, &val) < 0) { + LOGP(DFIND, LOGL_ERROR, + "Failed to get Model number\n"); + return; + } + + if (val == 2050) { + if (sysmobts_par_get_int(SYSMOBTS_PAR_TRX_NR, &val) < 0) { + LOGP(DFIND, LOGL_ERROR, + "Failed to get the TRX number\n"); + return; + } + + if (val != 0) + return; + } + + ucontrol0.fd = osmo_serial_init(ucontrol0.path, 115200); + if (ucontrol0.fd < 0) { + LOGP(DFIND, LOGL_ERROR, + "Failed to open the serial interface\n"); + return; + } + + temp_uc_timer.cb = check_uctemp_timer_cb; + temp_uc_timer.data = &ucontrol0; + check_uctemp_timer_cb(&ucontrol0); +} + static struct osmo_timer_list temp_timer; static void check_temp_timer_cb(void *unused) { @@ -309,6 +358,9 @@ int main(int argc, char **argv) hours_timer.cb = hours_timer_cb; hours_timer_cb(NULL); + /* start uc temperature check timer */ + initialize_sbts2050(); + /* handle broadcast messages for ipaccess-find */ fd.cb = ipaccess_bcast; rc = osmo_sock_init_ofd(&fd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.c b/src/osmo-bts-sysmo/misc/sysmobts_misc.c index c043045..081b65f 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_misc.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.c @@ -32,6 +32,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> #include <osmocom/core/application.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> @@ -39,7 +40,169 @@ #include "sysmobts_misc.h" #include "sysmobts_par.h" #include "sysmobts_mgr.h" +#include "sbts2050_header.h" +#define SERIAL_ALLOC_SIZE 300 +#define SIZE_HEADER_RSP 5 +#define SIZE_HEADER_CMD 4 + +/********************************************************************** + * Functions read/write from serial interface + *********************************************************************/ +static int hand_serial_read(int fd, struct msgb *msg, int numbytes) +{ + int rc, bread = 0; + + if (numbytes > msgb_tailroom(msg)) + return -ENOSPC; + + while (bread < numbytes) { + rc = read(fd, msg->tail, numbytes - bread); + if (rc < 0) + return -1; + if (rc == 0) + break; + + bread += rc; + msgb_put(msg, rc); + } + + return bread; +} + +static int hand_serial_write(int fd, struct msgb *msg) +{ + int rc, bwritten = 0; + + while (msg->len > 0) { + rc = write(fd, msg->data, msg->len); + if (rc <= 0) + return -1; + + msgb_pull(msg, rc); + bwritten += rc; + } + + return bwritten; +} + +/********************************************************************** + * Functions request information to Microcontroller + *********************************************************************/ +static void add_parity(cmdpkt_t *command) +{ + int n; + uint8_t parity = 0x00; + for (n = 0; n < SIZE_HEADER_CMD+command->u8Len; n++) + parity ^= ((uint8_t *)command)[n]; + + command->cmd.raw[command->u8Len] = parity; +} + +struct msgb *sbts2050_ucinfo_get(struct uc *ucontrol, struct ucinfo info) +{ + int num, rc; + cmdpkt_t *command; + rsppkt_t *response; + struct msgb *msg; + fd_set fdread; + struct timeval tout = { + .tv_sec = 10, + }; + + switch (info.id) { + case SBTS2050_TEMP_RQT: + num = sizeof(command->cmd.tempGet); + break; + default: + return NULL; + } + num = num + SIZE_HEADER_CMD+1; + + msg = msgb_alloc(SERIAL_ALLOC_SIZE, "Message Microcontroller"); + if (msg == NULL) { + LOGP(DTEMP, LOGL_ERROR, "Error creating msg\n"); + return NULL; + } + command = (cmdpkt_t *) msgb_put(msg, num); + + command->u16Magic = 0xCAFE; + switch (info.id) { + case SBTS2050_TEMP_RQT: + command->u8Id = info.id; + command->u8Len = sizeof(command->cmd.tempGet); + break; + default: + goto err; + } + + add_parity(command); + + if (hand_serial_write(ucontrol->fd, msg) < 0) + goto err; + + msgb_reset(msg); + + FD_ZERO(&fdread); + FD_SET(ucontrol->fd, &fdread); + + num = SIZE_HEADER_RSP; + while (1) { + rc = select(ucontrol->fd+1, &fdread, NULL, NULL, &tout); + if (rc > 0) { + if (hand_serial_read(ucontrol->fd, msg, num) < 0) + goto err; + + response = (rsppkt_t *)msg->data; + + if (response->u8Id != info.id || msg->len <= 0 || + response->i8Error != RQT_SUCCESS) + goto err; + + if (msg->len == SIZE_HEADER_RSP + response->u8Len + 1) + break; + + num = response->u8Len + 1; + } else + goto err; + } + + return msg; + +err: + msgb_free(msg); + return NULL; +} + +/********************************************************************** + * Uc temperature handling + *********************************************************************/ +void sbts2050_uc_check_temp(struct uc *ucontrol, int *temp_pa, int *temp_board) +{ + rsppkt_t *response; + struct msgb *msg; + struct ucinfo info = { + .id = SBTS2050_TEMP_RQT, + }; + + msg = sbts2050_ucinfo_get(ucontrol, info); + + if (msg == NULL) { + LOGP(DTEMP, LOGL_ERROR, "Error reading temperature\n"); + return; + } + + response = (rsppkt_t *)msg->data; + + *temp_board = response->rsp.tempGet.i8BrdTemp; + *temp_pa = response->rsp.tempGet.i8PaTemp; + + LOGP(DTEMP, LOGL_DEBUG, "Temperature Board: %+3d C\n" + "Tempeture PA: %+3d C\n", + response->rsp.tempGet.i8BrdTemp, + response->rsp.tempGet.i8PaTemp); + msgb_free(msg); +} /********************************************************************* * Temperature handling diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.h b/src/osmo-bts-sysmo/misc/sysmobts_misc.h index 8f7da47..a0c57a4 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_misc.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.h @@ -13,11 +13,28 @@ enum sysmobts_temp_type { _NUM_TEMP_TYPES }; +struct uc { + int id; + int fd; + const char *path; +}; + +struct ucinfo { + uint16_t id; + int master; + int slave; + int pa; +}; + int sysmobts_temp_get(enum sysmobts_temp_sensor sensor, enum sysmobts_temp_type type); void sysmobts_check_temp(int no_eeprom_write); +struct msgb *sbts2050_ucinfo_get(struct uc *ucontrol, struct ucinfo info); + +void sbts2050_uc_check_temp(struct uc *ucontrol, int *temp_pa, int *temp_board); + int sysmobts_update_hours(int no_epprom_write); enum sysmobts_firmware_type {

11 years, 3 months

patchwork question

by ☎

Hi. There's no patches in http://patchwork.ozlabs.org/project/osmocom-bb/list/ and http://patchwork.ozlabs.org/project/openbsc/list/ - does it mean that system went online just recently or there's something wrong with the patches hanging in ML? -- best regards, Max, http://fairwaves.ru

11 years, 3 months

[PATCH 2/2] sms,db: Do not store delivered messages in the DB.

by Alexander Chemeris

In a production system we should not store messages longer than needed, as it will quickly bloat our DB. In case one wants to store messages for debug purposes, we could add one of the following capabilities later: - hexdump to a log file - send to an SMPP entry on delivery - send to Wireshark -- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. / ООО УмРадио https://fairwaves.co

11 years, 3 months

[PATCH 1/9] Complete definitions for all speech traffic frames at MNCC interface

by Andreas Eversberg

The new definitions are: half rate and AMR Change of definition name for bad frame, because it applies to all types of traffic, not only TCH/F. Increase MNCC interface version to 4. --- openbsc/include/openbsc/mncc.h | 6 ++++-- openbsc/src/libmsc/mncc.c | 6 +++++- openbsc/src/libtrau/trau_mux.c | 2 +- openbsc/tests/trau/trau_test.c | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h index ffc247b..c61f6b8 100644 --- a/openbsc/include/openbsc/mncc.h +++ b/openbsc/include/openbsc/mncc.h @@ -95,7 +95,9 @@ struct gsm_call { #define GSM_TCHF_FRAME 0x0300 #define GSM_TCHF_FRAME_EFR 0x0301 -#define GSM_TCHF_BAD_FRAME 0x03ff +#define GSM_TCHH_FRAME 0x0302 +#define GSM_TCH_FRAME_AMR 0x0303 +#define GSM_BAD_FRAME 0x03ff #define MNCC_SOCKET_HELLO 0x0400 @@ -161,7 +163,7 @@ struct gsm_data_frame { unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 2 +#define MNCC_SOCK_VERSION 4 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; diff --git a/openbsc/src/libmsc/mncc.c b/openbsc/src/libmsc/mncc.c index b484772..73db5f0 100644 --- a/openbsc/src/libmsc/mncc.c +++ b/openbsc/src/libmsc/mncc.c @@ -84,7 +84,11 @@ static struct mncc_names { {"MNCC_FRAME_DROP", 0x0202}, {"MNCC_LCHAN_MODIFY", 0x0203}, - {"GSM_TCH_FRAME", 0x0300}, + {"GSM_TCHF_FRAME", 0x0300}, + {"GSM_TCHF_FRAME_EFR", 0x0301}, + {"GSM_TCHH_FRAME", 0x0302}, + {"GSM_TCH_FRAME_AMR", 0x0303}, + {"GSM_BAD_FRAME", 0x03ff}, {NULL, 0} }; diff --git a/openbsc/src/libtrau/trau_mux.c b/openbsc/src/libtrau/trau_mux.c index 7b9bac0..fd1895f 100644 --- a/openbsc/src/libtrau/trau_mux.c +++ b/openbsc/src/libtrau/trau_mux.c @@ -314,7 +314,7 @@ struct msgb *trau_decode_efr(uint32_t callref, return msg; bad_frame: - frame->msg_type = GSM_TCHF_BAD_FRAME; + frame->msg_type = GSM_BAD_FRAME; return msg; } diff --git a/openbsc/tests/trau/trau_test.c b/openbsc/tests/trau/trau_test.c index f8a48db..b95f1e8 100644 --- a/openbsc/tests/trau/trau_test.c +++ b/openbsc/tests/trau/trau_test.c @@ -57,7 +57,7 @@ void test_trau_fr_efr(unsigned char *data) msg = trau_decode_efr(1, &tf); OSMO_ASSERT(msg != NULL); frame = (struct gsm_data_frame *)msg->data; - OSMO_ASSERT(frame->msg_type == GSM_TCHF_BAD_FRAME); + OSMO_ASSERT(frame->msg_type == GSM_BAD_FRAME); msgb_free(msg); } -- 1.8.1.5

11 years, 3 months

[PATCH] openbsc/tests/trau/Makefile.am

by koue＠chaosophia.net

[PATCH] openbsc/tests/trau/Makefile.am

11 years, 3 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC March 2014