diff options
Diffstat (limited to 'src/t20/nvbctlib_t20.c')
| -rw-r--r-- | src/t20/nvbctlib_t20.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/t20/nvbctlib_t20.c b/src/t20/nvbctlib_t20.c index c145d6d..91fe9e6 100644 --- a/src/t20/nvbctlib_t20.c +++ b/src/t20/nvbctlib_t20.c @@ -59,22 +59,22 @@ case token_bl_##x:\ #define CASE_GET_NVU32(id) \ 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) \ @@ -490,7 +490,7 @@ t20_setbl_param(u_int32_t set, } int -t20_bct_get_value(parse_token id, u_int32_t *data, u_int8_t *bct) +t20_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. */ @@ -523,25 +523,25 @@ t20_bct_get_value(parse_token id, u_int32_t *data, u_int8_t *bct) CASE_GET_CONST(reserved_size, NVBOOT_BCT_RESERVED_SIZE); 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 = sizeof(nvboot_config_table) - sizeof(nvboot_hash); + *((u_int32_t *)data) = sizeof(nvboot_config_table) - sizeof(nvboot_hash); break; CASE_GET_CONST(max_bct_search_blks, NVBOOT_MAX_BCT_SEARCH_BLOCKS); @@ -569,7 +569,7 @@ t20_bct_get_value(parse_token id, u_int32_t *data, u_int8_t *bct) } int -t20_bct_set_value(parse_token id, u_int32_t data, u_int8_t *bct) +t20_bct_set_value(parse_token id, void *data, u_int8_t *bct) { nvboot_config_table *bct_ptr = (nvboot_config_table *)bct; |