[Pkg-ofed-commits] [mstflint] 09/10: Fix typos
Benjamin Drung
bdrung at moszumanska.debian.org
Tue Aug 16 14:47:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
bdrung pushed a commit to branch master
in repository mstflint.
commit a0bbef3e6ea8ca87963b768967ef4e08755c4935
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date: Tue Aug 16 16:29:45 2016 +0200
Fix typos
---
debian/patches/0002-Fix-typo-allign-align.patch | 301 +++++++++++++++++++++
.../patches/0003-Fix-typo-missmatch-mismatch.patch | 239 ++++++++++++++++
debian/patches/0004-Fix-other-typos.patch | 79 ++++++
debian/patches/series | 3 +
4 files changed, 622 insertions(+)
diff --git a/debian/patches/0002-Fix-typo-allign-align.patch b/debian/patches/0002-Fix-typo-allign-align.patch
new file mode 100644
index 0000000..4a1e7a1
--- /dev/null
+++ b/debian/patches/0002-Fix-typo-allign-align.patch
@@ -0,0 +1,301 @@
+From a64e280474d59c2745eacadec223e107cd6a7a5d Mon Sep 17 00:00:00 2001
+From: Benjamin Drung <benjamin.drung at profitbricks.com>
+Date: Tue, 9 Aug 2016 16:53:40 +0200
+Subject: Fix typo allign -> align
+
+---
+ mflash/mflash.c | 10 +++++-----
+ mflash/mflash_access_layer.c | 6 +++---
+ mflash/mflash_pack_layer.h | 4 ++--
+ mlxfwops/lib/flint_io.cpp | 2 +-
+ mlxfwops/lib/fs3_ops.cpp | 2 +-
+ mtcr_ul/mtcr_ib_ofed.c | 6 +++---
+ mtcr_ul/mtcr_tools_cif.c | 20 ++++++++++----------
+ tools_layouts/register_access_open_layouts.c | 6 +++---
+ tools_layouts/register_access_open_layouts.h | 2 +-
+ tools_layouts/tools_open_layouts.h | 2 +-
+ 10 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/mflash/mflash.c b/mflash/mflash.c
+index 299441c..987d95f 100644
+--- a/mflash/mflash.c
++++ b/mflash/mflash.c
+@@ -938,7 +938,7 @@ int read_chunks (mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data) {
+
+ //
+ // First and last cycles (can be the same one) may not be block aligned.
+- // Check the status, and copy data to a padded temp bufer if not alligned.
++ // Check the status, and copy data to a padded temp bufer if not aligned.
+ // (there's an option to write partial buffer, but Intel reference code always
+ // writes full buffer, with pads if needed. I do the dame ...)
+ //
+@@ -1478,7 +1478,7 @@ int cntx_st_spi_block_read_ex (mflash* mfl, u_int32_t blk_addr, u_int32_t blk_s
+ u_int32_t gw_addr = 0;
+
+ //printf("-D- cntx_st_spi_block_read_ex(addr=%05x, u_int32_t size=%03x, first=%d, last=%d)\n", blk_addr, blk_size, (u_int32_t) is_first, (u_int32_t) is_last);
+- COM_CHECK_ALLIGN(blk_addr, blk_size);
++ COM_CHECK_ALIGN(blk_addr, blk_size);
+
+ if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4) {
+ return MFE_BAD_PARAMS;
+@@ -1528,7 +1528,7 @@ int cntx_st_spi_block_read_old (mflash* mfl, u_int32_t blk_addr, u_int32_t blk_
+ u_int32_t gw_cmd = 0;
+ u_int32_t gw_addr = 0;
+
+- COM_CHECK_ALLIGN(blk_addr, blk_size);
++ COM_CHECK_ALIGN(blk_addr, blk_size);
+
+ if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4) {
+ return MFE_BAD_PARAMS;
+@@ -1566,7 +1566,7 @@ int cntx_st_spi_page_write (mflash* mfl, u_int32_t addr, u_int32_t size, u_in
+ u_int8_t is_last = 0;
+ u_int8_t* p = data;
+
+- WRITE_CHECK_ALLIGN(addr, mfl->attr.block_write, size);
++ WRITE_CHECK_ALIGN(addr, mfl->attr.block_write, size);
+
+ last_addr = addr + size;
+ last_blk_addr = last_addr - mfl->attr.block_write;
+@@ -1592,7 +1592,7 @@ int cntx_sst_spi_byte_write (mflash* mfl, u_int32_t addr, u_int32_t size, u_i
+ u_int32_t last_addr;
+ u_int8_t* p = data;
+
+- WRITE_CHECK_ALLIGN(addr, mfl->attr.block_write, size);
++ WRITE_CHECK_ALIGN(addr, mfl->attr.block_write, size);
+
+ last_addr = addr + size;
+
+diff --git a/mflash/mflash_access_layer.c b/mflash/mflash_access_layer.c
+index f5e6836..cec8241 100755
+--- a/mflash/mflash_access_layer.c
++++ b/mflash/mflash_access_layer.c
+@@ -105,7 +105,7 @@ int sx_block_read_by_type(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u
+ return MFE_BAD_PARAMS;
+ }
+ rc = mfl_get_bank_info(mfl, blk_addr, &flash_offset, &bank); CHECK_RC(rc);
+- COM_CHECK_ALLIGN(flash_offset, blk_size);
++ COM_CHECK_ALIGN(flash_offset, blk_size);
+
+ rc = check_access_type( mfl); CHECK_RC(rc);
+ rc = sx_st_block_access(mfl->mf, flash_offset, bank, blk_size, data, REG_ACCESS_METHOD_GET);CHECK_RC(rc);
+@@ -118,11 +118,11 @@ int sx_block_write_by_type(mflash* mfl, u_int32_t addr, u_int32_t size, u_int8_t
+ int rc, bank;
+ u_int32_t flash_offset;
+
+- WRITE_CHECK_ALLIGN(addr, mfl->attr.block_write, size);
++ WRITE_CHECK_ALIGN(addr, mfl->attr.block_write, size);
+
+
+ rc = mfl_get_bank_info(mfl, addr, &flash_offset, &bank); CHECK_RC(rc);
+- COM_CHECK_ALLIGN(flash_offset, size);
++ COM_CHECK_ALIGN(flash_offset, size);
+
+ rc = check_access_type( mfl); CHECK_RC(rc);
+ rc = sx_st_block_access(mfl->mf, flash_offset, bank, size, data, REG_ACCESS_METHOD_SET);CHECK_RC(rc);
+diff --git a/mflash/mflash_pack_layer.h b/mflash/mflash_pack_layer.h
+index f36859c..3866781 100755
+--- a/mflash/mflash_pack_layer.h
++++ b/mflash/mflash_pack_layer.h
+@@ -171,7 +171,7 @@ enum AccessTypeByMfile{
+ #endif
+ */
+
+-#define WRITE_CHECK_ALLIGN(addr, block_write, size) {\
++#define WRITE_CHECK_ALIGN(addr, block_write, size) {\
+ if (addr & ((u_int32_t)block_write - 1)) {\
+ return MFE_BAD_ALIGN;\
+ }\
+@@ -180,7 +180,7 @@ enum AccessTypeByMfile{
+ }\
+ }
+
+-#define COM_CHECK_ALLIGN(flash_addr, size) {\
++#define COM_CHECK_ALIGN(flash_addr, size) {\
+ if (flash_addr & (size - 1 )) {\
+ return MFE_BAD_ALIGN;\
+ }\
+diff --git a/mlxfwops/lib/flint_io.cpp b/mlxfwops/lib/flint_io.cpp
+index db5b9ec..4fa3923 100755
+--- a/mlxfwops/lib/flint_io.cpp
++++ b/mlxfwops/lib/flint_io.cpp
+@@ -521,7 +521,7 @@ bool Flash::write (u_int32_t addr,
+ Aligner align(first_set);
+ align.Init (addr, cnt);
+ while (align.GetNextChunk(chunk_addr, chunk_size)) {
+- // Write / Erase in sector_size alligned chunks
++ // Write / Erase in sector_size aligned chunks
+ int rc;
+
+ if (!noerase) {
+diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
+index 0f65f2b..3e83a47 100644
+--- a/mlxfwops/lib/fs3_ops.cpp
++++ b/mlxfwops/lib/fs3_ops.cpp
+@@ -1713,7 +1713,7 @@ bool Fs3Operations::Fs3UpdateVpdSection(struct toc_info *curr_toc, char *vpd,
+ }
+ if (vpd_size % 4) {
+ delete[] vpd_data;
+- return errmsg("Size of VPD file: %d is not 4-byte alligned!", vpd_size);
++ return errmsg("Size of VPD file: %d is not 4-byte aligned!", vpd_size);
+ }
+ // assuming VPD section is the last piece of Data on the flash
+ if ( (_ioAccess)->is_flash() && (getAbsAddr(curr_toc) + vpd_size > (_ioAccess)->get_size())) {
+diff --git a/mtcr_ul/mtcr_ib_ofed.c b/mtcr_ul/mtcr_ib_ofed.c
+index 971d4b8..3ba1b89 100644
+--- a/mtcr_ul/mtcr_ib_ofed.c
++++ b/mtcr_ul/mtcr_ib_ofed.c
+@@ -782,7 +782,7 @@ mib_close(mfile *mf)
+ return 0;
+ }
+
+-#define CHECK_ALLIGN(length) { \
++#define CHECK_ALIGN(length) { \
+ if (length % 4) { \
+ IBERROR(("Size must be 4 aligned, got %d", length));\
+ return -1; \
+@@ -857,7 +857,7 @@ MTCR_API int mib_readblock(mfile *mf, unsigned int offset, u_int32_t *data, int
+ }
+ ibvs_mad* h = (ibvs_mad*)(mf->ctx);
+
+- CHECK_ALLIGN(length);
++ CHECK_ALIGN(length);
+
+ if (ibvsmad_craccess_rw(h, offset, IB_MAD_METHOD_GET, (length / 4), data) == ~0ull) {
+ IBERROR(("cr access read to %s failed", h->portid2str(&h->portid)));
+@@ -874,7 +874,7 @@ MTCR_API int mib_writeblock(mfile *mf, unsigned int offset, u_int32_t *data, int
+ }
+ ibvs_mad* h = (ibvs_mad*)(mf->ctx);
+
+- CHECK_ALLIGN(length);
++ CHECK_ALIGN(length);
+
+ if (ibvsmad_craccess_rw(h, offset, IB_MAD_METHOD_SET, (length / 4), data) == ~0ull) {
+ IBERROR(("cr access read to %s failed", h->portid2str(&h->portid)));
+diff --git a/mtcr_ul/mtcr_tools_cif.c b/mtcr_ul/mtcr_tools_cif.c
+index 926054f..176454a 100644
+--- a/mtcr_ul/mtcr_tools_cif.c
++++ b/mtcr_ul/mtcr_tools_cif.c
+@@ -301,7 +301,7 @@ int tools_cmdif_send_inline_cmd(mfile* mf,
+ // read from mailbox method. output[2] is in BigEndian
+ static int tools_cmdif_mbox_read(mfile* mf, u_int32_t offset, u_int32_t output[2])
+ {
+- if (!mf || (offset & 0x1) != 0 || !output) {// offset should be quad word alligned (i.e only even dwords)
++ if (!mf || (offset & 0x1) != 0 || !output) {// offset should be quad word aligned (i.e only even dwords)
+ return ME_BAD_PARAMS;
+ }
+ tools_cmdif cmdif;
+@@ -324,7 +324,7 @@ static int tools_cmdif_mbox_read(mfile* mf, u_int32_t offset, u_int32_t output[2
+ // write to mailbox method. input[2] is in BigEndian
+ static int tools_cmdif_mbox_write(mfile* mf, u_int32_t offset, u_int32_t input[2])
+ {
+- if (!mf || (offset & 0x1) != 0) {// offset should be quad word alligned (i.e only even dwords)
++ if (!mf || (offset & 0x1) != 0) {// offset should be quad word aligned (i.e only even dwords)
+ return ME_BAD_PARAMS;
+ }
+ tools_cmdif cmdif;
+@@ -411,7 +411,7 @@ cleanup_no_sem:
+ return val == MAGIC ? ME_OK : ME_CMDIF_NOT_SUPP;
+ }
+
+-#define COMPLEMENT_TO_QUAD_ALLIGNED(byte_sz) \
++#define COMPLEMENT_TO_QUAD_ALIGNED(byte_sz) \
+ ((byte_sz) + ((8 - ((byte_sz) & 7) == 8) ? 0 : (8 - ((byte_sz) & 7))))
+
+ int tools_cmdif_send_mbox_command_int(mfile* mf,
+@@ -425,16 +425,16 @@ int tools_cmdif_send_mbox_command_int(mfile* mf,
+ int skip_write,
+ int use_cr_mbox)
+ {
+- int read_data_size_quad_alligned = COMPLEMENT_TO_QUAD_ALLIGNED(read_data_size);
+- int write_data_size_quad_alligned = COMPLEMENT_TO_QUAD_ALLIGNED(write_data_size);
++ int read_data_size_quad_aligned = COMPLEMENT_TO_QUAD_ALIGNED(read_data_size);
++ int write_data_size_quad_aligned = COMPLEMENT_TO_QUAD_ALIGNED(write_data_size);
+ int rc,
+ i;
+ /*printf("-D- opcode: 0x%x, opcode mod: 0x%x, data_offs_in_mbox: 0x%x, write_data_size: 0x%x(0x%x), read_data_size 0x%x(0x%x), skip_write: %d\n",\
+- opcode, opcode_modifier, data_offs_in_mbox, write_data_size, write_data_size_quad_alligned, read_data_size, read_data_size_quad_alligned, skip_write);*/
++ opcode, opcode_modifier, data_offs_in_mbox, write_data_size, write_data_size_quad_aligned, read_data_size, read_data_size_quad_aligned, skip_write);*/
+ // check params
+ if (!mf || !data || data_offs_in_mbox < 0 || (data_offs_in_mbox & 7) != 0 || \
+- data_offs_in_mbox + read_data_size_quad_alligned > TOOLS_HCR_MAX_MBOX || \
+- data_offs_in_mbox + write_data_size_quad_alligned > TOOLS_HCR_MAX_MBOX) {
++ data_offs_in_mbox + read_data_size_quad_aligned > TOOLS_HCR_MAX_MBOX || \
++ data_offs_in_mbox + write_data_size_quad_aligned > TOOLS_HCR_MAX_MBOX) {
+ return ME_BAD_PARAMS;
+ }
+ mpci_change(mf);
+@@ -486,12 +486,12 @@ int tools_cmdif_send_mbox_command_int(mfile* mf,
+ // read read_data_size bytes from mbox and update our data
+ if (use_cr_mbox == 1) {
+ // read mailbox from virtual CR-space
+- rc = tools_cmdif_cr_mbox_read(mf, data_offs_in_mbox, &mailbox[data_offs_in_mbox], read_data_size_quad_alligned);
++ rc = tools_cmdif_cr_mbox_read(mf, data_offs_in_mbox, &mailbox[data_offs_in_mbox], read_data_size_quad_aligned);
+ if (rc) {
+ goto cleanup;
+ }
+ } else {
+- for (i = data_offs_in_mbox ; i< (data_offs_in_mbox + read_data_size_quad_alligned); i+=8) { // it is required to write in quad word chunks (64bits each time)
++ for (i = data_offs_in_mbox ; i< (data_offs_in_mbox + read_data_size_quad_aligned); i+=8) { // it is required to write in quad word chunks (64bits each time)
+ rc = tools_cmdif_mbox_read(mf, i/4, (u_int32_t*)&(mailbox[i]));
+ if (rc) {
+ goto cleanup;
+diff --git a/tools_layouts/register_access_open_layouts.c b/tools_layouts/register_access_open_layouts.c
+index c6d2e8f..a5a49fc 100644
+--- a/tools_layouts/register_access_open_layouts.c
++++ b/tools_layouts/register_access_open_layouts.c
+@@ -167,7 +167,7 @@ void register_access_mfpa_pack(const struct register_access_mfpa *ptr_struct, u_
+ adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
+
+ offset = 200;
+- adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_allignment);
++ adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_alignment);
+
+ offset = 224;
+ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int64_t)ptr_struct->capability_mask);
+@@ -208,7 +208,7 @@ void register_access_mfpa_unpack(struct register_access_mfpa *ptr_struct, const
+ ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+
+ offset = 200;
+- ptr_struct->block_allignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
++ ptr_struct->block_alignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+
+ offset = 224;
+ ptr_struct->capability_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+@@ -250,7 +250,7 @@ void register_access_mfpa_print(const struct register_access_mfpa *ptr_struct, F
+ fprintf(file, "sector_size : "UH_FMT"\n", ptr_struct->sector_size);
+
+ adb2c_add_indentation(file, indent_level);
+- fprintf(file, "block_allignment : "UH_FMT"\n", ptr_struct->block_allignment);
++ fprintf(file, "block_alignment : "UH_FMT"\n", ptr_struct->block_alignment);
+
+ adb2c_add_indentation(file, indent_level);
+ fprintf(file, "capability_mask : "U32H_FMT"\n", ptr_struct->capability_mask);
+diff --git a/tools_layouts/register_access_open_layouts.h b/tools_layouts/register_access_open_layouts.h
+index e455493..374f2f4 100644
+--- a/tools_layouts/register_access_open_layouts.h
++++ b/tools_layouts/register_access_open_layouts.h
+@@ -102,7 +102,7 @@ struct register_access_mfpa {
+ u_int16_t sector_size;
+ /* Description - */
+ /* 24.16 - 24.23 */
+- u_int8_t block_allignment;
++ u_int8_t block_alignment;
+ /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+ /* Description - capability mask ;bit 0:Parallel flash Support;else:Reserved */
+ /* 28.0 - 32.31 */
+diff --git a/tools_layouts/tools_open_layouts.h b/tools_layouts/tools_open_layouts.h
+index 318db63..f99abe4 100644
+--- a/tools_layouts/tools_open_layouts.h
++++ b/tools_layouts/tools_open_layouts.h
+@@ -281,7 +281,7 @@ struct tools_open_nv_hdr {
+ /* Description - Shadow: i.e if set the Fw will not update the tlv immediately but wait for a command */
+ /* 4.24 - 4.24 */
+ u_int8_t shadow;
+- /* Description - Pad count: for non dword alligned tlvs */
++ /* Description - Pad count: for non dword aligned tlvs */
+ /* 4.25 - 4.26 */
+ u_int8_t pad_cnt;
+ /* Description - Data version can be set by caller or left as 0. */
+--
+2.7.4
+
diff --git a/debian/patches/0003-Fix-typo-missmatch-mismatch.patch b/debian/patches/0003-Fix-typo-missmatch-mismatch.patch
new file mode 100644
index 0000000..a2f11a9
--- /dev/null
+++ b/debian/patches/0003-Fix-typo-missmatch-mismatch.patch
@@ -0,0 +1,239 @@
+From 89b16dee4bcba85053455abfcb4cb7a56d2634d5 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung <benjamin.drung at profitbricks.com>
+Date: Tue, 9 Aug 2016 16:59:13 +0200
+Subject: Fix typo missmatch -> mismatch
+
+---
+ flint/err_msgs.h | 2 +-
+ flint/subcommands.cpp | 2 +-
+ mlxfwops/lib/aux_tlv_ops.cpp | 2 +-
+ mlxfwops/lib/aux_tlv_ops.h | 2 +-
+ mlxfwops/lib/fs2_ops.cpp | 6 +++---
+ mlxfwops/lib/fs3_ops.cpp | 12 ++++++------
+ mlxfwops/lib/fw_ops.cpp | 6 +++---
+ mlxfwops/lib/mlxfwops.cpp | 6 +++---
+ mlxfwops/lib/mlxfwops_com.h | 8 ++++----
+ 9 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/flint/err_msgs.h b/flint/err_msgs.h
+index 6f8bc18..8ce5f0e 100644
+--- a/flint/err_msgs.h
++++ b/flint/err_msgs.h
+@@ -131,7 +131,7 @@ typedef enum {
+ #define FLINT_NO_GUID_MAC_FLAGS_ERROR "Can not set GUIDs/MACs: please run with -uid/-guid/-mac flag.\n"
+ #define FLINT_NO_UID_FLAG_ERROR "Can not set GUIDs/MACs: uid is not specified, please run with -uid flag.\n"
+ #define FLINT_CHECKSUM_ERROR "Failed to calculate checksum on %s: %s\n"
+-#define FLINT_CHECKSUM_MISSMATCH_ERROR "Given checksum: %s does not match the checksum calculated on device FW: %s.\n"
++#define FLINT_CHECKSUM_MISMATCH_ERROR "Given checksum: %s does not match the checksum calculated on device FW: %s.\n"
+ #define FLINT_CHECKSUM_PARSE_ERROR "Failed to parse given checksum.\n"
+ #define FLINT_CHECKSUM_LEN_ERROR "MD5 checksum should be exactly 16 bytes long.\n"
+ #define FLINT_CHECKSUM_HEX_ERROR "MD5 checksum should contain only hexadecimal digits.\n"
+diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
+index 71a9fbd..84b237f 100644
+--- a/flint/subcommands.cpp
++++ b/flint/subcommands.cpp
+@@ -1377,7 +1377,7 @@ FlintStatus BurnSubCommand::burnFs2()
+
+ // Warn if a fw which does not support config is burnt over fw that does support config
+ // The other way (new fw with config, old fw w/o config) is a normal update flow.
+- // Update: all fw should now support config sectors, so we just check any missmatch in the config pads
++ // Update: all fw should now support config sectors, so we just check any mismatch in the config pads
+
+
+ // Verify config offset. Should never be different between image and flash (unless changing PSID).
+diff --git a/mlxfwops/lib/aux_tlv_ops.cpp b/mlxfwops/lib/aux_tlv_ops.cpp
+index a580c78..f3f8280 100644
+--- a/mlxfwops/lib/aux_tlv_ops.cpp
++++ b/mlxfwops/lib/aux_tlv_ops.cpp
+@@ -339,7 +339,7 @@ Tlv_Status_t ImageTlvOps::parseTlvs()
+ if (tlv.hdr.header_type == 0x0) { // only know how to deal with header of type 0x0
+ // check CRC and store
+ if (tlv.hdr.crc != calcTlvCrc(tlv)) {
+- return (Tlv_Status_t)errmsgWCode(TS_TLV_CRC_MISSMATCH, "Failed to parse TLVs, CRC missmatch for TLV type 0x%x", tlv.hdr.type);
++ return (Tlv_Status_t)errmsgWCode(TS_TLV_CRC_MISMATCH, "Failed to parse TLVs, CRC mismatch for TLV type 0x%x", tlv.hdr.type);
+ }
+ // store it
+ _tlvVec.push_back(tlv);
+diff --git a/mlxfwops/lib/aux_tlv_ops.h b/mlxfwops/lib/aux_tlv_ops.h
+index e139d20..dde60b1 100644
+--- a/mlxfwops/lib/aux_tlv_ops.h
++++ b/mlxfwops/lib/aux_tlv_ops.h
+@@ -46,7 +46,7 @@ typedef enum {
+ TS_OLD_TIMESTAMP,
+ TS_UNSUPPORTED_ICMD_VERSION,
+ // image related errors,
+- TS_TLV_CRC_MISSMATCH,
++ TS_TLV_CRC_MISMATCH,
+ TS_TLV_PARSE_ERROR,
+ TS_NO_TLV_SECTION_FOUND,
+ TS_FAILED_TO_OPEN_FILE,
+diff --git a/mlxfwops/lib/fs2_ops.cpp b/mlxfwops/lib/fs2_ops.cpp
+index 7268ee3..2a686c6 100644
+--- a/mlxfwops/lib/fs2_ops.cpp
++++ b/mlxfwops/lib/fs2_ops.cpp
+@@ -930,7 +930,7 @@ bool Fs2Operations::Fs2FailSafeBurn(Fs2Operations &imageOps,
+ }
+
+ if (_fwImgInfo.cntxLog2ChunkSize != imageOps._fwImgInfo.cntxLog2ChunkSize) {
+- return errmsg(MLXFW_FS_INFO_MISSMATCH_ERR, "Failsafe chunk sizes in flash (0x%x) and in image (0x%x) are not the same.",
++ return errmsg(MLXFW_FS_INFO_MISMATCH_ERR, "Failsafe chunk sizes in flash (0x%x) and in image (0x%x) are not the same.",
+ 1 << _fwImgInfo.cntxLog2ChunkSize,
+ 1 << imageOps._fwImgInfo.cntxLog2ChunkSize);
+ }
+@@ -1404,11 +1404,11 @@ bool Fs2Operations::Fs2Burn(Fs2Operations &imageOps, ExtBurnParams& burnParams)
+ _ioAccess->get_rev_id(),
+ imageOps._fwImgInfo.supportedHwId,
+ imageOps._fwImgInfo.supportedHwIdNum)) {
+- return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "Device/Image mismatch: %s\n",this->err( ));
++ return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n",this->err( ));
+ }
+ } else if (imageOps._fs2ImgInfo.infoOffs[II_DeviceType]) {
+ if (!CheckMatchingDevId(_ioAccess->get_dev_id(), imageOps._fwImgInfo.ext_info.dev_type)) {
+- return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "Device/Image mismatch: %s\n",this->err());
++ return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n",this->err());
+ }
+ }
+
+diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
+index 3e83a47..bf63474 100644
+--- a/mlxfwops/lib/fs3_ops.cpp
++++ b/mlxfwops/lib/fs3_ops.cpp
+@@ -704,7 +704,7 @@ bool Fs3Operations::UpdateDevDataITOC(Fs3Operations &imageOps, struct toc_info *
+ if ( (flash_toc_entry->device_data != image_toc_entry->device_data) || \
+ (flash_toc_entry->no_crc != image_toc_entry->no_crc) || \
+ (flash_toc_entry->relative_addr != image_toc_entry->relative_addr)) {
+- return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "An inconsistency was found in %s section attributes. %s ITOC attribute differs",\
++ return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "An inconsistency was found in %s section attributes. %s ITOC attribute differs",\
+ GetSectionNameByType(image_toc_entry->type), GET_DIFFER_STR(flash_toc_entry, image_toc_entry));
+ }
+ // replace itoc entry in the image
+@@ -927,10 +927,10 @@ bool Fs3Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
+ _ioAccess->get_rev_id(),
+ imageOps._fwImgInfo.supportedHwId,
+ imageOps._fwImgInfo.supportedHwIdNum)) {
+- return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "Device/Image mismatch: %s\n",this->err( ));
++ return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n",this->err( ));
+ }
+ } else { // no suppored hw ids (problem with the image ?)
+- return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "No supported devices were found in the FW image.");
++ return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "No supported devices were found in the FW image.");
+ }
+ }
+
+@@ -975,10 +975,10 @@ bool Fs3Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
+ if (_fwImgInfo.cntxLog2ChunkSize != imageOps._fwImgInfo.cntxLog2ChunkSize) {
+ //TODO: remove both cond before release
+ if (_ioAccess->get_size() < 0x1000000) {
+- return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "Image intended for 16MB Flash. please replace your HCA or perform rework before updating.");
++ return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Image intended for 16MB Flash. please replace your HCA or perform rework before updating.");
+ }
+ // if (imageOps._fwImgInfo.cntxLog2ChunkSize == 0x16 ) {
+- return errmsg(MLXFW_FS_INFO_MISSMATCH_ERR, "Device and Image chunk sizes differ\n"
++ return errmsg(MLXFW_FS_INFO_MISMATCH_ERR, "Device and Image chunk sizes differ\n"
+ " Internal users: in order to fix, please run: mlxfwup -d %s -f %d.%04d.%04d --fix_cx4_image\n"
+ " External users: contact Mellanox support team.", _devName, imageOps._fwImgInfo.ext_info.fw_ver[0],
+ imageOps._fwImgInfo.ext_info.fw_ver[1], imageOps._fwImgInfo.ext_info.fw_ver[2]);
+@@ -2465,7 +2465,7 @@ bool Fs3Operations::TestAndSetTimeStamp(Fs3Operations &imageOps)
+ // versions match allow update
+ retRc = true;
+ } else {
+- retRc = errmsg("Stamped FW version missmatch: %d.%d.%04d differs from %d.%d.%04d", devFwVer.fw_ver_major,\
++ retRc = errmsg("Stamped FW version mismatch: %d.%d.%04d differs from %d.%d.%04d", devFwVer.fw_ver_major,\
+ devFwVer.fw_ver_minor,\
+ devFwVer.fw_ver_subminor,\
+ imageOps._fwImgInfo.ext_info.fw_ver[0],\
+diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
+index 34a8fc7..e4220b7 100644
+--- a/mlxfwops/lib/fw_ops.cpp
++++ b/mlxfwops/lib/fw_ops.cpp
+@@ -1010,7 +1010,7 @@ bool FwOperations::HWIdRevToName(u_int32_t hw_id, u_int8_t rev_id, char *hw_name
+
+ // This function gets the HW ID of the target device and the dev ID from
+ // the image. It then matches the 2 IDs and returns an error in case of
+-// missmatch. The match is not 1:1 , since the FW image contains the SW
++// mismatch. The match is not 1:1 , since the FW image contains the SW
+ // dev id, and a single hw dev id may match multiple SW dev IDs.
+ //
+ bool FwOperations::CheckMatchingHwDevId(u_int32_t hwDevId, u_int32_t rev_id, u_int32_t* supportedHwId, u_int32_t supportedHwIdNum) {
+@@ -1059,7 +1059,7 @@ bool FwOperations::CheckMatchingHwDevId(u_int32_t hwDevId, u_int32_t rev_id, u_i
+ return false;
+ }
+
+- return errmsg(MLXFW_DEVICE_IMAGE_MISSMATCH_ERR, "FW image file cannot be programmed to device %s, it is intended for: %s only",
++ return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "FW image file cannot be programmed to device %s, it is intended for: %s only",
+ curr_hw_id_name, supp_hw_id_list);
+ }
+ bool FwOperations::CheckMatchingDevId(u_int32_t hwDevId, u_int32_t imageDevId) {
+@@ -1113,7 +1113,7 @@ bool FwOperations::CheckPSID(FwOperations &imageOps, u_int8_t allow_psid_change)
+ {
+ if (!allow_psid_change) {
+ if (strncmp( _fwImgInfo.ext_info.psid, imageOps._fwImgInfo.ext_info.psid, PSID_LEN)) {
+- return errmsg(MLXFW_PSID_MISSMATCH_ERR, "Image PSID is %s, it cannot be burnt into current device (PSID: %s)",
++ return errmsg(MLXFW_PSID_MISMATCH_ERR, "Image PSID is %s, it cannot be burnt into current device (PSID: %s)",
+ imageOps._fwImgInfo.ext_info.psid, _fwImgInfo.ext_info.psid);
+ }
+ }
+diff --git a/mlxfwops/lib/mlxfwops.cpp b/mlxfwops/lib/mlxfwops.cpp
+index 681076a..4e387a3 100755
+--- a/mlxfwops/lib/mlxfwops.cpp
++++ b/mlxfwops/lib/mlxfwops.cpp
+@@ -105,7 +105,7 @@ MLXFWOP_API const char* MLXFWOPCALL mlxfw_err2str(int err)
+ return "Memory allocation Error";
+ case MLXFW_ERR_IN_STR:
+ return "Error in String";
+- case MLXFW_PSID_MISSMATCH_ERR:
++ case MLXFW_PSID_MISMATCH_ERR:
+ return "PSID Mismatch";
+ case MLXFW_FLASH_WRITE_ERR:
+ return "Flash write Failed";
+@@ -127,11 +127,11 @@ MLXFWOP_API const char* MLXFWOPCALL mlxfw_err2str(int err)
+ return "Image too large";
+ case MLXFW_IMAGE_FORMAT_ERR:
+ return "Incompatible image format";
+- case MLXFW_DEVICE_IMAGE_MISSMATCH_ERR:
++ case MLXFW_DEVICE_IMAGE_MISMATCH_ERR:
+ return "FW image does not match device";
+ case MLXFW_IMAGE_CORRUPTED_ERR:
+ return "FW image corrupted";
+- case MLXFW_FS_INFO_MISSMATCH_ERR:
++ case MLXFW_FS_INFO_MISMATCH_ERR:
+ return "Failsafe information mismatch";
+ case MLXFW_DEV_ID_ERR:
+ return "Unsupported device ID";
+diff --git a/mlxfwops/lib/mlxfwops_com.h b/mlxfwops/lib/mlxfwops_com.h
+index 0935904..578764c 100644
+--- a/mlxfwops/lib/mlxfwops_com.h
++++ b/mlxfwops/lib/mlxfwops_com.h
+@@ -94,7 +94,7 @@ enum {
+ MLXFW_ERR,
+ MLXFW_MEM_ERR,
+ MLXFW_ERR_IN_STR,
+- MLXFW_PSID_MISSMATCH_ERR,
++ MLXFW_PSID_MISMATCH_ERR,
+ MLXFW_FLASH_WRITE_ERR,
+ MLXFW_NO_VALID_IMAGE_ERR,
+ MLXFW_MULTIPLE_VALID_IMAGES_ERR,
+@@ -105,9 +105,9 @@ enum {
+ MLXFW_IMAGE_NOT_FS_ERR,
+ MLXFW_IMAGE_TOO_LARGE_ERR,
+ MLXFW_IMAGE_FORMAT_ERR,
+- MLXFW_DEVICE_IMAGE_MISSMATCH_ERR,
++ MLXFW_DEVICE_IMAGE_MISMATCH_ERR,
+ MLXFW_IMAGE_CORRUPTED_ERR,
+- MLXFW_FS_INFO_MISSMATCH_ERR,
++ MLXFW_FS_INFO_MISMATCH_ERR,
+ MLXFW_DEV_ID_ERR,
+ MLXFW_UNSUPPORTED_BIN_VER_ERR,
+ MLXFW_NO_VALID_ITOC_ERR,
+@@ -120,7 +120,7 @@ enum {
+ MLXFW_GET_SECT_ERR,
+ MLXFW_UPDATE_SECT_ERR,
+ MLXFW_BAD_PARAM_ERR,
+- MLXFW_PRS_MISSMATCH_ERR,
++ MLXFW_PRS_MISMATCH_ERR,
+ MLXFW_NO_VALID_DEVICE_INFO_ERR,
+ MLXFW_TWO_VALID_DEVICE_INFO_ERR,
+ MLXFW_DTOC_OVERWRITE_CHUNK
+--
+2.7.4
+
diff --git a/debian/patches/0004-Fix-other-typos.patch b/debian/patches/0004-Fix-other-typos.patch
new file mode 100644
index 0000000..83bb5f4
--- /dev/null
+++ b/debian/patches/0004-Fix-other-typos.patch
@@ -0,0 +1,79 @@
+From ae8878787c5f0e3d6fafeb7f2d283f7d205f9e88 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung <benjamin.drung at profitbricks.com>
+Date: Tue, 9 Aug 2016 17:01:15 +0200
+Subject: Fix other typos
+
+---
+ flint/subcommands.cpp | 2 +-
+ man/mstmcra.1 | 2 +-
+ man/mstmtserver.1 | 2 +-
+ small_utils/mcra.c | 2 +-
+ small_utils/mtserver.c | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
+index 84b237f..dd0532e 100644
+--- a/flint/subcommands.cpp
++++ b/flint/subcommands.cpp
+@@ -647,7 +647,7 @@ bool SubCommand::getPasswordFromUser(const char *preStr, char buffer[MAX_PASSWOR
+ int i;
+
+ if (!stdinHndl) {
+- // adrianc: this might be problematic if called and stdout was alreading overriden use CIN$ instead
++ // adrianc: this might be problematic if called and stdout was alreading overridden use CIN$ instead
+ stdinHndl = GetStdHandle(STD_INPUT_HANDLE);
+ }
+ printf("%s:", preStr);
+diff --git a/man/mstmcra.1 b/man/mstmcra.1
+index d7a72e2..102597c 100644
+--- a/man/mstmcra.1
++++ b/man/mstmcra.1
+@@ -30,5 +30,5 @@ mstmcra [-s <i2c-slave>] [-a <adb dump>] [-v] [-h] <device>
+ .IP
+ .SH Environment Vairables:
+ .TP
+-ADB_DUMP : Holds the path to adb dump, used for access by path (can be overriden by "\-a").
++ADB_DUMP : Holds the path to adb dump, used for access by path (can be overridden by "\-a").
+ .TP
+diff --git a/man/mstmtserver.1 b/man/mstmtserver.1
+index bccd186..885bf49 100644
+--- a/man/mstmtserver.1
++++ b/man/mstmtserver.1
+@@ -10,7 +10,7 @@ mstmtserver [options]
+ .TP
+ \fB-p\fR[ort] <port> - Listen to specify port (default is 23108).
+ .TP
+-\fB-d\fR[ebug] - Print all socket traffic (for debuging only).
++\fB-d\fR[ebug] - Print all socket traffic (for debugging only).
+ .TP
+ \fB-h\fR[elp] - Print help message.
+ .TP
+diff --git a/small_utils/mcra.c b/small_utils/mcra.c
+index 9cdf872..dd18b2c 100644
+--- a/small_utils/mcra.c
++++ b/small_utils/mcra.c
+@@ -76,7 +76,7 @@ void usage(const char *n, int with_exit)
+ printf(" -v : Display version info\n");
+ printf("\n");
+ printf("Environment Variables:\n");
+- printf(" ADB_DUMP : Holds the path to adb dump, used for access by path (can be overriden by \"-a\").\n");
++ printf(" ADB_DUMP : Holds the path to adb dump, used for access by path (can be overridden by \"-a\").\n");
+ if (with_exit) {
+ exit(1);
+ }
+diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c
+index 4436058..5ad1776 100644
+--- a/small_utils/mtserver.c
++++ b/small_utils/mtserver.c
+@@ -325,7 +325,7 @@ void usage(const char *s)
+ printf("Usage:\n\t%s [switches]\n\n", s);
+ printf("Switches may be:\n");
+ printf("\t-p[ort] <port> - Listen to specify port (default is %d).\n", port);
+- printf("\t-d[ebug] - Print all socket traffic (for debuging only).\n");
++ printf("\t-d[ebug] - Print all socket traffic (for debugging only).\n");
+ printf("%s", sim_str);
+ printf("\t-h[elp] - Print help message.\n");
+ exit (1);
+--
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
index e0323ee..09feeb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
0001-Remove-date-and-time-from-version-string-to-ensure-r.patch
+0002-Fix-typo-allign-align.patch
+0003-Fix-typo-missmatch-mismatch.patch
+0004-Fix-other-typos.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/mstflint.git
More information about the Pkg-ofed-commits
mailing list