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>

48 files changed, 51 insertions, 47 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 185c6968..3578a80e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-SUBDIRS = osmocom osmocore
+SUBDIRS = osmocom
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index ec548fbd..21f4f2d0 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,5 +1,5 @@
 if ENABLE_VTY
-SUBDIRS = vty codec crypt
+SUBDIRS = vty codec crypt gsm core
 else
-SUBDIRS = codec crypt
+SUBDIRS = codec crypt gsm core
 endif
diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am
new file mode 100644
index 00000000..6109f478
--- /dev/null
+++ b/include/osmocom/core/Makefile.am
@@ -0,0 +1,12 @@
+osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \
+		   bitvec.h statistics.h utils.h \
+		   gsmtap.h write_queue.h \
+		   logging.h rate_ctr.h gsmtap_util.h \
+		   plugin.h crc16.h panic.h process.h msgfile.h \
+		   backtrace.h
+
+if ENABLE_TALLOC
+osmocore_HEADERS += talloc.h
+endif
+
+osmocoredir = $(includedir)/osmocom/core
diff --git a/include/osmocore/backtrace.h b/include/osmocom/core/backtrace.h
index bbbb2c28..bbbb2c28 100644
--- a/include/osmocore/backtrace.h
+++ b/include/osmocom/core/backtrace.h
diff --git a/include/osmocore/bits.h b/include/osmocom/core/bits.h
index 8d4a0789..8d4a0789 100644
--- a/include/osmocore/bits.h
+++ b/include/osmocom/core/bits.h
diff --git a/include/osmocore/bitvec.h b/include/osmocom/core/bitvec.h
index 42977fb2..42977fb2 100644
--- a/include/osmocore/bitvec.h
+++ b/include/osmocom/core/bitvec.h
diff --git a/include/osmocore/crc16.h b/include/osmocom/core/crc16.h
index 7a512490..7a512490 100644
--- a/include/osmocore/crc16.h
+++ b/include/osmocom/core/crc16.h
diff --git a/include/osmocore/gsmtap.h b/include/osmocom/core/gsmtap.h
index 236b25ac..236b25ac 100644
--- a/include/osmocore/gsmtap.h
+++ b/include/osmocom/core/gsmtap.h
diff --git a/include/osmocore/gsmtap_util.h b/include/osmocom/core/gsmtap_util.h
index 96449443..96449443 100644
--- a/include/osmocore/gsmtap_util.h
+++ b/include/osmocom/core/gsmtap_util.h
diff --git a/include/osmocore/linuxlist.h b/include/osmocom/core/linuxlist.h
index fb99c5ec..fb99c5ec 100644
--- a/include/osmocore/linuxlist.h
+++ b/include/osmocom/core/linuxlist.h
diff --git a/include/osmocore/logging.h b/include/osmocom/core/logging.h
index fd458440..db029402 100644
--- a/include/osmocore/logging.h
+++ b/include/osmocom/core/logging.h
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define LOG_MAX_CATEGORY	32
 #define LOG_MAX_CTX		8
diff --git a/include/osmocore/msgb.h b/include/osmocom/core/msgb.h
index c4f44305..57b5d7f4 100644
--- a/include/osmocore/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -21,8 +21,8 @@
  */
 
 #include <stdint.h>
-#include "linuxlist.h"
-#include "utils.h"
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/utils.h>
 
 #define MSGB_DEBUG
 
@@ -62,7 +62,7 @@ extern struct msgb *msgb_dequeue(struct llist_head *queue);
 extern void msgb_reset(struct msgb *m);
 
 #ifdef MSGB_DEBUG
-#include <osmocore/panic.h>
+#include <osmocom/core/panic.h>
 #define MSGB_ABORT(msg, fmt, args ...) do {		\
 	osmo_panic("msgb(%p): " fmt, msg, ## args);	\
 	} while(0)
diff --git a/include/osmocore/msgfile.h b/include/osmocom/core/msgfile.h
index 92caa9fc..92caa9fc 100644
--- a/include/osmocore/msgfile.h
+++ b/include/osmocom/core/msgfile.h
diff --git a/include/osmocore/panic.h b/include/osmocom/core/panic.h
index c5a83778..c5a83778 100644
--- a/include/osmocore/panic.h
+++ b/include/osmocom/core/panic.h
diff --git a/include/osmocore/plugin.h b/include/osmocom/core/plugin.h
index 98f9b56d..98f9b56d 100644
--- a/include/osmocore/plugin.h
+++ b/include/osmocom/core/plugin.h
diff --git a/include/osmocore/process.h b/include/osmocom/core/process.h
index 2d663828..2d663828 100644
--- a/include/osmocore/process.h
+++ b/include/osmocom/core/process.h
diff --git a/include/osmocore/rate_ctr.h b/include/osmocom/core/rate_ctr.h
index f887d9a7..dba573d9 100644
--- a/include/osmocore/rate_ctr.h
+++ b/include/osmocom/core/rate_ctr.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define RATE_CTR_INTV_NUM	4
 
diff --git a/include/osmocore/select.h b/include/osmocom/core/select.h
index 2d8b3ec0..5ca21c3e 100644
--- a/include/osmocore/select.h
+++ b/include/osmocom/core/select.h
@@ -1,7 +1,7 @@
 #ifndef _BSC_SELECT_H
 #define _BSC_SELECT_H
 
-#include "linuxlist.h"
+#include <osmocom/core/linuxlist.h>
 
 #define BSC_FD_READ	0x0001
 #define BSC_FD_WRITE	0x0002
diff --git a/include/osmocore/signal.h b/include/osmocom/core/signal.h
index 02d83d2e..02d83d2e 100644
--- a/include/osmocore/signal.h
+++ b/include/osmocom/core/signal.h
diff --git a/include/osmocore/statistics.h b/include/osmocom/core/statistics.h
index 1d56054a..1d56054a 100644
--- a/include/osmocore/statistics.h
+++ b/include/osmocom/core/statistics.h
diff --git a/include/osmocore/talloc.h b/include/osmocom/core/talloc.h
index f7f7643b..f7f7643b 100644
--- a/include/osmocore/talloc.h
+++ b/include/osmocom/core/talloc.h
diff --git a/include/osmocore/timer.h b/include/osmocom/core/timer.h
index fee888bf..19664781 100644
--- a/include/osmocore/timer.h
+++ b/include/osmocom/core/timer.h
@@ -23,7 +23,7 @@
 
 #include <sys/time.h>
 
-#include "linuxlist.h"
+#include <osmocom/core/linuxlist.h>
 
 /**
  * Timer management:
diff --git a/include/osmocore/utils.h b/include/osmocom/core/utils.h
index 0cdf03b8..0cdf03b8 100644
--- a/include/osmocore/utils.h
+++ b/include/osmocom/core/utils.h
diff --git a/include/osmocore/write_queue.h b/include/osmocom/core/write_queue.h
index ef244c32..ef244c32 100644
--- a/include/osmocore/write_queue.h
+++ b/include/osmocom/core/write_queue.h
diff --git a/include/osmocom/crypt/gprs_cipher.h b/include/osmocom/crypt/gprs_cipher.h
index 3e514ec7..30510711 100644
--- a/include/osmocom/crypt/gprs_cipher.h
+++ b/include/osmocom/crypt/gprs_cipher.h
@@ -1,7 +1,7 @@
 #ifndef _GPRS_CIPHER_H
 #define _GPRS_CIPHER_H
 
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/linuxlist.h>
 
 #define GSM0464_CIPH_MAX_BLOCK	1523
 
diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am
new file mode 100644
index 00000000..8685fc9a
--- /dev/null
+++ b/include/osmocom/gsm/Makefile.am
@@ -0,0 +1,6 @@
+osmogsm_HEADERS = comp128.h gsm0808.h gsm48_ie.h mncc.h rxlev_stat.h \
+		  gsm0480.h gsm48.h gsm_utils.h rsl.h tlv.h
+
+SUBDIRS = protocol
+
+osmogsmdir = $(includedir)/osmocom/gsm
diff --git a/include/osmocore/comp128.h b/include/osmocom/gsm/comp128.h
index c37808f0..c37808f0 100644
--- a/include/osmocore/comp128.h
+++ b/include/osmocom/gsm/comp128.h
diff --git a/include/osmocore/gsm0480.h b/include/osmocom/gsm/gsm0480.h
index b504332e..d6626d60 100644
--- a/include/osmocore/gsm0480.h
+++ b/include/osmocom/gsm/gsm0480.h
@@ -1,9 +1,9 @@
 #ifndef gsm0480_h
 #define gsm0480_h
 
-#include "msgb.h"
-#include "protocol/gsm_04_08.h"
-#include "protocol/gsm_04_80.h"
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_80.h>
 
 #define MAX_LEN_USSD_STRING	31
 
diff --git a/include/osmocore/gsm0808.h b/include/osmocom/gsm/gsm0808.h
index 1d853775..1d853775 100644
--- a/include/osmocore/gsm0808.h
+++ b/include/osmocom/gsm/gsm0808.h
diff --git a/include/osmocore/gsm48.h b/include/osmocom/gsm/gsm48.h
index ffe0399b..1e9403bc 100644
--- a/include/osmocore/gsm48.h
+++ b/include/osmocom/gsm/gsm48.h
@@ -1,9 +1,9 @@
 #ifndef _OSMOCORE_GSM48_H
 #define _OSMOCORE_GSM48_H
 
-#include <osmocore/tlv.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsm48_ie.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/gsm48_ie.h>
 
 /* A parsed GPRS routing area */
 struct gprs_ra_id {
diff --git a/include/osmocore/gsm48_ie.h b/include/osmocom/gsm/gsm48_ie.h
index fa66159f..f4fce25c 100644
--- a/include/osmocore/gsm48_ie.h
+++ b/include/osmocom/gsm/gsm48_ie.h
@@ -5,10 +5,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/mncc.h>
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/mncc.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 
 /* decode a 'called/calling/connect party BCD number' as in 10.5.4.7 */
 int gsm48_decode_bcd_number(char *output, int output_len,
diff --git a/include/osmocore/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h
index 19adb70a..19adb70a 100644
--- a/include/osmocore/gsm_utils.h
+++ b/include/osmocom/gsm/gsm_utils.h
diff --git a/include/osmocore/mncc.h b/include/osmocom/gsm/mncc.h
index a094bb9b..a094bb9b 100644
--- a/include/osmocore/mncc.h
+++ b/include/osmocom/gsm/mncc.h
diff --git a/include/osmocom/gsm/protocol/Makefile.am b/include/osmocom/gsm/protocol/Makefile.am
new file mode 100644
index 00000000..8483f10a
--- /dev/null
+++ b/include/osmocom/gsm/protocol/Makefile.am
@@ -0,0 +1,6 @@
+osmogsm_proto_HEADERS = gsm_03_41.h \
+			gsm_04_08.h gsm_04_11.h gsm_04_12.h gsm_04_80.h \
+			gsm_08_08.h gsm_08_58.h \
+			gsm_12_21.h
+
+osmogsm_protodir = $(includedir)/osmocom/gsm/protocol
diff --git a/include/osmocore/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h
index 54365cbc..54365cbc 100644
--- a/include/osmocore/protocol/gsm_03_41.h
+++ b/include/osmocom/gsm/protocol/gsm_03_41.h
diff --git a/include/osmocore/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h
index 3ad7dfdc..3ad7dfdc 100644
--- a/include/osmocore/protocol/gsm_04_08.h
+++ b/include/osmocom/gsm/protocol/gsm_04_08.h
diff --git a/include/osmocore/protocol/gsm_04_11.h b/include/osmocom/gsm/protocol/gsm_04_11.h
index c6a2b193..c6a2b193 100644
--- a/include/osmocore/protocol/gsm_04_11.h
+++ b/include/osmocom/gsm/protocol/gsm_04_11.h
diff --git a/include/osmocore/protocol/gsm_04_12.h b/include/osmocom/gsm/protocol/gsm_04_12.h
index 9b1538a5..9b1538a5 100644
--- a/include/osmocore/protocol/gsm_04_12.h
+++ b/include/osmocom/gsm/protocol/gsm_04_12.h
diff --git a/include/osmocore/protocol/gsm_04_80.h b/include/osmocom/gsm/protocol/gsm_04_80.h
index fa5c9451..fa5c9451 100644
--- a/include/osmocore/protocol/gsm_04_80.h
+++ b/include/osmocom/gsm/protocol/gsm_04_80.h
diff --git a/include/osmocore/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h
index 6b8f9359..6b8f9359 100644
--- a/include/osmocore/protocol/gsm_08_08.h
+++ b/include/osmocom/gsm/protocol/gsm_08_08.h
diff --git a/include/osmocore/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h
index 74a4083b..74a4083b 100644
--- a/include/osmocore/protocol/gsm_08_58.h
+++ b/include/osmocom/gsm/protocol/gsm_08_58.h
diff --git a/include/osmocore/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h
index 9cae45da..b8b00f3f 100644
--- a/include/osmocore/protocol/gsm_12_21.h
+++ b/include/osmocom/gsm/protocol/gsm_12_21.h
@@ -24,7 +24,7 @@
  */
 
 #include <stdint.h>
-#include <osmocore/tlv.h>
+#include <osmocom/gsm/tlv.h>
 
 /* generic header in front of every OML message according to TS 08.59 */
 struct abis_om_hdr {
diff --git a/include/osmocore/rsl.h b/include/osmocom/gsm/rsl.h
index 54d67032..7e46330f 100644
--- a/include/osmocore/rsl.h
+++ b/include/osmocom/gsm/rsl.h
@@ -2,8 +2,8 @@
 #define _OSMOCORE_RSL_H
 
 #include <stdint.h>
-#include <osmocore/utils.h>
-#include <osmocore/protocol/gsm_08_58.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/protocol/gsm_08_58.h>
 
 void rsl_init_rll_hdr(struct abis_rsl_rll_hdr *dh, uint8_t msg_type);
 
diff --git a/include/osmocore/rxlev_stat.h b/include/osmocom/gsm/rxlev_stat.h
index 415509dc..415509dc 100644
--- a/include/osmocore/rxlev_stat.h
+++ b/include/osmocom/gsm/rxlev_stat.h
diff --git a/include/osmocore/tlv.h b/include/osmocom/gsm/tlv.h
index 7bda9f92..552af2bd 100644
--- a/include/osmocore/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
 
 /* Terminology / wording
 		tag	length		value	(in bits)
diff --git a/include/osmocom/vty/telnet_interface.h b/include/osmocom/vty/telnet_interface.h
index 444e6497..0c034e41 100644
--- a/include/osmocom/vty/telnet_interface.h
+++ b/include/osmocom/vty/telnet_interface.h
@@ -21,8 +21,8 @@
 #ifndef TELNET_INTERFACE_H
 #define TELNET_INTERFACE_H
 
-#include <osmocore/logging.h>
-#include <osmocore/select.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/select.h>
 
 #include <osmocom/vty/vty.h>
 
diff --git a/include/osmocore/Makefile.am b/include/osmocore/Makefile.am
deleted file mode 100644
index b65589a6..00000000
--- a/include/osmocore/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \
-		   tlv.h bitvec.h comp128.h statistics.h gsm_utils.h utils.h \
-		   gsmtap.h write_queue.h rsl.h gsm48.h rxlev_stat.h mncc.h \
-		   gsm48_ie.h logging.h gsm0808.h rate_ctr.h gsmtap_util.h \
-		   plugin.h crc16.h panic.h process.h gsm0480.h msgfile.h \
-		   backtrace.h
-
-if ENABLE_TALLOC
-osmocore_HEADERS += talloc.h
-endif
-
-osmocoredir = $(includedir)/osmocore
-
-SUBDIRS = protocol
diff --git a/include/osmocore/protocol/Makefile.am b/include/osmocore/protocol/Makefile.am
deleted file mode 100644
index 03a4849d..00000000
--- a/include/osmocore/protocol/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-osmocore_proto_HEADERS = gsm_03_41.h \
-			 gsm_04_08.h gsm_04_11.h gsm_04_12.h gsm_04_80.h \
-			 gsm_08_08.h gsm_08_58.h \
-			 gsm_12_21.h
-
-osmocore_protodir = $(includedir)/osmocore/protocol