diff options
Diffstat (limited to 'src/bitfield')
| -rw-r--r-- | src/bitfield/8byte.c | 4 | ||||
| -rw-r--r-- | src/bitfield/8byte.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/bitfield/8byte.c b/src/bitfield/8byte.c index bfceb788..76dccc75 100644 --- a/src/bitfield/8byte.c +++ b/src/bitfield/8byte.c @@ -8,7 +8,7 @@ uint8_t eightbyte_get_nibble(const uint64_t source, const uint8_t nibble_index, const bool data_is_big_endian) { - return get_bit_field(source, NIBBLE_SIZE * nibble_index, NIBBLE_SIZE, + return eightbyte_get_bit_field(source, NIBBLE_SIZE * nibble_index, NIBBLE_SIZE, data_is_big_endian); } @@ -20,7 +20,7 @@ uint8_t eightbyte_get_byte(uint64_t source, const uint8_t byte_index, return (source >> (EIGHTBYTE_BIT - ((byte_index + 1) * CHAR_BIT))) & 0xFF; } -uint64_t get_bit_field(uint64_t source, const uint16_t offset, +uint64_t eightbyte_get_bit_field(uint64_t source, const uint16_t offset, const uint16_t bit_count, const bool data_is_big_endian) { int startByte = offset / CHAR_BIT; int endByte = (offset + bit_count - 1) / CHAR_BIT; diff --git a/src/bitfield/8byte.h b/src/bitfield/8byte.h index 0abc1f07..194007c8 100644 --- a/src/bitfield/8byte.h +++ b/src/bitfield/8byte.h @@ -36,7 +36,7 @@ extern "C" { * * Returns the value of the requested bit field, right aligned in a uint64_t. */ -uint64_t get_bit_field(uint64_t source, const uint16_t offset, +uint64_t eightbyte_get_bit_field(uint64_t source, const uint16_t offset, const uint16_t bit_count, const bool data_is_big_endian); /* Public: Return a single nibble from the payload, with range checking. @@ -50,7 +50,7 @@ uint64_t get_bit_field(uint64_t source, const uint16_t offset, * Returns the retreived nibble, right aligned in a uint8_t. */ uint8_t eightbyte_get_nibble(const uint64_t source, const uint8_t nibble_index, - const bool data_is_big_endian); + const bool data_is_big_endian); /* Public: Return a single byte from the payload, with range checking. * @@ -62,7 +62,7 @@ uint8_t eightbyte_get_nibble(const uint64_t source, const uint8_t nibble_index, * Returns the retreived byte. */ uint8_t eightbyte_get_byte(const uint64_t source, const uint8_t byte_index, - const bool data_is_big_endian); + const bool data_is_big_endian); /* Public: Set the bit field in the given data array to the new value. * @@ -74,8 +74,8 @@ uint8_t eightbyte_get_byte(const uint64_t source, const uint8_t byte_index, * Returns true if the bit_count is enough to fully represent the value, and * false if it will not fit. */ -bool set_bit_field(uint64_t* destination, uint64_t value, const uint16_t offset, - const uint16_t bit_count); +bool eightbyte_set_bit_field(uint64_t* destination, uint64_t value, + const uint16_t offset, const uint16_t bit_count); /* Private: Determine the index of the last bit used. */ |