Merge remote branch 'origin/master' into on-waves/bsc-master

* Move to libosmocore
* Move to new debugging architecture
* Register the BTS types
* Has only been compile tested

Conflicts:
	openbsc/include/openbsc/Makefile.am
	openbsc/include/openbsc/gsm_data.h
	openbsc/include/openbsc/ipaccess.h
	openbsc/include/openbsc/mgcp.h
	openbsc/include/openbsc/msgb.h
	openbsc/include/openbsc/tlv.h
	openbsc/src/Makefile.am
	openbsc/src/abis_rsl.c
	openbsc/src/bsc_init.c
	openbsc/src/bsc_mgcp.c
	openbsc/src/chan_alloc.c
	openbsc/src/debug.c
	openbsc/src/gsm_subscriber_base.c
	openbsc/src/msgb.c
	openbsc/src/rest_octets.c
	openbsc/src/sccp/sccp.c
	openbsc/src/vty/command.c
	openbsc/src/vty_interface.c
	openbsc/tests/Makefile.am

1 files changed, 45 insertions, 0 deletions

diff --git a/rrlp-ephemeris/ubx-parse.h b/rrlp-ephemeris/ubx-parse.h
new file mode 100644
index 000000000..621475d65
--- /dev/null
+++ b/rrlp-ephemeris/ubx-parse.h
@@ -0,0 +1,45 @@
+/*
+ * ubx-parse.h
+ *
+ * Header for parsing code converting UBX messages to GPS assist data
+ *
+ *
+ * Copyright (C) 2009  Sylvain Munaut <tnt@246tNt.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __UBX_PARSE_H__
+#define __UBX_PARSE_H__
+
+
+#include "gps.h"
+#include "ubx.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Dispatch table */
+extern struct ubx_dispatch_entry ubx_parse_dt[];
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UBX_PARSE_H__ */
+