libosmocore: don't make local changes in this repository

All changes to libosmocore need to be committed to
git://git.osmocom.org/libosmocore.git first, and then imported by means
of git-subtree.

diff --git a/src/shared/libosmocore/include/osmocore/protocol/gsm_04_08.h b/src/shared/libosmocore/include/osmocore/protocol/gsm_04_08.h
index 0e2cd8e..801b9b5 100644 (file)
--- a/src/shared/libosmocore/include/osmocore/protocol/gsm_04_08.h
+++ b/src/shared/libosmocore/include/osmocore/protocol/gsm_04_08.h
@@ -685,7 +685,6 @@ enum chreq_type {
 /* Chapter 5.1.2.2 */
 #define        GSM_CSTATE_NULL                 0
 #define        GSM_CSTATE_INITIATED            1
-#define GSM_CSTATE_MM_CONNECTION_PEND  2 /* see 10.5.4.6 */
 #define        GSM_CSTATE_MO_CALL_PROC         3
 #define        GSM_CSTATE_CALL_DELIVERED       4
 #define        GSM_CSTATE_CALL_PRESENT         6

diff --git a/src/shared/libosmocore/src/gsm48.c b/src/shared/libosmocore/src/gsm48.c
index adaeba3..5761c67 100644 (file)
--- a/src/shared/libosmocore/src/gsm48.c
+++ b/src/shared/libosmocore/src/gsm48.c
@@ -97,10 +97,10 @@ static const struct value_string rr_cause_names[] = {
 };
 
 /* FIXME: convert to value_string */
-static const char *cc_state_names[33] = {
+static const char *cc_state_names[32] = {
        "NULL",
        "INITIATED",
-       "MM_CONNECTION_PEND",
+       "illegal state 2",
        "MO_CALL_PROC",
        "CALL_DELIVERED",
        "illegal state 5",

diff --git a/src/shared/libosmocore/src/gsm48_ie.c b/src/shared/libosmocore/src/gsm48_ie.c
index 3c2a1f7..4ca5fb8 100644 (file)
--- a/src/shared/libosmocore/src/gsm48_ie.c
+++ b/src/shared/libosmocore/src/gsm48_ie.c
@@ -2,7 +2,7 @@
  * 3GPP TS 04.08 version 7.21.0 Release 1998 / ETSI TS 100 940 V7.21.0 */
 
 /* (C) 2008 by Harald Welte <laforge@gnumonks.org>
- * (C) 2009-2010 by Andreas Eversberg
+ * (C) 2008-2010 by Andreas Eversberg
  *
  * All Rights Reserved
  *