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>

19 files changed, 31 insertions, 31 deletions

diff --git a/src/target/firmware/layer1/afc.c b/src/target/firmware/layer1/afc.c
index 92545a7f..a51a1071 100644
--- a/src/target/firmware/layer1/afc.c
+++ b/src/target/firmware/layer1/afc.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include <debug.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <layer1/afc.h>
 #include <layer1/avg.h>
diff --git a/src/target/firmware/layer1/agc.c b/src/target/firmware/layer1/agc.c
index 780e260f..b72a6e74 100644
--- a/src/target/firmware/layer1/agc.c
+++ b/src/target/firmware/layer1/agc.c
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 #include <debug.h>
 #include <rffe.h>
 
diff --git a/src/target/firmware/layer1/apc.c b/src/target/firmware/layer1/apc.c
index 5cff191b..480c7607 100644
--- a/src/target/firmware/layer1/apc.c
+++ b/src/target/firmware/layer1/apc.c
@@ -22,8 +22,8 @@
 
 #include <errno.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <layer1/apc.h>
 
diff --git a/src/target/firmware/layer1/async.c b/src/target/firmware/layer1/async.c
index 76d0b721..e5c80c7c 100644
--- a/src/target/firmware/layer1/async.c
+++ b/src/target/firmware/layer1/async.c
@@ -26,8 +26,8 @@
 #include <arm.h>
 #include <asm/system.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 #include <layer1/sync.h>
 #include <layer1/async.h>
diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c
index aef12a59..2e951601 100644
--- a/src/target/firmware/layer1/l23_api.c
+++ b/src/target/firmware/layer1/l23_api.c
@@ -29,8 +29,8 @@
 #include <debug.h>
 #include <byteorder.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <comm/sercomm.h>
 
 #include <layer1/sync.h>
diff --git a/src/target/firmware/layer1/mframe_sched.c b/src/target/firmware/layer1/mframe_sched.c
index 326f6603..428102a7 100644
--- a/src/target/firmware/layer1/mframe_sched.c
+++ b/src/target/firmware/layer1/mframe_sched.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <layer1/prim.h>
 #include <layer1/sync.h>
diff --git a/src/target/firmware/layer1/prim_fbsb.c b/src/target/firmware/layer1/prim_fbsb.c
index d46e4a42..124a3162 100644
--- a/src/target/firmware/layer1/prim_fbsb.c
+++ b/src/target/firmware/layer1/prim_fbsb.c
@@ -30,8 +30,8 @@
 #include <debug.h>
 #include <memory.h>
 #include <byteorder.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/msgb.h>
 #include <calypso/dsp_api.h>
 #include <calypso/irq.h>
 #include <calypso/tpu.h>
diff --git a/src/target/firmware/layer1/prim_freq.c b/src/target/firmware/layer1/prim_freq.c
index 7878be68..88bc4532 100644
--- a/src/target/firmware/layer1/prim_freq.c
+++ b/src/target/firmware/layer1/prim_freq.c
@@ -29,8 +29,8 @@
 #include <debug.h>
 #include <memory.h>
 #include <byteorder.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/msgb.h>
 #include <calypso/dsp_api.h>
 #include <calypso/irq.h>
 #include <calypso/tpu.h>
diff --git a/src/target/firmware/layer1/prim_pm.c b/src/target/firmware/layer1/prim_pm.c
index 134bffde..5d2f413c 100644
--- a/src/target/firmware/layer1/prim_pm.c
+++ b/src/target/firmware/layer1/prim_pm.c
@@ -29,8 +29,8 @@
 #include <debug.h>
 #include <memory.h>
 #include <byteorder.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/msgb.h>
 #include <calypso/dsp_api.h>
 #include <calypso/irq.h>
 #include <calypso/tpu.h>
diff --git a/src/target/firmware/layer1/prim_rach.c b/src/target/firmware/layer1/prim_rach.c
index b0e7288d..47f74241 100644
--- a/src/target/firmware/layer1/prim_rach.c
+++ b/src/target/firmware/layer1/prim_rach.c
@@ -30,8 +30,8 @@
 #include <debug.h>
 #include <memory.h>
 #include <byteorder.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/msgb.h>
 #include <calypso/dsp_api.h>
 #include <calypso/irq.h>
 #include <calypso/tpu.h>
diff --git a/src/target/firmware/layer1/prim_rx_nb.c b/src/target/firmware/layer1/prim_rx_nb.c
index 80002884..ea902677 100644
--- a/src/target/firmware/layer1/prim_rx_nb.c
+++ b/src/target/firmware/layer1/prim_rx_nb.c
@@ -29,8 +29,8 @@
 #include <debug.h>
 #include <memory.h>
 #include <byteorder.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/msgb.h>
 #include <calypso/dsp_api.h>
 #include <calypso/irq.h>
 #include <calypso/tpu.h>
diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c
index d525ce15..013318d4 100644
--- a/src/target/firmware/layer1/prim_tch.c
+++ b/src/target/firmware/layer1/prim_tch.c
@@ -30,9 +30,9 @@
 #include <debug.h>
 #include <memory.h>
 #include <byteorder.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/core/msgb.h>
 #include <calypso/dsp_api.h>
 #include <calypso/irq.h>
 #include <calypso/tpu.h>
diff --git a/src/target/firmware/layer1/prim_tx_nb.c b/src/target/firmware/layer1/prim_tx_nb.c
index 4989bf56..3038178b 100644
--- a/src/target/firmware/layer1/prim_tx_nb.c
+++ b/src/target/firmware/layer1/prim_tx_nb.c
@@ -30,8 +30,8 @@
 #include <debug.h>
 #include <memory.h>
 #include <byteorder.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/msgb.h>
 #include <calypso/dsp_api.h>
 #include <calypso/irq.h>
 #include <calypso/tpu.h>
diff --git a/src/target/firmware/layer1/prim_utils.c b/src/target/firmware/layer1/prim_utils.c
index 5d6c71c7..c85da717 100644
--- a/src/target/firmware/layer1/prim_utils.c
+++ b/src/target/firmware/layer1/prim_utils.c
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 #include <layer1/sync.h>
 
 
diff --git a/src/target/firmware/layer1/rfch.c b/src/target/firmware/layer1/rfch.c
index 5627b7e4..d0818d04 100644
--- a/src/target/firmware/layer1/rfch.c
+++ b/src/target/firmware/layer1/rfch.c
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <layer1/sync.h>
 
diff --git a/src/target/firmware/layer1/sched_gsmtime.c b/src/target/firmware/layer1/sched_gsmtime.c
index ba3bac70..01e22ca3 100644
--- a/src/target/firmware/layer1/sched_gsmtime.c
+++ b/src/target/firmware/layer1/sched_gsmtime.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <debug.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #include <layer1/tdma_sched.h>
 #include <layer1/sched_gsmtime.h>
diff --git a/src/target/firmware/layer1/sync.c b/src/target/firmware/layer1/sync.c
index 3397dc03..36f42975 100644
--- a/src/target/firmware/layer1/sync.c
+++ b/src/target/firmware/layer1/sync.c
@@ -33,8 +33,8 @@
 #include <byteorder.h>
 #include <asm/system.h>
 
-#include <osmocore/gsm_utils.h>
-#include <osmocore/msgb.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/msgb.h>
 #include <calypso/dsp_api.h>
 #include <calypso/irq.h>
 #include <calypso/tpu.h>
diff --git a/src/target/firmware/layer1/tdma_sched.c b/src/target/firmware/layer1/tdma_sched.c
index 013d305a..88129922 100644
--- a/src/target/firmware/layer1/tdma_sched.c
+++ b/src/target/firmware/layer1/tdma_sched.c
@@ -26,7 +26,7 @@
 
 #include <defines.h>
 #include <debug.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <layer1/tdma_sched.h>
 #include <layer1/sync.h>
diff --git a/src/target/firmware/layer1/toa.c b/src/target/firmware/layer1/toa.c
index adb32f2d..7d80d952 100644
--- a/src/target/firmware/layer1/toa.c
+++ b/src/target/firmware/layer1/toa.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 
 #include <debug.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <layer1/toa.h>
 #include <layer1/avg.h>