From 8a56deb957f46d5c1fcfd1dd53dfafb99dfb7cb3 Mon Sep 17 00:00:00 2001 From: Mathias Westerdahl Date: Tue, 22 May 2018 11:00:17 +0200 Subject: [PATCH] Revert "Removed field initializers to make it compile on MSVC" This reverts commit c14197859a8a9e18737d3bae5598449a97364961. --- game.project | 2 +- qrcode/src/qrcode.cpp | 2 - qrcode/src/quirc/decode.c | 12 +- qrcode/src/quirc/identify.c | 9 +- qrcode/src/quirc/quirc.c | 16 +- qrcode/src/quirc/version_db.c | 560 +++++++++++++++++----------------- 6 files changed, 296 insertions(+), 305 deletions(-) diff --git a/game.project b/game.project index ed3bb19..af533c5 100644 --- a/game.project +++ b/game.project @@ -1,7 +1,7 @@ [project] title = QRCode version = 0.1 -dependencies = https://github.com/defold/extension-camera/archive/dev-android2.zip,https://github.com/andsve/dirtylarry/archive/master.zip +dependencies = https://github.com/defold/extension-camera/archive/dev-android.zip,https://github.com/andsve/dirtylarry/archive/master.zip custom_resources = main/images/defold.png [bootstrap] diff --git a/qrcode/src/qrcode.cpp b/qrcode/src/qrcode.cpp index 48eff62..41f945f 100644 --- a/qrcode/src/qrcode.cpp +++ b/qrcode/src/qrcode.cpp @@ -1,9 +1,7 @@ #include #include #include -#if !defined(DM_PLATFORM_WINDOWS) #include -#endif #define EXTENSION_NAME QRCode #define LIB_NAME "QRCode" diff --git a/qrcode/src/quirc/decode.c b/qrcode/src/quirc/decode.c index 43cafd8..aa80acc 100644 --- a/qrcode/src/quirc/decode.c +++ b/qrcode/src/quirc/decode.c @@ -42,9 +42,9 @@ static const uint8_t gf16_log[16] = { }; static const struct galois_field gf16 = { - 15, - gf16_log, - gf16_exp + .p = 15, + .log = gf16_log, + .exp = gf16_exp }; static const uint8_t gf256_exp[256] = { @@ -118,9 +118,9 @@ static const uint8_t gf256_log[256] = { }; const static struct galois_field gf256 = { - 255, - gf256_log, - gf256_exp + .p = 255, + .log = gf256_log, + .exp = gf256_exp }; /************************************************************************ diff --git a/qrcode/src/quirc/identify.c b/qrcode/src/quirc/identify.c index f209a81..8d490d4 100644 --- a/qrcode/src/quirc/identify.c +++ b/qrcode/src/quirc/identify.c @@ -19,11 +19,6 @@ #include #include "quirc_internal.h" -#ifdef WIN32 -#include -#define alloca _alloca -#endif - /************************************************************************ * Linear algebra routines */ @@ -200,10 +195,8 @@ static void threshold(struct quirc *q) if (threshold_s < THRESHOLD_S_MIN) threshold_s = THRESHOLD_S_MIN; - int* row_average = (int*)alloca(q->w * sizeof(int)); - for (y = 0; y < q->h; y++) { - //int row_average[q->w]; + int row_average[q->w]; memset(row_average, 0, sizeof(row_average)); diff --git a/qrcode/src/quirc/quirc.c b/qrcode/src/quirc/quirc.c index 6965db7..3300007 100644 --- a/qrcode/src/quirc/quirc.c +++ b/qrcode/src/quirc/quirc.c @@ -72,14 +72,14 @@ int quirc_count(const struct quirc *q) } static const char *const error_table[] = { - "Success", - "Invalid grid size", - "Invalid version", - "Format data ECC failure", - "ECC failure", - "Unknown data type", - "Data overflow", - "Data underflow" + [QUIRC_SUCCESS] = "Success", + [QUIRC_ERROR_INVALID_GRID_SIZE] = "Invalid grid size", + [QUIRC_ERROR_INVALID_VERSION] = "Invalid version", + [QUIRC_ERROR_FORMAT_ECC] = "Format data ECC failure", + [QUIRC_ERROR_DATA_ECC] = "ECC failure", + [QUIRC_ERROR_UNKNOWN_DATA_TYPE] = "Unknown data type", + [QUIRC_ERROR_DATA_OVERFLOW] = "Data overflow", + [QUIRC_ERROR_DATA_UNDERFLOW] = "Data underflow" }; const char *quirc_strerror(quirc_decode_error_t err) diff --git a/qrcode/src/quirc/version_db.c b/qrcode/src/quirc/version_db.c index 877bd75..fea8146 100644 --- a/qrcode/src/quirc/version_db.c +++ b/qrcode/src/quirc/version_db.c @@ -19,403 +19,403 @@ const struct quirc_version_info quirc_version_db[QUIRC_MAX_VERSION + 1] = { {0}, { /* Version 1 */ - 26, - {0}, - { - {26, 16, 1}, - {26, 19, 1}, - {26, 9, 1}, - {26, 13, 1} + .data_bytes = 26, + .apat = {0}, + .ecc = { + {.bs = 26, .dw = 16, .ns = 1}, + {.bs = 26, .dw = 19, .ns = 1}, + {.bs = 26, .dw = 9, .ns = 1}, + {.bs = 26, .dw = 13, .ns = 1} } }, { /* Version 2 */ - 44, - {6, 18, 0}, - { - {44, 28, 1}, - {44, 34, 1}, - {44, 16, 1}, - {44, 22, 1} + .data_bytes = 44, + .apat = {6, 18, 0}, + .ecc = { + {.bs = 44, .dw = 28, .ns = 1}, + {.bs = 44, .dw = 34, .ns = 1}, + {.bs = 44, .dw = 16, .ns = 1}, + {.bs = 44, .dw = 22, .ns = 1} } }, { /* Version 3 */ - 70, - {6, 22, 0}, - { - {70, 44, 1}, - {70, 55, 1}, - {35, 13, 2}, - {35, 17, 2} + .data_bytes = 70, + .apat = {6, 22, 0}, + .ecc = { + {.bs = 70, .dw = 44, .ns = 1}, + {.bs = 70, .dw = 55, .ns = 1}, + {.bs = 35, .dw = 13, .ns = 2}, + {.bs = 35, .dw = 17, .ns = 2} } }, { /* Version 4 */ - 100, - {6, 26, 0}, - { - {50, 32, 2}, - {100, 80, 1}, - {25, 9, 4}, - {50, 24, 2} + .data_bytes = 100, + .apat = {6, 26, 0}, + .ecc = { + {.bs = 50, .dw = 32, .ns = 2}, + {.bs = 100, .dw = 80, .ns = 1}, + {.bs = 25, .dw = 9, .ns = 4}, + {.bs = 50, .dw = 24, .ns = 2} } }, { /* Version 5 */ - 134, - {6, 30, 0}, - { - {67, 43, 2}, - {134, 108, 1}, - {33, 11, 2}, - {33, 15, 2} + .data_bytes = 134, + .apat = {6, 30, 0}, + .ecc = { + {.bs = 67, .dw = 43, .ns = 2}, + {.bs = 134, .dw = 108, .ns = 1}, + {.bs = 33, .dw = 11, .ns = 2}, + {.bs = 33, .dw = 15, .ns = 2} } }, { /* Version 6 */ - 172, - {6, 34, 0}, - { - {43, 27, 4}, - {86, 68, 2}, - {43, 15, 4}, - {43, 19, 4} + .data_bytes = 172, + .apat = {6, 34, 0}, + .ecc = { + {.bs = 43, .dw = 27, .ns = 4}, + {.bs = 86, .dw = 68, .ns = 2}, + {.bs = 43, .dw = 15, .ns = 4}, + {.bs = 43, .dw = 19, .ns = 4} } }, { /* Version 7 */ - 196, - {6, 22, 38, 0}, - { - {49, 31, 4}, - {98, 78, 2}, - {39, 13, 4}, - {32, 14, 2} + .data_bytes = 196, + .apat = {6, 22, 38, 0}, + .ecc = { + {.bs = 49, .dw = 31, .ns = 4}, + {.bs = 98, .dw = 78, .ns = 2}, + {.bs = 39, .dw = 13, .ns = 4}, + {.bs = 32, .dw = 14, .ns = 2} } }, { /* Version 8 */ - 242, - {6, 24, 42, 0}, - { - {60, 38, 2}, - {121, 97, 2}, - {40, 14, 4}, - {40, 18, 4} + .data_bytes = 242, + .apat = {6, 24, 42, 0}, + .ecc = { + {.bs = 60, .dw = 38, .ns = 2}, + {.bs = 121, .dw = 97, .ns = 2}, + {.bs = 40, .dw = 14, .ns = 4}, + {.bs = 40, .dw = 18, .ns = 4} } }, { /* Version 9 */ - 292, - {6, 26, 46, 0}, - { - {58, 36, 3}, - {146, 116, 2}, - {36, 12, 4}, - {36, 16, 4} + .data_bytes = 292, + .apat = {6, 26, 46, 0}, + .ecc = { + {.bs = 58, .dw = 36, .ns = 3}, + {.bs = 146, .dw = 116, .ns = 2}, + {.bs = 36, .dw = 12, .ns = 4}, + {.bs = 36, .dw = 16, .ns = 4} } }, { /* Version 10 */ - 346, - {6, 28, 50, 0}, - { - {69, 43, 4}, - {86, 68, 2}, - {43, 15, 6}, - {43, 19, 6} + .data_bytes = 346, + .apat = {6, 28, 50, 0}, + .ecc = { + {.bs = 69, .dw = 43, .ns = 4}, + {.bs = 86, .dw = 68, .ns = 2}, + {.bs = 43, .dw = 15, .ns = 6}, + {.bs = 43, .dw = 19, .ns = 6} } }, { /* Version 11 */ - 404, - {6, 30, 54, 0}, - { - {80, 50, 1}, - {101, 81, 4}, - {36, 12, 3}, - {50, 22, 4} + .data_bytes = 404, + .apat = {6, 30, 54, 0}, + .ecc = { + {.bs = 80, .dw = 50, .ns = 1}, + {.bs = 101, .dw = 81, .ns = 4}, + {.bs = 36, .dw = 12, .ns = 3}, + {.bs = 50, .dw = 22, .ns = 4} } }, { /* Version 12 */ - 466, - {6, 32, 58, 0}, - { - {58, 36, 6}, - {116, 92, 2}, - {42, 14, 7}, - {46, 20, 4} + .data_bytes = 466, + .apat = {6, 32, 58, 0}, + .ecc = { + {.bs = 58, .dw = 36, .ns = 6}, + {.bs = 116, .dw = 92, .ns = 2}, + {.bs = 42, .dw = 14, .ns = 7}, + {.bs = 46, .dw = 20, .ns = 4} } }, { /* Version 13 */ - 532, - {6, 34, 62, 0}, - { - {59, 37, 8}, - {133, 107, 4}, - {33, 11, 12}, - {44, 20, 8} + .data_bytes = 532, + .apat = {6, 34, 62, 0}, + .ecc = { + {.bs = 59, .dw = 37, .ns = 8}, + {.bs = 133, .dw = 107, .ns = 4}, + {.bs = 33, .dw = 11, .ns = 12}, + {.bs = 44, .dw = 20, .ns = 8} } }, { /* Version 14 */ - 581, - {6, 26, 46, 66, 0}, - { - {64, 40, 4}, - {145, 115, 3}, - {36, 12, 11}, - {36, 16, 11} + .data_bytes = 581, + .apat = {6, 26, 46, 66, 0}, + .ecc = { + {.bs = 64, .dw = 40, .ns = 4}, + {.bs = 145, .dw = 115, .ns = 3}, + {.bs = 36, .dw = 12, .ns = 11}, + {.bs = 36, .dw = 16, .ns = 11} } }, { /* Version 15 */ - 655, - {6, 26, 48, 70, 0}, - { - {65, 41, 5}, - {109, 87, 5}, - {36, 12, 11}, - {54, 24, 5} + .data_bytes = 655, + .apat = {6, 26, 48, 70, 0}, + .ecc = { + {.bs = 65, .dw = 41, .ns = 5}, + {.bs = 109, .dw = 87, .ns = 5}, + {.bs = 36, .dw = 12, .ns = 11}, + {.bs = 54, .dw = 24, .ns = 5} } }, { /* Version 16 */ - 733, - {6, 26, 50, 74, 0}, - { - {73, 45, 7}, - {122, 98, 5}, - {45, 15, 3}, - {43, 19, 15} + .data_bytes = 733, + .apat = {6, 26, 50, 74, 0}, + .ecc = { + {.bs = 73, .dw = 45, .ns = 7}, + {.bs = 122, .dw = 98, .ns = 5}, + {.bs = 45, .dw = 15, .ns = 3}, + {.bs = 43, .dw = 19, .ns = 15} } }, { /* Version 17 */ - 815, - {6, 30, 54, 78, 0}, - { - {74, 46, 10}, - {135, 107, 1}, - {42, 14, 2}, - {50, 22, 1} + .data_bytes = 815, + .apat = {6, 30, 54, 78, 0}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 10}, + {.bs = 135, .dw = 107, .ns = 1}, + {.bs = 42, .dw = 14, .ns = 2}, + {.bs = 50, .dw = 22, .ns = 1} } }, { /* Version 18 */ - 901, - {6, 30, 56, 82, 0}, - { - {69, 43, 9}, - {150, 120, 5}, - {42, 14, 2}, - {50, 22, 17} + .data_bytes = 901, + .apat = {6, 30, 56, 82, 0}, + .ecc = { + {.bs = 69, .dw = 43, .ns = 9}, + {.bs = 150, .dw = 120, .ns = 5}, + {.bs = 42, .dw = 14, .ns = 2}, + {.bs = 50, .dw = 22, .ns = 17} } }, { /* Version 19 */ - 991, - {6, 30, 58, 86, 0}, - { - {70, 44, 3}, - {141, 113, 3}, - {39, 13, 9}, - {47, 21, 17} + .data_bytes = 991, + .apat = {6, 30, 58, 86, 0}, + .ecc = { + {.bs = 70, .dw = 44, .ns = 3}, + {.bs = 141, .dw = 113, .ns = 3}, + {.bs = 39, .dw = 13, .ns = 9}, + {.bs = 47, .dw = 21, .ns = 17} } }, { /* Version 20 */ - 1085, - {6, 34, 62, 90, 0}, - { - {67, 41, 3}, - {135, 107, 3}, - {43, 15, 15}, - {54, 24, 15} + .data_bytes = 1085, + .apat = {6, 34, 62, 90, 0}, + .ecc = { + {.bs = 67, .dw = 41, .ns = 3}, + {.bs = 135, .dw = 107, .ns = 3}, + {.bs = 43, .dw = 15, .ns = 15}, + {.bs = 54, .dw = 24, .ns = 15} } }, { /* Version 21 */ - 1156, - {6, 28, 50, 72, 92, 0}, - { - {68, 42, 17}, - {144, 116, 4}, - {46, 16, 19}, - {50, 22, 17} + .data_bytes = 1156, + .apat = {6, 28, 50, 72, 92, 0}, + .ecc = { + {.bs = 68, .dw = 42, .ns = 17}, + {.bs = 144, .dw = 116, .ns = 4}, + {.bs = 46, .dw = 16, .ns = 19}, + {.bs = 50, .dw = 22, .ns = 17} } }, { /* Version 22 */ - 1258, - {6, 26, 50, 74, 98, 0}, - { - {74, 46, 17}, - {139, 111, 2}, - {37, 13, 34}, - {54, 24, 7} + .data_bytes = 1258, + .apat = {6, 26, 50, 74, 98, 0}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 17}, + {.bs = 139, .dw = 111, .ns = 2}, + {.bs = 37, .dw = 13, .ns = 34}, + {.bs = 54, .dw = 24, .ns = 7} } }, { /* Version 23 */ - 1364, - {6, 30, 54, 78, 102, 0}, - { - {75, 47, 4}, - {151, 121, 4}, - {45, 15, 16}, - {54, 24, 11} + .data_bytes = 1364, + .apat = {6, 30, 54, 78, 102, 0}, + .ecc = { + {.bs = 75, .dw = 47, .ns = 4}, + {.bs = 151, .dw = 121, .ns = 4}, + {.bs = 45, .dw = 15, .ns = 16}, + {.bs = 54, .dw = 24, .ns = 11} } }, { /* Version 24 */ - 1474, - {6, 28, 54, 80, 106, 0}, - { - {73, 45, 6}, - {147, 117, 6}, - {46, 16, 30}, - {54, 24, 11} + .data_bytes = 1474, + .apat = {6, 28, 54, 80, 106, 0}, + .ecc = { + {.bs = 73, .dw = 45, .ns = 6}, + {.bs = 147, .dw = 117, .ns = 6}, + {.bs = 46, .dw = 16, .ns = 30}, + {.bs = 54, .dw = 24, .ns = 11} } }, { /* Version 25 */ - 1588, - {6, 32, 58, 84, 110, 0}, - { - {75, 47, 8}, - {132, 106, 8}, - {45, 15, 22}, - {54, 24, 7} + .data_bytes = 1588, + .apat = {6, 32, 58, 84, 110, 0}, + .ecc = { + {.bs = 75, .dw = 47, .ns = 8}, + {.bs = 132, .dw = 106, .ns = 8}, + {.bs = 45, .dw = 15, .ns = 22}, + {.bs = 54, .dw = 24, .ns = 7} } }, { /* Version 26 */ - 1706, - {6, 30, 58, 86, 114, 0}, - { - {74, 46, 19}, - {142, 114, 10}, - {46, 16, 33}, - {50, 22, 28} + .data_bytes = 1706, + .apat = {6, 30, 58, 86, 114, 0}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 19}, + {.bs = 142, .dw = 114, .ns = 10}, + {.bs = 46, .dw = 16, .ns = 33}, + {.bs = 50, .dw = 22, .ns = 28} } }, { /* Version 27 */ - 1828, - {6, 34, 62, 90, 118, 0}, - { - {73, 45, 22}, - {152, 122, 8}, - {45, 15, 12}, - {53, 23, 8} + .data_bytes = 1828, + .apat = {6, 34, 62, 90, 118, 0}, + .ecc = { + {.bs = 73, .dw = 45, .ns = 22}, + {.bs = 152, .dw = 122, .ns = 8}, + {.bs = 45, .dw = 15, .ns = 12}, + {.bs = 53, .dw = 23, .ns = 8} } }, { /* Version 28 */ - 1921, - {6, 26, 50, 74, 98, 122, 0}, - { - {73, 45, 3}, - {147, 117, 3}, - {45, 15, 11}, - {54, 24, 4} + .data_bytes = 1921, + .apat = {6, 26, 50, 74, 98, 122, 0}, + .ecc = { + {.bs = 73, .dw = 45, .ns = 3}, + {.bs = 147, .dw = 117, .ns = 3}, + {.bs = 45, .dw = 15, .ns = 11}, + {.bs = 54, .dw = 24, .ns = 4} } }, { /* Version 29 */ - 2051, - {6, 30, 54, 78, 102, 126, 0}, - { - {73, 45, 21}, - {146, 116, 7}, - {45, 15, 19}, - {53, 23, 1} + .data_bytes = 2051, + .apat = {6, 30, 54, 78, 102, 126, 0}, + .ecc = { + {.bs = 73, .dw = 45, .ns = 21}, + {.bs = 146, .dw = 116, .ns = 7}, + {.bs = 45, .dw = 15, .ns = 19}, + {.bs = 53, .dw = 23, .ns = 1} } }, { /* Version 30 */ - 2185, - {6, 26, 52, 78, 104, 130, 0}, - { - {75, 47, 19}, - {145, 115, 5}, - {45, 15, 23}, - {54, 24, 15} + .data_bytes = 2185, + .apat = {6, 26, 52, 78, 104, 130, 0}, + .ecc = { + {.bs = 75, .dw = 47, .ns = 19}, + {.bs = 145, .dw = 115, .ns = 5}, + {.bs = 45, .dw = 15, .ns = 23}, + {.bs = 54, .dw = 24, .ns = 15} } }, { /* Version 31 */ - 2323, - {6, 30, 56, 82, 108, 134, 0}, - { - {74, 46, 2}, - {145, 115, 13}, - {45, 15, 23}, - {54, 24, 42} + .data_bytes = 2323, + .apat = {6, 30, 56, 82, 108, 134, 0}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 2}, + {.bs = 145, .dw = 115, .ns = 13}, + {.bs = 45, .dw = 15, .ns = 23}, + {.bs = 54, .dw = 24, .ns = 42} } }, { /* Version 32 */ - 2465, - {6, 34, 60, 86, 112, 138, 0}, - { - {74, 46, 10}, - {145, 115, 17}, - {45, 15, 19}, - {54, 24, 10} + .data_bytes = 2465, + .apat = {6, 34, 60, 86, 112, 138, 0}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 10}, + {.bs = 145, .dw = 115, .ns = 17}, + {.bs = 45, .dw = 15, .ns = 19}, + {.bs = 54, .dw = 24, .ns = 10} } }, { /* Version 33 */ - 2611, - {6, 30, 58, 86, 114, 142, 0}, - { - {74, 46, 14}, - {145, 115, 17}, - {45, 15, 11}, - {54, 24, 29} + .data_bytes = 2611, + .apat = {6, 30, 58, 86, 114, 142, 0}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 14}, + {.bs = 145, .dw = 115, .ns = 17}, + {.bs = 45, .dw = 15, .ns = 11}, + {.bs = 54, .dw = 24, .ns = 29} } }, { /* Version 34 */ - 2761, - {6, 34, 62, 90, 118, 146, 0}, - { - {74, 46, 14}, - {145, 115, 13}, - {46, 16, 59}, - {54, 24, 44} + .data_bytes = 2761, + .apat = {6, 34, 62, 90, 118, 146, 0}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 14}, + {.bs = 145, .dw = 115, .ns = 13}, + {.bs = 46, .dw = 16, .ns = 59}, + {.bs = 54, .dw = 24, .ns = 44} } }, { /* Version 35 */ - 2876, - {6, 30, 54, 78, 102, 126, 150}, - { - {75, 47, 12}, - {151, 121, 12}, - {45, 15, 22}, - {54, 24, 39} + .data_bytes = 2876, + .apat = {6, 30, 54, 78, 102, 126, 150}, + .ecc = { + {.bs = 75, .dw = 47, .ns = 12}, + {.bs = 151, .dw = 121, .ns = 12}, + {.bs = 45, .dw = 15, .ns = 22}, + {.bs = 54, .dw = 24, .ns = 39} } }, { /* Version 36 */ - 3034, - {6, 24, 50, 76, 102, 128, 154}, - { - {75, 47, 6}, - {151, 121, 6}, - {45, 15, 2}, - {54, 24, 46} + .data_bytes = 3034, + .apat = {6, 24, 50, 76, 102, 128, 154}, + .ecc = { + {.bs = 75, .dw = 47, .ns = 6}, + {.bs = 151, .dw = 121, .ns = 6}, + {.bs = 45, .dw = 15, .ns = 2}, + {.bs = 54, .dw = 24, .ns = 46} } }, { /* Version 37 */ - 3196, - {6, 28, 54, 80, 106, 132, 158}, - { - {74, 46, 29}, - {152, 122, 17}, - {45, 15, 24}, - {54, 24, 49} + .data_bytes = 3196, + .apat = {6, 28, 54, 80, 106, 132, 158}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 29}, + {.bs = 152, .dw = 122, .ns = 17}, + {.bs = 45, .dw = 15, .ns = 24}, + {.bs = 54, .dw = 24, .ns = 49} } }, { /* Version 38 */ - 3362, - {6, 32, 58, 84, 110, 136, 162}, - { - {74, 46, 13}, - {152, 122, 4}, - {45, 15, 42}, - {54, 24, 48} + .data_bytes = 3362, + .apat = {6, 32, 58, 84, 110, 136, 162}, + .ecc = { + {.bs = 74, .dw = 46, .ns = 13}, + {.bs = 152, .dw = 122, .ns = 4}, + {.bs = 45, .dw = 15, .ns = 42}, + {.bs = 54, .dw = 24, .ns = 48} } }, { /* Version 39 */ - 3532, - {6, 26, 54, 82, 110, 138, 166}, - { - {75, 47, 40}, - {147, 117, 20}, - {45, 15, 10}, - {54, 24, 43} + .data_bytes = 3532, + .apat = {6, 26, 54, 82, 110, 138, 166}, + .ecc = { + {.bs = 75, .dw = 47, .ns = 40}, + {.bs = 147, .dw = 117, .ns = 20}, + {.bs = 45, .dw = 15, .ns = 10}, + {.bs = 54, .dw = 24, .ns = 43} } }, { /* Version 40 */ - 3706, - {6, 30, 58, 86, 114, 142, 170}, - { - {75, 47, 18}, - {148, 118, 19}, - {45, 15, 20}, - {54, 24, 34} + .data_bytes = 3706, + .apat = {6, 30, 58, 86, 114, 142, 170}, + .ecc = { + {.bs = 75, .dw = 47, .ns = 18}, + {.bs = 148, .dw = 118, .ns = 19}, + {.bs = 45, .dw = 15, .ns = 20}, + {.bs = 54, .dw = 24, .ns = 34} } } };