Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to bit band API to make it more type-sane.

Browse Source
This commit is contained in:
Jared Boone
2012-09-11 11:31:49 -07:00
parent ec0bbe53c4
commit f5d21b947b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/common/bitband.c
View File

@ -21,25 +21,25 @@
#include "bitband.h" #include "bitband.h"
volatile uint_fast8_t* peripheral_bitband_address(volatile void* const address, const uint_fast8_t bit_number) { volatile uint32_t* peripheral_bitband_address(volatile void* const address, const uint_fast8_t bit_number) {
const uint32_t bit_band_base = 0x42000000; const uint32_t bit_band_base = 0x42000000;
const uint32_t byte_offset = (uint32_t)address - 0x40000000; const uint32_t byte_offset = (uint32_t)address - 0x40000000;
const uint32_t bit_word_offset = (byte_offset * 32) + (bit_number * 4); const uint32_t bit_word_offset = (byte_offset * 32) + (bit_number * 4);
const uint32_t bit_word_address = bit_band_base + bit_word_offset; const uint32_t bit_word_address = bit_band_base + bit_word_offset;
return (volatile uint_fast8_t*)bit_word_address; return (volatile uint32_t*)bit_word_address;
} }
void peripheral_bitband_set(volatile void* const peripheral_address, const uint_fast8_t bit_number) { void peripheral_bitband_set(volatile void* const peripheral_address, const uint_fast8_t bit_number) {
volatile uint_fast8_t* const bitband_address = peripheral_bitband_address(peripheral_address, bit_number); volatile uint32_t* const bitband_address = peripheral_bitband_address(peripheral_address, bit_number);
*bitband_address = 1; *bitband_address = 1;
} }
void peripheral_bitband_clear(volatile void* const peripheral_address, const uint_fast8_t bit_number) { void peripheral_bitband_clear(volatile void* const peripheral_address, const uint_fast8_t bit_number) {
volatile uint_fast8_t* const bitband_address = peripheral_bitband_address(peripheral_address, bit_number); volatile uint32_t* const bitband_address = peripheral_bitband_address(peripheral_address, bit_number);
*bitband_address = 0; *bitband_address = 0;
} }
uint_fast8_t peripheral_bitband_get(volatile void* const peripheral_address, const uint_fast8_t bit_number) { uint32_t peripheral_bitband_get(volatile void* const peripheral_address, const uint_fast8_t bit_number) {
volatile uint_fast8_t* const bitband_address = peripheral_bitband_address(peripheral_address, bit_number); volatile uint32_t* const bitband_address = peripheral_bitband_address(peripheral_address, bit_number);
return *bitband_address; return *bitband_address;
} }

4
firmware/common/bitband.h
View File

@ -24,9 +24,9 @@
#include <stdint.h> #include <stdint.h>
volatile uint_fast8_t* peripheral_bitband_address(volatile void* const address, const uint_fast8_t bit_number); volatile uint32_t* peripheral_bitband_address(volatile void* const address, const uint_fast8_t bit_number);
void peripheral_bitband_set(volatile void* const peripheral_address, const uint_fast8_t bit_number); void peripheral_bitband_set(volatile void* const peripheral_address, const uint_fast8_t bit_number);
void peripheral_bitband_clear(volatile void* const peripheral_address, const uint_fast8_t bit_number); void peripheral_bitband_clear(volatile void* const peripheral_address, const uint_fast8_t bit_number);
uint_fast8_t peripheral_bitband_get(volatile void* const peripheral_address, const uint_fast8_t bit_number); uint32_t peripheral_bitband_get(volatile void* const peripheral_address, const uint_fast8_t bit_number);
#endif//__BITBAND_H__ #endif//__BITBAND_H__