Skip to content

B
Beam Positoning Monitor - Software
Commit dda12c9a authored by Lucas Russo's avatar Lucas Russo
Browse files
Options

sm_io/chips/*: fix read/write sizes to BYTE instead of BIT

parent 1eab6647
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
src/sm_io/chips/sm_ch_24aa64.c
View file @ dda12c9a
...@@ -149,8 +149,8 @@ static ssize_t _smch_24aa64_write_generic (smch_24aa64_t *self, uint16_t addr, ...@@ -149,8 +149,8 @@ static ssize_t _smch_24aa64_write_generic (smch_24aa64_t *self, uint16_t addr,
DBE_DEBUG (DBG_SM_CH | DBG_LVL_TRACE, "[sm_ch:24aa64_write_generic] data = 0x%02X\n", *data); DBE_DEBUG (DBG_SM_CH | DBG_LVL_TRACE, "[sm_ch:24aa64_write_generic] data = 0x%02X\n", *data);
DBE_DEBUG (DBG_SM_CH | DBG_LVL_TRACE, "[sm_ch:24aa64_write_generic] addr = 0x%04X\n", addr); DBE_DEBUG (DBG_SM_CH | DBG_LVL_TRACE, "[sm_ch:24aa64_write_generic] addr = 0x%04X\n", addr);
ssize_t smpr_err = smpr_write_block (self->proto, E24AA64_ADDR_SIZE, E24AA64_ADDR_W(addr), ssize_t smpr_err = smpr_write_block (self->proto, E24AA64_ADDR_SIZE/SMPR_BYTE_2_BIT,
size, (uint32_t *) &data); E24AA64_ADDR_W(addr), size, (uint32_t *) &data);
/* Check if we have written everything */ /* Check if we have written everything */
ASSERT_TEST(smpr_err >= 0 && (size_t)smpr_err == size /* in bytes */, ASSERT_TEST(smpr_err >= 0 && (size_t)smpr_err == size /* in bytes */,
...@@ -184,8 +184,8 @@ static ssize_t _smch_24aa64_read_generic (smch_24aa64_t *self, uint16_t addr, ...@@ -184,8 +184,8 @@ static ssize_t _smch_24aa64_read_generic (smch_24aa64_t *self, uint16_t addr,
* */ * */
DBE_DEBUG (DBG_SM_CH | DBG_LVL_TRACE, "[sm_ch:24aa64_read_generic] addr = 0x%04X\n", addr); DBE_DEBUG (DBG_SM_CH | DBG_LVL_TRACE, "[sm_ch:24aa64_read_generic] addr = 0x%04X\n", addr);
err = smpr_read_block (self->proto, E24AA64_ADDR_SIZE, E24AA64_ADDR_W(addr), err = smpr_read_block (self->proto, E24AA64_ADDR_SIZE/SMPR_BYTE_2_BIT,
size, (uint32_t *) data); E24AA64_ADDR_W(addr), size, (uint32_t *) data);
/* Check if we have written everything */ /* Check if we have written everything */
ASSERT_TEST(err >= 0 && (size_t) err == size /* in bytes */, ASSERT_TEST(err >= 0 && (size_t) err == size /* in bytes */,
"Could not READ from SMPR", err_smpr_read, -1); "Could not READ from SMPR", err_smpr_read, -1);
......
src/sm_io/chips/sm_ch_ad9510.c
View file @ dda12c9a
...@@ -772,8 +772,8 @@ static ssize_t _smch_ad9510_write_8 (smch_ad9510_t *self, uint8_t addr, ...@@ -772,8 +772,8 @@ static ssize_t _smch_ad9510_write_8 (smch_ad9510_t *self, uint8_t addr,
AD9510_HDR_ADDR_W(addr) AD9510_HDR_ADDR_W(addr)
); );
uint32_t __data = AD9510_DATA_W(*data); uint32_t __data = AD9510_DATA_W(*data);
ssize_t smpr_err = smpr_write_block (self->spi, AD9510_INSTADDR_SIZE, __addr, ssize_t smpr_err = smpr_write_block (self->spi, AD9510_INSTADDR_SIZE/SMPR_BYTE_2_BIT, __addr,
AD9510_DATA_SIZE, &__data); AD9510_DATA_SIZE/SMPR_BYTE_2_BIT, &__data);
ASSERT_TEST(smpr_err == sizeof(uint32_t), "Could not write to SMPR", ASSERT_TEST(smpr_err == sizeof(uint32_t), "Could not write to SMPR",
err_smpr_write, -1); err_smpr_write, -1);
...@@ -799,8 +799,8 @@ static ssize_t _smch_ad9510_read_8 (smch_ad9510_t *self, uint8_t addr, ...@@ -799,8 +799,8 @@ static ssize_t _smch_ad9510_read_8 (smch_ad9510_t *self, uint8_t addr,
AD9510_HDR_ADDR_W(addr) AD9510_HDR_ADDR_W(addr)
); );
uint32_t __data = 0; uint32_t __data = 0;
ssize_t smpr_err = smpr_read_block (self->spi, AD9510_INSTADDR_SIZE, __addr, ssize_t smpr_err = smpr_read_block (self->spi, AD9510_INSTADDR_SIZE/SMPR_BYTE_2_BIT, __addr,
AD9510_DATA_SIZE, &__data); AD9510_DATA_SIZE/SMPR_BYTE_2_BIT, &__data);
ASSERT_TEST(smpr_err == sizeof(uint32_t), "Could not write to SMPR", ASSERT_TEST(smpr_err == sizeof(uint32_t), "Could not write to SMPR",
err_smpr_write, -1); err_smpr_write, -1);
......
src/sm_io/chips/sm_ch_isla216p.c
View file @ dda12c9a
...@@ -228,8 +228,8 @@ static ssize_t _smch_isla216p_write_8 (smch_isla216p_t *self, uint8_t addr, ...@@ -228,8 +228,8 @@ static ssize_t _smch_isla216p_write_8 (smch_isla216p_t *self, uint8_t addr,
); );
uint32_t __data = ISLA216P_DATA_W(*data); uint32_t __data = ISLA216P_DATA_W(*data);
ssize_t smpr_err = smpr_write_block (self->proto, ISLA216P_INSTADDR_SIZE, __addr, ssize_t smpr_err = smpr_write_block (self->proto, ISLA216P_INSTADDR_SIZE/SMPR_BYTE_2_BIT,
ISLA216P_DATA_SIZE, &__data); __addr, ISLA216P_DATA_SIZE/SMPR_BYTE_2_BIT, &__data);
ASSERT_TEST(smpr_err == sizeof(uint32_t), "Could not write to SMPR", ASSERT_TEST(smpr_err == sizeof(uint32_t), "Could not write to SMPR",
err_smpr_write, -1); err_smpr_write, -1);
...@@ -256,8 +256,8 @@ static ssize_t _smch_isla216p_read_8 (smch_isla216p_t *self, uint8_t addr, ...@@ -256,8 +256,8 @@ static ssize_t _smch_isla216p_read_8 (smch_isla216p_t *self, uint8_t addr,
); );
uint32_t __data = 0; uint32_t __data = 0;
ssize_t smpr_err = smpr_read_block (self->proto, ISLA216P_INSTADDR_SIZE, __addr, ssize_t smpr_err = smpr_read_block (self->proto, ISLA216P_INSTADDR_SIZE/SMPR_BYTE_2_BIT,
ISLA216P_DATA_SIZE, &__data); __addr, ISLA216P_DATA_SIZE/SMPR_BYTE_2_BIT, &__data);
ASSERT_TEST(smpr_err == sizeof(uint32_t), "Could not write to SMPR", ASSERT_TEST(smpr_err == sizeof(uint32_t), "Could not write to SMPR",
err_smpr_write, -1); err_smpr_write, -1);
......
src/sm_io/chips/sm_ch_si57x.c
View file @ dda12c9a
...@@ -256,8 +256,8 @@ static ssize_t _smch_si57x_write_generic (smch_si57x_t *self, uint8_t addr, ...@@ -256,8 +256,8 @@ static ssize_t _smch_si57x_write_generic (smch_si57x_t *self, uint8_t addr,
DBE_DEBUG (DBG_SM_CH | DBG_LVL_TRACE, "[sm_ch:si57x_write_8] addr = 0x%02X\n", DBE_DEBUG (DBG_SM_CH | DBG_LVL_TRACE, "[sm_ch:si57x_write_8] addr = 0x%02X\n",
addr); addr);
err = smpr_write_block (self->proto, SI57X_ADDR_TRANS_SIZE, addr, err = smpr_write_block (self->proto, SI57X_ADDR_TRANS_SIZE/SMPR_BYTE_2_BIT,
size, (uint32_t *) data); addr, size, (uint32_t *) data);
ASSERT_TEST(err >= 0 && (size_t) err == size /* in bytes*/, ASSERT_TEST(err >= 0 && (size_t) err == size /* in bytes*/,
"Could not write data to PROTO", err_exit, -1); "Could not write data to PROTO", err_exit, -1);
...@@ -300,8 +300,8 @@ static ssize_t _smch_si57x_read_generic (smch_si57x_t *self, uint8_t addr, uint8 ...@@ -300,8 +300,8 @@ static ssize_t _smch_si57x_read_generic (smch_si57x_t *self, uint8_t addr, uint8
uint64_t __addr = addr; uint64_t __addr = addr;
err = smpr_read_block (self->proto, SI57X_ADDR_TRANS_SIZE, __addr, err = smpr_read_block (self->proto, SI57X_ADDR_TRANS_SIZE/SMPR_BYTE_2_BIT,
size, (uint32_t *) data); __addr, size, (uint32_t *) data);
/* Check if we have written everything */ /* Check if we have written everything */
ASSERT_TEST(err >= 0 && (size_t) err == size /* in bytes */, ASSERT_TEST(err >= 0 && (size_t) err == size /* in bytes */,
"Could not read data from PROTO", err_exit, -1); "Could not read data from PROTO", err_exit, -1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment