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

USB device: add USB message structure for sniffer communication

Browse Source 
Change-Id: Id2c6f32ade2fec9b9ef91bd8c5e1fd195f2d7351
This commit is contained in:
Kévin Redon
2018-07-01 18:21:30 +02:00
committed by King Kévin
parent e2f84f6a8b
commit 012940f48e
1 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
firmware/libcommon/include/simtrace_prot.h
View File

@@ -1,7 +1,3 @@
#pragma once
#include <stdint.h>
/* SIMtrace2 USB protocol */ /* SIMtrace2 USB protocol */
/* (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de> /* (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de>
@@ -21,6 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#pragma once
#include <stdint.h>
#include <stdbool.h>
/*********************************************************************** /***********************************************************************
* COMMON HEADER * COMMON HEADER
@@ -32,8 +32,8 @@ enum simtrace_msg_class {
SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGC_CARDEM,
/* Modem Control (if modem is attached next to device) */ /* Modem Control (if modem is attached next to device) */
SIMTRACE_MSGC_MODEM, SIMTRACE_MSGC_MODEM,
/* SIM protocol tracing */ /* Reader/phone-car/SIM communication sniff */
SIMTRACE_MSGC_TRACE, SIMTRACE_MSGC_SNIFF,
/* first vendor-specific request */ /* first vendor-specific request */
_SIMTRACE_MGSC_VENDOR_FIRST = 127, _SIMTRACE_MGSC_VENDOR_FIRST = 127,
@@ -74,10 +74,18 @@ enum simtrace_msg_type_modem {
SIMTRACE_MSGT_BD_MODEM_STATUS, SIMTRACE_MSGT_BD_MODEM_STATUS,
}; };
/* SIMTRACE_MSGC_TRACE */ /* SIMTRACE_MSGC_SNIFF */
enum simtrace_msg_type_trace { enum simtrace_msg_type_sniff {
/* FIXME */ /* Status change (card inserted, reset, ...) */
_dummy, SIMTRACE_MSGT_SNIFF_CHANGE = 0,
/* Fi/Di baudrate change */
SIMTRACE_MSGT_SNIFF_FIDI,
/* ATR data */
SIMTRACE_MSGT_SNIFF_ATR,
/* PPS (request or response) data */
SIMTRACE_MSGT_SNIFF_PPS,
/* TPDU data */
SIMTRACE_MSGT_SNIFF_TPDU,
}; };
/* common message header */ /* common message header */
@@ -92,7 +100,7 @@ struct simtrace_msg_hdr {
} __attribute__ ((packed)); } __attribute__ ((packed));
/*********************************************************************** /***********************************************************************
* CARD EMULATOR / FORWARDER * Capabilities
***********************************************************************/ ***********************************************************************/
/* generic capabilities */ /* generic capabilities */
@@ -137,7 +145,6 @@ enum simtrace_capability_vendor {
SIMTRACE_CAP_SYSMO_QMOD_RESET_HUB, SIMTRACE_CAP_SYSMO_QMOD_RESET_HUB,
}; };
/* SIMTRACE_CMD_BD_BOARD_INFO */ /* SIMTRACE_CMD_BD_BOARD_INFO */
struct simtrace_board_info { struct simtrace_board_info {
struct { struct {
@@ -276,3 +283,36 @@ struct st_modem_status {
/* bit-field of changed status bits */ /* bit-field of changed status bits */
uint8_t changed_mask; uint8_t changed_mask;
} __attribute__((packed)); } __attribute__((packed));
/***********************************************************************
* SNIFF
***********************************************************************/
/* SIMTRACE_MSGT_SNIFF_CHANGE flags */
#define SNIFF_CHANGE_FLAG_CARD_INSERT (1<<0)
#define SNIFF_CHANGE_FLAG_CARD_EJECT (1<<1)
#define SNIFF_CHANGE_FLAG_RESET_HOLD (1<<2)
#define SNIFF_CHANGE_FLAG_RESET_RELEASE (1<<3)
#define SNIFF_CHANGE_FLAG_TIMEOUT_WT (1<<4)
/* SIMTRACE_MSGT_SNIFF_CHANGE */
struct sniff_change {
/* SIMTRACE_MSGT_SNIFF_CHANGE flags */
uint32_t flags;
} __attribute__ ((packed));
/* SIMTRACE_MSGT_SNIFF_FIDI */
struct sniff_fidi {
/* Fi/Di values as encoded in TA1 */
uint8_t fidi;
} __attribute__ ((packed));
/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU */
struct sniff_data {
/* if the data is complete (an error might have occurred during transmission */
bool complete;
/* data length */
uint16_t length;
/* data */
uint8_t data[0];
} __attribute__ ((packed));