include: reorganize headers file to include/osmocom/[gsm|core]

This patch moves all GSM-specific definitions to include/osmocom/gsm.
Moreover, the headers in include/osmocore/ have been moved to
include/osmocom/core.

This has been proposed by Harald Welte and Sylvain Munaunt.

Tested with `make distcheck'.

Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>

9 files changed, 30 insertions, 30 deletions

diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
index 6174bd72..0ff85e2d 100644
--- a/src/gsm/gprs_cipher_core.c
+++ b/src/gsm/gprs_cipher_core.c
@@ -23,9 +23,9 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/plugin.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/plugin.h>
 
 #include <osmocom/crypt/gprs_cipher.h>
 
diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c
index b6b345cb..b9b3ed97 100644
--- a/src/gsm/gsm0480.c
+++ b/src/gsm/gsm0480.c
@@ -22,13 +22,13 @@
  *
  */
 
-#include <osmocore/gsm0480.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm0480.h>
+#include <osmocom/gsm/gsm_utils.h>
 
-#include <osmocore/logging.h>
+#include <osmocom/core/logging.h>
 
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/protocol/gsm_04_80.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_80.h>
 
 #include <string.h>
 
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c
index dc450cc4..1640adc8 100644
--- a/src/gsm/gsm0808.c
+++ b/src/gsm/gsm0808.c
@@ -18,9 +18,9 @@
  *
  */
 
-#include <osmocore/gsm0808.h>
-#include <osmocore/protocol/gsm_08_08.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/gsm/gsm0808.h>
+#include <osmocom/gsm/protocol/gsm_08_08.h>
+#include <osmocom/gsm/gsm48.h>
 
 #include <arpa/inet.h>
 
diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index daec4f39..436bf14b 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -28,11 +28,11 @@
 
 #include <arpa/inet.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/tlv.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/gsm48.h>
 
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 const struct tlv_definition gsm48_att_tlvdef = {
 	.def = {
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 0e270881..efcf2816 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -27,12 +27,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include <osmocore/utils.h>
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/mncc.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsm48_ie.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/mncc.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/gsm48_ie.h>
 
 static const char bcd_num_digits[] = {
 	'0', '1', '2', '3', '4', '5', '6', '7',
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
index 54a13ad8..377705d9 100644
--- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -23,8 +23,8 @@
  */
 
 //#include <openbsc/gsm_data.h>
-#include <osmocore/utils.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/gsm_utils.h>
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "../config.h"
+#include "../../config.h"
 
 /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet
  * Greek symbols at hex positions 0x10 and 0x12-0x1a
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index 3bfeffb9..12ac0cfb 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <osmocore/tlv.h>
-#include <osmocore/rsl.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/rsl.h>
 
 #define RSL_ALLOC_SIZE		200
 #define RSL_ALLOC_HEADROOM	56
diff --git a/src/gsm/rxlev_stat.c b/src/gsm/rxlev_stat.c
index b474aaa8..626aaffb 100644
--- a/src/gsm/rxlev_stat.c
+++ b/src/gsm/rxlev_stat.c
@@ -27,8 +27,8 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include <osmocore/bitvec.h>
-#include <osmocore/rxlev_stat.h>
+#include <osmocom/core/bitvec.h>
+#include <osmocom/gsm/rxlev_stat.h>
 
 int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n, enum bit_value val)
 {
diff --git a/src/gsm/tlv_parser.c b/src/gsm/tlv_parser.c
index bbef7a9a..1e4c6b5f 100644
--- a/src/gsm/tlv_parser.c
+++ b/src/gsm/tlv_parser.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdint.h>
-#include <osmocore/utils.h>
-#include <osmocore/tlv.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/tlv.h>
 
 struct tlv_definition tvlv_att_def;