diff options
author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-05 17:50:31 -0700 |
---|---|---|
committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-05 17:50:31 -0700 |
commit | bbfeec2dd7b312745856236214c91fce6b9ec22c (patch) | |
tree | a10fdbe9e941a35ae77cdd1490531b7061dcc6b6 /drivers/gadc | |
parent | a02c124940b6c5d61ffcbfb2c7e4d493775c3192 (diff) | |
parent | be61787daadcf8cc1e1f307fc48441949e5ec2c0 (diff) | |
download | uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.tar.gz uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.tar.bz2 uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.zip |
Merge pull request #28 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'drivers/gadc')
-rw-r--r-- | drivers/gadc/AT91SAM7/gadc_lld.c | 27 | ||||
-rw-r--r-- | drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h | 23 | ||||
-rw-r--r-- | drivers/gadc/AT91SAM7/gadc_lld_config.h | 23 |
3 files changed, 13 insertions, 60 deletions
diff --git a/drivers/gadc/AT91SAM7/gadc_lld.c b/drivers/gadc/AT91SAM7/gadc_lld.c index 68866132..791e6bee 100644 --- a/drivers/gadc/AT91SAM7/gadc_lld.c +++ b/drivers/gadc/AT91SAM7/gadc_lld.c @@ -1,29 +1,8 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -/** - * @file drivers/gadc/AT91SAM7/gadc_lld.c - * @brief GADC - Periodic ADC driver source file for the AT91SAM7 cpu. + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: * - * @defgroup Driver Driver - * @ingroup GADC - * @{ + * http://chibios-gfx.com/license.html */ #include "ch.h" diff --git a/drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h b/drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h index 6f23db17..d7aa2ceb 100644 --- a/drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h +++ b/drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h @@ -1,22 +1,9 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://chibios-gfx.com/license.html + */ /** * @file drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h diff --git a/drivers/gadc/AT91SAM7/gadc_lld_config.h b/drivers/gadc/AT91SAM7/gadc_lld_config.h index 8ba71f20..13906fbb 100644 --- a/drivers/gadc/AT91SAM7/gadc_lld_config.h +++ b/drivers/gadc/AT91SAM7/gadc_lld_config.h @@ -1,22 +1,9 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://chibios-gfx.com/license.html + */ /** * @file drivers/gadc/AT91SAM7/gadc_lld_config.h |