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

usb: Moved USB_PMA_BASE address definition to family-specific memorymap.h

Browse Source 
credit: @fenugrec
This commit is contained in:
Kuldeep Singh Dhaka 2015-08-01 18:38:47 +05:30 committed by Karl Palsson
parent 6357630a90
commit 5c73d60176
6 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/stm32/f0/memorymap.h
View File

@ -58,7 +58,7 @@
#define I2C1_BASE (PERIPH_BASE_APB + 0x5400) #define I2C1_BASE (PERIPH_BASE_APB + 0x5400)
#define I2C2_BASE (PERIPH_BASE_APB + 0x5800) #define I2C2_BASE (PERIPH_BASE_APB + 0x5800)
#define USB_DEV_FS_BASE (PERIPH_BASE_APB + 0x5C00) #define USB_DEV_FS_BASE (PERIPH_BASE_APB + 0x5C00)
/* USB_PMA_BASE already defined in usb.h */ #define USB_PMA_BASE (PERIPH_BASE_APB + 0x6000)
#define BX_CAN1_BASE (PERIPH_BASE_APB + 0x6400) #define BX_CAN1_BASE (PERIPH_BASE_APB + 0x6400)
#define CRS_BASE (PERIPH_BASE_APB + 0x6C00) #define CRS_BASE (PERIPH_BASE_APB + 0x6C00)

1
include/libopencm3/stm32/f1/memorymap.h
View File

@ -59,6 +59,7 @@
#define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400) #define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400)
#define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800)
#define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x5c00) #define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x5c00)
#define USB_PMA_BASE (PERIPH_BASE_APB1 + 0x6000)
#define USB_CAN_SRAM_BASE (PERIPH_BASE_APB1 + 0x6000) #define USB_CAN_SRAM_BASE (PERIPH_BASE_APB1 + 0x6000)
#define BX_CAN1_BASE (PERIPH_BASE_APB1 + 0x6400) #define BX_CAN1_BASE (PERIPH_BASE_APB1 + 0x6400)
#define BX_CAN2_BASE (PERIPH_BASE_APB1 + 0x6800) #define BX_CAN2_BASE (PERIPH_BASE_APB1 + 0x6800)

2
include/libopencm3/stm32/f3/memorymap.h
View File

@ -58,7 +58,7 @@
#define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400) #define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400)
#define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800)
#define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x5C00) #define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x5C00)
#define USB_SRAM_BASE (PERIPH_BASE_APB1 + 0x6000) #define USB_PMA_BASE (PERIPH_BASE_APB1 + 0x6000)
#define BX_CAN_BASE (PERIPH_BASE_APB1 + 0x6400) #define BX_CAN_BASE (PERIPH_BASE_APB1 + 0x6400)
/* PERIPH_BASE_APB1 + 0x6800 (0x4000 6800 - 0x4000 6BFF): Reserved */ /* PERIPH_BASE_APB1 + 0x6800 (0x4000 6800 - 0x4000 6BFF): Reserved */
/* PERIPH_BASE_APB1 + 0x6C00 (0x4000 6C00 - 0x4000 6FFF): Reserved */ /* PERIPH_BASE_APB1 + 0x6C00 (0x4000 6C00 - 0x4000 6FFF): Reserved */

2
include/libopencm3/stm32/l0/memorymap.h
View File

@ -45,7 +45,7 @@
#define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400) #define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400)
#define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800)
#define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x5c00) #define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x5c00)
#define USB_SRAM_BASE (PERIPH_BASE_APB1 + 0x6000) #define USB_PMA_BASE (PERIPH_BASE_APB1 + 0x6000)
#define CRS_BASE (PERIPH_BASE_APB1 + 0x6C00) #define CRS_BASE (PERIPH_BASE_APB1 + 0x6C00)
#define POWER_CONTROL_BASE (PERIPH_BASE_APB1 + 0x7000) #define POWER_CONTROL_BASE (PERIPH_BASE_APB1 + 0x7000)
#define DAC_BASE (PERIPH_BASE_APB1 + 0x7400) #define DAC_BASE (PERIPH_BASE_APB1 + 0x7400)

2
include/libopencm3/stm32/l1/memorymap.h
View File

@ -56,7 +56,7 @@
#define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400) #define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400)
#define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800)
#define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x5c00) #define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x5c00)
#define USB_SRAM_BASE (PERIPH_BASE_APB1 + 0x6000) #define USB_PMA_BASE (PERIPH_BASE_APB1 + 0x6000)
/* gap */ /* gap */
#define POWER_CONTROL_BASE (PERIPH_BASE_APB1 + 0x7000) #define POWER_CONTROL_BASE (PERIPH_BASE_APB1 + 0x7000)
#define DAC_BASE (PERIPH_BASE_APB1 + 0x7400) #define DAC_BASE (PERIPH_BASE_APB1 + 0x7400)

5
include/libopencm3/stm32/usb.h
View File

@ -41,11 +41,6 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/stm32/tools.h> #include <libopencm3/stm32/tools.h>
/* --- USB base addresses -------------------------------------------------- */
/* USB packet buffer memory base address. */
#define USB_PMA_BASE 0x40006000L
/* --- USB general registers ----------------------------------------------- */ /* --- USB general registers ----------------------------------------------- */
/* USB Control register */ /* USB Control register */