build-fix for bs11_config

[Michael Gernoth]

Hi,
it seems that the last few commits (starting with SVN revision 308)
broke the compilation of bs11_config. As I wanted to take a look at
the boot process of my newly delivered BS11, I've just fixed bs11_config
to build again and it even seems to work.
Find attached my (ugly) patch to fix the build problems.

Regards,
  Michael

-- 
Michael Gernoth                            Department of Computer Science IV 
Martensstrasse 1  D-91058 Erlangen Germany  University of Erlangen-Nuremberg
	      http://www4.informatik.uni-erlangen.de/~gernoth/
-------------- next part --------------
diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index 8edc99b..8469f67 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -10,6 +10,7 @@ bsc_hack_SOURCES = bsc_hack.c abis_rsl.c abis_nm.c gsm_04_08.c gsm_data.c \
 		input/misdn.c input/ipaccess.c signal.c gsm_utils.c
 bsc_hack_LDADD = -ldl -ldbi
 
-bs11_config_SOURCES = bs11_config.c abis_nm.c gsm_data.c msgb.c debug.c select.c timer.c rs232.c
+bs11_config_SOURCES = bs11_config.c abis_nm.c gsm_data.c msgb.c debug.c select.c timer.c rs232.c\
+		tlv_parser.c
 
 ipaccess_find_SOURCES = ipaccess-find.c select.c timer.c
diff --git a/openbsc/src/bs11_config.c b/openbsc/src/bs11_config.c
index e623ade..1bb53be 100644
--- a/openbsc/src/bs11_config.c
+++ b/openbsc/src/bs11_config.c
@@ -194,6 +194,12 @@ static int swload_cbfn(unsigned int hook, unsigned int event, struct msgb *msg,
 	return 0;
 }
 
+int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
+		struct gsm_nm_state *old_state, struct gsm_nm_state *new_state)
+{
+	return 0;
+}
+
 static const char *bs11_link_state[] = {
 	[0x00]	= "Down",
 	[0x01]	= "Up",
@@ -225,6 +231,17 @@ static const char *mbccu_load_name(u_int8_t linkstate)
 	return mbccu_load[linkstate];
 }
 
+/* FIXME: this is not correct, please parse this correctly */
+struct abis_nm_bs11_state {
+	u_int8_t        tag_f0;
+	u_int8_t        len_f0;
+	u_int8_t        phase;
+	u_int8_t        mbccu;
+	u_int8_t        ccu;
+	u_int8_t        tag_f1;
+	u_int8_t        len_f1;
+	u_int8_t        abis_link;
+} __attribute__((packed));
 
 static void print_state(struct abis_nm_bs11_state *st)
 {
@@ -492,7 +509,7 @@ int main(int argc, char **argv)
 
 	handle_options(argc, argv);
 
-	gsmnet = gsm_network_init(1, 1, 1);
+	gsmnet = gsm_network_init(1, 1, 1, 1);
 	if (!gsmnet) {
 		fprintf(stderr, "Unable to allocate gsm network\n");
 		exit(1);