aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Chemeris <Alexander.Chemeris@gmail.com>2015-06-30 22:34:42 -0400
committerAlexander Chemeris <Alexander.Chemeris@gmail.com>2015-07-20 21:27:42 -0400
commit85bea349ebb4d9a53764f9a96220cdea088f605b (patch)
tree64589b4b34af9c916e98e116ee4e63e212e9c5c8
parent4e3bfe14126d016bbdde46b05dfa050b9cf7a0bb (diff)
hack: 2nd sector BTS. Needs code cleanup and more testing.achemeris/2sector
-rw-r--r--src/osmo-bts-trx/main.c2
-rw-r--r--src/osmo-bts-trx/trx_if.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c
index 1a3e1c7..07ab9ea 100644
--- a/src/osmo-bts-trx/main.c
+++ b/src/osmo-bts-trx/main.c
@@ -339,7 +339,7 @@ int main(int argc, char **argv)
write_pid_file("osmo-bts");
- rc = telnet_init(tall_bts_ctx, NULL, 4241);
+ rc = telnet_init(tall_bts_ctx, NULL, 4243);
if (rc < 0) {
fprintf(stderr, "Error initializing telnet\n");
exit(1);
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 69ad841..29f83a3 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -53,7 +53,7 @@ int setbsic_enabled = 0;
* socket
*/
-static uint16_t base_port_local = 5800;
+static uint16_t base_port_local = 5803;
/* open socket */
static int trx_udp_open(void *priv, struct osmo_fd *ofd, uint16_t port,
@@ -231,9 +231,9 @@ static int trx_ctrl_cmd(struct trx_l1h *l1h, int critical, const char *cmd,
int trx_if_cmd_poweroff(struct trx_l1h *l1h)
{
- if (l1h->trx->nr == 0)
- return trx_ctrl_cmd(l1h, 1, "POWEROFF", "");
- else
+// if (l1h->trx->nr == 0)
+// return trx_ctrl_cmd(l1h, 1, "POWEROFF", "");
+// else
return 0;
}
@@ -510,11 +510,11 @@ int trx_if_open(struct trx_l1h *l1h)
LOGP(DTRX, LOGL_NOTICE, "Waiting for transceiver send clock\n");
}
rc = trx_udp_open(l1h, &l1h->trx_ofd_ctrl,
- base_port_local + (l1h->trx->nr << 1) + 1, trx_ctrl_read_cb);
+ base_port_local + l1h->trx->nr*3 + 1, trx_ctrl_read_cb);
if (rc < 0)
goto err;
rc = trx_udp_open(l1h, &l1h->trx_ofd_data,
- base_port_local + (l1h->trx->nr << 1) + 2, trx_data_read_cb);
+ base_port_local + l1h->trx->nr*3 + 2, trx_data_read_cb);
if (rc < 0)
goto err;