Skip to content

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

sm_io/chips/*: avoid the extra memcpy by passing the user buffer

parent 6fabb2eb
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
src/sm_io/chips/sm_ch_ad9510.c
View file @ bb12644c
......@@ -772,7 +772,11 @@ static ssize_t _smch_ad9510_write_8 (smch_ad9510_t *self, uint8_t addr,
AD9510_HDR_ADDR_W(addr)
);
size_t __addr_size = AD9510_INSTADDR_SIZE/SMPR_BYTE_2_BIT;
DBE_DEBUG (DBG_SM_PR | DBG_LVL_WARN,
"[_smch_ad9510_write_8] data = 0x%08X\n", *data);
uint32_t __data = AD9510_DATA_W(*data);
DBE_DEBUG (DBG_SM_PR | DBG_LVL_WARN,
"[_smch_ad9510_write_8] __data = 0x%08X\n", __data);
size_t __data_size = AD9510_DATA_SIZE/SMPR_BYTE_2_BIT;
ssize_t smpr_err = smpr_write_block (self->spi, __addr_size, __addr,
......@@ -802,17 +806,13 @@ static ssize_t _smch_ad9510_read_8 (smch_ad9510_t *self, uint8_t addr,
AD9510_HDR_ADDR_W(addr)
);
size_t __addr_size = AD9510_INSTADDR_SIZE/SMPR_BYTE_2_BIT;
uint32_t __data = 0;
size_t __data_size = AD9510_DATA_SIZE/SMPR_BYTE_2_BIT;
ssize_t smpr_err = smpr_read_block (self->spi, __addr_size, __addr,
__data_size, &__data);
__data_size, (uint32_t *) data);
ASSERT_TEST(smpr_err > 0 && (size_t) smpr_err == __data_size,
"Could not read to SMPR", err_read_write, -1);
/* Only the 8 LSB are valid for one byte reading (AD9510_HDR_BT_W(0x0)) */
memcpy(data, &__data, sizeof(uint8_t));
err_read_write:
return err;
}
......
src/sm_io/chips/sm_ch_isla216p.c
View file @ bb12644c
......@@ -257,17 +257,13 @@ static ssize_t _smch_isla216p_read_8 (smch_isla216p_t *self, uint8_t addr,
ISLA216P_HDR_ADDR_W(addr)
);
size_t __addr_size = ISLA216P_INSTADDR_SIZE/SMPR_BYTE_2_BIT;
uint32_t __data = 0;
size_t __data_size = ISLA216P_DATA_SIZE/SMPR_BYTE_2_BIT;
ssize_t smpr_err = smpr_read_block (self->proto, __addr_size,
__addr, __data_size, &__data);
__addr, __data_size, (uint32_t *) data);
ASSERT_TEST(smpr_err > 0 && (size_t) smpr_err == __data_size,
"Could not read to SMPR", err_smpr_read, -1);
/* Only the 8 LSB are valid for one byte reading (ISLA216P_HDR_BT_W(0x0)) */
memcpy(data, &__data, sizeof(uint8_t));
err_smpr_read:
return err;
}
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