[Pkg-ofed-commits] [mstflint] 05/09: Refresh remaining patches
Benjamin Drung
bdrung at moszumanska.debian.org
Tue Jan 24 13:23:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
bdrung pushed a commit to branch master
in repository mstflint.
commit 016d5e236c86b904c29795ad2e59b863fb418bea
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date: Wed Jan 18 16:46:54 2017 +0100
Refresh remaining patches
---
debian/patches/0002-Fix-typo-allign-align.patch | 380 ++++++++----------------
debian/patches/0004-Fix-other-typos.patch | 100 ++-----
debian/patches/0006-Fix-man-page-errors.patch | 337 +++++----------------
debian/patches/Fix-typo-recieved-received.patch | 318 ++++----------------
4 files changed, 282 insertions(+), 853 deletions(-)
diff --git a/debian/patches/0002-Fix-typo-allign-align.patch b/debian/patches/0002-Fix-typo-allign-align.patch
index 30b9c1e..dc5c304 100644
--- a/debian/patches/0002-Fix-typo-allign-align.patch
+++ b/debian/patches/0002-Fix-typo-allign-align.patch
@@ -1,233 +1,64 @@
-From a64e280474d59c2745eacadec223e107cd6a7a5d Mon Sep 17 00:00:00 2001
+From 51f618b7c3174ad4c4c7d1b7c0e79c1a8c682771 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung at profitbricks.com>
-Date: Tue, 9 Aug 2016 16:53:40 +0200
+Date: Tue, 3 Jan 2017 20:01:47 +0100
Subject: Fix typo allign -> align
+Signed-off-by: Benjamin Drung <benjamin.drung at profitbricks.com>
---
- 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 ++++++++++----------
+ mlxfwops/lib/fs4_ops.cpp | 2 +-
+ tools_layouts/connectib_layouts.c | 12 ++++++------
+ tools_layouts/connectib_layouts.h | 4 ++--
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(-)
+ tools_layouts/tools_open_layouts.c | 6 +++---
+ tools_layouts/tools_open_layouts.h | 4 ++--
+ 7 files changed, 18 insertions(+), 18 deletions(-)
---- a/mflash/mflash.c
-+++ b/mflash/mflash.c
-@@ -946,7 +946,7 @@
-
- //
- // 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 ...)
- //
-@@ -1486,7 +1486,7 @@
- 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;
-@@ -1536,7 +1536,7 @@
- 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;
-@@ -1574,7 +1574,7 @@
- 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;
-@@ -1600,7 +1600,7 @@
- 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;
-
---- a/mflash/mflash_access_layer.c
-+++ b/mflash/mflash_access_layer.c
-@@ -121,7 +121,7 @@
- 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);
-@@ -134,11 +134,11 @@
- 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);
---- a/mflash/mflash_pack_layer.h
-+++ b/mflash/mflash_pack_layer.h
-@@ -204,7 +204,7 @@
- #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;\
- }\
-@@ -213,7 +213,7 @@
- }\
- }
-
--#define COM_CHECK_ALLIGN(flash_addr, size) {\
-+#define COM_CHECK_ALIGN(flash_addr, size) {\
- if (flash_addr & (size - 1 )) {\
- return MFE_BAD_ALIGN;\
- }\
---- a/mlxfwops/lib/flint_io.cpp
-+++ b/mlxfwops/lib/flint_io.cpp
-@@ -597,7 +597,7 @@
- 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) {
---- a/mlxfwops/lib/fs3_ops.cpp
-+++ b/mlxfwops/lib/fs3_ops.cpp
-@@ -1704,7 +1704,7 @@
+diff --git a/mlxfwops/lib/fs4_ops.cpp b/mlxfwops/lib/fs4_ops.cpp
+index c033a05..11de107 100755
+--- a/mlxfwops/lib/fs4_ops.cpp
++++ b/mlxfwops/lib/fs4_ops.cpp
+@@ -1285,7 +1285,7 @@ bool Fs4Operations::Fs4UpdateVpdSection(struct fs4_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())) {
---- a/mtcr_ul/mtcr_ib_ofed.c
-+++ b/mtcr_ul/mtcr_ib_ofed.c
-@@ -782,7 +782,7 @@
- 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 @@
- }
- ibvs_mad* h = (ibvs_mad*)(mf->ctx);
+ //check if vpd exceeds the dtoc array
+diff --git a/tools_layouts/connectib_layouts.c b/tools_layouts/connectib_layouts.c
+index 411b2e9..229588c 100644
+--- a/tools_layouts/connectib_layouts.c
++++ b/tools_layouts/connectib_layouts.c
+@@ -10862,7 +10862,7 @@ void connectib_mfpa_pack(const struct connectib_mfpa *ptr_struct, u_int8_t* ptr_
+ adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
-- CHECK_ALLIGN(length);
-+ CHECK_ALIGN(length);
+ 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);
- 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 @@
- }
- ibvs_mad* h = (ibvs_mad*)(mf->ctx);
+ offset = 192;
+ adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_size);
+@@ -10915,7 +10915,7 @@ void connectib_mfpa_unpack(struct connectib_mfpa *ptr_struct, const u_int8_t* pt
+ ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-- CHECK_ALLIGN(length);
-+ CHECK_ALIGN(length);
+ 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);
- 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)));
---- a/mtcr_ul/mtcr_tools_cif.c
-+++ b/mtcr_ul/mtcr_tools_cif.c
-@@ -301,7 +301,7 @@
- // 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 @@
- // 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 @@
- return val == MAGIC ? ME_OK : ME_CMDIF_NOT_SUPP;
- }
+ offset = 192;
+ ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+@@ -10969,7 +10969,7 @@ void connectib_mfpa_print(const struct connectib_mfpa *ptr_struct, FILE* file, i
+ fprintf(file, "sector_size : " UH_FMT "\n", ptr_struct->sector_size);
--#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))))
+ 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);
- int tools_cmdif_send_mbox_command_int(mfile* mf,
-@@ -425,16 +425,16 @@
- 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 @@
- // 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;
---- a/tools_layouts/register_access_open_layouts.c
-+++ b/tools_layouts/register_access_open_layouts.c
-@@ -167,7 +167,7 @@
+ adb2c_add_indentation(file, indent_level);
+ fprintf(file, "block_size : " UH_FMT "\n", ptr_struct->block_size);
+@@ -23988,7 +23988,7 @@ void connectib_register_mfpa_pack(const struct connectib_register_mfpa *ptr_stru
adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
offset = 200;
@@ -235,8 +66,8 @@ Subject: Fix typo allign -> align
+ 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 @@
+ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->capability_mask);
+@@ -24032,7 +24032,7 @@ void connectib_register_mfpa_unpack(struct connectib_register_mfpa *ptr_struct,
ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
offset = 200;
@@ -245,89 +76,86 @@ Subject: Fix typo allign -> align
offset = 224;
ptr_struct->capability_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-@@ -250,7 +250,7 @@
- fprintf(file, "sector_size : "UH_FMT"\n", ptr_struct->sector_size);
+@@ -24077,7 +24077,7 @@ void connectib_register_mfpa_print(const struct connectib_register_mfpa *ptr_str
+ 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);
+- 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);
---- a/tools_layouts/register_access_open_layouts.h
-+++ b/tools_layouts/register_access_open_layouts.h
-@@ -102,7 +102,7 @@
+ fprintf(file, "capability_mask : " U32H_FMT "\n", ptr_struct->capability_mask);
+diff --git a/tools_layouts/connectib_layouts.h b/tools_layouts/connectib_layouts.h
+index 9aeb646..457d823 100644
+--- a/tools_layouts/connectib_layouts.h
++++ b/tools_layouts/connectib_layouts.h
+@@ -4426,7 +4426,7 @@ Sector block size is available in MFMC.sector_protect_size */
u_int16_t sector_size;
/* Description - */
- /* 24.16 - 24.23 */
+ /* 0x18.16 - 0x18.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 */
---- a/tools_layouts/tools_open_layouts.h
-+++ b/tools_layouts/tools_open_layouts.h
-@@ -282,7 +282,7 @@
- /* Description - Shadow: i.e if set the Fw will not update the tlv immediately but wait for a command */
- /* 0x4.24 - 0x4.24 */
- u_int8_t shadow;
-- /* Description - Pad count: for non dword alligned tlvs */
-+ /* Description - Pad count: for non dword aligned tlvs */
- /* 0x4.25 - 0x4.26 */
- u_int8_t pad_cnt;
- /* Description - Data version can be set by caller or left as 0. */
-@@ -455,7 +455,7 @@
+ /* Description - */
+ /* 0x18.24 - 0x18.31 */
+ u_int8_t block_size;
+@@ -8132,7 +8132,7 @@ struct connectib_register_mfpa {
u_int16_t sector_size;
/* Description - */
/* 0x18.16 - 0x18.23 */
- u_int8_t block_allignment;
+ u_int8_t block_alignment;
- /* Description - */
- /* 0x18.24 - 0x18.31 */
- u_int8_t block_size;
---- a/tools_layouts/connectib_layouts.c
-+++ b/tools_layouts/connectib_layouts.c
-@@ -6578,7 +6578,7 @@
+ /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+ /* Description - capability mask ;bit 0:Parallel flash Support;else:Reserved */
+ /* 0x1c.0 - 0x20.31 */
+diff --git a/tools_layouts/register_access_open_layouts.c b/tools_layouts/register_access_open_layouts.c
+index 1642d29..38993dd 100644
+--- a/tools_layouts/register_access_open_layouts.c
++++ b/tools_layouts/register_access_open_layouts.c
+@@ -166,7 +166,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;
+ 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=192;
- adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_size);
-@@ -6620,7 +6620,7 @@
+ offset = 224;
+ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->capability_mask);
+@@ -207,7 +207,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;
+ 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=192;
- ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-@@ -6660,7 +6660,7 @@
- fprintf(file, "sector_size : "UH_FMT"\n", ptr_struct->sector_size);
+ offset = 224;
+ ptr_struct->capability_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+@@ -249,7 +249,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);
+- 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, "block_size : "UH_FMT"\n", ptr_struct->block_size);
---- a/tools_layouts/connectib_layouts.h
-+++ b/tools_layouts/connectib_layouts.h
-@@ -1844,7 +1844,7 @@
+ 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 b4d24e4..6a72da3 100644
+--- a/tools_layouts/register_access_open_layouts.h
++++ b/tools_layouts/register_access_open_layouts.h
+@@ -101,7 +101,7 @@ struct register_access_mfpa {
u_int16_t sector_size;
/* Description - */
- /* 24.16 - 24.23 */
+ /* 0x18.16 - 0x18.23 */
- u_int8_t block_allignment;
+ u_int8_t block_alignment;
- /* Description - */
- /* 24.24 - 28.31 */
- u_int8_t block_size;
+ /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+ /* Description - capability mask ;bit 0:Parallel flash Support;else:Reserved */
+ /* 0x1c.0 - 0x20.31 */
+diff --git a/tools_layouts/tools_open_layouts.c b/tools_layouts/tools_open_layouts.c
+index 5d52d57..3c3670a 100644
--- a/tools_layouts/tools_open_layouts.c
+++ b/tools_layouts/tools_open_layouts.c
-@@ -1401,7 +1401,7 @@
+@@ -1409,7 +1409,7 @@ void tools_open_mfpa_pack(const struct tools_open_mfpa *ptr_struct, u_int8_t* pt
adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
offset = 200;
@@ -336,7 +164,7 @@ Subject: Fix typo allign -> align
offset = 192;
adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_size);
-@@ -1454,7 +1454,7 @@
+@@ -1462,7 +1462,7 @@ void tools_open_mfpa_unpack(struct tools_open_mfpa *ptr_struct, const u_int8_t*
ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
offset = 200;
@@ -345,7 +173,7 @@ Subject: Fix typo allign -> align
offset = 192;
ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-@@ -1508,7 +1508,7 @@
+@@ -1516,7 +1516,7 @@ void tools_open_mfpa_print(const struct tools_open_mfpa *ptr_struct, FILE* file,
fprintf(file, "sector_size : " UH_FMT "\n", ptr_struct->sector_size);
adb2c_add_indentation(file, indent_level);
@@ -354,3 +182,27 @@ Subject: Fix typo allign -> align
adb2c_add_indentation(file, indent_level);
fprintf(file, "block_size : " UH_FMT "\n", ptr_struct->block_size);
+diff --git a/tools_layouts/tools_open_layouts.h b/tools_layouts/tools_open_layouts.h
+index 86998c6..50db6ee 100644
+--- a/tools_layouts/tools_open_layouts.h
++++ b/tools_layouts/tools_open_layouts.h
+@@ -285,7 +285,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 */
+ /* 0x4.24 - 0x4.24 */
+ u_int8_t shadow;
+- /* Description - Pad count: for non dword alligned tlvs */
++ /* Description - Pad count: for non dword aligned tlvs */
+ /* 0x4.25 - 0x4.26 */
+ u_int8_t pad_cnt;
+ /* Description - Data version can be set by caller or left as 0. */
+@@ -458,7 +458,7 @@ struct tools_open_mfpa {
+ u_int16_t sector_size;
+ /* Description - */
+ /* 0x18.16 - 0x18.23 */
+- u_int8_t block_allignment;
++ u_int8_t block_alignment;
+ /* Description - */
+ /* 0x18.24 - 0x18.31 */
+ u_int8_t block_size;
+--
+2.9.3
diff --git a/debian/patches/0004-Fix-other-typos.patch b/debian/patches/0004-Fix-other-typos.patch
index 2b990d8..bce1549 100644
--- a/debian/patches/0004-Fix-other-typos.patch
+++ b/debian/patches/0004-Fix-other-typos.patch
@@ -1,88 +1,42 @@
-From ae8878787c5f0e3d6fafeb7f2d283f7d205f9e88 Mon Sep 17 00:00:00 2001
+From 9444f969e46558cc3147021b18a19af4d2a8da75 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
+Date: Wed, 18 Jan 2017 17:00:13 +0100
+Subject: Fix typo informations -> information
+There is no plural for information.
+
+Signed-off-by: Benjamin Drung <benjamin.drung at profitbricks.com>
---
- 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(-)
+ man/mstconfig.1 | 2 +-
+ mlxconfig/mlxcfg_parser.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
---- a/flint/subcommands.cpp
-+++ b/flint/subcommands.cpp
-@@ -650,7 +650,7 @@
- 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);
---- a/man/mstmcra.1
-+++ b/man/mstmcra.1
-@@ -30,5 +30,5 @@
- .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
---- a/man/mstmtserver.1
-+++ b/man/mstmtserver.1
-@@ -10,7 +10,7 @@
- .TP
- \fB-p\fR[ort] <port> - Listen to specify port (default is 23108).
+diff --git a/man/mstconfig.1 b/man/mstconfig.1
+index 91dff6b..95c6cce 100644
+--- a/man/mstconfig.1
++++ b/man/mstconfig.1
+@@ -51,7 +51,7 @@ clear_semaphore
.TP
--\fB-d\fR[ebug] - Print all socket traffic (for debuging only).
-+\fB-d\fR[ebug] - Print all socket traffic (for debugging only).
+ .B
+ i[show_confs]
+-: display informations about all configurations.
++: display information about all configurations.
.TP
- \fB-h\fR[elp] - Print help message.
- .TP
---- a/small_utils/mcra.c
-+++ b/small_utils/mcra.c
-@@ -76,7 +76,7 @@
- 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);
- }
---- a/small_utils/mtserver.c
-+++ b/small_utils/mtserver.c
-@@ -325,7 +325,7 @@
- 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);
+ .B
+ q[uery]
+diff --git a/mlxconfig/mlxcfg_parser.cpp b/mlxconfig/mlxcfg_parser.cpp
+index 3a86e3d..b36b936 100644
--- a/mlxconfig/mlxcfg_parser.cpp
+++ b/mlxconfig/mlxcfg_parser.cpp
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ void MlxCfg::printHelp()
printf("\n");
printf(IDENT"COMMANDS:\n");
printf(IDENT2"%-24s : %s\n","clear_semaphore", "clear the tool semaphore.");
- printf(IDENT2"%-24s : %s\n","i[show_confs]", "display informations about all configurations.");
+ printf(IDENT2"%-24s : %s\n","i[show_confs]", "display information about all configurations.");
- printf(IDENT2"%-24s : %s\n","q[uery]", "query current supported configurations.");
+ printf(IDENT2"%-24s : %s\n","q[uery]", "query supported configurations.");
printf(IDENT2"%-24s : %s\n","r[eset]", "reset all configurations to their default value.");
printf(IDENT2"%-24s : %s\n","s[et]", "set configurations to a specific device.");
---- a/mlxfwops/lib/flint_io.cpp
-+++ b/mlxfwops/lib/flint_io.cpp
-@@ -295,7 +295,7 @@
- bool FImage::write(u_int32_t addr, void* data, int cnt)
- {
- if ( !_isFile ) {
-- return errmsg("Cannot perfrom write to file. no file specified.");
-+ return errmsg("Cannot perform write to file. no file specified.");
- }
-
- if (!readWriteCommCheck(addr, 0)) {
+--
+2.9.3
+
diff --git a/debian/patches/0006-Fix-man-page-errors.patch b/debian/patches/0006-Fix-man-page-errors.patch
index eb02333..daab8fe 100644
--- a/debian/patches/0006-Fix-man-page-errors.patch
+++ b/debian/patches/0006-Fix-man-page-errors.patch
@@ -1,294 +1,94 @@
-From bf9daf9b6dfe968b4637887337a0173d25348922 Mon Sep 17 00:00:00 2001
+From 460db56498606089ad63d34f5c56133c9343d0da Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung at profitbricks.com>
-Date: Tue, 9 Aug 2016 17:49:31 +0200
+Date: Tue, 3 Jan 2017 20:01:35 +0100
Subject: Fix man page errors
+lintian found some issues with the man pages. Fix the reported issue,
+but do not start the needed full adjustment of the formatting.
+
+Signed-off-by: Benjamin Drung <benjamin.drung at profitbricks.com>
---
man/mstconfig.1 | 6 +++---
- man/mstflint.1 | 55 ++++++++++++++++++++++++++++---------------------------
+ man/mstflint.1 | 14 +++++---------
man/mstmcra.1 | 7 ++-----
man/mstmread.1 | 6 ++----
man/mstmtserver.1 | 7 +++----
man/mstmwrite.1 | 4 +---
man/mstregdump.1 | 9 +++------
man/mstvpd.1 | 6 ++----
- 8 files changed, 44 insertions(+), 56 deletions(-)
+ 8 files changed, 21 insertions(+), 38 deletions(-)
+diff --git a/man/mstconfig.1 b/man/mstconfig.1
+index d172e66..91dff6b 100644
--- a/man/mstconfig.1
+++ b/man/mstconfig.1
-@@ -2,11 +2,11 @@
+@@ -1,12 +1,12 @@
+ .TH MSTCONFIG "1" "4.6.0" "10 January 2017" ""
.SH NAME
- mstconfig \- set or query non-volatile configurable options for Mellanox HCAs
+-mstconfig
++mstconfig \- set or query non-volatile configurable options for Mellanox HCAs
.IP
-.SH SYNOPSIS:
+.SH SYNOPSIS
.IP
- mstconfig [\-d <mst device> ] [\-y|\-e] <s[et] <parameters to set>|q[uery]|r[eset]>
+ mstconfig [Options] <Commands> [Parameters]
.IP
-.SH OPTIONS:
+.SH OPTIONS
+ .RS
.TP
- \fB\-d\fR|\-\-dev <device>
- : Perform operation for a specified mst device.
-@@ -216,7 +216,7 @@
- .IP
- LINK_TYPE_P2=<ETH|IB|VPI>
- .IP
--\fBWake On LAN:\R
-+\fBWake On LAN:\fR
- .IP
- WOL_MAGIC_EN=<False|True>
- .IP
+ .B
+diff --git a/man/mstflint.1 b/man/mstflint.1
+index 36cafc9..63fdadf 100644
--- a/man/mstflint.1
+++ b/man/mstflint.1
-@@ -427,7 +427,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 \fB-guid\fP 0x2c9000100d050 \fB-i\fP image1.bin b
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -446,7 +446,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 query
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -463,7 +463,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 v
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -480,7 +480,7 @@
- .IP
- \fIExamples\fP: None
-
--."***************************************************************************************
-+\"***************************************************************************************
- .RE
+@@ -29,12 +29,10 @@
+ flint is a FW (firmware) burning and flash memory operations tool for
+ Mellanox Infiniband HCAs, Ethernet NIC cards, and switch devices.
+ .SH OPTIONS
+-\fBMstFlint\fP [\fIOPTIONS\fP] <command> [\fIParameters\fP]
+-.RS
.TP
.B
-@@ -496,7 +496,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 brom exp-rom.rom
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -513,7 +513,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 drom
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -530,7 +530,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 rrom exp-rom.rom
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -549,7 +549,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 \fB-i\fP image1.bin bb
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -588,7 +588,7 @@
- .IP \(bu 4
- mstflint -d 08:00.0 -guid 0x0002c9000100d050 -mac 0x0002c900d050 sg
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -605,11 +605,11 @@
- .IP \(bu 4
- mstflint \fB-i\fP fw_image.bin set_vpd vpd.bin
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
--.b
-+.B
- \fIName\fP: sv
- .IP
- \fIDescription\fP: Set VSD in the given device/image.
-@@ -624,7 +624,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 \fB-vsd\fP VSD_STRING sv
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -641,7 +641,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 ri file.bin
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -662,7 +662,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 dc
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -680,7 +680,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 dh hash.csv
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -697,7 +697,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 set_key 1234deaf5678
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -719,7 +719,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 hw_access enable
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -752,7 +752,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 hw set Flash1.WriteProtected=Top,1-SubSectors
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -769,7 +769,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 erase 0x10000
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -786,7 +786,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 rw 0x20
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
+ \fB-d\fP|\fB--device\fP <device>
+-: Device flash is connected to.
++Device flash is connected to.
+ Commands affected: all
.TP
-@@ -809,7 +809,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 ww 0x10008 0x5a445a44
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -836,7 +836,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 wwne 0x10008 0x5a445a44
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
- .TP
-@@ -857,7 +857,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 wbne 0x10000 12 0x30000 0x76800 0x5a445a44
-
--."***************************************************************************************
-+\"***************************************************************************************
-
+ .B
+@@ -287,12 +285,11 @@ device.
.RE
- .TP
-@@ -876,7 +876,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 wb myData.bin 0x0
-
--."***************************************************************************************
-+\"***************************************************************************************
-
.RE
+ .PP
+-COMMANDS SUMMARY:
+-.RS
++COMMANDS SUMMARY
.TP
-@@ -894,11 +894,12 @@
- size - size of data to read in bytes
- .IP
- file - filename to write the block (raw binary). If not given, the data is printed to screen.
-+.IP
- \fIExamples\fP:
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 rb 0x10000 100 file.bin
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
+ .B
+ burn|b
+-: Burn flash
++Burn flash
.TP
-@@ -914,7 +915,7 @@
- \fIExamples\fP:
- .IP \(bu 4
- mstflint \fB-i\fP fw_image.bin qrom
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
+ .B
+ query|q [full]
+@@ -325,9 +322,8 @@ rrom
+ bb
+ : Burn Block - Burns the given image as is. No checks are done.
.TP
-@@ -931,7 +932,7 @@
- .IP \(bu 4
- mstflint \fB-d\fP 04:00.0 checksum
-
--."***************************************************************************************
-+\"***************************************************************************************
-
- .RE
+-.B
+-sg
+-[guids_num=<num|num_port1,num_port2> step_size=<size|size_port1,size_port2>] | [nocrc] : Set GUIDs.
++\fBsg\fR [guids_num=<num|num_port1,num_port2> step_size=<size|size_port1,size_port2>] | [nocrc]
++Set GUIDs.
.TP
+ .B
+ sv
+diff --git a/man/mstmcra.1 b/man/mstmcra.1
+index 935f39e..e8705d7 100644
--- a/man/mstmcra.1
+++ b/man/mstmcra.1
@@ -1,11 +1,9 @@
- .TH MSTMCRA "1" "4.4.0" ""
+ .TH MSTMCRA "1" "4.6.0" ""
.SH NAME
-mstmcra
+mstmcra \- Mellanox Configuration Registers Access tool
@@ -301,15 +101,17 @@ Subject: Fix man page errors
mstmcra [-s <i2c-slave>] [-a <adb dump>] [-v] [-h] <device>
<addr[.<bit offset>:<bit size>]|[,<bytes number>]> [data]
-@@ -31,4 +29,3 @@
+@@ -31,4 +29,3 @@ mstmcra [-s <i2c-slave>] [-a <adb dump>] [-v] [-h] <device>
.SH Environment Vairables:
.TP
ADB_DUMP : Holds the path to adb dump, used for access by path (can be overridden by "\-a").
-.TP
+diff --git a/man/mstmread.1 b/man/mstmread.1
+index d47feb2..3c27c6c 100644
--- a/man/mstmread.1
+++ b/man/mstmread.1
@@ -1,10 +1,8 @@
- .TH MSTMREAD "1" "4.4.0" ""
+ .TH MSTMREAD "1" "4.6.0" ""
.SH NAME
-mstmread
+mstmread \- Mellanox Read Configuration Register Tool
@@ -321,10 +123,12 @@ Subject: Fix man page errors
-
mstmread <device> <addr>
.IP
+diff --git a/man/mstmtserver.1 b/man/mstmtserver.1
+index 22ba224..4866d7a 100644
--- a/man/mstmtserver.1
+++ b/man/mstmtserver.1
@@ -1,16 +1,15 @@
- .TH MSTMTSERVER "1" "4.4.0" ""
+ .TH MSTMTSERVER "1" "4.6.0" ""
.SH NAME
-mstmtserver
+mstmtserver \- Mellanox Software tools (mst) server (remote mtcr calls)
@@ -343,10 +147,12 @@ Subject: Fix man page errors
.TP
\fB-h\fR[elp] - Print help message.
-.TP
+diff --git a/man/mstmwrite.1 b/man/mstmwrite.1
+index b3cc05a..7524d5e 100644
--- a/man/mstmwrite.1
+++ b/man/mstmwrite.1
@@ -1,10 +1,8 @@
- .TH MSTMWRITE "1" "4.4.0" ""
+ .TH MSTMWRITE "1" "4.6.0" "" ""
.SH NAME
-mstmwrite
+mstmwrite \- Mellanox Write Configuration Register Tool
@@ -355,12 +161,14 @@ Subject: Fix man page errors
.IP
-Mellanox Write Configuration Register Tool
-
- mstmread <device> <addr> <value>
+ mstmwrite <device> <addr> <value>
.IP
+diff --git a/man/mstregdump.1 b/man/mstregdump.1
+index 77a6e3c..eb05db0 100644
--- a/man/mstregdump.1
+++ b/man/mstregdump.1
@@ -1,14 +1,12 @@
- .TH MSTREGDUMP "1" "4.4.0" ""
+ .TH MSTREGDUMP "1" "4.6.0" "" ""
.SH NAME
-mstregdump
+mstregdump \- Mellanox mstdump utility, dumps device internal configuration data
@@ -377,15 +185,17 @@ Subject: Fix man page errors
.TP
\fB-full\fR : Dump more expanded list of addresses
\fBNote\fR : be careful when using this flag, None safe addresses might be read.
-@@ -20,4 +18,3 @@
+@@ -20,4 +18,3 @@ mstregdump [-full] <device> [i2c-slave] [-v[ersion] [-h[elp]]]
.SH EXAMPLE:
.TP
mstregdump 04:00.0
-.TP
+diff --git a/man/mstvpd.1 b/man/mstvpd.1
+index 85ca8f4..78b544d 100644
--- a/man/mstvpd.1
+++ b/man/mstvpd.1
@@ -1,11 +1,9 @@
- .TH MSTVPD "1" "4.4.0" ""
+ .TH MSTVPD "1" "4.6.0" "" ""
.SH NAME
-mstvpd
+mstvpd \- Mellanox VPD read tool
@@ -398,3 +208,6 @@ Subject: Fix man page errors
mstvpd [-m|-n] [-t ##] <file> [\-- keyword ...]
.IP
.SH OPTIONS:
+--
+2.9.3
+
diff --git a/debian/patches/Fix-typo-recieved-received.patch b/debian/patches/Fix-typo-recieved-received.patch
index 07d10b3..c10db4c 100644
--- a/debian/patches/Fix-typo-recieved-received.patch
+++ b/debian/patches/Fix-typo-recieved-received.patch
@@ -1,317 +1,127 @@
+From 91e76fa10ba3bf478ff0e7782228e8e8c697e319 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung at profitbricks.com>
+Date: Tue, 3 Jan 2017 20:01:55 +0100
Subject: Fix typo recieved -> received
---- a/mft_utils/mft_sig_handler.c
-+++ b/mft_utils/mft_sig_handler.c
-@@ -52,7 +52,7 @@
-
- static void my_termination_handler(int sig)
- {
-- s_is_fired = sig; // assuming signals recieved are always different then zero
-+ s_is_fired = sig; // assuming signals received are always different then zero
- if (s_interrupt_message) {
- fprintf(stderr, "%s", s_interrupt_message);
- }
-@@ -147,7 +147,7 @@
- int sig;
- sig = mft_signal_is_fired();
- if (sig) {
-- // reset recieved signal
-+ // reset received signal
- mft_signal_set_fired(0);
- // retore prev handler
- mft_signal_set_handling(0);
---- a/mlxconfig/mlxcfg_lib.cpp
-+++ b/mlxconfig/mlxcfg_lib.cpp
-@@ -168,7 +168,7 @@
- int sig;
- sig = mft_signal_is_fired();
- if (sig) {
-- // reset recieved signal
-+ // reset received signal
- mft_signal_set_fired(0);
- // retore prev handler
- mft_signal_set_handling(0);
---- a/mlxconfig/mlxcfg_param_lib.cpp
-+++ b/mlxconfig/mlxcfg_param_lib.cpp
-@@ -204,7 +204,7 @@
- int sig;
- sig = mft_signal_is_fired();
- if (sig) {
-- // reset recieved signal
-+ // reset received signal
- mft_signal_set_fired(0);
- // retore prev handler
- mft_signal_set_handling(0);
-@@ -260,7 +260,7 @@
- mft_signal_set_handling(1);
- DEBUG_PRINT_SEND(&mnvaTlv, nvda);
- rc = reg_access_nvda(mf, method, &mnvaTlv);
-- DEBUG_PRINT_RECIEVE(&mnvaTlv, nvda);
-+ DEBUG_PRINT_RECEIVE(&mnvaTlv, nvda);
- dealWithSignal();
- if (rc) {
- return rc;
-@@ -462,7 +462,7 @@
- DEBUG_PRINT_SEND(&bootSettingsExtTlv, boot_settings_ext);
- rc = mnvaCom4thGen(mf, buff, tools_open_boot_settings_ext_size(), tlvTypeIdx, REG_ACCESS_METHOD_GET, _port);
- // check rc
-- DEBUG_PRINT_RECIEVE(&bootSettingsExtTlv, boot_settings_ext);
-+ DEBUG_PRINT_RECEIVE(&bootSettingsExtTlv, boot_settings_ext);
- if (rc) {// when attempting to get a nv_cfg tlv from device ME_REG_ACCESS_RES_NOT_AVLBL means - no valid
- // tlv found. i.e default configuration are on.
- if (rc == ME_REG_ACCESS_RES_NOT_AVLBL) {
-@@ -604,7 +604,7 @@
- DEBUG_PRINT_SEND(&sriovTlv, sriov);
- rc = mnvaCom4thGen(mf, buff, tools_open_sriov_size(), tlvTypeIdx, REG_ACCESS_METHOD_GET, 0);
- // check rc
-- DEBUG_PRINT_RECIEVE(&sriovTlv, sriov);
-+ DEBUG_PRINT_RECEIVE(&sriovTlv, sriov);
- if (rc) {// when attempting to get a nv_cfg tlv from device ME_REG_ACCESS_RES_NOT_AVLBL means - no valid
- // tlv found. i.e default configuration are on.
- if (rc == ME_REG_ACCESS_RES_NOT_AVLBL) {
---- a/mlxconfig/mlxcfg_utils.cpp
-+++ b/mlxconfig/mlxcfg_utils.cpp
-@@ -56,7 +56,7 @@
- int sig;
- sig = mft_signal_is_fired();
- if (sig) {
-- // reset recieved signal
-+ // reset received signal
- mft_signal_set_fired(0);
- // retore prev handler
- mft_signal_set_handling(0);
-@@ -87,7 +87,7 @@
- mft_signal_set_handling(1);
- //DEBUG_PRINT_SEND(&mnvaTlv, nvda);
- rc = reg_access_nvda(mf, method, &mnvaTlv);
-- //DEBUG_PRINT_RECIEVE(&mnvaTlv, nvda);
-+ //DEBUG_PRINT_RECEIVE(&mnvaTlv, nvda);
- dealWithSignal();
- if (rc) {
- return rc;
---- a/mlxfwops/lib/flint_io.cpp
-+++ b/mlxfwops/lib/flint_io.cpp
-@@ -427,7 +427,7 @@
-
- u_int32_t phys_addr = cont2phys(addr);
- // printf("-D- read1: addr = %#x, phys_addr = %#x\n", addr, phys_addr);
-- // here we set a "silent" signal handler and deal with the recieved signal after the read
-+ // here we set a "silent" signal handler and deal with the received signal after the read
- mft_signal_set_handling(1);
- rc = mf_read(_mfl, phys_addr, 4, (u_int8_t*)data);
- deal_with_signal();
-@@ -929,7 +929,7 @@
- int sig;
- sig = mft_signal_is_fired();
- if (sig) {
-- // reset recieved signal
-+ // reset received signal
- mft_signal_set_fired(0);
- // retore prev handler
- mft_signal_set_handling(0);
---- a/mlxfwops/lib/fw_ops.cpp
-+++ b/mlxfwops/lib/fw_ops.cpp
-@@ -837,7 +837,7 @@
- u_int32_t new_perc = ((cnt - towrite + alreadyWrittenSz) * 100) / totalSz;
-
- if (progressFunc((int)new_perc)) {
-- return errmsg("Aborting... recieved interrupt signal");
-+ return errmsg("Aborting... received interrupt signal");
- }
- }
- }
+Signed-off-by: Benjamin Drung <benjamin.drung at profitbricks.com>
+---
+ mtcr_ul/mtcr_ul_com.c | 2 +-
+ tools_layouts/connectib_layouts.c | 12 ++++++------
+ tools_layouts/connectib_layouts.h | 12 ++++++------
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/mtcr_ul/mtcr_ul_com.c b/mtcr_ul/mtcr_ul_com.c
+index 50a663f..122acc7 100644
+--- a/mtcr_ul/mtcr_ul_com.c
++++ b/mtcr_ul/mtcr_ul_com.c
+@@ -2315,7 +2315,7 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id, maccess_reg_method_t metho
+ memcpy(reg_data, buffer + OP_TLV_SIZE + REG_TLV_HEADER_LEN, reg_size);
+
+ #ifdef _ENABLE_DEBUG_
+- fprintf(stdout, "-I-Tlv's of Data Recieved:\n");
++ fprintf(stdout, "-I-Tlv's of Data Received:\n");
+ fprintf(stdout, "\tOperation Tlv\n");
+ OperationTlv_dump(&tlv, stdout);
+ fprintf(stdout, "\tReg Tlv\n");
+diff --git a/tools_layouts/connectib_layouts.c b/tools_layouts/connectib_layouts.c
+index 229588c..46f8f69 100644
--- a/tools_layouts/connectib_layouts.c
+++ b/tools_layouts/connectib_layouts.c
-@@ -28783,10 +28783,10 @@
- adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int64_t)ptr_struct->a_multicast_frames_received_ok_low);
+@@ -5542,10 +5542,10 @@ void connectib_eth_802_3_cntrs_grp_data_layout_pack(const struct connectib_eth_8
+ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->a_multicast_frames_received_ok_low);
- offset=576;
-- adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int64_t)ptr_struct->a_broadcast_frames_recieved_ok_high);
-+ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int64_t)ptr_struct->a_broadcast_frames_received_ok_high);
+ offset = 576;
+- adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->a_broadcast_frames_recieved_ok_high);
++ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->a_broadcast_frames_received_ok_high);
- offset=608;
-- adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int64_t)ptr_struct->a_broadcast_frames_recieved_ok_low);
-+ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int64_t)ptr_struct->a_broadcast_frames_received_ok_low);
+ offset = 608;
+- adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->a_broadcast_frames_recieved_ok_low);
++ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->a_broadcast_frames_received_ok_low);
- offset=640;
- adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int64_t)ptr_struct->a_in_range_length_errors_high);
-@@ -28909,10 +28909,10 @@
+ offset = 640;
+ adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->a_in_range_length_errors_high);
+@@ -5667,10 +5667,10 @@ void connectib_eth_802_3_cntrs_grp_data_layout_unpack(struct connectib_eth_802_3
ptr_struct->a_multicast_frames_received_ok_low = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
- offset=576;
+ offset = 576;
- ptr_struct->a_broadcast_frames_recieved_ok_high = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+ ptr_struct->a_broadcast_frames_received_ok_high = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
- offset=608;
+ offset = 608;
- ptr_struct->a_broadcast_frames_recieved_ok_low = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+ ptr_struct->a_broadcast_frames_received_ok_low = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
- offset=640;
+ offset = 640;
ptr_struct->a_in_range_length_errors_high = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-@@ -29033,10 +29033,10 @@
- fprintf(file, "a_multicast_frames_received_ok_low : "U32H_FMT"\n", ptr_struct->a_multicast_frames_received_ok_low);
+@@ -5793,10 +5793,10 @@ void connectib_eth_802_3_cntrs_grp_data_layout_print(const struct connectib_eth_
+ fprintf(file, "a_multicast_frames_received_ok_low : " U32H_FMT "\n", ptr_struct->a_multicast_frames_received_ok_low);
adb2c_add_indentation(file, indent_level);
-- fprintf(file, "a_broadcast_frames_recieved_ok_high : "U32H_FMT"\n", ptr_struct->a_broadcast_frames_recieved_ok_high);
-+ fprintf(file, "a_broadcast_frames_received_ok_high : "U32H_FMT"\n", ptr_struct->a_broadcast_frames_received_ok_high);
+- fprintf(file, "a_broadcast_frames_recieved_ok_high : " U32H_FMT "\n", ptr_struct->a_broadcast_frames_recieved_ok_high);
++ fprintf(file, "a_broadcast_frames_received_ok_high : " U32H_FMT "\n", ptr_struct->a_broadcast_frames_received_ok_high);
adb2c_add_indentation(file, indent_level);
-- fprintf(file, "a_broadcast_frames_recieved_ok_low : "U32H_FMT"\n", ptr_struct->a_broadcast_frames_recieved_ok_low);
-+ fprintf(file, "a_broadcast_frames_received_ok_low : "U32H_FMT"\n", ptr_struct->a_broadcast_frames_received_ok_low);
+- fprintf(file, "a_broadcast_frames_recieved_ok_low : " U32H_FMT "\n", ptr_struct->a_broadcast_frames_recieved_ok_low);
++ fprintf(file, "a_broadcast_frames_received_ok_low : " U32H_FMT "\n", ptr_struct->a_broadcast_frames_received_ok_low);
adb2c_add_indentation(file, indent_level);
- fprintf(file, "a_in_range_length_errors_high : "U32H_FMT"\n", ptr_struct->a_in_range_length_errors_high);
+ fprintf(file, "a_in_range_length_errors_high : " U32H_FMT "\n", ptr_struct->a_in_range_length_errors_high);
+diff --git a/tools_layouts/connectib_layouts.h b/tools_layouts/connectib_layouts.h
+index 457d823..1fc1d65 100644
--- a/tools_layouts/connectib_layouts.h
+++ b/tools_layouts/connectib_layouts.h
-@@ -10067,7 +10067,7 @@
+@@ -1038,7 +1038,7 @@ Otherwise, undefined. */
/* Size in bytes - 248 */
struct connectib_llr_counters {
/*---------------- DWORD[0] (Offset 0x0) ----------------*/
- /* Description - The total number of cells recieved (including bad cells) */
+ /* Description - The total number of cells received (including bad cells) */
- /* 0.0 - 4.31 */
+ /* 0x0.0 - 0x4.31 */
u_int32_t llr_rx_cells_high;
/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-@@ -10075,7 +10075,7 @@
- /* 4.0 - 8.31 */
+@@ -1046,7 +1046,7 @@ struct connectib_llr_counters {
+ /* 0x4.0 - 0x8.31 */
u_int32_t llr_rx_cells_low;
/*---------------- DWORD[2] (Offset 0x8) ----------------*/
- /* Description - The total number of bad cells recieved (including CRC error) */
+ /* Description - The total number of bad cells received (including CRC error) */
- /* 8.0 - 12.31 */
+ /* 0x8.0 - 0xc.31 */
u_int32_t llr_rx_error_high;
/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-@@ -10083,7 +10083,7 @@
- /* 12.0 - 16.31 */
+@@ -1054,7 +1054,7 @@ struct connectib_llr_counters {
+ /* 0xc.0 - 0x10.31 */
u_int32_t llr_rx_error_low;
/*---------------- DWORD[4] (Offset 0x10) ----------------*/
- /* Description - The total number of cells recieved with CRC error */
+ /* Description - The total number of cells received with CRC error */
- /* 16.0 - 20.31 */
+ /* 0x10.0 - 0x14.31 */
u_int32_t llr_rx_crc_error_high;
/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-@@ -11412,13 +11412,13 @@
+@@ -2504,13 +2504,13 @@ internal MAC sublayer error. */
to the broadcast address. Frames transmitted to multicast
addresses are not broadcast frames and are excluded. */
- /* 72.0 - 76.31 */
+ /* 0x48.0 - 0x4c.31 */
- u_int32_t a_broadcast_frames_recieved_ok_high;
+ u_int32_t a_broadcast_frames_received_ok_high;
/*---------------- DWORD[19] (Offset 0x4c) ----------------*/
/* Description - A count of the frames that were successfully transmitted
to the broadcast address. Frames transmitted to multicast
addresses are not broadcast frames and are excluded. */
- /* 76.0 - 80.31 */
+ /* 0x4c.0 - 0x50.31 */
- u_int32_t a_broadcast_frames_recieved_ok_low;
+ u_int32_t a_broadcast_frames_received_ok_low;
/*---------------- DWORD[20] (Offset 0x50) ----------------*/
/* Description - A count of frames with a length/type field value between
the minimum unpadded MAC client data size and the
-@@ -20913,7 +20913,7 @@
- /* 8.23 - 8.23 */
+@@ -27873,7 +27873,7 @@ values 15-9 are reserved - does not work */
+ /* 0x8.23 - 0x8.23 */
u_int8_t i2c_slave_en;
/* Description - value 0 will disabe yu_fuse read/write requests to reach the fuse (in case Fuse is malfunctioning).
-upon reads, data recieved will be hard wired zeros.
+upon reads, data received will be hard wired zeros.
upon write, efuse_done will rise after 1 cycle. */
- /* 8.24 - 8.24 */
+ /* 0x8.24 - 0x8.24 */
u_int8_t fuse_enable;
---- a/mflash/mflash_pack_layer.c
-+++ b/mflash/mflash_pack_layer.c
-@@ -164,7 +164,7 @@
-
- /*
- * getters and setters for mfl->curr_bank
-- * manily used to monitor values mfl->curr_bank recieves
-+ * manily used to monitor values mfl->curr_bank receives
- * used for a verification hack to make sure facebook reset bug doesnt reproduce.
- * (bug where accessing gpio of flash bank 4 caused system reboot)
- */
---- a/mlxconfig/mlxcfg_generic_commander.cpp
-+++ b/mlxconfig/mlxcfg_generic_commander.cpp
-@@ -910,7 +910,7 @@
- mft_signal_set_handling(1);
- DEBUG_PRINT_SEND(&_nvdaTlv, nvda);
- rc = reg_access_nvda(mf, REG_ACCESS_METHOD_SET, &_nvdaTlv);
-- DEBUG_PRINT_RECIEVE(&_nvdaTlv, nvda);
-+ DEBUG_PRINT_RECEIVE(&_nvdaTlv, nvda);
- dealWithSignal();
- if (rc) {
- return errmsg("Failed to set raw TLV: %s", m_err2str((MError)rc));
---- a/mlxconfig/mlxcfg_parser.cpp
-+++ b/mlxconfig/mlxcfg_parser.cpp
-@@ -319,7 +319,7 @@
- return err(true, "missing configuration arguments. For more information please run " MLXCFG_NAME " -h|--help.");
- }
- if (i != argc && (_mlxParams.cmd == Mc_Reset || _mlxParams.cmd == Mc_Query)) {
-- return err(true, "%s command expects no argument but %d argument recieved", (_mlxParams.cmd == Mc_Reset) ? "reset" : "query", argc -i);
-+ return err(true, "%s command expects no argument but %d argument received", (_mlxParams.cmd == Mc_Reset) ? "reset" : "query", argc -i);
- }
- if ((_mlxParams.cmd == Mc_Set || _mlxParams.cmd == Mc_Clr_Sem || _mlxParams.cmd == Mc_Set_Raw || _mlxParams.cmd == Mc_Backup || _mlxParams.cmd == Mc_ShowConfs) && _mlxParams.device.length() == 0) {
- return err(true, "%s command expects device to be specified.",
---- a/mlxconfig/mlxcfg_utils.h
-+++ b/mlxconfig/mlxcfg_utils.h
-@@ -78,12 +78,12 @@
- # define DEBUG_PRINT_SEND(data_struct, struct_name)\
- printf("-I- Data Sent:\n");\
- tools_open_##struct_name##_print(data_struct, stdout, 1)
--# define DEBUG_PRINT_RECIEVE(data_struct, struct_name)\
-- printf("-I- Data Recieved:\n");\
-+# define DEBUG_PRINT_RECEIVE(data_struct, struct_name)\
-+ printf("-I- Data Received:\n");\
- tools_open_##struct_name##_print(data_struct, stdout, 1)
- #else
- # define DEBUG_PRINT_SEND(data_struct, struct_name)
--# define DEBUG_PRINT_RECIEVE(data_struct, struct_name)
-+# define DEBUG_PRINT_RECEIVE(data_struct, struct_name)
- #endif
-
- #define CHECK_RC(rc)\
---- a/mlxfwops/lib/fs2_ops.cpp
-+++ b/mlxfwops/lib/fs2_ops.cpp
-@@ -1824,7 +1824,7 @@
- u_int32_t cntx_image_num;
- FindAllImageStart(romImg, cntx_image_start, &cntx_image_num, _cntx_magic_pattern);
- if (cntx_image_num != 0) {
-- return errmsg("Expecting an expansion ROM image, Recieved Mellanox FW image.");
-+ return errmsg("Expecting an expansion ROM image, Received Mellanox FW image.");
- }
-
- if (!Fs2IntQuery()) {
---- a/mlxfwops/lib/fs3_ops.cpp
-+++ b/mlxfwops/lib/fs3_ops.cpp
-@@ -1802,7 +1802,7 @@
- sprintf(message, "Updating %-4s section - ", msg);
- // Burn new Section
- // we pass a null callback and print the progress here as the writes are small (guids/mfg/vpd_str)
-- // in the future if we want to pass the cb prints to writeImage , need to change the signature of progressCallBack to recieve and optional string to print
-+ // in the future if we want to pass the cb prints to writeImage , need to change the signature of progressCallBack to receive and optional string to print
-
- PRINT_PROGRESS(callBackFunc, message);
-
---- a/reg_access/reg_access.c
-+++ b/reg_access/reg_access.c
-@@ -63,12 +63,12 @@
- # define DEBUG_PRINT_SEND(data_struct, struct_name, method, prefix)\
- printf("-I- Data Sent (Method: %s):\n", method == REG_ACCESS_METHOD_SET ? "SET" : "GET");\
- prefix##_##struct_name##_print(data_struct, stdout, 1)
--# define DEBUG_PRINT_RECIEVE(data_struct, struct_name, method, prefix)\
-+# define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method, prefix)\
- printf("-I- Data Received (Mehtod: %s):\n", method == REG_ACCESS_METHOD_SET ? "SET" : "GET");\
- prefix##_##struct_name##_print(data_struct, stdout, 1)
- #else
- # define DEBUG_PRINT_SEND(data_struct, struct_name, method, prefix)
--# define DEBUG_PRINT_RECIEVE(data_struct, struct_name, method, prefix)
-+# define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method, prefix)
- #endif
-
- /***************************************************/
-@@ -88,7 +88,7 @@
- DEBUG_PRINT_SEND(data_struct, struct_name, method, print_func);\
- rc = maccess_reg(mf, reg_id, (maccess_reg_method_t)method, data, reg_size, r_reg_size, w_reg_size, status);\
- unpack_func(data_struct, data);\
-- DEBUG_PRINT_RECIEVE(data_struct, struct_name, method, print_func);
-+ DEBUG_PRINT_RECEIVE(data_struct, struct_name, method, print_func);
-
- #define REG_ACCESS_GENERIC_VAR(mf, methdod, reg_id, data_struct, struct_name, reg_size , r_reg_size, w_reg_size, pack_func,\
- unpack_func, size_func, print_func)\
+--
+2.9.3
+
--
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