laforge has submitted this change. (
https://gerrit.osmocom.org/c/simtrace2/+/26977 )
Change subject: cosmetic: contrib/simtrace.lua: more consistent formatting
......................................................................
cosmetic: contrib/simtrace.lua: more consistent formatting
Change-Id: If842dd95c7244ebe33579ed104247c66682ed4d4
---
M contrib/simtrace.lua
1 file changed, 11 insertions(+), 12 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua
index 83bc925..09ee9e6 100644
--- a/contrib/simtrace.lua
+++ b/contrib/simtrace.lua
@@ -160,11 +160,11 @@
if(command == 0x0101 or command == 0x0106) then
return dissect_rxtx(payload_data(),pinfo,subtree)
elseif(command == 0x0104) then
- return dissect_status(payload_data(),pinfo,subtree)
+ return dissect_status(payload_data(),pinfo,subtree)
elseif(command == 0x0102) then
- return dissect_atr(payload_data(),pinfo,subtree)
+ return dissect_atr(payload_data(),pinfo,subtree)
elseif(command == 0x0201) then
- return dissect_modem_reset(payload_data(),pinfo,subtree)
+ return dissect_modem_reset(payload_data(),pinfo,subtree)
else
subtree:add(payload, payload_data)
end
@@ -173,13 +173,12 @@
function usb_simtrace_protocol.init()
-local usb_product_dissectors = DissectorTable.get("usb.product")
-usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -- OCTSIMTEST
-usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) -- NGFF_CARDEM
-usb_product_dissectors:add(0x1d5060e3, usb_simtrace_protocol) -- SIMTRACE2
-usb_product_dissectors:add(0x1d504004, usb_simtrace_protocol) -- QMOD
-usb_product_dissectors:add(0x1d504001, usb_simtrace_protocol) -- OWHW
-DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol)
-DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol)
---concatss = ByteArray.new()
+ local usb_product_dissectors = DissectorTable.get("usb.product")
+ usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -- OCTSIMTEST
+ usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) -- NGFF_CARDEM
+ usb_product_dissectors:add(0x1d5060e3, usb_simtrace_protocol) -- SIMTRACE2
+ usb_product_dissectors:add(0x1d504004, usb_simtrace_protocol) -- QMOD
+ usb_product_dissectors:add(0x1d504001, usb_simtrace_protocol) -- OWHW
+ DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol)
+ DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol)
end
--
To view, visit
https://gerrit.osmocom.org/c/simtrace2/+/26977
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: If842dd95c7244ebe33579ed104247c66682ed4d4
Gerrit-Change-Number: 26977
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged