summaryrefslogtreecommitdiffstats
path: root/src/host/layer23/include/osmocom/bb/mobile
diff options
context:
space:
mode:
authorPablo Neira Ayuso2011-04-26 02:55:30 +0200
committerPablo Neira Ayuso2011-04-26 02:55:30 +0200
commitade79a00838801dbcd95efd026d18b15eb1e1e3c (patch)
tree6b08d76dcee3abe022770fee6fd52b16d322c79e /src/host/layer23/include/osmocom/bb/mobile
parentMerge commit '28dbfe9bf7a799ab1da2563fd5e007d007b54168' (diff)
downloadosmocom-ade79a00838801dbcd95efd026d18b15eb1e1e3c.tar.gz
osmocom-ade79a00838801dbcd95efd026d18b15eb1e1e3c.tar.xz
osmocom-ade79a00838801dbcd95efd026d18b15eb1e1e3c.zip
src: use new libosmogsm and include/osmocom/[gsm|core] path to headers
This patch changes include paths to get osmocom-bb working with the current libosmocore tree. Among all these renames, you can notice several tweaks that I added on purpose, and that require some explanation, they are: * hexdump() in osmocon.c and osmoload.c has been renamed to avoid clashing with hexdump() defined in libosmocore. * gsmmap now depends on libosmogsm. Actually I had to cleanup Makefile.am because I was experiencing weird linking problems, probably due to a bug in the autotools. With the change included in this patch, I got it compiled and linked here correctly. This patch has been tested with the phone Motorola C123 and the following images files: * firmware/board/compal_e88/hello_world.compalram.bin * firmware/board/compal_e88/layer1.compalram.bin Using the osmocon, bcch_scan and mobile tools. Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>
Diffstat (limited to 'src/host/layer23/include/osmocom/bb/mobile')
-rw-r--r--src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h2
-rw-r--r--src/host/layer23/include/osmocom/bb/mobile/mncc.h4
-rw-r--r--src/host/layer23/include/osmocom/bb/mobile/transaction.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index 830c8cf..b140c18 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
@@ -1,7 +1,7 @@
#ifndef _GSM48_RR_H
#define _GSM48_RR_H
-#include "osmocore/protocol/gsm_04_08.h"
+#include <osmocom/gsm/protocol/gsm_04_08.h>
#define GSM_TA_CM 55385
diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
index 151f0b4..e378ecc 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
@@ -26,8 +26,8 @@
#ifndef _MNCC_H
#define _MNCC_H
-#include <osmocore/linuxlist.h>
-#include <osmocore/mncc.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/gsm/mncc.h>
struct gsm_call {
struct llist_head entry;
diff --git a/src/host/layer23/include/osmocom/bb/mobile/transaction.h b/src/host/layer23/include/osmocom/bb/mobile/transaction.h
index 4be82c1..6cbc25b 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/transaction.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/transaction.h
@@ -1,7 +1,7 @@
#ifndef _TRANSACT_H
#define _TRANSACT_H
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
/* One transaction */
struct gsm_trans {