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>

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 3113fa2c..10cff9b2 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 8fbbff97..54256b5a 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 814d2c60..42bf7343 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 f8d6b716..93c50778 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 b1602705..9b10b62a 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 630c6163..c40359ea 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 879e4cfb..07962052 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 1a908087..73ff8c09 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 950e597e..a21d183f 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;