From 1001a9323b0624cadef03673b4e086f56eb9d442 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Tue, 21 May 2019 23:27:21 +0000 Subject: [PATCH] stm32: doc: dma: move to peripheral_apis drops dummy .c files, and adds proper groupings to the shared files. --- lib/stm32/common/dma_common_f24.c | 3 ++- lib/stm32/common/dma_common_l1f013.c | 3 ++- lib/stm32/f0/Makefile | 2 +- lib/stm32/f0/dma.c | 31 ---------------------------- lib/stm32/f1/dma.c | 31 ---------------------------- lib/stm32/f2/dma.c | 31 ---------------------------- lib/stm32/f3/Makefile | 2 +- lib/stm32/f3/dma.c | 31 ---------------------------- lib/stm32/f4/dma.c | 31 ---------------------------- lib/stm32/l1/Makefile | 2 +- lib/stm32/l1/dma.c | 31 ---------------------------- 11 files changed, 7 insertions(+), 191 deletions(-) delete mode 100644 lib/stm32/f0/dma.c delete mode 100644 lib/stm32/f1/dma.c delete mode 100644 lib/stm32/f2/dma.c delete mode 100644 lib/stm32/f3/dma.c delete mode 100644 lib/stm32/f4/dma.c delete mode 100644 lib/stm32/l1/dma.c diff --git a/lib/stm32/common/dma_common_f24.c b/lib/stm32/common/dma_common_f24.c index d706674f..2c61b548 100644 --- a/lib/stm32/common/dma_common_f24.c +++ b/lib/stm32/common/dma_common_f24.c @@ -1,4 +1,5 @@ -/** @addtogroup dma_file +/** @addtogroup dma_file DMA peripheral API +@ingroup peripheral_apis @author @htmlonly © @endhtmlonly 2012 Ken Sarkies diff --git a/lib/stm32/common/dma_common_l1f013.c b/lib/stm32/common/dma_common_l1f013.c index 47abfa24..2f9190a4 100644 --- a/lib/stm32/common/dma_common_l1f013.c +++ b/lib/stm32/common/dma_common_l1f013.c @@ -1,4 +1,5 @@ -/** @addtogroup dma_file +/** @addtogroup dma_file DMA peripheral API +@ingroup peripheral_apis @author @htmlonly © @endhtmlonly 2010 Thomas Otto diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile index 858e34ad..5a8333d7 100644 --- a/lib/stm32/f0/Makefile +++ b/lib/stm32/f0/Makefile @@ -36,7 +36,7 @@ TGT_CFLAGS += $(STANDARD_FLAGS) ARFLAGS = rcs -OBJS = can.o flash.o rcc.o dma.o rtc.o comparator.o \ +OBJS = can.o flash.o rcc.o rtc.o comparator.o \ pwr.o adc.o desig.o OBJS += gpio_common_all.o gpio_common_f0234.o crc_common_all.o crc_v2.o \ diff --git a/lib/stm32/f0/dma.c b/lib/stm32/f0/dma.c deleted file mode 100644 index 8f158a81..00000000 --- a/lib/stm32/f0/dma.c +++ /dev/null @@ -1,31 +0,0 @@ -/** @defgroup dma_file DMA - * - * @ingroup STM32F0xx - * - * @brief libopencm3 STM32F0xx DMA - * - * @version 1.0.0 - * - * @date 10 July 2013 - * - * LGPL License Terms @ref lgpl_license - */ - -/* - * This file is part of the libopencm3 project. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include diff --git a/lib/stm32/f1/dma.c b/lib/stm32/f1/dma.c deleted file mode 100644 index 70193659..00000000 --- a/lib/stm32/f1/dma.c +++ /dev/null @@ -1,31 +0,0 @@ -/** @defgroup dma_file DMA - -@ingroup STM32F1xx - -@brief libopencm3 STM32F1xx DMA - -@version 1.0.0 - -@date 18 August 2012 - -LGPL License Terms @ref lgpl_license -*/ - -/* - * This file is part of the libopencm3 project. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include diff --git a/lib/stm32/f2/dma.c b/lib/stm32/f2/dma.c deleted file mode 100644 index 285f1fe7..00000000 --- a/lib/stm32/f2/dma.c +++ /dev/null @@ -1,31 +0,0 @@ -/** @defgroup dma_file DMA - -@ingroup STM32F2xx - -@brief libopencm3 STM32F2xx DMA - -@version 1.0.0 - -@date 30 November 2012 - -LGPL License Terms @ref lgpl_license -*/ - -/* - * This file is part of the libopencm3 project. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile index 1c098e81..010e14df 100644 --- a/lib/stm32/f3/Makefile +++ b/lib/stm32/f3/Makefile @@ -37,7 +37,7 @@ TGT_CFLAGS += $(STANDARD_FLAGS) ARFLAGS = rcs -OBJS = rcc.o adc.o can.o pwr.o dma.o flash.o desig.o +OBJS = rcc.o adc.o can.o pwr.o flash.o desig.o OBJS += gpio_common_all.o gpio_common_f0234.o \ dac_common_all.o crc_common_all.o crc_v2.o \ diff --git a/lib/stm32/f3/dma.c b/lib/stm32/f3/dma.c deleted file mode 100644 index c5d82b13..00000000 --- a/lib/stm32/f3/dma.c +++ /dev/null @@ -1,31 +0,0 @@ -/** @defgroup dma_file DMA - * - * @ingroup STM32F3xx - * - * @brief libopencm3 STM32F3xx Direct Memory Access - * - * @version 1.0.0 - * - * @date 11 July 2013 - * - * LGPL License Terms @ref lgpl_license - */ - -/* - * This file is part of the libopencm3 project. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include diff --git a/lib/stm32/f4/dma.c b/lib/stm32/f4/dma.c deleted file mode 100644 index 6616621a..00000000 --- a/lib/stm32/f4/dma.c +++ /dev/null @@ -1,31 +0,0 @@ -/** @defgroup dma_file DMA - -@ingroup STM32F4xx - -@brief libopencm3 STM32F4xx DMA - -@version 1.0.0 - -@date 30 November 2012 - -LGPL License Terms @ref lgpl_license -*/ - -/* - * This file is part of the libopencm3 project. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include diff --git a/lib/stm32/l1/Makefile b/lib/stm32/l1/Makefile index 68a6b6ee..cd614593 100644 --- a/lib/stm32/l1/Makefile +++ b/lib/stm32/l1/Makefile @@ -35,7 +35,7 @@ TGT_CFLAGS += $(DEBUG_FLAGS) TGT_CFLAGS += $(STANDARD_FLAGS) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = desig.o flash.o rcc.o dma.o lcd.o +OBJS = desig.o flash.o rcc.o lcd.o OBJS += crc_common_all.o dac_common_all.o OBJS += dma_common_l1f013.o OBJS += flash_common_all.o flash_common_l01.o diff --git a/lib/stm32/l1/dma.c b/lib/stm32/l1/dma.c deleted file mode 100644 index 6f4622d2..00000000 --- a/lib/stm32/l1/dma.c +++ /dev/null @@ -1,31 +0,0 @@ -/** @defgroup dma_file DMA - * - * @ingroup STM32L1xx - * - * @brief libopencm3 STM32L1xx DMA - * - * @version 1.0.0 - * - * @date 10 July 2013 - * - * LGPL License Terms @ref lgpl_license - */ - -/* - * This file is part of the libopencm3 project. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include