summaryrefslogtreecommitdiffstats
path: root/src/target/firmware/include
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/target/firmware/include
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/target/firmware/include')
-rw-r--r--src/target/firmware/include/comm/msgb.h2
-rw-r--r--src/target/firmware/include/comm/sercomm.h2
-rw-r--r--src/target/firmware/include/comm/timer.h2
-rw-r--r--src/target/firmware/include/layer1/async.h2
-rw-r--r--src/target/firmware/include/layer1/l23_api.h2
-rw-r--r--src/target/firmware/include/layer1/sched_gsmtime.h2
-rw-r--r--src/target/firmware/include/layer1/sync.h4
-rw-r--r--src/target/firmware/include/rf/trf6151.h2
-rw-r--r--src/target/firmware/include/rffe.h2
9 files changed, 10 insertions, 10 deletions
diff --git a/src/target/firmware/include/comm/msgb.h b/src/target/firmware/include/comm/msgb.h
index 3113fa2..10cff9b 100644
--- a/src/target/firmware/include/comm/msgb.h
+++ b/src/target/firmware/include/comm/msgb.h
@@ -20,7 +20,7 @@
*
*/
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
#include <console.h>
struct msgb {
diff --git a/src/target/firmware/include/comm/sercomm.h b/src/target/firmware/include/comm/sercomm.h
index 8fbbff9..54256b5 100644
--- a/src/target/firmware/include/comm/sercomm.h
+++ b/src/target/firmware/include/comm/sercomm.h
@@ -3,7 +3,7 @@
/* SERCOMM layer on UART1 (modem UART) */
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
#define SERCOMM_UART_NR 1
diff --git a/src/target/firmware/include/comm/timer.h b/src/target/firmware/include/comm/timer.h
index 814d2c6..42bf734 100644
--- a/src/target/firmware/include/comm/timer.h
+++ b/src/target/firmware/include/comm/timer.h
@@ -23,7 +23,7 @@
#include <sys/time.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
/**
* Timer management:
diff --git a/src/target/firmware/include/layer1/async.h b/src/target/firmware/include/layer1/async.h
index f8d6b71..93c5077 100644
--- a/src/target/firmware/include/layer1/async.h
+++ b/src/target/firmware/include/layer1/async.h
@@ -1,7 +1,7 @@
#ifndef _L1_ASYNC_H
#define _L1_ASYNC_H
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
#include <layer1/mframe_sched.h>
diff --git a/src/target/firmware/include/layer1/l23_api.h b/src/target/firmware/include/layer1/l23_api.h
index b160270..9b10b62 100644
--- a/src/target/firmware/include/layer1/l23_api.h
+++ b/src/target/firmware/include/layer1/l23_api.h
@@ -2,7 +2,7 @@
#define _L1_L23_API_H
#include <stdint.h>
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
#include <l1ctl_proto.h>
void l1a_l23api_init(void);
diff --git a/src/target/firmware/include/layer1/sched_gsmtime.h b/src/target/firmware/include/layer1/sched_gsmtime.h
index 630c616..c40359e 100644
--- a/src/target/firmware/include/layer1/sched_gsmtime.h
+++ b/src/target/firmware/include/layer1/sched_gsmtime.h
@@ -2,7 +2,7 @@
#define _L1_SCHED_GSMTIME_H
#include <stdint.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
struct sched_gsmtime_event {
struct llist_head list;
diff --git a/src/target/firmware/include/layer1/sync.h b/src/target/firmware/include/layer1/sync.h
index 879e4cf..0796205 100644
--- a/src/target/firmware/include/layer1/sync.h
+++ b/src/target/firmware/include/layer1/sync.h
@@ -1,8 +1,8 @@
#ifndef _L1_SYNC_H
#define _L1_SYNC_H
-#include <osmocore/linuxlist.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/gsm/gsm_utils.h>
#include <layer1/tdma_sched.h>
#include <layer1/mframe_sched.h>
#include <l1ctl_proto.h>
diff --git a/src/target/firmware/include/rf/trf6151.h b/src/target/firmware/include/rf/trf6151.h
index 1a90808..73ff8c0 100644
--- a/src/target/firmware/include/rf/trf6151.h
+++ b/src/target/firmware/include/rf/trf6151.h
@@ -1,7 +1,7 @@
#ifndef _TRF6151_H
#define _TRF6151_H
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
/* initialize (reset + power up) */
void trf6151_init(uint8_t tsp_uid, uint16_t tsp_reset_id);
diff --git a/src/target/firmware/include/rffe.h b/src/target/firmware/include/rffe.h
index 950e597..a21d183 100644
--- a/src/target/firmware/include/rffe.h
+++ b/src/target/firmware/include/rffe.h
@@ -1,7 +1,7 @@
#ifndef _RFFE_H
#define _RFFE_H
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
extern const uint8_t system_inherent_gain;