From 6bd53eeb32b1aea9b56d20b6ccc77e33f182f9b6 Mon Sep 17 00:00:00 2001 From: Przemyslaw Romaniak Date: Fri, 15 Sep 2023 11:46:29 +0200 Subject: Fixed catalog functions to correctly support 64bit arguments. Minor SBD test fixes. Signed-off-by: Przemyslaw Romaniak --- library/include/mipi_syst.h.in | 9 +- library/include/mipi_syst/api.h | 5 +- library/include/mipi_syst/inline.h | 42 ++-- library/include/mipi_syst/message.h | 2 +- library/src/mipi_syst_api.c | 22 +- library/test/unit/mipi_syst_catid32_test.cpp | 299 +++++++++++++++++++++--- library/test/unit/mipi_syst_catid64_test.cpp | 325 +++++++++++++++++++++++---- library/test/unit/mipi_syst_sbd_test.cpp | 20 +- 8 files changed, 597 insertions(+), 127 deletions(-) diff --git a/library/include/mipi_syst.h.in b/library/include/mipi_syst.h.in index 23b96ac..54a6839 100644 --- a/library/include/mipi_syst.h.in +++ b/library/include/mipi_syst.h.in @@ -466,6 +466,13 @@ typedef void (*mipi_syst_msg_write_t)( #if defined(_WIN64) || defined(__x86_64__) || defined (__LP64__) #define MIPI_SYST_PCFG_ENABLE_64BIT_ADDR #endif + +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) +typedef mipi_syst_u64 mipi_syst_param; +#else +typedef mipi_syst_u32 mipi_syst_param; +#endif + /** * Enable atomic 64-bit write operations * @@ -804,7 +811,7 @@ struct mipi_syst_handle_flags { #endif mipi_syst_u32 systh_param_count; /**< number of parameters */ - mipi_syst_u32 systh_param[6]; /**< catalog msg parameters */ + mipi_syst_param systh_param[6]; /**< catalog msg parameters */ #if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_HANDLE_DATA) struct mipi_syst_platform_handle systh_platform; diff --git a/library/include/mipi_syst/api.h b/library/include/mipi_syst/api.h index 6849039..3fa3f4b 100644 --- a/library/include/mipi_syst/api.h +++ b/library/include/mipi_syst/api.h @@ -1570,7 +1570,8 @@ enum mipi_syst_catalog_parameter_types { /** * Send catalog message with 0-6 parameters.
* This family of Macros is used to send 32 or 64-bit wide catalog - * message IDs with up to six 32-bit wide parameters into the trace stream. + * message IDs with up to six 32/64-bit wide parameters into the trace stream. + * Size of parameters are chosen depending on MIPI_SYST_PCFG_ENABLE_64BIT_ADDR. * The macro names are encoded in the following way: * MIPI_SYST_CATALOG{ID-WIDTH}_{PARAMETER-COUNT} * @@ -1581,7 +1582,7 @@ enum mipi_syst_catalog_parameter_types { * @param sev mipi_syst_severity severity level (0..7) * @param id catalog ID * - * Up to 6 32-Bit numeric parameter follow the catalog ID. + * Up to 6 32/64-bit numeric parameter follow the catalog ID. * * Example: * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.c} diff --git a/library/include/mipi_syst/inline.h b/library/include/mipi_syst/inline.h index 65996e7..d68dfed 100644 --- a/library/include/mipi_syst/inline.h +++ b/library/include/mipi_syst/inline.h @@ -117,7 +117,7 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param0(struct mipi_syst_ * Setup handle for 1 parameter passed to catid message. */ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param1(struct mipi_syst_handle* h, - mipi_syst_u32 p1) + mipi_syst_param p1) { if (h) { h->systh_param_count = 1; @@ -129,8 +129,8 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param1(struct mipi_syst_ * Setup handle for 2 parameters passed to catid message. */ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param2(struct mipi_syst_handle* h, - mipi_syst_u32 p1, - mipi_syst_u32 p2) + mipi_syst_param p1, + mipi_syst_param p2) { if (h) { h->systh_param_count = 2; @@ -143,9 +143,9 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param2(struct mipi_syst_ * Setup handle for 3 parameters passed to catid message. */ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param3(struct mipi_syst_handle* h, - mipi_syst_u32 p1, - mipi_syst_u32 p2, - mipi_syst_u32 p3) + mipi_syst_param p1, + mipi_syst_param p2, + mipi_syst_param p3) { if (h) { h->systh_param_count = 3; @@ -159,10 +159,10 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param3(struct mipi_syst_ * Setup handle for 4 parameters passed to catid message. */ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param4(struct mipi_syst_handle* h, - mipi_syst_u32 p1, - mipi_syst_u32 p2, - mipi_syst_u32 p3, - mipi_syst_u32 p4) + mipi_syst_param p1, + mipi_syst_param p2, + mipi_syst_param p3, + mipi_syst_param p4) { if (h) { h->systh_param_count = 4; @@ -177,11 +177,11 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param4(struct mipi_syst_ * Setup handle for 5 parameters passed to catid message. */ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param5(struct mipi_syst_handle* h, - mipi_syst_u32 p1, - mipi_syst_u32 p2, - mipi_syst_u32 p3, - mipi_syst_u32 p4, - mipi_syst_u32 p5) + mipi_syst_param p1, + mipi_syst_param p2, + mipi_syst_param p3, + mipi_syst_param p4, + mipi_syst_param p5) { if (h) { h->systh_param_count = 5; @@ -197,12 +197,12 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param5(struct mipi_syst_ * Setup handle for 6 parameters passed to catid message. */ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param6(struct mipi_syst_handle* h, - mipi_syst_u32 p1, - mipi_syst_u32 p2, - mipi_syst_u32 p3, - mipi_syst_u32 p4, - mipi_syst_u32 p5, - mipi_syst_u32 p6) + mipi_syst_param p1, + mipi_syst_param p2, + mipi_syst_param p3, + mipi_syst_param p4, + mipi_syst_param p5, + mipi_syst_param p6) { if (h) { h->systh_param_count = 6; diff --git a/library/include/mipi_syst/message.h b/library/include/mipi_syst/message.h index beb528d..eaaf4e9 100644 --- a/library/include/mipi_syst/message.h +++ b/library/include/mipi_syst/message.h @@ -99,7 +99,7 @@ union mipi_syst_sbd_id { struct { union mipi_syst_catid id; - mipi_syst_u32 *param; + mipi_syst_param *param; } data_catid; #if defined(MIPI_SYST_PCFG_ENABLE_SBD_API) diff --git a/library/src/mipi_syst_api.c b/library/src/mipi_syst_api.c index ad1908d..13e3192 100644 --- a/library/src/mipi_syst_api.c +++ b/library/src/mipi_syst_api.c @@ -267,7 +267,7 @@ insert_optional_msg_components(struct mipi_syst_handle* svh, #endif #if defined(MIPI_SYST_PCFG_LENGTH_FIELD) - /* pay load length */ + /* payload length */ if(0 != desc->ed_tag.et_length) { desc->ed_len = len; *prog++ = scatter_ops[SCATTER_OP_LENGTH]; @@ -380,7 +380,7 @@ mipi_syst_write_catalog64_message(struct mipi_syst_handle* svh, #endif paramlen = (mipi_syst_u16) - (svh->systh_param_count * sizeof(mipi_syst_u32)); + (svh->systh_param_count * sizeof(mipi_syst_param)); insert_optional_msg_components( svh, loc, @@ -394,7 +394,7 @@ mipi_syst_write_catalog64_message(struct mipi_syst_handle* svh, /* parameters (if any) */ if (0 != paramlen) { - mipi_syst_u32 *param; + mipi_syst_param *param; param = svh->systh_param; desc.ed_pld.data_catid.param = param; *prog_ptr = scatter_ops[SCATTER_OP_CATID_ARGS]; @@ -402,9 +402,13 @@ mipi_syst_write_catalog64_message(struct mipi_syst_handle* svh, ++prog_ptr; #if defined(MIPI_SYST_BIG_ENDIAN) while(paramlen) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) + *param = MIPI_SYST_HTOLE64(*param); +#else *param = MIPI_SYST_HTOLE32(*param); +#endif param++; - paramlen-=sizeof(mipi_syst_u32); + paramlen-=sizeof(mipi_syst_param); } #endif } @@ -453,7 +457,7 @@ mipi_syst_write_catalog32_message(struct mipi_syst_handle* svh, #endif paramlen = (mipi_syst_u16) - (svh->systh_param_count * sizeof(mipi_syst_u32)); + (svh->systh_param_count * sizeof(mipi_syst_param)); insert_optional_msg_components( svh, loc, @@ -467,7 +471,7 @@ mipi_syst_write_catalog32_message(struct mipi_syst_handle* svh, /* parameters (if any) */ if (0 != paramlen) { - mipi_syst_u32 * param; + mipi_syst_param * param; param = svh->systh_param; desc.ed_pld.data_catid.param = param; *prog_ptr = scatter_ops[SCATTER_OP_CATID_ARGS]; @@ -475,9 +479,13 @@ mipi_syst_write_catalog32_message(struct mipi_syst_handle* svh, ++prog_ptr; #if defined(MIPI_SYST_BIG_ENDIAN) while(paramlen) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) + *param = MIPI_SYST_HTOLE64(*param); +#else *param = MIPI_SYST_HTOLE32(*param); +#endif param++; - paramlen-=sizeof(mipi_syst_u32); + paramlen-=sizeof(mipi_syst_param); } #endif } diff --git a/library/test/unit/mipi_syst_catid32_test.cpp b/library/test/unit/mipi_syst_catid32_test.cpp index a2e0a27..7e3830b 100644 --- a/library/test/unit/mipi_syst_catid32_test.cpp +++ b/library/test/unit/mipi_syst_catid32_test.cpp @@ -121,40 +121,77 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_basic) TEST_F(MipiSysTFixtureCatId32, syst_catid32_noloc_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("01012233[typ=3:1 mu=1:2 sev=3 len]0004cafebabe"), MIPI_SYST_CATALOG32_0(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]0008cafebabe00000001"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]000ccafebabe0000000000000001"), MIPI_SYST_CATALOG32_1(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]000ccafebabe0000000200000001"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0014cafebabe00000000000000010000000000000002"), MIPI_SYST_CATALOG32_2(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]0010cafebabe000000020000000100000003"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]001ccafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATALOG32_3(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]0014cafebabe00000002000000010000000400000003"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0024cafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATALOG32_4(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]0018cafebabe0000000200000001000000040000000300000005"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]002ccafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATALOG32_5(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4, 5) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]001ccafebabe000000020000000100000004000000030000000600000005"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0034cafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATALOG32_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4, 5, 6) ); +#else + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0004cafebabe"), + MIPI_SYST_CATALOG32_0(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0008cafebabe00000001"), + MIPI_SYST_CATALOG32_1(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]000ccafebabe0000000200000001"), + MIPI_SYST_CATALOG32_2(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0010cafebabe000000020000000100000003"), + MIPI_SYST_CATALOG32_3(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0014cafebabe00000002000000010000000400000003"), + MIPI_SYST_CATALOG32_4(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0018cafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATALOG32_5(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]001ccafebabe000000020000000100000004000000030000000600000005"), + MIPI_SYST_CATALOG32_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4, 5, 6) + ); +#endif } #if defined(MIPI_SYST_PCFG_ENABLE_LOCATION_RECORD) @@ -175,7 +212,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0008cafebabe00000001"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd000ccafebabe0000000000000001"), MIPI_SYST_CATALOG32_1_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1) ); #else @@ -187,7 +224,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd000ccafebabe0000000200000001"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0014cafebabe00000000000000010000000000000002"), MIPI_SYST_CATALOG32_2_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2) ); #else @@ -199,7 +236,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0010cafebabe000000020000000100000003"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd001ccafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATALOG32_3_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3) ); #else @@ -211,7 +248,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0014cafebabe00000002000000010000000400000003"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0024cafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATALOG32_4_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4) ); #else @@ -223,7 +260,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0018cafebabe0000000200000001000000040000000300000005"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd002ccafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATALOG32_5_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4, 5) ); #else @@ -235,7 +272,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd001ccafebabe000000020000000100000004000000030000000600000005"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0034cafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATALOG32_6_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, 1, 2, 3, 4, 5, 6) ); #else @@ -249,6 +286,42 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_locaddr_output) TEST_F(MipiSysTFixtureCatId32, syst_catid32_loc16_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0004cafebabe"), + MIPI_SYST_CATALOG32_0_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd000ccafebabe0000000000000001"), + MIPI_SYST_CATALOG32_1_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, 1) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0014cafebabe00000000000000010000000000000002"), + MIPI_SYST_CATALOG32_2_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, 1, 2) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd001ccafebabe000000000000000100000000000000020000000000000003"), + MIPI_SYST_CATALOG32_3_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, 1, 2, 3) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0024cafebabe0000000000000001000000000000000200000000000000030000000000000004"), + MIPI_SYST_CATALOG32_4_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd002ccafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), + MIPI_SYST_CATALOG32_5_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0034cafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), + MIPI_SYST_CATALOG32_6_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, 1, 2, 3, 4, 5, 6) + ); +#else EXPECT_STREQ( xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0004cafebabe"), MIPI_SYST_CATALOG32_0_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE) @@ -283,10 +356,47 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_loc16_output) xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd001ccafebabe000000020000000100000004000000030000000600000005"), MIPI_SYST_CATALOG32_6_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, 1, 2, 3, 4, 5, 6) ); +#endif } TEST_F(MipiSysTFixtureCatId32, syst_catid32_loc32_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0004cafebabe"), + MIPI_SYST_CATALOG32_0_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd000ccafebabe0000000000000001"), + MIPI_SYST_CATALOG32_1_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, 1) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0014cafebabe00000000000000010000000000000002"), + MIPI_SYST_CATALOG32_2_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, 1, 2) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd001ccafebabe000000000000000100000000000000020000000000000003"), + MIPI_SYST_CATALOG32_3_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, 1, 2, 3) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0024cafebabe0000000000000001000000000000000200000000000000030000000000000004"), + MIPI_SYST_CATALOG32_4_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd002ccafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), + MIPI_SYST_CATALOG32_5_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0034cafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), + MIPI_SYST_CATALOG32_6_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, 1, 2, 3, 4, 5, 6) + ); +#else EXPECT_STREQ( xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0004cafebabe"), MIPI_SYST_CATALOG32_0_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE) @@ -321,46 +431,89 @@ TEST_F(MipiSysTFixtureCatId32, syst_catid32_loc32_output) xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd001ccafebabe000000020000000100000004000000030000000600000005"), MIPI_SYST_CATALOG32_6_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, 1, 2, 3, 4, 5, 6) ); +#endif } #endif //MIPI_SYST_PCFG_ENABLE_LOCATION_RECORD TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_noloc_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("01012233[typ=3:1 mu=1:2 sev=3 len]0004cafebabe"), MIPI_SYST_CATPRINTF32_0(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy" ) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]0008cafebabe00000001"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]000ccafebabe0000000000000001"), MIPI_SYST_CATPRINTF32_1(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]000ccafebabe0000000200000001"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0014cafebabe00000000000000010000000000000002"), MIPI_SYST_CATPRINTF32_2(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]0010cafebabe000000020000000100000003"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]001ccafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATPRINTF32_3(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]0014cafebabe00000002000000010000000400000003"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0024cafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATPRINTF32_4(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4) ); EXPECT_STREQ( - xform("01012233[typ=3:1 mu=1:2 sev=3 len]0018cafebabe0000000200000001000000040000000300000005"), + xform("01012233[typ=3:1 mu=1:2 sev=3 len]002ccafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATPRINTF32_5(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5) ); EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0034cafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), + MIPI_SYST_CATPRINTF32_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5, 6) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0034cafebabe111111111111111122222222222222223333333333333333123456788765432100000000000000050000000000000006"), + MIPI_SYST_CATPRINTF32_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 0x1111111111111111ull, 0x2222222222222222ull, 0x3333333333333333ull, 0x1234567887654321ull, 5, 6) + ); +#else + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0004cafebabe"), + MIPI_SYST_CATPRINTF32_0(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy") + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0008cafebabe00000001"), + MIPI_SYST_CATPRINTF32_1(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]000ccafebabe0000000200000001"), + MIPI_SYST_CATPRINTF32_2(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0010cafebabe000000020000000100000003"), + MIPI_SYST_CATPRINTF32_3(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0014cafebabe00000002000000010000000400000003"), + MIPI_SYST_CATPRINTF32_4(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("01012233[typ=3:1 mu=1:2 sev=3 len]0018cafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATPRINTF32_5(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( xform("01012233[typ=3:1 mu=1:2 sev=3 len]001ccafebabe000000020000000100000004000000030000000600000005"), MIPI_SYST_CATPRINTF32_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5, 6) - ); + ); +#endif } #if defined(MIPI_SYST_PCFG_ENABLE_LOCATION_RECORD) @@ -381,7 +534,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0008cafebabe00000001"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd000ccafebabe0000000000000001"), MIPI_SYST_CATPRINTF32_1_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1) ); #else @@ -393,7 +546,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd000ccafebabe0000000200000001"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0014cafebabe00000000000000010000000000000002"), MIPI_SYST_CATPRINTF32_2_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2) ); #else @@ -405,7 +558,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0010cafebabe000000020000000100000003"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd001ccafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATPRINTF32_3_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3) ); #else @@ -417,7 +570,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0014cafebabe00000002000000010000000400000003"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0024cafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATPRINTF32_4_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4) ); #else @@ -429,7 +582,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0018cafebabe0000000200000001000000040000000300000005"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd002ccafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATPRINTF32_5_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5) ); #else @@ -441,7 +594,7 @@ TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd001ccafebabe000000020000000100000004000000030000000600000005"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0312345678aabbccdd0034cafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATPRINTF32_6_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5, 6) ); #else @@ -455,78 +608,152 @@ TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_locaddr_output) TEST_F(MipiSysTFixtureCatId32, syst_catprintf2_loc16_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0004cafebabe"), MIPI_SYST_CATPRINTF32_0_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy") ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0008cafebabe00000001"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd000ccafebabe0000000000000001"), MIPI_SYST_CATPRINTF32_1_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd000ccafebabe0000000200000001"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0014cafebabe00000000000000010000000000000002"), MIPI_SYST_CATPRINTF32_2_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0010cafebabe000000020000000100000003"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd001ccafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATPRINTF32_3_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2, 3) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0014cafebabe00000002000000010000000400000003"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0024cafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATPRINTF32_4_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2, 3, 4) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0018cafebabe0000000200000001000000040000000300000005"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd002ccafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATPRINTF32_5_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd001ccafebabe000000020000000100000004000000030000000600000005"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0034cafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATPRINTF32_6_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5, 6) ); +#else + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0004cafebabe"), + MIPI_SYST_CATPRINTF32_0_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy") + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0008cafebabe00000001"), + MIPI_SYST_CATPRINTF32_1_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd000ccafebabe0000000200000001"), + MIPI_SYST_CATPRINTF32_2_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0010cafebabe000000020000000100000003"), + MIPI_SYST_CATPRINTF32_3_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2, 3) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0014cafebabe00000002000000010000000400000003"), + MIPI_SYST_CATPRINTF32_4_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd0018cafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATPRINTF32_5_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]005678abcd001ccafebabe000000020000000100000004000000030000000600000005"), + MIPI_SYST_CATPRINTF32_6_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5, 6) + ); +#endif } TEST_F(MipiSysTFixtureCatId32, syst_catprintf32_loc32_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0004cafebabe"), MIPI_SYST_CATPRINTF32_0_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy") ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0008cafebabe00000001"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd000ccafebabe0000000000000001"), MIPI_SYST_CATPRINTF32_1_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd000ccafebabe0000000200000001"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0014cafebabe00000000000000010000000000000002"), MIPI_SYST_CATPRINTF32_2_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0010cafebabe000000020000000100000003"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd001ccafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATPRINTF32_3_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2, 3) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0014cafebabe00000002000000010000000400000003"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0024cafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATPRINTF32_4_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2, 3, 4) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0018cafebabe0000000200000001000000040000000300000005"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd002ccafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATPRINTF32_5_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5) ); EXPECT_STREQ( - xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd001ccafebabe000000020000000100000004000000030000000600000005"), + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0034cafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATPRINTF32_6_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5, 6) ); +#else + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0004cafebabe"), + MIPI_SYST_CATPRINTF32_0_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy") + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0008cafebabe00000001"), + MIPI_SYST_CATPRINTF32_1_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd000ccafebabe0000000200000001"), + MIPI_SYST_CATPRINTF32_2_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0010cafebabe000000020000000100000003"), + MIPI_SYST_CATPRINTF32_3_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2, 3) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0014cafebabe00000002000000010000000400000003"), + MIPI_SYST_CATPRINTF32_4_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd0018cafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATPRINTF32_5_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("01012333[typ=3:1 mu=1:2 sev=3 loc len]0112345678aabbccdd001ccafebabe000000020000000100000004000000030000000600000005"), + MIPI_SYST_CATPRINTF32_6_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xCAFEBABE, "dummy", 1, 2, 3, 4, 5, 6) + ); +#endif } #endif //MIPI_SYST_PCFG_ENABLE_LOCATION_RECORD #endif //MIPI_SYST_PCFG_ENABLE_PLATFORM_STATE_DATA && MIPI_SYST_PCFG_ENABLE_DEFAULT_SCATTER_WRITE && MIPI_SYST_PCFG_ENABLE_CATID32_API \ No newline at end of file diff --git a/library/test/unit/mipi_syst_catid64_test.cpp b/library/test/unit/mipi_syst_catid64_test.cpp index 8842632..a80ff9c 100644 --- a/library/test/unit/mipi_syst_catid64_test.cpp +++ b/library/test/unit/mipi_syst_catid64_test.cpp @@ -118,40 +118,77 @@ TEST_F(MipiSysTFixtureCatId64, syst_catid64_basic) TEST_F(MipiSysTFixtureCatId64, syst_catid64_noloc_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("02012233[typ=3:2 mu=1:2 sev=3 len]0008000decafcafebabe"), MIPI_SYST_CATALOG64_0(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull) ); EXPECT_STREQ( - xform("02012233[typ=3:2 mu=1:2 sev=3 len]000c000decafcafebabe00000001"), + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0010000decafcafebabe0000000000000001"), MIPI_SYST_CATALOG64_1(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1) ); EXPECT_STREQ( - xform("02012233[typ=3:2 mu=1:2 sev=3 len]0010000decafcafebabe0000000200000001"), + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0018000decafcafebabe00000000000000010000000000000002"), MIPI_SYST_CATALOG64_2(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2) ); EXPECT_STREQ( - xform("02012233[typ=3:2 mu=1:2 sev=3 len]0014000decafcafebabe000000020000000100000003"), + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0020000decafcafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATALOG64_3(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3) ); EXPECT_STREQ( - xform("02012233[typ=3:2 mu=1:2 sev=3 len]0018000decafcafebabe00000002000000010000000400000003"), + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0028000decafcafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATALOG64_4(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4) ); EXPECT_STREQ( - xform("02012233[typ=3:2 mu=1:2 sev=3 len]001c000decafcafebabe0000000200000001000000040000000300000005"), + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0030000decafcafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATALOG64_5(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5) ); EXPECT_STREQ( - xform("02012233[typ=3:2 mu=1:2 sev=3 len]0020000decafcafebabe000000020000000100000004000000030000000600000005"), + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0038000decafcafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATALOG64_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5, 6) ); +#else + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0008000decafcafebabe"), + MIPI_SYST_CATALOG64_0(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]000c000decafcafebabe00000001"), + MIPI_SYST_CATALOG64_1(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0010000decafcafebabe0000000200000001"), + MIPI_SYST_CATALOG64_2(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0014000decafcafebabe000000020000000100000003"), + MIPI_SYST_CATALOG64_3(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0018000decafcafebabe00000002000000010000000400000003"), + MIPI_SYST_CATALOG64_4(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]001c000decafcafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATALOG64_5(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0020000decafcafebabe000000020000000100000004000000030000000600000005"), + MIPI_SYST_CATALOG64_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5, 6) + ); +#endif } #if defined(MIPI_SYST_PCFG_ENABLE_LOCATION_RECORD) @@ -172,7 +209,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_catid64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd000c000decafcafebabe00000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0010000decafcafebabe0000000000000001"), MIPI_SYST_CATALOG64_1_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1) ); #else @@ -184,7 +221,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_catid64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0010000decafcafebabe0000000200000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0018000decafcafebabe00000000000000010000000000000002"), MIPI_SYST_CATALOG64_2_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2) ); #else @@ -196,7 +233,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_catid64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0014000decafcafebabe000000020000000100000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0020000decafcafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATALOG64_3_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3) ); #else @@ -208,7 +245,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_catid64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0018000decafcafebabe00000002000000010000000400000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0028000decafcafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATALOG64_4_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4) ); #else @@ -220,7 +257,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_catid64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd001c000decafcafebabe0000000200000001000000040000000300000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0030000decafcafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATALOG64_5_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5) ); #else @@ -232,7 +269,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_catid64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0038000decafcafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATALOG64_6_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5, 6) ); #else @@ -246,118 +283,234 @@ TEST_F(MipiSysTFixtureCatId64, syst_catid64_locaddr_output) TEST_F(MipiSysTFixtureCatId64, syst_catid64_loc16_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0008000decafcafebabe"), MIPI_SYST_CATALOG64_0_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd000c000decafcafebabe00000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0010000decafcafebabe0000000000000001"), MIPI_SYST_CATALOG64_1_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0010000decafcafebabe0000000200000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0018000decafcafebabe00000000000000010000000000000002"), MIPI_SYST_CATALOG64_2_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0014000decafcafebabe000000020000000100000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0020000decafcafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATALOG64_3_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2, 3) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0018000decafcafebabe00000002000000010000000400000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0028000decafcafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATALOG64_4_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2, 3, 4) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd001c000decafcafebabe0000000200000001000000040000000300000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0030000decafcafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATALOG64_5_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0038000decafcafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATALOG64_6_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5, 6) ); +#else + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0008000decafcafebabe"), + MIPI_SYST_CATALOG64_0_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd000c000decafcafebabe00000001"), + MIPI_SYST_CATALOG64_1_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0010000decafcafebabe0000000200000001"), + MIPI_SYST_CATALOG64_2_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0014000decafcafebabe000000020000000100000003"), + MIPI_SYST_CATALOG64_3_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2, 3) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0018000decafcafebabe00000002000000010000000400000003"), + MIPI_SYST_CATALOG64_4_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd001c000decafcafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATALOG64_5_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + MIPI_SYST_CATALOG64_6_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5, 6) + ); +#endif } TEST_F(MipiSysTFixtureCatId64, syst_catid64_loc32_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0008000decafcafebabe"), MIPI_SYST_CATALOG64_0_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd000c000decafcafebabe00000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0010000decafcafebabe0000000000000001"), MIPI_SYST_CATALOG64_1_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0010000decafcafebabe0000000200000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0018000decafcafebabe00000000000000010000000000000002"), MIPI_SYST_CATALOG64_2_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0014000decafcafebabe000000020000000100000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0020000decafcafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATALOG64_3_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2, 3) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0018000decafcafebabe00000002000000010000000400000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0028000decafcafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATALOG64_4_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2, 3, 4) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd001c000decafcafebabe0000000200000001000000040000000300000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0030000decafcafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATALOG64_5_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0038000decafcafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATALOG64_6_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5, 6) ); +#else + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0008000decafcafebabe"), + MIPI_SYST_CATALOG64_0_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd000c000decafcafebabe00000001"), + MIPI_SYST_CATALOG64_1_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0010000decafcafebabe0000000200000001"), + MIPI_SYST_CATALOG64_2_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0014000decafcafebabe000000020000000100000003"), + MIPI_SYST_CATALOG64_3_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2, 3) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0018000decafcafebabe00000002000000010000000400000003"), + MIPI_SYST_CATALOG64_4_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd001c000decafcafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATALOG64_5_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + MIPI_SYST_CATALOG64_6_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, 1, 2, 3, 4, 5, 6) + ); +#endif } #endif //MIPI_SYST_PCFG_ENABLE_LOCATION_RECORD TEST_F(MipiSysTFixtureCatId64, syst_printf64_noloc_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("02012233[typ=3:2 mu=1:2 sev=3 len]0008000decafcafebabe"), MIPI_SYST_CATPRINTF64_0(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy") - ); + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0010000decafcafebabe0000000000000001"), + MIPI_SYST_CATPRINTF64_1(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0018000decafcafebabe00000000000000010000000000000002"), + MIPI_SYST_CATPRINTF64_2(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0020000decafcafebabe000000000000000100000000000000020000000000000003"), + MIPI_SYST_CATPRINTF64_3(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0028000decafcafebabe0000000000000001000000000000000200000000000000030000000000000004"), + MIPI_SYST_CATPRINTF64_4(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0030000decafcafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), + MIPI_SYST_CATPRINTF64_5(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0038000decafcafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), + MIPI_SYST_CATPRINTF64_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5, 6) + ); + + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0038000decafcafebabe111111111111111122222222222222223333333333333333123456788765432100000000000000050000000000000006"), + MIPI_SYST_CATPRINTF64_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 0x1111111111111111ull, 0x2222222222222222ull, 0x3333333333333333ull, 0x1234567887654321ull, 5, 6) + ); +#else + EXPECT_STREQ( + xform("02012233[typ=3:2 mu=1:2 sev=3 len]0008000decafcafebabe"), + MIPI_SYST_CATPRINTF64_0(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy") + ); EXPECT_STREQ( xform("02012233[typ=3:2 mu=1:2 sev=3 len]000c000decafcafebabe00000001"), MIPI_SYST_CATPRINTF64_1(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1) - ); + ); EXPECT_STREQ( xform("02012233[typ=3:2 mu=1:2 sev=3 len]0010000decafcafebabe0000000200000001"), MIPI_SYST_CATPRINTF64_2(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2) - ); + ); EXPECT_STREQ( xform("02012233[typ=3:2 mu=1:2 sev=3 len]0014000decafcafebabe000000020000000100000003"), MIPI_SYST_CATPRINTF64_3(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3) - ); + ); EXPECT_STREQ( xform("02012233[typ=3:2 mu=1:2 sev=3 len]0018000decafcafebabe00000002000000010000000400000003"), MIPI_SYST_CATPRINTF64_4(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4) - ); + ); EXPECT_STREQ( xform("02012233[typ=3:2 mu=1:2 sev=3 len]001c000decafcafebabe0000000200000001000000040000000300000005"), MIPI_SYST_CATPRINTF64_5(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5) - ); + ); EXPECT_STREQ( xform("02012233[typ=3:2 mu=1:2 sev=3 len]0020000decafcafebabe000000020000000100000004000000030000000600000005"), MIPI_SYST_CATPRINTF64_6(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5, 6) - ); + ); +#endif } #if defined(MIPI_SYST_PCFG_ENABLE_LOCATION_RECORD) @@ -378,7 +531,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_printf64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd000c000decafcafebabe00000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0010000decafcafebabe0000000000000001"), MIPI_SYST_CATPRINTF64_1_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1) ); #else @@ -390,7 +543,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_printf64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0010000decafcafebabe0000000200000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0018000decafcafebabe00000000000000010000000000000002"), MIPI_SYST_CATPRINTF64_2_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2) ); #else @@ -402,7 +555,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_printf64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0014000decafcafebabe000000020000000100000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0020000decafcafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATPRINTF64_3_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3) ); #else @@ -414,7 +567,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_printf64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0018000decafcafebabe00000002000000010000000400000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0028000decafcafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATPRINTF64_4_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4) ); #else @@ -426,7 +579,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_printf64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd001c000decafcafebabe0000000200000001000000040000000300000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0030000decafcafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATPRINTF64_5_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5) ); #else @@ -438,7 +591,7 @@ TEST_F(MipiSysTFixtureCatId64, syst_printf64_locaddr_output) #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0312345678aabbccdd0038000decafcafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATPRINTF64_6_LOCADDR(ph, MIPI_SYST_SEVERITY_WARNING, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5, 6) ); #else @@ -452,78 +605,152 @@ TEST_F(MipiSysTFixtureCatId64, syst_printf64_locaddr_output) TEST_F(MipiSysTFixtureCatId64, syst_printf64_loc16_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0008000decafcafebabe"), MIPI_SYST_CATPRINTF64_0_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy") ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd000c000decafcafebabe00000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0010000decafcafebabe0000000000000001"), MIPI_SYST_CATPRINTF64_1_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0010000decafcafebabe0000000200000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0018000decafcafebabe00000000000000010000000000000002"), MIPI_SYST_CATPRINTF64_2_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0014000decafcafebabe000000020000000100000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0020000decafcafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATPRINTF64_3_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0018000decafcafebabe00000002000000010000000400000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0028000decafcafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATPRINTF64_4_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd001c000decafcafebabe0000000200000001000000040000000300000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0030000decafcafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATPRINTF64_5_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0038000decafcafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATPRINTF64_6_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5, 6) ); +#else + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0008000decafcafebabe"), + MIPI_SYST_CATPRINTF64_0_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy") + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd000c000decafcafebabe00000001"), + MIPI_SYST_CATPRINTF64_1_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0010000decafcafebabe0000000200000001"), + MIPI_SYST_CATPRINTF64_2_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0014000decafcafebabe000000020000000100000003"), + MIPI_SYST_CATPRINTF64_3_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0018000decafcafebabe00000002000000010000000400000003"), + MIPI_SYST_CATPRINTF64_4_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd001c000decafcafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATPRINTF64_5_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]005678abcd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + MIPI_SYST_CATPRINTF64_6_LOC16(ph, MIPI_SYST_SEVERITY_WARNING, 0xabcd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5, 6) + ); +#endif } TEST_F(MipiSysTFixtureCatId64, syst_printf64_loc32_output) { +#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR) EXPECT_STREQ( xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0008000decafcafebabe"), MIPI_SYST_CATPRINTF64_0_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy") ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd000c000decafcafebabe00000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0010000decafcafebabe0000000000000001"), MIPI_SYST_CATPRINTF64_1_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0010000decafcafebabe0000000200000001"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0018000decafcafebabe00000000000000010000000000000002"), MIPI_SYST_CATPRINTF64_2_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0014000decafcafebabe000000020000000100000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0020000decafcafebabe000000000000000100000000000000020000000000000003"), MIPI_SYST_CATPRINTF64_3_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0018000decafcafebabe00000002000000010000000400000003"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0028000decafcafebabe0000000000000001000000000000000200000000000000030000000000000004"), MIPI_SYST_CATPRINTF64_4_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd001c000decafcafebabe0000000200000001000000040000000300000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0030000decafcafebabe00000000000000010000000000000002000000000000000300000000000000040000000000000005"), MIPI_SYST_CATPRINTF64_5_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5) ); EXPECT_STREQ( - xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0038000decafcafebabe000000000000000100000000000000020000000000000003000000000000000400000000000000050000000000000006"), MIPI_SYST_CATPRINTF64_6_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5, 6) ); +#else + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0008000decafcafebabe"), + MIPI_SYST_CATPRINTF64_0_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy") + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd000c000decafcafebabe00000001"), + MIPI_SYST_CATPRINTF64_1_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0010000decafcafebabe0000000200000001"), + MIPI_SYST_CATPRINTF64_2_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0014000decafcafebabe000000020000000100000003"), + MIPI_SYST_CATPRINTF64_3_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0018000decafcafebabe00000002000000010000000400000003"), + MIPI_SYST_CATPRINTF64_4_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd001c000decafcafebabe0000000200000001000000040000000300000005"), + MIPI_SYST_CATPRINTF64_5_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5) + ); + + EXPECT_STREQ( + xform("02012333[typ=3:2 mu=1:2 sev=3 loc len]0112345678aabbccdd0020000decafcafebabe000000020000000100000004000000030000000600000005"), + MIPI_SYST_CATPRINTF64_6_LOC32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xDECAFCAFEBABEull, "dummy", 1, 2, 3, 4, 5, 6) + ); +#endif } #endif //MIPI_SYST_PCFG_ENABLE_LOCATION_RECORD diff --git a/library/test/unit/mipi_syst_sbd_test.cpp b/library/test/unit/mipi_syst_sbd_test.cpp index c17ef15..4c9d661 100644 --- a/library/test/unit/mipi_syst_sbd_test.cpp +++ b/library/test/unit/mipi_syst_sbd_test.cpp @@ -169,22 +169,22 @@ TEST_F(MipiSysTFixtureSBD, syst_sbd32_reference) { EXPECT_EQ( - xform("00012039[typ=9:0 mu=1:2 sev=3]aabbccddcdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), + xform("00012239[typ=9:0 mu=1:2 sev=3 len]001caabbccddcdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), MIPI_SYST_SBD32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, MIPI_SYST_SBD_NO_BLOB_ADDRESS, NULL, sizeof(test), &test) ); EXPECT_EQ( - xform("08012039[typ=9:8 mu=1:2 sev=3]aabbccddabcd1234cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), + xform("08012239[typ=9:8 mu=1:2 sev=3 len]0020aabbccddabcd1234cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), MIPI_SYST_SBD32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xabcd1234, NULL, sizeof(test), &test) ); EXPECT_EQ( - xform("0a012039[typ=9:a mu=1:2 sev=3]aabbccddabcd1234727574637572745369726373656420656f697470006ecdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), + xform("0a012239[typ=9:a mu=1:2 sev=3 len]0036aabbccddabcd1234727574637572745369726373656420656f697470006ecdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), MIPI_SYST_SBD32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, 0xabcd1234, "Structure description", sizeof(test), &test) ); EXPECT_EQ( - xform("02012039[typ=9:2 mu=1:2 sev=3]aabbccdd727574637572745369726373656420656f6e206e6f697470737365726464612000cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), + xform("02012239[typ=9:2 mu=1:2 sev=3 len]003daabbccdd727574637572745369726373656420656f6e206e6f697470737365726464612000cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), MIPI_SYST_SBD32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, MIPI_SYST_SBD_NO_BLOB_ADDRESS, "Structure description no address", sizeof(test), &test) ); } @@ -193,22 +193,22 @@ TEST_F(MipiSysTFixtureSBD, syst_sbd64_reference) { EXPECT_EQ( - xform("01012039[typ=9:1 mu=1:2 sev=3]aabbccdd11223344cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), + xform("01012239[typ=9:1 mu=1:2 sev=3 len]0020aabbccdd11223344cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), MIPI_SYST_SBD64(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd11223344, MIPI_SYST_SBD_NO_BLOB_ADDRESS, NULL, sizeof(test), &test) ); EXPECT_EQ( - xform("09012039[typ=9:9 mu=1:2 sev=3]aabbccdd11223344abcd1234cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), + xform("09012239[typ=9:9 mu=1:2 sev=3 len]0024aabbccdd11223344abcd1234cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), MIPI_SYST_SBD64(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd11223344, 0xabcd1234, NULL, sizeof(test), &test) ); EXPECT_EQ( - xform("0b012039[typ=9:b mu=1:2 sev=3]aabbccdd11223344abcd1234727574637572745369726373656420656f697470006ecdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), + xform("0b012239[typ=9:b mu=1:2 sev=3 len]003aaabbccdd11223344abcd1234727574637572745369726373656420656f697470006ecdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), MIPI_SYST_SBD64(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd11223344, 0xabcd1234, "Structure description", sizeof(test), &test) ); EXPECT_EQ( - xform("03012039[typ=9:3 mu=1:2 sev=3]aabbccdd11223344727574637572745369726373656420656f6e206e6f697470737365726464612000cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), + xform("03012239[typ=9:3 mu=1:2 sev=3 len]0041aabbccdd11223344727574637572745369726373656420656f6e206e6f697470737365726464612000cdcdcdcdaabbccdd0011223344556677cdcdcd553f8fbe77"), MIPI_SYST_SBD64(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd11223344, MIPI_SYST_SBD_NO_BLOB_ADDRESS, "Structure description no address", sizeof(test), &test) ); } @@ -216,12 +216,12 @@ TEST_F(MipiSysTFixtureSBD, syst_sbd64_reference) TEST_F(MipiSysTFixtureSBD, syst_sbd_long_struct) { EXPECT_EQ( - xform("00012039[typ=9:0 mu=1:2 sev=3]aabbccddcdcdcdcdaabbccdd0011223344556677cdcdcd003f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd013f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd023f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd033f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd043f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd053f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd063f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd073f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd083f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd093f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0a3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0b3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0c3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0d3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0e3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0f3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd103f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd113f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd123f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd133f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd143f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd153f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd163f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd173f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd183f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd193f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1a3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1b3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1c3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1d3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1e3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1f3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd203f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd213f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd223f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd233f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd243f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd253f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd263f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd273f8fbe77"), + xform("00012239[typ=9:0 mu=1:2 sev=3 len]03c4aabbccddcdcdcdcdaabbccdd0011223344556677cdcdcd003f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd013f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd023f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd033f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd043f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd053f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd063f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd073f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd083f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd093f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0a3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0b3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0c3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0d3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0e3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0f3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd103f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd113f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd123f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd133f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd143f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd153f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd163f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd173f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd183f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd193f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1a3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1b3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1c3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1d3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1e3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1f3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd203f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd213f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd223f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd233f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd243f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd253f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd263f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd273f8fbe77"), MIPI_SYST_SBD32(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd, MIPI_SYST_SBD_NO_BLOB_ADDRESS, NULL, sizeof(test_long), &test_long) ); EXPECT_EQ( - xform("01012039[typ=9:1 mu=1:2 sev=3]aabbccdd11223344cdcdcdcdaabbccdd0011223344556677cdcdcd003f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd013f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd023f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd033f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd043f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd053f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd063f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd073f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd083f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd093f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0a3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0b3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0c3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0d3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0e3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0f3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd103f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd113f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd123f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd133f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd143f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd153f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd163f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd173f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd183f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd193f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1a3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1b3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1c3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1d3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1e3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1f3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd203f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd213f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd223f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd233f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd243f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd253f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd263f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd273f8fbe77"), + xform("01012239[typ=9:1 mu=1:2 sev=3 len]03c8aabbccdd11223344cdcdcdcdaabbccdd0011223344556677cdcdcd003f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd013f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd023f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd033f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd043f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd053f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd063f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd073f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd083f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd093f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0a3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0b3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0c3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0d3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0e3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd0f3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd103f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd113f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd123f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd133f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd143f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd153f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd163f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd173f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd183f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd193f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1a3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1b3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1c3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1d3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1e3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd1f3f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd203f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd213f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd223f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd233f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd243f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd253f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd263f8fbe77cdcdcdcdaabbccdd0011223344556677cdcdcd273f8fbe77"), MIPI_SYST_SBD64(ph, MIPI_SYST_SEVERITY_WARNING, 0xaabbccdd11223344, MIPI_SYST_SBD_NO_BLOB_ADDRESS, NULL, sizeof(test_long), &test_long) ); } -- cgit v1.1