From 5c73d601763dd140bff020be8d6d06f03c2bea78 Mon Sep 17 00:00:00 2001 From: Kuldeep Singh Dhaka Date: Sat, 1 Aug 2015 18:38:47 +0530 Subject: [PATCH] usb: Moved USB_PMA_BASE address definition to family-specific memorymap.h credit: @fenugrec --- include/libopencm3/stm32/f0/memorymap.h | 2 +- include/libopencm3/stm32/f1/memorymap.h | 1 + include/libopencm3/stm32/f3/memorymap.h | 2 +- include/libopencm3/stm32/l0/memorymap.h | 2 +- include/libopencm3/stm32/l1/memorymap.h | 2 +- include/libopencm3/stm32/usb.h | 5 ----- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/libopencm3/stm32/f0/memorymap.h b/include/libopencm3/stm32/f0/memorymap.h index 04405dcc..fe71d6a6 100644 --- a/include/libopencm3/stm32/f0/memorymap.h +++ b/include/libopencm3/stm32/f0/memorymap.h @@ -58,7 +58,7 @@ #define I2C1_BASE (PERIPH_BASE_APB + 0x5400) #define I2C2_BASE (PERIPH_BASE_APB + 0x5800) #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 CRS_BASE (PERIPH_BASE_APB + 0x6C00) diff --git a/include/libopencm3/stm32/f1/memorymap.h b/include/libopencm3/stm32/f1/memorymap.h index f61fd22c..cbc04f4e 100644 --- a/include/libopencm3/stm32/f1/memorymap.h +++ b/include/libopencm3/stm32/f1/memorymap.h @@ -59,6 +59,7 @@ #define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400) #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #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 BX_CAN1_BASE (PERIPH_BASE_APB1 + 0x6400) #define BX_CAN2_BASE (PERIPH_BASE_APB1 + 0x6800) diff --git a/include/libopencm3/stm32/f3/memorymap.h b/include/libopencm3/stm32/f3/memorymap.h index f07bb146..500a0671 100644 --- a/include/libopencm3/stm32/f3/memorymap.h +++ b/include/libopencm3/stm32/f3/memorymap.h @@ -58,7 +58,7 @@ #define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400) #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #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) /* PERIPH_BASE_APB1 + 0x6800 (0x4000 6800 - 0x4000 6BFF): Reserved */ /* PERIPH_BASE_APB1 + 0x6C00 (0x4000 6C00 - 0x4000 6FFF): Reserved */ diff --git a/include/libopencm3/stm32/l0/memorymap.h b/include/libopencm3/stm32/l0/memorymap.h index 23ec83b8..ebefc7b8 100644 --- a/include/libopencm3/stm32/l0/memorymap.h +++ b/include/libopencm3/stm32/l0/memorymap.h @@ -45,7 +45,7 @@ #define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400) #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #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 POWER_CONTROL_BASE (PERIPH_BASE_APB1 + 0x7000) #define DAC_BASE (PERIPH_BASE_APB1 + 0x7400) diff --git a/include/libopencm3/stm32/l1/memorymap.h b/include/libopencm3/stm32/l1/memorymap.h index ac1aa6e3..1b9cd10e 100644 --- a/include/libopencm3/stm32/l1/memorymap.h +++ b/include/libopencm3/stm32/l1/memorymap.h @@ -56,7 +56,7 @@ #define I2C1_BASE (PERIPH_BASE_APB1 + 0x5400) #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #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 */ #define POWER_CONTROL_BASE (PERIPH_BASE_APB1 + 0x7000) #define DAC_BASE (PERIPH_BASE_APB1 + 0x7400) diff --git a/include/libopencm3/stm32/usb.h b/include/libopencm3/stm32/usb.h index 223ad4ab..7be2dcc4 100644 --- a/include/libopencm3/stm32/usb.h +++ b/include/libopencm3/stm32/usb.h @@ -41,11 +41,6 @@ LGPL License Terms @ref lgpl_license #include #include -/* --- USB base addresses -------------------------------------------------- */ - -/* USB packet buffer memory base address. */ -#define USB_PMA_BASE 0x40006000L - /* --- USB general registers ----------------------------------------------- */ /* USB Control register */