From 8d6a5d8f895edc44f2513774773437a80ba042f2 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sat, 7 Nov 2015 18:27:05 +0100
Subject: [PATCH] move USBDDriverCallbacks_ConfigurationChanged() to main.c

This alows us to mark simtrace_config as static variable and keep all
code related to this variable local to main.c
---
 firmware/src_simtrace/main.c     | 12 +++++++++++-
 firmware/src_simtrace/simtrace.h |  1 -
 firmware/src_simtrace/usb.c      | 11 -----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/firmware/src_simtrace/main.c b/firmware/src_simtrace/main.c
index 1454e027..a1058e18 100644
--- a/firmware/src_simtrace/main.c
+++ b/firmware/src_simtrace/main.c
@@ -51,7 +51,17 @@ static const conf_func config_func_ptrs[] = {
 /*------------------------------------------------------------------------------
  *         Internal variables
  *------------------------------------------------------------------------------*/
-volatile enum confNum simtrace_config = CFG_NUM_SNIFF;
+static volatile enum confNum simtrace_config = CFG_NUM_SNIFF;
+
+/*----------------------------------------------------------------------------
+ *       Callbacks
+ *----------------------------------------------------------------------------*/
+
+void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
+{
+    TRACE_INFO_WP("cfgChanged%d ", cfgnum);
+    simtrace_config = cfgnum;
+}
 
 /*------------------------------------------------------------------------------
  *        Main
diff --git a/firmware/src_simtrace/simtrace.h b/firmware/src_simtrace/simtrace.h
index ea2d401f..00d2b738 100644
--- a/firmware/src_simtrace/simtrace.h
+++ b/firmware/src_simtrace/simtrace.h
@@ -29,7 +29,6 @@ extern volatile ringbuf sim_rcv_buf;
 
 extern volatile bool rcvdChar;
 extern volatile uint32_t char_stat;
-extern volatile enum confNum simtrace_config;
 
 extern const Pin pinPhoneRST;
 
diff --git a/firmware/src_simtrace/usb.c b/firmware/src_simtrace/usb.c
index 9555003b..be1933c8 100644
--- a/firmware/src_simtrace/usb.c
+++ b/firmware/src_simtrace/usb.c
@@ -595,17 +595,6 @@ const USBDDriverDescriptors driverDescriptors = {
 };
 
 
-/*----------------------------------------------------------------------------
- *       Callbacks
- *----------------------------------------------------------------------------*/
-
-void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
-{
-    TRACE_INFO_WP("cfgChanged%d ", cfgnum);
-    simtrace_config = cfgnum;
-}
-
-
 /*----------------------------------------------------------------------------
  *        Functions 
  *----------------------------------------------------------------------------*/