diff options
Diffstat (limited to 'src/t124/nvbctlib_t124.c')
| -rw-r--r-- | src/t124/nvbctlib_t124.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/t124/nvbctlib_t124.c b/src/t124/nvbctlib_t124.c index 27e5a62..ec5c3a2 100644 --- a/src/t124/nvbctlib_t124.c +++ b/src/t124/nvbctlib_t124.c @@ -60,22 +60,22 @@ case token_bl_##x:\ case token_##id:\ if (bct == NULL) \ return -ENODATA; \ - *data = bct_ptr->id; \ + *((u_int32_t *)data) = bct_ptr->id; \ break #define CASE_GET_CONST(id, val) \ case token_##id:\ - *data = val; \ + *((u_int32_t *)data) = val; \ break #define CASE_GET_CONST_PREFIX(id, val_prefix) \ case token_##id:\ - *data = val_prefix##_##id; \ + *((u_int32_t *)data) = val_prefix##_##id; \ break #define CASE_SET_NVU32(id) \ case token_##id:\ - bct_ptr->id = data; \ + bct_ptr->id = *((u_int32_t *)data); \ break #define CASE_GET_DATA(id, size) \ @@ -902,7 +902,7 @@ t124_setbl_param(u_int32_t set, } int -t124_bct_get_value(parse_token id, u_int32_t *data, u_int8_t *bct) +t124_bct_get_value(parse_token id, void *data, u_int8_t *bct) { nvboot_config_table *bct_ptr = (nvboot_config_table *)bct; nvboot_config_table samplebct; /* Used for computing offsets. */ @@ -941,25 +941,25 @@ t124_bct_get_value(parse_token id, u_int32_t *data, u_int8_t *bct) break; case token_reserved_offset: - *data = (u_int8_t *)&(samplebct.reserved) + *((u_int32_t *)data) = (u_int8_t *)&(samplebct.reserved) - (u_int8_t *)&samplebct; break; case token_bct_size: - *data = sizeof(nvboot_config_table); + *((u_int32_t *)data) = sizeof(nvboot_config_table); break; CASE_GET_CONST(hash_size, sizeof(nvboot_hash)); case token_crypto_offset: /* Offset to region in BCT to encrypt & sign */ - *data = (u_int8_t *)&(samplebct.random_aes_blk) + *((u_int32_t *)data) = (u_int8_t *)&(samplebct.random_aes_blk) - (u_int8_t *)&samplebct; break; case token_crypto_length: /* size of region in BCT to encrypt & sign */ - *data = (u_int8_t *)bct_ptr + sizeof(nvboot_config_table) + *((u_int32_t *)data) = (u_int8_t *)bct_ptr + sizeof(nvboot_config_table) - (u_int8_t *)&(bct_ptr->random_aes_blk); break; @@ -986,11 +986,11 @@ t124_bct_get_value(parse_token id, u_int32_t *data, u_int8_t *bct) } int -t124_bct_set_value(parse_token id, u_int32_t data, u_int8_t *bct) +t124_bct_set_value(parse_token id, void *data, u_int8_t *bct) { nvboot_config_table *bct_ptr = (nvboot_config_table *)bct; - if (bct == NULL) + if (data == NULL || bct == NULL) return -ENODATA; switch (id) { |