sdcard_spi: Updates after annotation class PD fixes.

diff --git a/decoder/test/sdcard_spi/cmd17.output b/decoder/test/sdcard_spi/cmd17.output
index d1539a8acda0e1f931aef7e3f81b9af31bbcc8eb..a69f428768c46f2076cd05fce34d101757d7fa2a 100644 (file)
--- a/decoder/test/sdcard_spi/cmd17.output
+++ b/decoder/test/sdcard_spi/cmd17.output
@@ -1,19 +1,19 @@
-114-135 sdcard_spi: bit-warning: "Start bit: 0"
-135-156 sdcard_spi: bit-warning: "Transmitter bit: 1"
-156-281 sdcard_spi: bit-warning: "Command: CMD17 (READ_SINGLE_BLOCK)"
-307-1050 sdcard_spi: bit-warning: "Argument: 0x000f"
-1074-1220 sdcard_spi: bit-warning: "CRC7: 0x0"
-1220-1240 sdcard_spi: bit-warning: "End bit: 1"
+114-135 sdcard_spi: bit: "Start bit: 0"
+135-156 sdcard_spi: bit: "Transmitter bit: 1"
+156-281 sdcard_spi: bit: "Command: CMD17 (READ_SINGLE_BLOCK)"
+307-1050 sdcard_spi: bit: "Argument: 0x000f"
+1074-1220 sdcard_spi: bit: "CRC7: 0x0"
+1220-1240 sdcard_spi: bit: "End bit: 1"
 114-1240 sdcard_spi: cmd17: "CMD17 (READ_SINGLE_BLOCK): Read a block from address 0x000f"
-1459-1626 sdcard_spi: acmd1: "R1: 0x00"
-1605-1626 sdcard_spi: bit-warning: "Card is not in idle state"
-1584-1605 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1563-1584 sdcard_spi: bit-warning: "No illegal command detected"
-1542-1563 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1521-1542 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1500-1521 sdcard_spi: bit-warning: "No misaligned address used in command"
-1480-1500 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1459-1480 sdcard_spi: bit-warning: "Bit 7 (always 0)"
+1459-1626 sdcard_spi: r1: "R1: 0x00"
+1605-1626 sdcard_spi: bit: "Card is not in idle state"
+1584-1605 sdcard_spi: bit: "Erase sequence not cleared"
+1563-1584 sdcard_spi: bit: "No illegal command detected"
+1542-1563 sdcard_spi: bit: "CRC check of last command was successful"
+1521-1542 sdcard_spi: bit: "No error in the sequence of erase commands"
+1500-1521 sdcard_spi: bit: "No misaligned address used in command"
+1480-1500 sdcard_spi: bit: "Command argument not outside allowed range"
+1459-1480 sdcard_spi: bit: "Bit 7 (always 0)"
 9250-9417 sdcard_spi: cmd17: "Start Block"
 9452-110815 sdcard_spi: cmd17: "Block data: [83, 105, 103, 114, 111, 107, 32, 114, 111, 99, 107, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]"
 110845-111202 sdcard_spi: cmd17: "CRC"

diff --git a/decoder/test/sdcard_spi/data_transfer_complete_real.output b/decoder/test/sdcard_spi/data_transfer_complete_real.output
index 60342ac8aa607760ec6774b0f3ec6bf0200c7c8d..19684477645e0b9505869a0c2defe95483aa6927 100644 (file)
--- a/decoder/test/sdcard_spi/data_transfer_complete_real.output
+++ b/decoder/test/sdcard_spi/data_transfer_complete_real.output
@@ -1,24 +1,24 @@
-313-334 sdcard_spi: bit-warning: "Start bit: 0"
-334-354 sdcard_spi: bit-warning: "Transmitter bit: 1"
-354-480 sdcard_spi: bit-warning: "Command: CMD24 (WRITE_BLOCK)"
-505-1248 sdcard_spi: bit-warning: "Argument: 0x000f"
-1273-1419 sdcard_spi: bit-warning: "CRC7: 0x0"
-1419-1440 sdcard_spi: bit-warning: "End bit: 1"
+313-334 sdcard_spi: bit: "Start bit: 0"
+334-354 sdcard_spi: bit: "Transmitter bit: 1"
+354-480 sdcard_spi: bit: "Command: CMD24 (WRITE_BLOCK)"
+505-1248 sdcard_spi: bit: "Argument: 0x000f"
+1273-1419 sdcard_spi: bit: "CRC7: 0x0"
+1419-1440 sdcard_spi: bit: "End bit: 1"
 313-1440 sdcard_spi: cmd24: "CMD24 (WRITE_BLOCK): Write a block to address 0x000f"
-1657-1824 sdcard_spi: acmd1: "R1: 0x00"
-1803-1824 sdcard_spi: bit-warning: "Card is not in idle state"
-1782-1803 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1761-1782 sdcard_spi: bit-warning: "No illegal command detected"
-1741-1761 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1720-1741 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1699-1720 sdcard_spi: bit-warning: "No misaligned address used in command"
-1678-1699 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1657-1678 sdcard_spi: bit-warning: "Bit 7 (always 0)"
+1657-1824 sdcard_spi: r1: "R1: 0x00"
+1803-1824 sdcard_spi: bit: "Card is not in idle state"
+1782-1803 sdcard_spi: bit: "Erase sequence not cleared"
+1761-1782 sdcard_spi: bit: "No illegal command detected"
+1741-1761 sdcard_spi: bit: "CRC check of last command was successful"
+1720-1741 sdcard_spi: bit: "No error in the sequence of erase commands"
+1699-1720 sdcard_spi: bit: "No misaligned address used in command"
+1678-1699 sdcard_spi: bit: "Command argument not outside allowed range"
+1657-1678 sdcard_spi: bit: "Bit 7 (always 0)"
 1877-2044 sdcard_spi: cmd24: "Start Block"
 2074-102772 sdcard_spi: cmd24: "Block data: [83, 105, 103, 114, 111, 107, 32, 114, 111, 99, 107, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]"
-103187-103250 sdcard_spi: bit-warning: "Don't care"
-103250-103271 sdcard_spi: bit-warning: "Always 0"
-103271-103333 sdcard_spi: bit-warning: "Data accepted"
-103333-103354 sdcard_spi: bit-warning: "Always 1"
+103187-103250 sdcard_spi: bit: "Don't care"
+103250-103271 sdcard_spi: bit: "Always 0"
+103271-103333 sdcard_spi: bit: "Data accepted"
+103333-103354 sdcard_spi: bit: "Always 1"
 103187-103354 sdcard_spi: cmd24: "Data Response"
 103392-4997904 sdcard_spi: cmd24: "Card is busy"

diff --git a/decoder/test/sdcard_spi/data_transfer_complete_simulated.output b/decoder/test/sdcard_spi/data_transfer_complete_simulated.output
index 01cae063caa0fa68420774c1b247bb1b548880d9..639f4aee9128f039cd7b7a451fe7b5dd15cb8105 100644 (file)
--- a/decoder/test/sdcard_spi/data_transfer_complete_simulated.output
+++ b/decoder/test/sdcard_spi/data_transfer_complete_simulated.output
@@ -1,24 +1,24 @@
-186-196 sdcard_spi: bit-warning: "Start bit: 0"
-196-206 sdcard_spi: bit-warning: "Transmitter bit: 1"
-206-266 sdcard_spi: bit-warning: "Command: CMD24 (WRITE_BLOCK)"
-276-626 sdcard_spi: bit-warning: "Argument: 0x0001"
-636-706 sdcard_spi: bit-warning: "CRC7: 0x0"
-706-716 sdcard_spi: bit-warning: "End bit: 1"
+186-196 sdcard_spi: bit: "Start bit: 0"
+196-206 sdcard_spi: bit: "Transmitter bit: 1"
+206-266 sdcard_spi: bit: "Command: CMD24 (WRITE_BLOCK)"
+276-626 sdcard_spi: bit: "Argument: 0x0001"
+636-706 sdcard_spi: bit: "CRC7: 0x0"
+706-716 sdcard_spi: bit: "End bit: 1"
 186-716 sdcard_spi: cmd24: "CMD24 (WRITE_BLOCK): Write a block to address 0x0001"
-816-896 sdcard_spi: acmd1: "R1: 0x00"
-886-896 sdcard_spi: bit-warning: "Card is not in idle state"
-876-886 sdcard_spi: bit-warning: "Erase sequence not cleared"
-866-876 sdcard_spi: bit-warning: "No illegal command detected"
-856-866 sdcard_spi: bit-warning: "CRC check of last command was successful"
-846-856 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-836-846 sdcard_spi: bit-warning: "No misaligned address used in command"
-826-836 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-816-826 sdcard_spi: bit-warning: "Bit 7 (always 0)"
+816-896 sdcard_spi: r1: "R1: 0x00"
+886-896 sdcard_spi: bit: "Card is not in idle state"
+876-886 sdcard_spi: bit: "Erase sequence not cleared"
+866-876 sdcard_spi: bit: "No illegal command detected"
+856-866 sdcard_spi: bit: "CRC check of last command was successful"
+846-856 sdcard_spi: bit: "No error in the sequence of erase commands"
+836-846 sdcard_spi: bit: "No misaligned address used in command"
+826-836 sdcard_spi: bit: "Command argument not outside allowed range"
+816-826 sdcard_spi: bit: "Bit 7 (always 0)"
 996-1076 sdcard_spi: cmd24: "Start Block"
 1086-47156 sdcard_spi: cmd24: "Block data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255]"
-47166-47196 sdcard_spi: bit-warning: "Don't care"
-47196-47206 sdcard_spi: bit-warning: "Always 0"
-47206-47236 sdcard_spi: bit-warning: "Data accepted"
-47236-47246 sdcard_spi: bit-warning: "Always 1"
+47166-47196 sdcard_spi: bit: "Don't care"
+47196-47206 sdcard_spi: bit: "Always 0"
+47206-47236 sdcard_spi: bit: "Data accepted"
+47236-47246 sdcard_spi: bit: "Always 1"
 47166-47246 sdcard_spi: cmd24: "Data Response"
 47256-47606 sdcard_spi: cmd24: "Card is busy"

diff --git a/decoder/test/sdcard_spi/data_transfer_start_snippet.output b/decoder/test/sdcard_spi/data_transfer_start_snippet.output
index 2f56531492cfb7f2fc798a62cf3cb8712d7aeda2..f696c970d2d4dda5b4abacdce69a5aa34d75653c 100644 (file)
--- a/decoder/test/sdcard_spi/data_transfer_start_snippet.output
+++ b/decoder/test/sdcard_spi/data_transfer_start_snippet.output
@@ -1,17 +1,17 @@
-312-333 sdcard_spi: bit-warning: "Start bit: 0"
-333-353 sdcard_spi: bit-warning: "Transmitter bit: 1"
-353-479 sdcard_spi: bit-warning: "Command: CMD24 (WRITE_BLOCK)"
-502-1240 sdcard_spi: bit-warning: "Argument: 0x0001"
-1263-1409 sdcard_spi: bit-warning: "CRC7: 0x0"
-1409-1430 sdcard_spi: bit-warning: "End bit: 1"
+312-333 sdcard_spi: bit: "Start bit: 0"
+333-353 sdcard_spi: bit: "Transmitter bit: 1"
+353-479 sdcard_spi: bit: "Command: CMD24 (WRITE_BLOCK)"
+502-1240 sdcard_spi: bit: "Argument: 0x0001"
+1263-1409 sdcard_spi: bit: "CRC7: 0x0"
+1409-1430 sdcard_spi: bit: "End bit: 1"
 312-1430 sdcard_spi: cmd24: "CMD24 (WRITE_BLOCK): Write a block to address 0x0001"
-14900-15067 sdcard_spi: acmd1: "R1: 0x00"
-15046-15067 sdcard_spi: bit-warning: "Card is not in idle state"
-15025-15046 sdcard_spi: bit-warning: "Erase sequence not cleared"
-15004-15025 sdcard_spi: bit-warning: "No illegal command detected"
-14983-15004 sdcard_spi: bit-warning: "CRC check of last command was successful"
-14963-14983 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-14942-14963 sdcard_spi: bit-warning: "No misaligned address used in command"
-14921-14942 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-14900-14921 sdcard_spi: bit-warning: "Bit 7 (always 0)"
+14900-15067 sdcard_spi: r1: "R1: 0x00"
+15046-15067 sdcard_spi: bit: "Card is not in idle state"
+15025-15046 sdcard_spi: bit: "Erase sequence not cleared"
+15004-15025 sdcard_spi: bit: "No illegal command detected"
+14983-15004 sdcard_spi: bit: "CRC check of last command was successful"
+14963-14983 sdcard_spi: bit: "No error in the sequence of erase commands"
+14942-14963 sdcard_spi: bit: "No misaligned address used in command"
+14921-14942 sdcard_spi: bit: "Command argument not outside allowed range"
+14900-14921 sdcard_spi: bit: "Bit 7 (always 0)"
 44090-44255 sdcard_spi: cmd24: "Start Block"

diff --git a/decoder/test/sdcard_spi/xmore_512mb_get_csd.output b/decoder/test/sdcard_spi/xmore_512mb_get_csd.output
index c870ec29a4144522fac9dc1ddc9c2e9c6e9037e5..2553cf49e3411d5cbb1c596006fdaaef307d309c 100644 (file)
--- a/decoder/test/sdcard_spi/xmore_512mb_get_csd.output
+++ b/decoder/test/sdcard_spi/xmore_512mb_get_csd.output
@@ -1,106 +1,106 @@
-1038730-1038734 sdcard_spi: bit-warning: "Start bit: 0"
-1038734-1038738 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1038738-1038762 sdcard_spi: bit-warning: "Command: CMD0 (GO_IDLE_STATE)"
-1038762-1038890 sdcard_spi: bit-warning: "Argument: 0x0000"
-1038890-1038918 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1038918-1038922 sdcard_spi: bit-warning: "End bit: 1"
+1038730-1038734 sdcard_spi: bit: "Start bit: 0"
+1038734-1038738 sdcard_spi: bit: "Transmitter bit: 1"
+1038738-1038762 sdcard_spi: bit: "Command: CMD0 (GO_IDLE_STATE)"
+1038762-1038890 sdcard_spi: bit: "Argument: 0x0000"
+1038890-1038918 sdcard_spi: bit: "CRC7: 0x4a"
+1038918-1038922 sdcard_spi: bit: "End bit: 1"
 1038730-1038922 sdcard_spi: cmd0: "CMD0 (GO_IDLE_STATE): Reset the SD card"
-1039003-1039035 sdcard_spi: acmd1: "R1: 0x01"
-1039031-1039035 sdcard_spi: bit-warning: "Card is in idle state"
-1039027-1039031 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1039023-1039027 sdcard_spi: bit-warning: "No illegal command detected"
-1039019-1039023 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1039015-1039019 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1039011-1039015 sdcard_spi: bit-warning: "No misaligned address used in command"
-1039007-1039011 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1039003-1039007 sdcard_spi: bit-warning: "Bit 7 (always 0)"
-1039223-1039227 sdcard_spi: bit-warning: "Start bit: 0"
-1039227-1039231 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1039231-1039255 sdcard_spi: bit-warning: "Command: CMD55 (APP_CMD)"
-1039255-1039383 sdcard_spi: bit-warning: "Argument: 0x0000"
-1039383-1039411 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1039411-1039415 sdcard_spi: bit-warning: "End bit: 1"
+1039003-1039035 sdcard_spi: r1: "R1: 0x01"
+1039031-1039035 sdcard_spi: bit: "Card is in idle state"
+1039027-1039031 sdcard_spi: bit: "Erase sequence not cleared"
+1039023-1039027 sdcard_spi: bit: "No illegal command detected"
+1039019-1039023 sdcard_spi: bit: "CRC check of last command was successful"
+1039015-1039019 sdcard_spi: bit: "No error in the sequence of erase commands"
+1039011-1039015 sdcard_spi: bit: "No misaligned address used in command"
+1039007-1039011 sdcard_spi: bit: "Command argument not outside allowed range"
+1039003-1039007 sdcard_spi: bit: "Bit 7 (always 0)"
+1039223-1039227 sdcard_spi: bit: "Start bit: 0"
+1039227-1039231 sdcard_spi: bit: "Transmitter bit: 1"
+1039231-1039255 sdcard_spi: bit: "Command: CMD55 (APP_CMD)"
+1039255-1039383 sdcard_spi: bit: "Argument: 0x0000"
+1039383-1039411 sdcard_spi: bit: "CRC7: 0x4a"
+1039411-1039415 sdcard_spi: bit: "End bit: 1"
 1039223-1039415 sdcard_spi: cmd55: "CMD55 (APP_CMD): Next command is an application-specific command"
-1039497-1039529 sdcard_spi: acmd1: "R1: 0x01"
-1039525-1039529 sdcard_spi: bit-warning: "Card is in idle state"
-1039521-1039525 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1039517-1039521 sdcard_spi: bit-warning: "No illegal command detected"
-1039513-1039517 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1039509-1039513 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1039505-1039509 sdcard_spi: bit-warning: "No misaligned address used in command"
-1039501-1039505 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1039497-1039501 sdcard_spi: bit-warning: "Bit 7 (always 0)"
-1039709-1039713 sdcard_spi: bit-warning: "Start bit: 0"
-1039713-1039717 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1039717-1039741 sdcard_spi: bit-warning: "Command: ACMD41 (SD_SEND_OP_COND)"
-1039741-1039869 sdcard_spi: bit-warning: "Argument: 0x0000"
-1039869-1039897 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1039897-1039901 sdcard_spi: bit-warning: "End bit: 1"
+1039497-1039529 sdcard_spi: r1: "R1: 0x01"
+1039525-1039529 sdcard_spi: bit: "Card is in idle state"
+1039521-1039525 sdcard_spi: bit: "Erase sequence not cleared"
+1039517-1039521 sdcard_spi: bit: "No illegal command detected"
+1039513-1039517 sdcard_spi: bit: "CRC check of last command was successful"
+1039509-1039513 sdcard_spi: bit: "No error in the sequence of erase commands"
+1039505-1039509 sdcard_spi: bit: "No misaligned address used in command"
+1039501-1039505 sdcard_spi: bit: "Command argument not outside allowed range"
+1039497-1039501 sdcard_spi: bit: "Bit 7 (always 0)"
+1039709-1039713 sdcard_spi: bit: "Start bit: 0"
+1039713-1039717 sdcard_spi: bit: "Transmitter bit: 1"
+1039717-1039741 sdcard_spi: bit: "Command: ACMD41 (SD_SEND_OP_COND)"
+1039741-1039869 sdcard_spi: bit: "Argument: 0x0000"
+1039869-1039897 sdcard_spi: bit: "CRC7: 0x4a"
+1039897-1039901 sdcard_spi: bit: "End bit: 1"
 1039709-1039901 sdcard_spi: acmd41: "ACMD41 (SD_SEND_OP_COND): Send HCS info and activate the card init process"
-1039983-1040015 sdcard_spi: acmd1: "R1: 0x01"
-1040011-1040015 sdcard_spi: bit-warning: "Card is in idle state"
-1040007-1040011 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1040003-1040007 sdcard_spi: bit-warning: "No illegal command detected"
-1039999-1040003 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1039995-1039999 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1039991-1039995 sdcard_spi: bit-warning: "No misaligned address used in command"
-1039987-1039991 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1039983-1039987 sdcard_spi: bit-warning: "Bit 7 (always 0)"
-1040202-1040206 sdcard_spi: bit-warning: "Start bit: 0"
-1040206-1040210 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1040210-1040234 sdcard_spi: bit-warning: "Command: CMD1 (SEND_OP_COND)"
-1040234-1040362 sdcard_spi: bit-warning: "Argument: 0x0000"
-1040362-1040390 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1040390-1040394 sdcard_spi: bit-warning: "End bit: 1"
+1039983-1040015 sdcard_spi: r1: "R1: 0x01"
+1040011-1040015 sdcard_spi: bit: "Card is in idle state"
+1040007-1040011 sdcard_spi: bit: "Erase sequence not cleared"
+1040003-1040007 sdcard_spi: bit: "No illegal command detected"
+1039999-1040003 sdcard_spi: bit: "CRC check of last command was successful"
+1039995-1039999 sdcard_spi: bit: "No error in the sequence of erase commands"
+1039991-1039995 sdcard_spi: bit: "No misaligned address used in command"
+1039987-1039991 sdcard_spi: bit: "Command argument not outside allowed range"
+1039983-1039987 sdcard_spi: bit: "Bit 7 (always 0)"
+1040202-1040206 sdcard_spi: bit: "Start bit: 0"
+1040206-1040210 sdcard_spi: bit: "Transmitter bit: 1"
+1040210-1040234 sdcard_spi: bit: "Command: CMD1 (SEND_OP_COND)"
+1040234-1040362 sdcard_spi: bit: "Argument: 0x0000"
+1040362-1040390 sdcard_spi: bit: "CRC7: 0x4a"
+1040390-1040394 sdcard_spi: bit: "End bit: 1"
 1040202-1040394 sdcard_spi: cmd1: "CMD1 (SEND_OP_COND): Send HCS info and activate the card init process"
-1040238-1040242 sdcard_spi: bit-warning: "HCS: 0"
-1040475-1040507 sdcard_spi: acmd1: "R1: 0x00"
-1040503-1040507 sdcard_spi: bit-warning: "Card is not in idle state"
-1040499-1040503 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1040495-1040499 sdcard_spi: bit-warning: "No illegal command detected"
-1040491-1040495 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1040487-1040491 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1040483-1040487 sdcard_spi: bit-warning: "No misaligned address used in command"
-1040479-1040483 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1040475-1040479 sdcard_spi: bit-warning: "Bit 7 (always 0)"
-1040695-1040699 sdcard_spi: bit-warning: "Start bit: 0"
-1040699-1040703 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1040703-1040727 sdcard_spi: bit-warning: "Command: CMD59 (CRC_ON_OFF)"
-1040727-1040855 sdcard_spi: bit-warning: "Argument: 0x0000"
-1040855-1040883 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1040883-1040887 sdcard_spi: bit-warning: "End bit: 1"
+1040238-1040242 sdcard_spi: bit: "HCS: 0"
+1040475-1040507 sdcard_spi: r1: "R1: 0x00"
+1040503-1040507 sdcard_spi: bit: "Card is not in idle state"
+1040499-1040503 sdcard_spi: bit: "Erase sequence not cleared"
+1040495-1040499 sdcard_spi: bit: "No illegal command detected"
+1040491-1040495 sdcard_spi: bit: "CRC check of last command was successful"
+1040487-1040491 sdcard_spi: bit: "No error in the sequence of erase commands"
+1040483-1040487 sdcard_spi: bit: "No misaligned address used in command"
+1040479-1040483 sdcard_spi: bit: "Command argument not outside allowed range"
+1040475-1040479 sdcard_spi: bit: "Bit 7 (always 0)"
+1040695-1040699 sdcard_spi: bit: "Start bit: 0"
+1040699-1040703 sdcard_spi: bit: "Transmitter bit: 1"
+1040703-1040727 sdcard_spi: bit: "Command: CMD59 (CRC_ON_OFF)"
+1040727-1040855 sdcard_spi: bit: "Argument: 0x0000"
+1040855-1040883 sdcard_spi: bit: "CRC7: 0x4a"
+1040883-1040887 sdcard_spi: bit: "End bit: 1"
 1040695-1040887 sdcard_spi: cmd59: "CMD59 (CRC_ON_OFF): Turn the SD card CRC option off"
-1040969-1041001 sdcard_spi: acmd1: "R1: 0x00"
-1040997-1041001 sdcard_spi: bit-warning: "Card is not in idle state"
-1040993-1040997 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1040989-1040993 sdcard_spi: bit-warning: "No illegal command detected"
-1040985-1040989 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1040981-1040985 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1040977-1040981 sdcard_spi: bit-warning: "No misaligned address used in command"
-1040973-1040977 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1040969-1040973 sdcard_spi: bit-warning: "Bit 7 (always 0)"
-1041182-1041186 sdcard_spi: bit-warning: "Start bit: 0"
-1041186-1041190 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1041190-1041214 sdcard_spi: bit-warning: "Command: CMD16 (SET_BLOCKLEN)"
-1041214-1041342 sdcard_spi: bit-warning: "Argument: 0x0200"
-1041342-1041370 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1041370-1041374 sdcard_spi: bit-warning: "End bit: 1"
+1040969-1041001 sdcard_spi: r1: "R1: 0x00"
+1040997-1041001 sdcard_spi: bit: "Card is not in idle state"
+1040993-1040997 sdcard_spi: bit: "Erase sequence not cleared"
+1040989-1040993 sdcard_spi: bit: "No illegal command detected"
+1040985-1040989 sdcard_spi: bit: "CRC check of last command was successful"
+1040981-1040985 sdcard_spi: bit: "No error in the sequence of erase commands"
+1040977-1040981 sdcard_spi: bit: "No misaligned address used in command"
+1040973-1040977 sdcard_spi: bit: "Command argument not outside allowed range"
+1040969-1040973 sdcard_spi: bit: "Bit 7 (always 0)"
+1041182-1041186 sdcard_spi: bit: "Start bit: 0"
+1041186-1041190 sdcard_spi: bit: "Transmitter bit: 1"
+1041190-1041214 sdcard_spi: bit: "Command: CMD16 (SET_BLOCKLEN)"
+1041214-1041342 sdcard_spi: bit: "Argument: 0x0200"
+1041342-1041370 sdcard_spi: bit: "CRC7: 0x4a"
+1041370-1041374 sdcard_spi: bit: "End bit: 1"
 1041182-1041374 sdcard_spi: cmd16: "CMD16 (SET_BLOCKLEN): Set the block length to 512 bytes"
-1041455-1041487 sdcard_spi: acmd1: "R1: 0x00"
-1041483-1041487 sdcard_spi: bit-warning: "Card is not in idle state"
-1041479-1041483 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1041475-1041479 sdcard_spi: bit-warning: "No illegal command detected"
-1041471-1041475 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1041467-1041471 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1041463-1041467 sdcard_spi: bit-warning: "No misaligned address used in command"
-1041459-1041463 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1041455-1041459 sdcard_spi: bit-warning: "Bit 7 (always 0)"
-1041822-1041826 sdcard_spi: bit-warning: "Start bit: 0"
-1041826-1041830 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1041830-1041854 sdcard_spi: bit-warning: "Command: CMD9 (SEND_CSD)"
-1041854-1041982 sdcard_spi: bit-warning: "Argument: 0x0000"
-1041982-1042010 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1042010-1042014 sdcard_spi: bit-warning: "End bit: 1"
+1041455-1041487 sdcard_spi: r1: "R1: 0x00"
+1041483-1041487 sdcard_spi: bit: "Card is not in idle state"
+1041479-1041483 sdcard_spi: bit: "Erase sequence not cleared"
+1041475-1041479 sdcard_spi: bit: "No illegal command detected"
+1041471-1041475 sdcard_spi: bit: "CRC check of last command was successful"
+1041467-1041471 sdcard_spi: bit: "No error in the sequence of erase commands"
+1041463-1041467 sdcard_spi: bit: "No misaligned address used in command"
+1041459-1041463 sdcard_spi: bit: "Command argument not outside allowed range"
+1041455-1041459 sdcard_spi: bit: "Bit 7 (always 0)"
+1041822-1041826 sdcard_spi: bit: "Start bit: 0"
+1041826-1041830 sdcard_spi: bit: "Transmitter bit: 1"
+1041830-1041854 sdcard_spi: bit: "Command: CMD9 (SEND_CSD)"
+1041854-1041982 sdcard_spi: bit: "Argument: 0x0000"
+1041982-1042010 sdcard_spi: bit: "CRC7: 0x4a"
+1042010-1042014 sdcard_spi: bit: "End bit: 1"
 1041822-1042014 sdcard_spi: cmd9: "CMD9 (SEND_CSD): Ask card to send its card specific data (CSD)"
 1042014-1042014 sdcard_spi: cmd9: "CMD9 (SEND_CSD): Ask card to send its card specific data (CSD)"
 1042014-1042014 sdcard_spi: cmd9: "CMD9 (SEND_CSD): Ask card to send its card specific data (CSD)"
@@ -122,28 +122,28 @@
 1042014-1042014 sdcard_spi: cmd9: "CMD9 (SEND_CSD): Ask card to send its card specific data (CSD)"
 1042014-1042014 sdcard_spi: cmd9: "CMD9 (SEND_CSD): Ask card to send its card specific data (CSD)"
 1042014-1043468 sdcard_spi: cmd9: "CSD: [0, 94, 0, 50, 95, 89, 131, 210, 237, 183, 127, 143, 150, 64, 0, 247]"
-1043795-1043799 sdcard_spi: bit-warning: "Start bit: 0"
-1043799-1043803 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1043803-1043827 sdcard_spi: bit-warning: "Command: CMD59 (CRC_ON_OFF)"
-1043827-1043955 sdcard_spi: bit-warning: "Argument: 0x0000"
-1043955-1043983 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1043983-1043987 sdcard_spi: bit-warning: "End bit: 1"
+1043795-1043799 sdcard_spi: bit: "Start bit: 0"
+1043799-1043803 sdcard_spi: bit: "Transmitter bit: 1"
+1043803-1043827 sdcard_spi: bit: "Command: CMD59 (CRC_ON_OFF)"
+1043827-1043955 sdcard_spi: bit: "Argument: 0x0000"
+1043955-1043983 sdcard_spi: bit: "CRC7: 0x4a"
+1043983-1043987 sdcard_spi: bit: "End bit: 1"
 1043795-1043987 sdcard_spi: cmd59: "CMD59 (CRC_ON_OFF): Turn the SD card CRC option off"
-1044069-1044101 sdcard_spi: acmd1: "R1: 0x00"
-1044097-1044101 sdcard_spi: bit-warning: "Card is not in idle state"
-1044093-1044097 sdcard_spi: bit-warning: "Erase sequence not cleared"
-1044089-1044093 sdcard_spi: bit-warning: "No illegal command detected"
-1044085-1044089 sdcard_spi: bit-warning: "CRC check of last command was successful"
-1044081-1044085 sdcard_spi: bit-warning: "No error in the sequence of erase commands"
-1044077-1044081 sdcard_spi: bit-warning: "No misaligned address used in command"
-1044073-1044077 sdcard_spi: bit-warning: "Command argument not outside allowed range"
-1044069-1044073 sdcard_spi: bit-warning: "Bit 7 (always 0)"
-1054355-1054359 sdcard_spi: bit-warning: "Start bit: 0"
-1054359-1054363 sdcard_spi: bit-warning: "Transmitter bit: 1"
-1054363-1054387 sdcard_spi: bit-warning: "Command: CMD9 (SEND_CSD)"
-1054387-1054515 sdcard_spi: bit-warning: "Argument: 0x0000"
-1054515-1054543 sdcard_spi: bit-warning: "CRC7: 0x4a"
-1054543-1054547 sdcard_spi: bit-warning: "End bit: 1"
+1044069-1044101 sdcard_spi: r1: "R1: 0x00"
+1044097-1044101 sdcard_spi: bit: "Card is not in idle state"
+1044093-1044097 sdcard_spi: bit: "Erase sequence not cleared"
+1044089-1044093 sdcard_spi: bit: "No illegal command detected"
+1044085-1044089 sdcard_spi: bit: "CRC check of last command was successful"
+1044081-1044085 sdcard_spi: bit: "No error in the sequence of erase commands"
+1044077-1044081 sdcard_spi: bit: "No misaligned address used in command"
+1044073-1044077 sdcard_spi: bit: "Command argument not outside allowed range"
+1044069-1044073 sdcard_spi: bit: "Bit 7 (always 0)"
+1054355-1054359 sdcard_spi: bit: "Start bit: 0"
+1054359-1054363 sdcard_spi: bit: "Transmitter bit: 1"
+1054363-1054387 sdcard_spi: bit: "Command: CMD9 (SEND_CSD)"
+1054387-1054515 sdcard_spi: bit: "Argument: 0x0000"
+1054515-1054543 sdcard_spi: bit: "CRC7: 0x4a"
+1054543-1054547 sdcard_spi: bit: "End bit: 1"
 1054355-1054547 sdcard_spi: cmd9: "CMD9 (SEND_CSD): Ask card to send its card specific data (CSD)"
 1054547-1054547 sdcard_spi: cmd9: "CMD9 (SEND_CSD): Ask card to send its card specific data (CSD)"
 1054547-1054547 sdcard_spi: cmd9: "CMD9 (SEND_CSD): Ask card to send its card specific data (CSD)"