aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristina Quast <chrysh.ng+git@gmail.com>2015-05-14 17:21:34 +0200
committerChristina Quast <chrysh.ng+git@gmail.com>2015-05-14 17:21:34 +0200
commit5cf676df61e7a37467322022338cf09d2bf8f1fe (patch)
treeb8d37013d23f1108edf36ed335631fe98752fc12
parent425717d08bbfd600fcb411a668f36e308207c719 (diff)
sniffer.py: Removed redundant find_dev function
-rwxr-xr-xusb_application/simtrace.py2
-rwxr-xr-xusb_application/sniffer.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/usb_application/simtrace.py b/usb_application/simtrace.py
index 4934958..25529ba 100755
--- a/usb_application/simtrace.py
+++ b/usb_application/simtrace.py
@@ -82,7 +82,7 @@ def main():
# ret = dev.read(0x83, 64, 100)
print(ret)
if args.sniff is True:
- sniffer.sniff()
+ sniffer.sniff(dev)
if args.select_file is True:
ccid_select.select()
if args.phone is True:
diff --git a/usb_application/sniffer.py b/usb_application/sniffer.py
index 7ac2dae..eab8dba 100755
--- a/usb_application/sniffer.py
+++ b/usb_application/sniffer.py
@@ -49,8 +49,7 @@ def find_eps(dev):
return (ep_in, ep_out)
# main code
-def sniff():
- dev = find_dev()
+def sniff(dev):
ans = array.array('B', [])
apdus = []