Commit Graph

79 Commits

Author SHA1 Message Date
Harald Welte
fefd571701 conf_func: Use named struct initializers and named array subscripts
As part of this, we also do away with the '-1' based array subscripts
2015-11-07 18:25:19 +01:00
Harald Welte
15d72cc631 add some comments on the conf_func members 2015-11-07 18:19:06 +01:00
Christina Quast
235409aa2e simtrace.h: Increased host to SIMtrace buf size
The host got stuck sometimes when large data frames had to be send
from the host program to SIMtrace. The printouts would just stop
if many large packets were received from the SIM card and needed
to be transferred to the mobile phone.
Increasing the buffer length removed the problem.
2015-06-24 16:05:39 +02:00
Christina Quast
3d8c093cb2 main: Increase timeout for USB configured state
When the timeout was too small, the main function would infinitely
loop around, restarting the board and waiting for the USB interface
to get configured. But since configuration seems to take more than
one second, it rarely succeeded.
Increasing the timeout makes the USB configuration finish in the
first try.
2015-06-24 16:02:52 +02:00
Christina Quast
bd5b8bd7f7 usb.c: Corrected grammatical mistake 2015-05-14 17:25:41 +02:00
Christina Quast
96025dbb69 phone.c: removed comments
Removed comment describing the typical first few packets between the
SIM card and phone I used for development and testing:
SuperSIM, Motorola C123
2015-05-08 17:31:14 +02:00
Christina Quast
049772e688 phone.c: Removed comment about wait time extension
Wait time extension commands are not implemented yet.
They are a nice-to-have for the future, since they would enable
the board to work with phones that expect a higher frequency.

With a wait time extension request towards the phone, SIMtrace could
signal the phone to wait for a longer time period while SIMtrace is
still waiting for a response from the SIM card.
2015-05-08 17:19:16 +02:00
Christina Quast
3b544a1217 cciddriverdesc: Atmel bug fix of slot status register
Atmel library mixes up the value for two different messages.
Explanation can be found here:
http://permalink.gmane.org/gmane.comp.mobile.osmocom.simtrace/29

Actually, a better fix for this problem would be to go through the
Atmel code and replace ICC_INSERTED_EVENT with ICC_BS_PRESENT_NOTACTIVATED
where appropriate and in accordance with the Smart Card CCID standard
(and libccid, for this matter).
2015-05-08 16:59:47 +02:00
Christina Quast
3735039b59 firmware, host: Changed vendor and product id
The code used a vendor and product id taken from Atmel example code.
Now it is changed to the vendor and product id, which was also previously
used in the original SIMtrace code.
2015-05-08 16:47:29 +02:00
Christina Quast
14f6399c03 tc_etu.c: Removed, because was never used
Since the host side does the parsing of the packets, (not the firmware,
as it was in the old simtrace version), we do not need to check for expired
max waiting time.
Instead, every byte received from the phone is filled into a ring buffer.
As soon as the USB endpoint to the host is not busy anymore, it is sent
to the host over the respective USB endpoint.
2015-05-08 16:45:28 +02:00
Christina Quast
5f83861b17 mitm.c: Removed unused commented out code 2015-05-08 16:45:28 +02:00
Christina Quast
560ade3239 main.c: Removed TC_Start/_Stop (was commented out)
Removed FIXME comment
Removed TC_Start, TC_Stop function call, which was commented out anyways.
2015-05-08 16:45:28 +02:00
Christina Quast
1b65ad0329 sniffer.c: Removed unused PR macro defnition 2015-05-08 16:45:28 +02:00
Christina Quast
0bf65dc0b6 usb.c: Removed FIXME comment
MITM does not support two interface settings.
The comment mixed up interface configurations and alternative
interface settings.
2015-05-08 16:45:28 +02:00
Christina Quast
ae82155866 USBDDriver.c: swaped args to memset 2015-05-08 16:45:15 +02:00
Christina Quast
bfd7354c86 usb.c: removed comment, named phone interface of MITM conf
String descriptor #0 always is the language descriptor.

The second USB interface is in the MITM configuration is
the interface to the phone.
2015-05-08 16:00:51 +02:00
Christina Quast
2c68f9c825 Makefile: Removed unused object file target tc_etu 2015-05-08 15:37:57 +02:00
Christina Quast
4a30a3700b Remove PR define, replace with TRACE_DEBUG
The define PR was introduced to switch quickly between TRACE levels
for specific debug print messages.

Now, it all became debug output, since it is not needed in normal
operation.
2015-05-08 15:34:45 +02:00
Christina Quast
9dbf1c90ac main.c: Set green LED when USB is configured 2015-05-06 08:46:32 +02:00
Christina Quast
cb646bc729 command to change fidi send by host 2015-05-03 14:21:26 +02:00
Christina Quast
6246000b3a iso7816_uart.c: Do not compile 2015-05-03 14:18:59 +02:00
Christina Quast
be235275fa Added not working PTS parsing to host communication 2015-05-02 17:56:32 +02:00
Christina Quast
7a7f98c9f2 ringbuf.c: rbuf peek function 2015-05-02 17:53:13 +02:00
Christina Quast
bf12a6f79e iso7816_uart: starting point for pts parsing 2015-05-02 13:22:07 +02:00
Christina Quast
4bec8d8e26 host_communication.c: printf becomes TRACE_DEBUG 2015-04-21 23:03:59 +02:00
Christina Quast
ddb1e7be1a cciddriver.c: Removed loop waiting for host on CCID_Read 2015-04-21 23:02:43 +02:00
Christina Quast
e4cbfe6f47 Moved ISR_PhoneRST into iso code file and simtrace header 2015-04-20 13:07:28 +02:00
Christina Quast
3d5e3ab612 simtrace_iso7816.c: Remove unused _ISO7816_Init 2015-04-20 12:20:50 +02:00
Christina Quast
b85f140636 iso7816_4.c: Removed time guard 2015-04-18 15:05:43 +02:00
Christina Quast
4b8149363a iso7816_4.c: CLK div differs for Master and Slave
Attention: Each init function has to enable and disable receiver and
transmitter on its own!
2015-04-17 18:50:25 +02:00
Christina Quast
dea1f55fb7 board.h: RST pin low per default on startup 2015-04-17 17:16:42 +02:00
Christina Quast
ad215aaf66 ccid.c: removed SMARTCARD_CONNECT_PIN check (always defined) 2015-04-16 15:00:07 +02:00
Christina Quast
2379ac8e32 main.c: Removed double declaration of var i 2015-04-16 11:09:37 +02:00
Christina Quast
68cc859870 iso7816_4.c: Moved around lines, only sniffer works 2015-04-16 11:08:32 +02:00
Christina Quast
ec9c09e9b9 Moved global Usart state into usart struct 2015-04-16 10:45:39 +02:00
Christina Quast
f3211e6424 board.h: init more phone pins (as input) 2015-04-16 10:41:12 +02:00
Christina Quast
911bf26a55 sniffer.c: Enable/disable interrupts in init/exit function 2015-04-13 22:39:11 +02:00
Christina Quast
d52201f6db phone.c: Enable/disable interrupts on init/exit 2015-04-13 22:38:05 +02:00
Christina Quast
dcce4c3244 phone.c: Callback routine for reenabling RST interrupt 2015-04-13 22:20:12 +02:00
Christina Quast
c63da3f6d5 Makefile: Check for already opened ttyUSBx
If two ttyUSBx interfaces are read from by ts at the same time,
some letters arrive at one terminal and others in the second one.
Therefore only one terminal should be open at all times.
2015-04-13 22:09:50 +02:00
Christina Quast
de68867402 main.c: Reset board if USB not configured 2015-04-12 15:20:57 +02:00
Christina Quast
fd069dce73 iso7816_4.c: Increased max interations 2015-04-12 13:32:12 +02:00
Christina Quast
b595e7cb53 Merge branch 'new_iso_init' (sniffer not working)
Conflicts:
	firmware/src_simtrace/phone.c
	firmware/src_simtrace/simtrace.h
2015-04-12 13:31:01 +02:00
Christina Quast
2b8a18bf3a Sniffer with ringbuf, works SOMETIMES
* Sniffer uses phone endpoints for communication and the ringbuffer
    routines the phone communication uses
* Most times the Usart1 interrupt is not triggered, and therefore
    no values are recorded
2015-04-12 09:31:36 +02:00
Christina Quast
5c6a299c71 phone.c: Sniffer bus config make switch 2015-04-11 20:03:14 +02:00
Christina Quast
611bea8b4b tc_etu: Corrected compiler warning 2015-04-11 18:15:51 +02:00
Christina Quast
4db82e092f ringbuffer implementation 2015-04-11 18:15:27 +02:00
Christina Quast
2ee3ec73f4 tc_etu.c: Fixed PIN initialisation compiler waring 2015-04-11 12:27:46 +02:00
Christina Quast
542f9183bb basic ringbuffer implementation 2015-04-11 09:31:15 +02:00
Christina Quast
87ddfa8c23 phone.c: Bug fix: USB err format string interchanged 2015-04-11 08:44:40 +02:00