From 84e75b1c04637b44d7364ca3b8d6a8666e5af795 Mon Sep 17 00:00:00 2001 From: Vovanium Date: Wed, 11 Aug 2021 17:55:40 +0300 Subject: [PATCH] * peripherial globals to chip file --- source/f4/07z/stm32-fsmc-units.ads | 10 ------- source/f4/07z/stm32-gpio-units.ads | 27 ------------------- source/f4/07z/stm32-rcc.ads | 5 ---- source/f4/07z/stm32-usart-units.ads | 27 ------------------- source/f4/29z/stm32-gpio-units.ads | 42 ----------------------------- source/f4/29z/stm32-usart-units.ads | 32 ---------------------- source/f4/stm32-exti-units.ads | 12 --------- source/f4/stm32-f407-units.ads | 10 +++++++ source/f4/stm32-f429-units.ads | 6 +++++ source/f4/stm32-pwr-units.ads | 10 ------- source/f4/stm32-syscfg-units.ads | 10 ------- 11 files changed, 16 insertions(+), 175 deletions(-) delete mode 100644 source/f4/07z/stm32-fsmc-units.ads delete mode 100644 source/f4/07z/stm32-gpio-units.ads delete mode 100644 source/f4/07z/stm32-rcc.ads delete mode 100644 source/f4/07z/stm32-usart-units.ads delete mode 100644 source/f4/29z/stm32-gpio-units.ads delete mode 100644 source/f4/29z/stm32-usart-units.ads delete mode 100644 source/f4/stm32-exti-units.ads delete mode 100644 source/f4/stm32-pwr-units.ads delete mode 100644 source/f4/stm32-syscfg-units.ads diff --git a/source/f4/07z/stm32-fsmc-units.ads b/source/f4/07z/stm32-fsmc-units.ads deleted file mode 100644 index a58fbbd..0000000 --- a/source/f4/07z/stm32-fsmc-units.ads +++ /dev/null @@ -1,10 +0,0 @@ -with System; -with STM32.Address_Map; - -package STM32.FSMC.Units is - pragma Preelaborate; - - FSMC : FSMC_Registers - with Volatile, Import, Address => System'To_Address (STM32.Address_Map.FMC_FSMC); - -end STM32.FSMC.Units; diff --git a/source/f4/07z/stm32-gpio-units.ads b/source/f4/07z/stm32-gpio-units.ads deleted file mode 100644 index a548974..0000000 --- a/source/f4/07z/stm32-gpio-units.ads +++ /dev/null @@ -1,27 +0,0 @@ -with System; -with STM32.Address_Map; - -package STM32.GPIO.Units is - pragma Preelaborate; - - package Address_Map renames STM32.Address_Map; - - GPIOA : GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOA); - - GPIOC : GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOC); - - GPIOD : GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOD); - - GPIOE : GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOE); - - GPIOF : GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOF); - - GPIOG : GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOG); - -end STM32.GPIO.Units; diff --git a/source/f4/07z/stm32-rcc.ads b/source/f4/07z/stm32-rcc.ads deleted file mode 100644 index 3a2e411..0000000 --- a/source/f4/07z/stm32-rcc.ads +++ /dev/null @@ -1,5 +0,0 @@ --- BUG: need to make separate unit for F407 etc. - -with STM32.F42x.RCC; - -package STM32.RCC renames STM32.F42x.RCC; diff --git a/source/f4/07z/stm32-usart-units.ads b/source/f4/07z/stm32-usart-units.ads deleted file mode 100644 index 8d5b62f..0000000 --- a/source/f4/07z/stm32-usart-units.ads +++ /dev/null @@ -1,27 +0,0 @@ -with System; -with STM32.Address_Map; - -package STM32.USART.Units is - pragma Preelaborate; - - package Address_Map renames STM32.Address_Map; - - USART1 : USART_Registers - with Volatile, Import, Address => System'To_Address (Address_Map.USART1); - - USART2 : USART_Registers - with Volatile, Import, Address => System'To_Address (Address_Map.USART2); - - USART3 : USART_Registers - with Volatile, Import, Address => System'To_Address (Address_Map.USART3); - - UART4 : USART_Registers - with Volatile, Import, Address => System'To_Address (Address_Map.UART4); - - UART5 : USART_Registers - with Volatile, Import, Address => System'To_Address (Address_Map.UART5); - - USART6 : USART_Registers - with Volatile, Import, Address => System'To_Address (Address_Map.USART6); - -end STM32.USART.Units; diff --git a/source/f4/29z/stm32-gpio-units.ads b/source/f4/29z/stm32-gpio-units.ads deleted file mode 100644 index 468a59d..0000000 --- a/source/f4/29z/stm32-gpio-units.ads +++ /dev/null @@ -1,42 +0,0 @@ -with System; -with STM32.Address_Map; - -package STM32.GPIO.Units is - pragma Preelaborate; - - package Address_Map renames STM32.Address_Map; - - GPIOA: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOA); - - GPIOB: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOB); - - GPIOC: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOC); - - GPIOD: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOD); - - GPIOE: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOE); - - GPIOF: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOF); - - GPIOG: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOG); - - GPIOH: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOH); - - GPIOI: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOI); - - GPIOJ: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOJ); - - GPIOK: GPIO_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.GPIOK); - -end STM32.GPIO.Units; \ No newline at end of file diff --git a/source/f4/29z/stm32-usart-units.ads b/source/f4/29z/stm32-usart-units.ads deleted file mode 100644 index 6e9f6f6..0000000 --- a/source/f4/29z/stm32-usart-units.ads +++ /dev/null @@ -1,32 +0,0 @@ -with System; -with STM32.Address_Map; -package STM32.USART.Units is - pragma Preelaborate; - - package Address_Map renames STM32.Address_Map; - - USART1: USART_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.USART1); - - USART2: USART_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.USART2); - - USART3: USART_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.USART3); - - UART4: USART_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.UART4); - - UART5: USART_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.UART5); - - USART6: USART_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.USART6); - - UART7: USART.USART_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.UART7); - - UART8: USART.USART_Registers - with Volatile, Import, Address => System'To_Address(Address_Map.UART8); - -end STM32.USART.Units; \ No newline at end of file diff --git a/source/f4/stm32-exti-units.ads b/source/f4/stm32-exti-units.ads deleted file mode 100644 index f71c4c1..0000000 --- a/source/f4/stm32-exti-units.ads +++ /dev/null @@ -1,12 +0,0 @@ -with System; -with STM32.Address_Map; - -package STM32.EXTI.Units is - pragma Preelaborate; - - package Address_Map renames STM32.Address_Map; - - EXTI : EXTI_Registers - with Volatile, Import, Address => System'To_Address (STM32.Address_Map.EXTI); - -end STM32.EXTI.Units; diff --git a/source/f4/stm32-f407-units.ads b/source/f4/stm32-f407-units.ads index bf9fab9..242e78e 100644 --- a/source/f4/stm32-f407-units.ads +++ b/source/f4/stm32-f407-units.ads @@ -1,5 +1,7 @@ with System; with STM32.Address_Map; +with STM32.EXTI; +with STM32.FSMC; with STM32.GPIO; with STM32.RCC; with STM32.PWR; @@ -9,6 +11,14 @@ with STM32.USART; package STM32.F407.Units is pragma Preelaborate; + EXTI : STM32.EXTI.EXTI_Registers + with Volatile, Import, Address => System'To_Address (STM32.Address_Map.EXTI); + + FSMC : STM32.FSMC.FSMC_Registers + with Volatile, Import, Address => System'To_Address (STM32.Address_Map.FMC_FSMC); + + --- + GPIOA: STM32.GPIO.GPIO_Registers with Volatile, Import, Address => System'To_Address(Address_Map.GPIOA); diff --git a/source/f4/stm32-f429-units.ads b/source/f4/stm32-f429-units.ads index 2a992c4..b9837be 100644 --- a/source/f4/stm32-f429-units.ads +++ b/source/f4/stm32-f429-units.ads @@ -1,5 +1,6 @@ with System; with STM32.Address_Map; +with STM32.EXTI; with STM32.GPIO; with STM32.LTDC; with STM32.RCC; @@ -10,6 +11,11 @@ with STM32.USART; package STM32.F429.Units is pragma Preelaborate; + EXTI : STM32.EXTI.EXTI_Registers + with Volatile, Import, Address => System'To_Address (STM32.Address_Map.EXTI); + + --- + GPIOA: STM32.GPIO.GPIO_Registers with Volatile, Import, Address => System'To_Address(Address_Map.GPIOA); diff --git a/source/f4/stm32-pwr-units.ads b/source/f4/stm32-pwr-units.ads deleted file mode 100644 index 590a139..0000000 --- a/source/f4/stm32-pwr-units.ads +++ /dev/null @@ -1,10 +0,0 @@ -with System; -with STM32.Address_Map; - -package STM32.PWR.Units is - pragma Preelaborate; - - PWR: PWR_Registers - with Volatile, Import, Address => System'To_Address(STM32.Address_Map.PWR); - -end STM32.PWR.Units; diff --git a/source/f4/stm32-syscfg-units.ads b/source/f4/stm32-syscfg-units.ads deleted file mode 100644 index 0c8b81f..0000000 --- a/source/f4/stm32-syscfg-units.ads +++ /dev/null @@ -1,10 +0,0 @@ -with System; -with STM32.Address_Map; - -package STM32.SYSCFG.Units is - pragma Preelaborate; - - SYSCFG : SYSCFG_Registers - with Volatile, Import, Address => System'To_Address (STM32.Address_Map.SYSCFG); - -end STM32.SYSCFG.Units;