jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Changed to use accessors instead of casting to volatile pointers.

Browse Source 
In places where we were defining memory mapped peripheral buffers we
were using directly a cast to "volatile int_type *". For consistency we
should use dereferenced accessor like: &MMIO32(address)
This commit is contained in:
Piotr Esden-Tempski 2013-06-12 21:37:55 -07:00
parent 39fa9e4c58
commit 8da7fbd71e
10 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/cm3/fpb.h
View File

@ -33,7 +33,7 @@
#define FPB_REMAP MMIO32(FPB_BASE + 4) #define FPB_REMAP MMIO32(FPB_BASE + 4)
/* Flash Patch Comparator (FPB_COMPx) */ /* Flash Patch Comparator (FPB_COMPx) */
#define FPB_COMP (volatile uint32_t *)(FPB_BASE + 8) #define FPB_COMP (&MMIO32(FPB_BASE + 8))
/* TODO: PID, CID */ /* TODO: PID, CID */

4
include/libopencm3/cm3/itm.h
View File

@ -25,10 +25,10 @@
/* --- ITM registers ------------------------------------------------------- */ /* --- ITM registers ------------------------------------------------------- */
/* Stimulus Port x (ITM_STIM[x]) */ /* Stimulus Port x (ITM_STIM[x]) */
#define ITM_STIM ((volatile uint32_t*)(ITM_BASE)) #define ITM_STIM (&MMIO32(ITM_BASE))
/* Trace Enable ports (ITM_TER[x]) */ /* Trace Enable ports (ITM_TER[x]) */
#define ITM_TER ((volatile uint32_t*)(ITM_BASE + 0xE00)) #define ITM_TER (&MMIO32(ITM_BASE + 0xE00))
/* Trace Privilege (ITM_TPR) */ /* Trace Privilege (ITM_TPR) */
#define ITM_TPR MMIO32(ITM_BASE + 0xE40) #define ITM_TPR MMIO32(ITM_BASE + 0xE40)

2
include/libopencm3/lm3s/gpio.h
View File

@ -64,7 +64,7 @@ LGPL License Terms @ref lgpl_license
/* --- GPIO registers ------------------------------------------------------ */ /* --- GPIO registers ------------------------------------------------------ */
#define GPIO_DATA(port) ((volatile uint32_t *)(port + 0x000)) #define GPIO_DATA(port) (&MMIO32(port + 0x000))
#define GPIO_DIR(port) MMIO32(port + 0x400) #define GPIO_DIR(port) MMIO32(port + 0x400)
#define GPIO_IS(port) MMIO32(port + 0x404) #define GPIO_IS(port) MMIO32(port + 0x404)
#define GPIO_IBE(port) MMIO32(port + 0x408) #define GPIO_IBE(port) MMIO32(port + 0x408)

2
include/libopencm3/lm4f/gpio.h
View File

@ -90,7 +90,7 @@
* ---------------------------------------------------------------------------*/ * ---------------------------------------------------------------------------*/
/* GPIO Data */ /* GPIO Data */
#define GPIO_DATA(port) ((volatile uint32_t *)(port + 0x000)) #define GPIO_DATA(port) (&MMIO32(port + 0x000))
/* GPIO Direction */ /* GPIO Direction */
#define GPIO_DIR(port) MMIO32(port + 0x400) #define GPIO_DIR(port) MMIO32(port + 0x400)

4
include/libopencm3/stm32/common/hash_common_f24.h
View File

@ -55,7 +55,7 @@ Mikhail Avkhimenia <mikhail@avkhimenia.net>
#define HASH_STR MMIO32(HASH + 0x08) #define HASH_STR MMIO32(HASH + 0x08)
/* HASH digest registers (HASH_HR[5]) */ /* HASH digest registers (HASH_HR[5]) */
#define HASH_HR ((volatile uint32_t*)(HASH + 0x0C)) /* x5 */ #define HASH_HR (&MMIO32(HASH + 0x0C)) /* x5 */
/* HASH interrupt enable register (HASH_IMR) */ /* HASH interrupt enable register (HASH_IMR) */
#define HASH_IMR MMIO32(HASH + 0x20) #define HASH_IMR MMIO32(HASH + 0x20)
@ -64,7 +64,7 @@ Mikhail Avkhimenia <mikhail@avkhimenia.net>
#define HASH_SR MMIO32(HASH + 0x28) #define HASH_SR MMIO32(HASH + 0x28)
/* HASH context swap registers (HASH_CSR[51]) */ /* HASH context swap registers (HASH_CSR[51]) */
#define HASH_CSR ((volatile uint32_t*)(HASH + 0xF8)) /* x51 */ #define HASH_CSR (&MMIO32(HASH + 0xF8)) /* x51 */
/* --- HASH_CR values ------------------------------------------------------ */ /* --- HASH_CR values ------------------------------------------------------ */

12
include/libopencm3/stm32/f1/usb.h
View File

@ -49,17 +49,17 @@ LGPL License Terms @ref lgpl_license
/* --- USB general registers ----------------------------------------------- */ /* --- USB general registers ----------------------------------------------- */
/* USB Control register */ /* USB Control register */
#define USB_CNTR_REG ((volatile uint32_t *)(USB_DEV_FS_BASE + 0x40)) #define USB_CNTR_REG (&MMIO32(USB_DEV_FS_BASE + 0x40))
/* USB Interrupt status register */ /* USB Interrupt status register */
#define USB_ISTR_REG ((volatile uint32_t *)(USB_DEV_FS_BASE + 0x44)) #define USB_ISTR_REG (&MMIO32(USB_DEV_FS_BASE + 0x44))
/* USB Frame number register */ /* USB Frame number register */
#define USB_FNR_REG ((volatile uint32_t *)(USB_DEV_FS_BASE + 0x48)) #define USB_FNR_REG (&MMIO32(USB_DEV_FS_BASE + 0x48))
/* USB Device address register */ /* USB Device address register */
#define USB_DADDR_REG ((volatile uint32_t *)(USB_DEV_FS_BASE + 0x4C)) #define USB_DADDR_REG (&MMIO32(USB_DEV_FS_BASE + 0x4C))
/* USB Buffer table address register */ /* USB Buffer table address register */
#define USB_BTABLE_REG ((volatile uint32_t *)(USB_DEV_FS_BASE + 0x50)) #define USB_BTABLE_REG (&MMIO32(USB_DEV_FS_BASE + 0x50))
/* USB EP register */ /* USB EP register */
#define USB_EP_REG(EP) ((volatile uint32_t *)(USB_DEV_FS_BASE) + (EP)) #define USB_EP_REG(EP) (&MMIO32(USB_DEV_FS_BASE) + (EP))
/* --- USB control register masks / bits ----------------------------------- */ /* --- USB control register masks / bits ----------------------------------- */

2
include/libopencm3/stm32/otg_fs.h
View File

@ -89,7 +89,7 @@
#define OTG_FS_PCGCCTL MMIO32(USB_OTG_FS_BASE + 0xE00) #define OTG_FS_PCGCCTL MMIO32(USB_OTG_FS_BASE + 0xE00)
/* Data FIFO */ /* Data FIFO */
#define OTG_FS_FIFO(x) ((volatile uint32_t*)(USB_OTG_FS_BASE \ #define OTG_FS_FIFO(x) (&MMIO32(USB_OTG_FS_BASE \
+ (((x) + 1) \ + (((x) + 1) \
<< 12))) << 12)))

3
include/libopencm3/stm32/otg_hs.h
View File

@ -145,8 +145,7 @@
#define OTG_HS_PCGCCTL MMIO32(USB_OTG_HS_BASE + OTG_PCGCCTL) #define OTG_HS_PCGCCTL MMIO32(USB_OTG_HS_BASE + OTG_PCGCCTL)
/* Data FIFO */ /* Data FIFO */
#define OTG_HS_FIFO(x) ((volatile uint32_t*)(USB_OTG_HS_BASE \ #define OTG_HS_FIFO(x) (&MMIO32(USB_OTG_HS_BASE + OTG_FIFO(x)))
+ OTG_FIFO(x)))
/* Global CSRs */ /* Global CSRs */
/* OTG_HS USB control registers (OTG_FS_GOTGCTL) */ /* OTG_HS USB control registers (OTG_FS_GOTGCTL) */

8
lib/stm32/f1/flash.c
View File

@ -122,13 +122,13 @@ void flash_program_word(uint32_t address, uint32_t data)
FLASH_CR |= FLASH_CR_PG; FLASH_CR |= FLASH_CR_PG;
/* Program the first half of the word. */ /* Program the first half of the word. */
(*(volatile uint16_t *)address) = (uint16_t)data; MMIO16(address) = (uint16_t)data;
/* Wait for the write to complete. */ /* Wait for the write to complete. */
flash_wait_for_last_operation(); flash_wait_for_last_operation();
/* Program the second half of the word. */ /* Program the second half of the word. */
(*(volatile uint16_t *)(address + 2)) = data >> 16; MMIO16(address + 2) = data >> 16;
/* Wait for the write to complete. */ /* Wait for the write to complete. */
flash_wait_for_last_operation(); flash_wait_for_last_operation();
@ -143,7 +143,7 @@ void flash_program_half_word(uint32_t address, uint16_t data)
FLASH_CR |= FLASH_CR_PG; FLASH_CR |= FLASH_CR_PG;
(*(volatile uint16_t *)address) = data; MMIO16(address) = data;
flash_wait_for_last_operation(); flash_wait_for_last_operation();
@ -196,7 +196,7 @@ void flash_program_option_bytes(uint32_t address, uint16_t data)
} }
FLASH_CR |= FLASH_CR_OPTPG; /* Enable option byte programming. */ FLASH_CR |= FLASH_CR_OPTPG; /* Enable option byte programming. */
(*(volatile uint16_t *)address) = data; MMIO16(address) = data;
flash_wait_for_last_operation(); flash_wait_for_last_operation();
FLASH_CR &= ~FLASH_CR_OPTPG; /* Disable option byte programming. */ FLASH_CR &= ~FLASH_CR_OPTPG; /* Disable option byte programming. */
} }

5
lib/usb/usb_fx07_common.c
View File

@ -30,9 +30,8 @@
* As the code can be used on both cores, the registers offset is modified * As the code can be used on both cores, the registers offset is modified
* according to the selected cores base address. */ * according to the selected cores base address. */
#define dev_base_address (usbd_dev->driver->base_address) #define dev_base_address (usbd_dev->driver->base_address)
#define REBASE(x) MMIO32((x)+(dev_base_address)) #define REBASE(x) MMIO32((x) + (dev_base_address))
#define REBASE_FIFO(x) ((volatile uint32_t*)((dev_base_address) \ #define REBASE_FIFO(x) (&MMIO32((dev_base_address) + (OTG_FIFO(x))))
+ (OTG_FIFO(x))))
void stm32fx07_set_address(usbd_device *usbd_dev, uint8_t addr) void stm32fx07_set_address(usbd_device *usbd_dev, uint8_t addr)
{ {