From 12ae903fee6b3fb40832fceb854ef005e95d0473 Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Sun, 22 Dec 2019 11:32:28 +0100 Subject: [PATCH] ps2: adjust to recent implementation, stop ends at rising clock edge Catch up with a recent change in the PS/2 decoder implementation. End the STOP bit at the rising CLOCK edge already, don't expect a clock inhibit phase after a data byte got transmitted. --- decoder/test/ps2/ps2_keyboard_asdfgh.output | 72 ++++++++++----------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/decoder/test/ps2/ps2_keyboard_asdfgh.output b/decoder/test/ps2/ps2_keyboard_asdfgh.output index febd71f..f332c67 100644 --- a/decoder/test/ps2/ps2_keyboard_asdfgh.output +++ b/decoder/test/ps2/ps2_keyboard_asdfgh.output @@ -8,11 +8,11 @@ 3577457-3579440 ps2: bit: "0" 3579440-3581424 ps2: bit: "0" 3581424-3583194 ps2: bit: "0" -3583194-3584416 ps2: bit: "1" +3583194-3584398 ps2: bit: "1" 3563575-3565558 ps2: start-bit: "Start bit" "Start" "S" 3565558-3581424 ps2: word: "Data: 1c" "D: 1c" "1c" 3581424-3583194 ps2: parity-ok: "Parity OK" "Par OK" "P" -3583194-3584416 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +3583194-3584398 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 7334063-7336046 ps2: bit: "0" 7336046-7338030 ps2: bit: "0" 7338030-7340013 ps2: bit: "0" @@ -23,11 +23,11 @@ 7347946-7349929 ps2: bit: "1" 7349929-7351912 ps2: bit: "1" 7351912-7353682 ps2: bit: "1" -7353682-7354902 ps2: bit: "1" +7353682-7354886 ps2: bit: "1" 7334063-7336046 ps2: start-bit: "Start bit" "Start" "S" 7336046-7351912 ps2: word: "Data: f0" "D: f0" "f0" 7351912-7353682 ps2: parity-ok: "Parity OK" "Par OK" "P" -7353682-7354902 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +7353682-7354886 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 7386681-7388664 ps2: bit: "0" 7388664-7390648 ps2: bit: "0" 7390648-7392631 ps2: bit: "0" @@ -38,11 +38,11 @@ 7400563-7402547 ps2: bit: "0" 7402547-7404530 ps2: bit: "0" 7404530-7406301 ps2: bit: "0" -7406301-7407520 ps2: bit: "1" +7406301-7407504 ps2: bit: "1" 7386681-7388664 ps2: start-bit: "Start bit" "Start" "S" 7388664-7404530 ps2: word: "Data: 1c" "D: 1c" "1c" 7404530-7406301 ps2: parity-ok: "Parity OK" "Par OK" "P" -7406301-7407520 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +7406301-7407504 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 11163115-11165099 ps2: bit: "0" 11165099-11167081 ps2: bit: "1" 11167081-11169065 ps2: bit: "1" @@ -53,11 +53,11 @@ 11176997-11178981 ps2: bit: "0" 11178981-11180964 ps2: bit: "0" 11180964-11182735 ps2: bit: "1" -11182735-11183955 ps2: bit: "1" +11182735-11183938 ps2: bit: "1" 11163115-11165099 ps2: start-bit: "Start bit" "Start" "S" 11165099-11180964 ps2: word: "Data: 1b" "D: 1b" "1b" 11180964-11182735 ps2: parity-ok: "Parity OK" "Par OK" "P" -11182735-11183955 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +11182735-11183938 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 14933986-14935969 ps2: bit: "0" 14935969-14937953 ps2: bit: "0" 14937953-14939936 ps2: bit: "0" @@ -68,11 +68,11 @@ 14947869-14949852 ps2: bit: "1" 14949852-14951835 ps2: bit: "1" 14951835-14953606 ps2: bit: "1" -14953606-14954827 ps2: bit: "1" +14953606-14954809 ps2: bit: "1" 14933986-14935969 ps2: start-bit: "Start bit" "Start" "S" 14935969-14951835 ps2: word: "Data: f0" "D: f0" "f0" 14951835-14953606 ps2: parity-ok: "Parity OK" "Par OK" "P" -14953606-14954827 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +14953606-14954809 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 14986463-14988446 ps2: bit: "0" 14988446-14990429 ps2: bit: "1" 14990429-14992412 ps2: bit: "1" @@ -83,11 +83,11 @@ 15000344-15002327 ps2: bit: "0" 15002327-15004311 ps2: bit: "0" 15004311-15006081 ps2: bit: "1" -15006081-15007301 ps2: bit: "1" +15006081-15007284 ps2: bit: "1" 14986463-14988446 ps2: start-bit: "Start bit" "Start" "S" 14988446-15004311 ps2: word: "Data: 1b" "D: 1b" "1b" 15004311-15006081 ps2: parity-ok: "Parity OK" "Par OK" "P" -15006081-15007301 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +15006081-15007284 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 18763422-18765406 ps2: bit: "0" 18765406-18767389 ps2: bit: "1" 18767389-18769372 ps2: bit: "1" @@ -98,11 +98,11 @@ 18777306-18779290 ps2: bit: "0" 18779290-18781273 ps2: bit: "0" 18781273-18783044 ps2: bit: "0" -18783044-18784266 ps2: bit: "1" +18783044-18784248 ps2: bit: "1" 18763422-18765406 ps2: start-bit: "Start bit" "Start" "S" 18765406-18781273 ps2: word: "Data: 23" "D: 23" "23" 18781273-18783044 ps2: parity-ok: "Parity OK" "Par OK" "P" -18783044-18784266 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +18783044-18784248 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 23479215-23481198 ps2: bit: "0" 23481198-23483181 ps2: bit: "0" 23483181-23485165 ps2: bit: "0" @@ -113,11 +113,11 @@ 23493098-23495080 ps2: bit: "1" 23495080-23497063 ps2: bit: "1" 23497063-23498834 ps2: bit: "1" -23498834-23500054 ps2: bit: "1" +23498834-23500037 ps2: bit: "1" 23479215-23481198 ps2: start-bit: "Start bit" "Start" "S" 23481198-23497063 ps2: word: "Data: f0" "D: f0" "f0" 23497063-23498834 ps2: parity-ok: "Parity OK" "Par OK" "P" -23498834-23500054 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +23498834-23500037 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 23531832-23533815 ps2: bit: "0" 23533815-23535798 ps2: bit: "1" 23535798-23537781 ps2: bit: "1" @@ -128,11 +128,11 @@ 23545714-23547698 ps2: bit: "0" 23547698-23549681 ps2: bit: "0" 23549681-23551452 ps2: bit: "0" -23551452-23552672 ps2: bit: "1" +23551452-23552655 ps2: bit: "1" 23531832-23533815 ps2: start-bit: "Start bit" "Start" "S" 23533815-23549681 ps2: word: "Data: 23" "D: 23" "23" 23549681-23551452 ps2: parity-ok: "Parity OK" "Par OK" "P" -23551452-23552672 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +23551452-23552655 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 27309030-27311013 ps2: bit: "0" 27311013-27312996 ps2: bit: "1" 27312996-27314979 ps2: bit: "1" @@ -143,11 +143,11 @@ 27322911-27324895 ps2: bit: "0" 27324895-27326878 ps2: bit: "0" 27326878-27328648 ps2: bit: "1" -27328648-27329868 ps2: bit: "1" +27328648-27329852 ps2: bit: "1" 27309030-27311013 ps2: start-bit: "Start bit" "Start" "S" 27311013-27326878 ps2: word: "Data: 2b" "D: 2b" "2b" 27326878-27328648 ps2: parity-ok: "Parity OK" "Par OK" "P" -27328648-27329868 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +27328648-27329852 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 32025095-32027079 ps2: bit: "0" 32027079-32029062 ps2: bit: "0" 32029062-32031046 ps2: bit: "0" @@ -158,11 +158,11 @@ 32038978-32040961 ps2: bit: "1" 32040961-32042944 ps2: bit: "1" 32042944-32044715 ps2: bit: "1" -32044715-32045935 ps2: bit: "1" +32044715-32045918 ps2: bit: "1" 32025095-32027079 ps2: start-bit: "Start bit" "Start" "S" 32027079-32042944 ps2: word: "Data: f0" "D: f0" "f0" 32042944-32044715 ps2: parity-ok: "Parity OK" "Par OK" "P" -32044715-32045935 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +32044715-32045918 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 32077572-32079555 ps2: bit: "0" 32079555-32081538 ps2: bit: "1" 32081538-32083521 ps2: bit: "1" @@ -173,11 +173,11 @@ 32091453-32093436 ps2: bit: "0" 32093436-32095419 ps2: bit: "0" 32095419-32097190 ps2: bit: "1" -32097190-32098412 ps2: bit: "1" +32097190-32098393 ps2: bit: "1" 32077572-32079555 ps2: start-bit: "Start bit" "Start" "S" 32079555-32095419 ps2: word: "Data: 2b" "D: 2b" "2b" 32095419-32097190 ps2: parity-ok: "Parity OK" "Par OK" "P" -32097190-32098412 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +32097190-32098393 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 38637581-38639565 ps2: bit: "0" 38639565-38641548 ps2: bit: "0" 38641548-38643531 ps2: bit: "0" @@ -188,11 +188,11 @@ 38651464-38653447 ps2: bit: "0" 38653447-38655431 ps2: bit: "0" 38655431-38657201 ps2: bit: "0" -38657201-38658423 ps2: bit: "1" +38657201-38658405 ps2: bit: "1" 38637581-38639565 ps2: start-bit: "Start bit" "Start" "S" 38639565-38655431 ps2: word: "Data: 34" "D: 34" "34" 38655431-38657201 ps2: parity-ok: "Parity OK" "Par OK" "P" -38657201-38658423 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +38657201-38658405 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 43353809-43355792 ps2: bit: "0" 43355792-43357776 ps2: bit: "0" 43357776-43359759 ps2: bit: "0" @@ -203,11 +203,11 @@ 43367692-43369675 ps2: bit: "1" 43369675-43371658 ps2: bit: "1" 43371658-43373429 ps2: bit: "1" -43373429-43374650 ps2: bit: "1" +43373429-43374632 ps2: bit: "1" 43353809-43355792 ps2: start-bit: "Start bit" "Start" "S" 43355792-43371658 ps2: word: "Data: f0" "D: f0" "f0" 43371658-43373429 ps2: parity-ok: "Parity OK" "Par OK" "P" -43373429-43374650 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +43373429-43374632 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 43406356-43408340 ps2: bit: "0" 43408340-43410323 ps2: bit: "0" 43410323-43412306 ps2: bit: "0" @@ -218,11 +218,11 @@ 43420239-43422223 ps2: bit: "0" 43422223-43424206 ps2: bit: "0" 43424206-43425977 ps2: bit: "0" -43425977-43427198 ps2: bit: "1" +43425977-43427180 ps2: bit: "1" 43406356-43408340 ps2: start-bit: "Start bit" "Start" "S" 43408340-43424206 ps2: word: "Data: 34" "D: 34" "34" 43424206-43425977 ps2: parity-ok: "Parity OK" "Par OK" "P" -43425977-43427198 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +43425977-43427180 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 49074046-49076029 ps2: bit: "0" 49076029-49078012 ps2: bit: "1" 49078012-49079995 ps2: bit: "1" @@ -233,11 +233,11 @@ 49087929-49089912 ps2: bit: "0" 49089912-49091895 ps2: bit: "0" 49091895-49093666 ps2: bit: "1" -49093666-49094887 ps2: bit: "1" +49093666-49094869 ps2: bit: "1" 49074046-49076029 ps2: start-bit: "Start bit" "Start" "S" 49076029-49091895 ps2: word: "Data: 33" "D: 33" "33" 49091895-49093666 ps2: parity-ok: "Parity OK" "Par OK" "P" -49093666-49094887 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +49093666-49094869 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 53790600-53792583 ps2: bit: "0" 53792583-53794567 ps2: bit: "0" 53794567-53796550 ps2: bit: "0" @@ -248,11 +248,11 @@ 53804483-53806467 ps2: bit: "1" 53806467-53808450 ps2: bit: "1" 53808450-53810220 ps2: bit: "1" -53810220-53811443 ps2: bit: "1" +53810220-53811424 ps2: bit: "1" 53790600-53792583 ps2: start-bit: "Start bit" "Start" "S" 53792583-53808450 ps2: word: "Data: f0" "D: f0" "f0" 53808450-53810220 ps2: parity-ok: "Parity OK" "Par OK" "P" -53810220-53811443 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +53810220-53811424 ps2: stop-bit: "Stop bit" "Stop" "St" "T" 53843151-53845134 ps2: bit: "0" 53845134-53847118 ps2: bit: "1" 53847118-53849101 ps2: bit: "1" @@ -263,8 +263,8 @@ 53857034-53859018 ps2: bit: "0" 53859018-53861001 ps2: bit: "0" 53861001-53862772 ps2: bit: "1" -53862772-53863994 ps2: bit: "1" +53862772-53863975 ps2: bit: "1" 53843151-53845134 ps2: start-bit: "Start bit" "Start" "S" 53845134-53861001 ps2: word: "Data: 33" "D: 33" "33" 53861001-53862772 ps2: parity-ok: "Parity OK" "Par OK" "P" -53862772-53863994 ps2: stop-bit: "Stop bit" "Stop" "St" "T" +53862772-53863975 ps2: stop-bit: "Stop bit" "Stop" "St" "T" -- 2.30.2