From 9b8e3592643029412b38dbe5bfae4c73f0199a66 Mon Sep 17 00:00:00 2001
From: Andreas Eversberg <jolly@eversberg.eu>
Date: Sat, 5 Mar 2016 08:02:13 +0100
Subject: [PATCH] anetz/bnetz: Remove redundant code to enter idle state

---
 src/anetz/anetz.c | 8 ++++----
 src/bnetz/bnetz.c | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/anetz/anetz.c b/src/anetz/anetz.c
index a68faa9..44d2935 100644
--- a/src/anetz/anetz.c
+++ b/src/anetz/anetz.c
@@ -131,6 +131,7 @@ int anetz_init(void)
 }
 
 static void anetz_timeout(struct timer *timer);
+static void anetz_go_idle(anetz_t *anetz);
 
 /* Create transceiver instance and link to a list. */
 int anetz_create(const char *sounddev, int samplerate, int kanal, int loopback, double loss_volume)
@@ -165,12 +166,11 @@ int anetz_create(const char *sounddev, int samplerate, int kanal, int loopback,
 		goto error;
 	}
 
-	/* go into idle state */
-	PDEBUG(DANETZ, DEBUG_INFO, "Entering IDLE state, sending 2280 Hz tone.\n");
-	anetz->state = ANETZ_FREI;
-	anetz->dsp_mode = DSP_MODE_TONE;
 	timer_init(&anetz->timer, anetz_timeout, anetz);
 
+	/* go into idle state */
+	anetz_go_idle(anetz);
+
 	return 0;
 
 error:
diff --git a/src/bnetz/bnetz.c b/src/bnetz/bnetz.c
index b87f2eb..23a6a9c 100644
--- a/src/bnetz/bnetz.c
+++ b/src/bnetz/bnetz.c
@@ -239,6 +239,7 @@ int bnetz_init(void)
 }
 
 static void bnetz_timeout(struct timer *timer);
+static void bnetz_go_idle(bnetz_t *bnetz);
 
 /* Create transceiver instance and link to a list. */
 int bnetz_create(const char *sounddev, int samplerate, int kanal, int gfs, int loopback, double loss_factor, const char *pilot)
@@ -312,16 +313,14 @@ error_pilot:
 		goto error;
 	}
 
-	/* go into idle state */
-	PDEBUG(DBNETZ, DEBUG_INFO, "Entering IDLE state, sending 'Gruppenfreisignal' %d on channel %d.\n", gfs, kanal);
-	bnetz->state = BNETZ_FREI;
-	bnetz->dsp_mode = DSP_MODE_TELEGRAMM;
 	bnetz->gfs = gfs;
 	strncpy(bnetz->pilot_file, pilot_file, sizeof(bnetz->pilot_file) - 1);
 	strncpy(bnetz->pilot_on, pilot_on, sizeof(bnetz->pilot_on) - 1);
 	strncpy(bnetz->pilot_off, pilot_off, sizeof(bnetz->pilot_off) - 1);
 	timer_init(&bnetz->timer, bnetz_timeout, bnetz);
-	switch_channel_19(bnetz, 0);
+
+	/* go into idle state */
+	bnetz_go_idle(bnetz);
 
 	return 0;