[PATCH] osmocom-bb[master]: Merge branch 'fixeria/trx' into master

[Vadim Yanitskiy]

Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/7263

to look at the new patch set (#3).

Merge branch 'fixeria/trx' into master

This change introduces the following:

  - trxcon - a similar to the osmocon application, which
    implements both L1CTL and TRX interfaces, and intended
    to connect the L2&3 applications with a transciever,
    such as FakeTRX, OsmoTRX or GR-GSM TRX.

  - trx_toolkit - a set of tools in Python, intended for
    hacking and debugging a TRX interface between both
    transceiver and L1 software, and for creating a virtual
    Um-interface between both OsmocomBB and OsmoBTS.

For more details, see:

https://osmocom.org/projects/baseband/wiki/TRX_Interface
https://osmocom.org/projects/baseband/wiki/FakeTRX
src/target/trx_toolkit/README

Change-Id: I83094ca021a0b84c107f7301e10a603e4b342e6e
---
M src/Makefile
M src/host/layer23/.gitignore
2 files changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/63/7263/3

diff --git a/src/Makefile b/src/Makefile
index 78deca8..d92acbc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,12 +12,8 @@
 TOPDIR=$(shell pwd)
 
 all: libosmocore-target nofirmware firmware mtk-firmware
-<<<<<<< HEAD   (f9ac7e virt_phy: Add missing gprs related entries to l1ctlPrimNames)
 
-nofirmware: layer23 osmocon gsmmap gprsdecode virtphy
-=======
-nofirmware: layer23 osmocon trxcon gsmmap virtphy
->>>>>>> BRANCH (00bfb3 trxcon/l1ctl.c: hexdump content of unhandled messages)
+nofirmware: layer23 osmocon trxcon gsmmap gprsdecode virtphy
 
 libosmocore-target: shared/libosmocore/build-target/src/.libs/libosmocore.a
 
diff --git a/src/host/layer23/.gitignore b/src/host/layer23/.gitignore
index 59601be..8fb93f7 100644
--- a/src/host/layer23/.gitignore
+++ b/src/host/layer23/.gitignore
@@ -19,6 +19,7 @@
 
 # build by-products
 *.o
+*.a
 
 # various
 *.sw?

-- 
To view, visit https://gerrit.osmocom.org/7263
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I83094ca021a0b84c107f7301e10a603e4b342e6e
Gerrit-PatchSet: 3
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>