From df175cd543988e1fa6a01c8bef0212391988b8f8 Mon Sep 17 00:00:00 2001 From: Vovanium Date: Thu, 18 Jan 2024 17:43:18 +0300 Subject: [PATCH] >< renaming USARTS --- examples/common/407z-piswords/board-uart.ads | 4 ++-- examples/common/429disco/board-uart.ads | 4 ++-- examples/common/f4/board-uart-io.adb | 4 ++-- .../source/f4/{stm32-f407-usart.ads => stm32-f407-usarts.ads} | 4 ++-- .../source/f4/{stm32-f429-usart.ads => stm32-f429-usarts.ads} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename library/source/f4/{stm32-f407-usart.ads => stm32-f407-usarts.ads} (94%) rename library/source/f4/{stm32-f429-usart.ads => stm32-f429-usarts.ads} (95%) diff --git a/examples/common/407z-piswords/board-uart.ads b/examples/common/407z-piswords/board-uart.ads index 64db18d..2929388 100644 --- a/examples/common/407z-piswords/board-uart.ads +++ b/examples/common/407z-piswords/board-uart.ads @@ -1,4 +1,4 @@ -with Chip.USART; +with Chip.USARTs; package Board.UART is Port : GPIO_Registers renames GPIOA; @@ -10,7 +10,7 @@ package Board.UART is AF : Alternate_Function renames Alternate_Functions.USART1; - Module : Chip.USART.USART_Base.USART_Registers renames Chip.USART.USART1; + Module : Chip.USARTs.USART_Base.USART_Registers renames Chip.USARTs.USART1; RCC_EN : Boolean renames RCC_HW.APB2ENR(Index.USART1); RCC_RST : Boolean renames RCC_HW.APB2RSTR(Index.USART1); diff --git a/examples/common/429disco/board-uart.ads b/examples/common/429disco/board-uart.ads index fdc3015..875ffd6 100644 --- a/examples/common/429disco/board-uart.ads +++ b/examples/common/429disco/board-uart.ads @@ -1,4 +1,4 @@ -with Chip.USART; +with Chip.USARTs; package Board.UART is @@ -11,7 +11,7 @@ package Board.UART is AF : Alternate_Function renames Alternate_Functions.USART1; - Module : Chip.USART.USART_Base.USART_Registers renames Chip.USART.USART1; + Module : Chip.USARTs.USART_Base.USART_Registers renames Chip.USARTs.USART1; RCC_EN : Boolean renames RCC_HW.APB2ENR (Index.USART1); RCC_RST : Boolean renames RCC_HW.APB2RSTR (Index.USART1); diff --git a/examples/common/f4/board-uart-io.adb b/examples/common/f4/board-uart-io.adb index bf23878..b73eaee 100644 --- a/examples/common/f4/board-uart-io.adb +++ b/examples/common/f4/board-uart-io.adb @@ -1,7 +1,7 @@ with STM32.GPIO.Ports; use STM32.GPIO.Ports; -with Chip.USART; -use Chip.USART.USART_Base; +with Chip.USARTs; +use Chip.USARTs.USART_Base; package body Board.UART.IO is package TX is new GPIO_Port_Boolean (Port, TX_Bit); diff --git a/library/source/f4/stm32-f407-usart.ads b/library/source/f4/stm32-f407-usarts.ads similarity index 94% rename from library/source/f4/stm32-f407-usart.ads rename to library/source/f4/stm32-f407-usarts.ads index 1db5d6b..af5c232 100644 --- a/library/source/f4/stm32-f407-usart.ads +++ b/library/source/f4/stm32-f407-usarts.ads @@ -2,7 +2,7 @@ with System.Storage_Elements; with STM32.Address_Map; with STM32.USARTs; -package STM32.F407.USART is +package STM32.F407.USARTs is package USART_Base renames STM32.USARTs; @@ -24,4 +24,4 @@ package STM32.F407.USART is USART6: aliased USART_Base.USART_Registers with Volatile, Import, Address => System.Storage_Elements.To_Address(Address_Map.USART6); -end STM32.F407.USART; +end STM32.F407.USARTs; diff --git a/library/source/f4/stm32-f429-usart.ads b/library/source/f4/stm32-f429-usarts.ads similarity index 95% rename from library/source/f4/stm32-f429-usart.ads rename to library/source/f4/stm32-f429-usarts.ads index c7e136b..370a369 100644 --- a/library/source/f4/stm32-f429-usart.ads +++ b/library/source/f4/stm32-f429-usarts.ads @@ -2,7 +2,7 @@ with System.Storage_Elements; with STM32.Address_Map; with STM32.USARTs; -package STM32.F429.USART is +package STM32.F429.USARTs is package USART_Base renames STM32.USARTs; @@ -30,4 +30,4 @@ package STM32.F429.USART is UART8: aliased USART_Base.USART_Registers with Volatile, Import, Address => System.Storage_Elements.To_Address(Address_Map.UART8); -end STM32.F429.USART; +end STM32.F429.USARTs;