catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-25 01:38:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

move USBDDriverCallbacks_ConfigurationChanged() to main.c

Browse Source 
This alows us to mark simtrace_config as static variable and keep all
code related to this variable local to main.c
This commit is contained in:
Harald Welte
2015-11-07 18:27:05 +01:00
parent d4c1421c91
commit 8d6a5d8f89
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/src_simtrace/main.c
View File

@@ -51,7 +51,17 @@ static const conf_func config_func_ptrs[] = {
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Internal variables * 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 * Main

1
firmware/src_simtrace/simtrace.h
View File

@@ -29,7 +29,6 @@ extern volatile ringbuf sim_rcv_buf;
extern volatile bool rcvdChar; extern volatile bool rcvdChar;
extern volatile uint32_t char_stat; extern volatile uint32_t char_stat;
extern volatile enum confNum simtrace_config;
extern const Pin pinPhoneRST; extern const Pin pinPhoneRST;

11
firmware/src_simtrace/usb.c
View File

@@ -595,17 +595,6 @@ const USBDDriverDescriptors driverDescriptors = {
}; };
/*----------------------------------------------------------------------------
* Callbacks
*----------------------------------------------------------------------------*/
void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)
{
TRACE_INFO_WP("cfgChanged%d ", cfgnum);
simtrace_config = cfgnum;
}
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Functions * Functions
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/