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

phone.py:Bug fixes, first part of communication works

Browse Source
This commit is contained in:
Christina Quast
2015-03-22 19:09:02 +01:00
parent 2889fc2d38
commit 5134fb6f53
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
usb_application/phone.py
View File

@@ -67,15 +67,15 @@ WAIT_CMD = 1
def handle_wait_rst(dev): def handle_wait_rst(dev):
# ATR handling # ATR handling
arr = dev.read(0x83, 64, 1000) # Notification endpoint arr = dev.read(0x83, 64, 1000) # Notification endpoint
print("arr: ", arr) # print("arr: ", arr)
c=arr.pop() c=arr.pop()
print(c) # print(c)
if c == ord('R'): if c == ord('R'):
# We received a Reset, so we send ATR # We received a Reset, so we send ATR
written = dev.write(0x1, atr, 1000) written = dev.write(0x1, atr, 1000)
print("Written data: ") # print("Written data: ")
print(written) # print(written)
state = WAIT_CMD; state = WAIT_CMD;
return state return state
@@ -99,8 +99,6 @@ def handle_phone_request(dev, state):
INS = 1 INS = 1
def send_response(dev, cmd): def send_response(dev, cmd):
print("Write response to ")
print("".join("%02x " % b for b in cmd))
# FIXME: We could get data of length 5 as well! Implement another distinct criteria! # FIXME: We could get data of length 5 as well! Implement another distinct criteria!
if len(cmd) == 5: # Received cmd from phone if len(cmd) == 5: # Received cmd from phone
if cmd[INS] == 0xA4: if cmd[INS] == 0xA4:
@@ -113,7 +111,7 @@ def send_response(dev, cmd):
0x04, 0x00, 0x83, 0x8A, 0x04, 0x00, 0x83, 0x8A,
0x83, 0x8A] 0x83, 0x8A]
SW = [0x90, 0x00] SW = [0x90, 0x00]
resp = [cmd[INS], data, SW] # Respond with INS byte resp = [cmd[INS]] + data + SW # Respond with INS byte
else: else:
print("Unknown cmd") print("Unknown cmd")
resp = [0x60, 0x00] resp = [0x60, 0x00]
@@ -122,15 +120,16 @@ def send_response(dev, cmd):
else: else:
resp = [0x60, 0x00] resp = [0x60, 0x00]
print("Cmd, resp: ")
print("".join("%02x " % b for b in cmd))
print("".join("%02x " % b for b in resp))
written = dev.write(0x01, resp, 10000); written = dev.write(0x01, resp, 10000);
if written > 0: if written > 0:
print("Bytes written:") print("Bytes written:")
print(written) print(written)
print("Cmd, resp: ")
print("".join("%02x " % b for b in cmd))
print("".join("%02x " % b for b in resp))
def emulate_sim(): def emulate_sim():
dev = find_dev() dev = find_dev()
state = WAIT_RST; state = WAIT_RST;
@@ -140,4 +139,5 @@ def emulate_sim():
state = handle_phone_request(dev, state) state = handle_phone_request(dev, state)
except usb.USBError as e: except usb.USBError as e:
print e # print e
pass