From: Gerhard Sittig Date: Sun, 22 Dec 2019 10:47:26 +0000 (+0100) Subject: ps2: add test for PS/2 data exchange without clock inhibit X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d2a6225becb43954765b75b81205dbc25deb4849;p=sigrok-test.git ps2: add test for PS/2 data exchange without clock inhibit The capture which was attached to bug #1460 demonstrated a previously unhandled condition, the absence of a host activity after the data byte transmission. Add another test case after the decoder implementation got adjusted. --- diff --git a/decoder/test/ps2/ps2_keyboard_asdfgh_no_inhibit.output b/decoder/test/ps2/ps2_keyboard_asdfgh_no_inhibit.output new file mode 100644 index 0000000..bde85ee --- /dev/null +++ b/decoder/test/ps2/ps2_keyboard_asdfgh_no_inhibit.output @@ -0,0 +1,270 @@ +5588185-5590276 ps2: bit: "0" +5590276-5592380 ps2: bit: "0" +5592380-5594459 ps2: bit: "0" +5594459-5596549 ps2: bit: "1" +5596549-5598639 ps2: bit: "1" +5598639-5600751 ps2: bit: "1" +5600751-5602855 ps2: bit: "0" +5602855-5604959 ps2: bit: "0" +5604959-5607012 ps2: bit: "0" +5607012-5609091 ps2: bit: "0" +5609091-5610122 ps2: bit: "1" +5588185-5590276 ps2: start-bit: "Start bit" "Start" "S" +5590276-5607012 ps2: word: "Data: 1c" "D: 1c" "1c" +5607012-5609091 ps2: parity-ok: "Parity OK" "Par OK" "P" +5609091-5610122 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +10251230-10253321 ps2: bit: "0" +10253321-10255425 ps2: bit: "0" +10255425-10257529 ps2: bit: "0" +10257529-10259633 ps2: bit: "0" +10259633-10261712 ps2: bit: "0" +10261712-10263802 ps2: bit: "1" +10263802-10265892 ps2: bit: "1" +10265892-10267982 ps2: bit: "1" +10267982-10270060 ps2: bit: "1" +10270060-10272150 ps2: bit: "1" +10272150-10273181 ps2: bit: "1" +10251230-10253321 ps2: start-bit: "Start bit" "Start" "S" +10253321-10270060 ps2: word: "Data: f0" "D: f0" "f0" +10270060-10272150 ps2: parity-ok: "Parity OK" "Par OK" "P" +10272150-10273181 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +10320122-10322213 ps2: bit: "0" +10322213-10324317 ps2: bit: "0" +10324317-10326397 ps2: bit: "0" +10326397-10328487 ps2: bit: "1" +10328487-10330577 ps2: bit: "1" +10330577-10332689 ps2: bit: "1" +10332689-10334793 ps2: bit: "0" +10334793-10336896 ps2: bit: "0" +10336896-10338949 ps2: bit: "0" +10338949-10341029 ps2: bit: "0" +10341029-10342060 ps2: bit: "1" +10320122-10322213 ps2: start-bit: "Start bit" "Start" "S" +10322213-10338949 ps2: word: "Data: 1c" "D: 1c" "1c" +10338949-10341029 ps2: parity-ok: "Parity OK" "Par OK" "P" +10341029-10342060 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +10907284-10909352 ps2: bit: "0" +10909352-10911442 ps2: bit: "1" +10911442-10913555 ps2: bit: "1" +10913555-10915634 ps2: bit: "0" +10915634-10917724 ps2: bit: "1" +10917724-10919836 ps2: bit: "1" +10919836-10921940 ps2: bit: "0" +10921940-10924044 ps2: bit: "0" +10924044-10926111 ps2: bit: "0" +10926111-10928201 ps2: bit: "1" +10928201-10929232 ps2: bit: "1" +10907284-10909352 ps2: start-bit: "Start bit" "Start" "S" +10909352-10926111 ps2: word: "Data: 1b" "D: 1b" "1b" +10926111-10928201 ps2: parity-ok: "Parity OK" "Par OK" "P" +10928201-10929232 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +14022919-14024987 ps2: bit: "0" +14024987-14027077 ps2: bit: "1" +14027077-14029188 ps2: bit: "1" +14029188-14031292 ps2: bit: "0" +14031292-14033396 ps2: bit: "0" +14033396-14035475 ps2: bit: "0" +14035475-14037586 ps2: bit: "1" +14037586-14039690 ps2: bit: "0" +14039690-14041743 ps2: bit: "0" +14041743-14043823 ps2: bit: "0" +14043823-14044854 ps2: bit: "1" +14022919-14024987 ps2: start-bit: "Start bit" "Start" "S" +14024987-14041743 ps2: word: "Data: 23" "D: 23" "23" +14041743-14043823 ps2: parity-ok: "Parity OK" "Par OK" "P" +14043823-14044854 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +15690546-15692637 ps2: bit: "0" +15692637-15694741 ps2: bit: "0" +15694741-15696845 ps2: bit: "0" +15696845-15698949 ps2: bit: "0" +15698949-15701028 ps2: bit: "0" +15701028-15703118 ps2: bit: "1" +15703118-15705209 ps2: bit: "1" +15705209-15707299 ps2: bit: "1" +15707299-15709376 ps2: bit: "1" +15709376-15711466 ps2: bit: "1" +15711466-15712498 ps2: bit: "1" +15690546-15692637 ps2: start-bit: "Start bit" "Start" "S" +15692637-15709376 ps2: word: "Data: f0" "D: f0" "f0" +15709376-15711466 ps2: parity-ok: "Parity OK" "Par OK" "P" +15711466-15712498 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +15755863-15757930 ps2: bit: "0" +15757930-15760020 ps2: bit: "1" +15760020-15762132 ps2: bit: "1" +15762132-15764212 ps2: bit: "0" +15764212-15766302 ps2: bit: "1" +15766302-15768414 ps2: bit: "1" +15768414-15770518 ps2: bit: "0" +15770518-15772622 ps2: bit: "0" +15772622-15774688 ps2: bit: "0" +15774688-15776778 ps2: bit: "1" +15776778-15777809 ps2: bit: "1" +15755863-15757930 ps2: start-bit: "Start bit" "Start" "S" +15757930-15774688 ps2: word: "Data: 1b" "D: 1b" "1b" +15774688-15776778 ps2: parity-ok: "Parity OK" "Par OK" "P" +15776778-15777809 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +18201439-18203507 ps2: bit: "0" +18203507-18205597 ps2: bit: "1" +18205597-18207709 ps2: bit: "1" +18207709-18209789 ps2: bit: "0" +18209789-18211901 ps2: bit: "1" +18211901-18213980 ps2: bit: "0" +18213980-18216092 ps2: bit: "1" +18216092-18218197 ps2: bit: "0" +18218197-18220264 ps2: bit: "0" +18220264-18222354 ps2: bit: "1" +18222354-18223385 ps2: bit: "1" +18201439-18203507 ps2: start-bit: "Start bit" "Start" "S" +18203507-18220264 ps2: word: "Data: 2b" "D: 2b" "2b" +18220264-18222354 ps2: parity-ok: "Parity OK" "Par OK" "P" +18222354-18223385 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +19250022-19252114 ps2: bit: "0" +19252114-19254218 ps2: bit: "0" +19254218-19256322 ps2: bit: "0" +19256322-19258426 ps2: bit: "0" +19258426-19260505 ps2: bit: "0" +19260505-19262595 ps2: bit: "1" +19262595-19264685 ps2: bit: "1" +19264685-19266775 ps2: bit: "1" +19266775-19268852 ps2: bit: "1" +19268852-19270943 ps2: bit: "1" +19270943-19271974 ps2: bit: "1" +19250022-19252114 ps2: start-bit: "Start bit" "Start" "S" +19252114-19268852 ps2: word: "Data: f0" "D: f0" "f0" +19268852-19270943 ps2: parity-ok: "Parity OK" "Par OK" "P" +19270943-19271974 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +19321640-19323707 ps2: bit: "0" +19323707-19325797 ps2: bit: "1" +19325797-19327908 ps2: bit: "1" +19327908-19330012 ps2: bit: "0" +19330012-19332116 ps2: bit: "0" +19332116-19334195 ps2: bit: "0" +19334195-19336306 ps2: bit: "1" +19336306-19338410 ps2: bit: "0" +19338410-19340463 ps2: bit: "0" +19340463-19342542 ps2: bit: "0" +19342542-19343573 ps2: bit: "1" +19321640-19323707 ps2: start-bit: "Start bit" "Start" "S" +19323707-19340463 ps2: word: "Data: 23" "D: 23" "23" +19340463-19342542 ps2: parity-ok: "Parity OK" "Par OK" "P" +19342542-19343573 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +23107933-23110025 ps2: bit: "0" +23110025-23112129 ps2: bit: "0" +23112129-23114233 ps2: bit: "0" +23114233-23116337 ps2: bit: "0" +23116337-23118417 ps2: bit: "0" +23118417-23120507 ps2: bit: "1" +23120507-23122597 ps2: bit: "1" +23122597-23124688 ps2: bit: "1" +23124688-23126766 ps2: bit: "1" +23126766-23128857 ps2: bit: "1" +23128857-23129888 ps2: bit: "1" +23107933-23110025 ps2: start-bit: "Start bit" "Start" "S" +23110025-23126766 ps2: word: "Data: f0" "D: f0" "f0" +23126766-23128857 ps2: parity-ok: "Parity OK" "Par OK" "P" +23128857-23129888 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +23176837-23178905 ps2: bit: "0" +23178905-23180995 ps2: bit: "1" +23180995-23183108 ps2: bit: "1" +23183108-23185188 ps2: bit: "0" +23185188-23187299 ps2: bit: "1" +23187299-23189379 ps2: bit: "0" +23189379-23191491 ps2: bit: "1" +23191491-23193595 ps2: bit: "0" +23193595-23195662 ps2: bit: "0" +23195662-23197752 ps2: bit: "1" +23197752-23198784 ps2: bit: "1" +23176837-23178905 ps2: start-bit: "Start bit" "Start" "S" +23178905-23195662 ps2: word: "Data: 2b" "D: 2b" "2b" +23195662-23197752 ps2: parity-ok: "Parity OK" "Par OK" "P" +23197752-23198784 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +26961003-26963094 ps2: bit: "0" +26963094-26965198 ps2: bit: "0" +26965198-26967277 ps2: bit: "0" +26967277-26969389 ps2: bit: "1" +26969389-26971468 ps2: bit: "0" +26971468-26973558 ps2: bit: "1" +26973558-26975671 ps2: bit: "1" +26975671-26977775 ps2: bit: "0" +26977775-26979828 ps2: bit: "0" +26979828-26981907 ps2: bit: "0" +26981907-26982938 ps2: bit: "1" +26961003-26963094 ps2: start-bit: "Start bit" "Start" "S" +26963094-26979828 ps2: word: "Data: 34" "D: 34" "34" +26979828-26981907 ps2: parity-ok: "Parity OK" "Par OK" "P" +26981907-26982938 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +29865460-29867551 ps2: bit: "0" +29867551-29869655 ps2: bit: "0" +29869655-29871759 ps2: bit: "0" +29871759-29873862 ps2: bit: "0" +29873862-29875942 ps2: bit: "0" +29875942-29878032 ps2: bit: "1" +29878032-29880122 ps2: bit: "1" +29880122-29882212 ps2: bit: "1" +29882212-29884290 ps2: bit: "1" +29884290-29886381 ps2: bit: "1" +29886381-29887412 ps2: bit: "1" +29865460-29867551 ps2: start-bit: "Start bit" "Start" "S" +29867551-29884290 ps2: word: "Data: f0" "D: f0" "f0" +29884290-29886381 ps2: parity-ok: "Parity OK" "Par OK" "P" +29886381-29887412 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +29934360-29936452 ps2: bit: "0" +29936452-29938556 ps2: bit: "0" +29938556-29940636 ps2: bit: "0" +29940636-29942748 ps2: bit: "1" +29942748-29944828 ps2: bit: "0" +29944828-29946918 ps2: bit: "1" +29946918-29949030 ps2: bit: "1" +29949030-29951134 ps2: bit: "0" +29951134-29953188 ps2: bit: "0" +29953188-29955267 ps2: bit: "0" +29955267-29956298 ps2: bit: "1" +29934360-29936452 ps2: start-bit: "Start bit" "Start" "S" +29936452-29953188 ps2: word: "Data: 34" "D: 34" "34" +29953188-29955267 ps2: parity-ok: "Parity OK" "Par OK" "P" +29955267-29956298 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +31964365-31966433 ps2: bit: "0" +31966433-31968523 ps2: bit: "1" +31968523-31970635 ps2: bit: "1" +31970635-31972739 ps2: bit: "0" +31972739-31974818 ps2: bit: "0" +31974818-31976908 ps2: bit: "1" +31976908-31979020 ps2: bit: "1" +31979020-31981124 ps2: bit: "0" +31981124-31983191 ps2: bit: "0" +31983191-31985281 ps2: bit: "1" +31985281-31986312 ps2: bit: "1" +31964365-31966433 ps2: start-bit: "Start bit" "Start" "S" +31966433-31983191 ps2: word: "Data: 33" "D: 33" "33" +31983191-31985281 ps2: parity-ok: "Parity OK" "Par OK" "P" +31985281-31986312 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +34868607-34870699 ps2: bit: "0" +34870699-34872802 ps2: bit: "0" +34872802-34874906 ps2: bit: "0" +34874906-34877009 ps2: bit: "0" +34877009-34879088 ps2: bit: "0" +34879088-34881177 ps2: bit: "1" +34881177-34883267 ps2: bit: "1" +34883267-34885357 ps2: bit: "1" +34885357-34887434 ps2: bit: "1" +34887434-34889524 ps2: bit: "1" +34889524-34890555 ps2: bit: "1" +34868607-34870699 ps2: start-bit: "Start bit" "Start" "S" +34870699-34887434 ps2: word: "Data: f0" "D: f0" "f0" +34887434-34889524 ps2: parity-ok: "Parity OK" "Par OK" "P" +34889524-34890555 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +34937495-34939563 ps2: bit: "0" +34939563-34941653 ps2: bit: "1" +34941653-34943764 ps2: bit: "1" +34943764-34945869 ps2: bit: "0" +34945869-34947948 ps2: bit: "0" +34947948-34950038 ps2: bit: "1" +34950038-34952150 ps2: bit: "1" +34952150-34954254 ps2: bit: "0" +34954254-34956321 ps2: bit: "0" +34956321-34958411 ps2: bit: "1" +34958411-34959442 ps2: bit: "1" +34937495-34939563 ps2: start-bit: "Start bit" "Start" "S" +34939563-34956321 ps2: word: "Data: 33" "D: 33" "33" +34956321-34958411 ps2: parity-ok: "Parity OK" "Par OK" "P" +34958411-34959442 ps2: stop-bit: "Stop bit" "Stop" "St" "T" diff --git a/decoder/test/ps2/test.conf b/decoder/test/ps2/test.conf index 3786324..f1ba907 100644 --- a/decoder/test/ps2/test.conf +++ b/decoder/test/ps2/test.conf @@ -2,3 +2,8 @@ test ps2_keyboard_asdfgh protocol-decoder ps2 channel clk=3 channel data=2 input ps2/keyboard/ps2_keyboard_asdfgh.sr output ps2 annotation match ps2_keyboard_asdfgh.output + +test ps2_keyboard_asdfgh_no_inhibit + protocol-decoder ps2 channel clk=0 channel data=1 + input ps2/keyboard/ps2_keyboard_asdfgh_no_inhibit.sr + output ps2 annotation match ps2_keyboard_asdfgh_no_inhibit.output