diff --git a/cpu/lm4f120/include/cpu_conf.h b/cpu/lm4f120/include/cpu_conf.h index ad3e6bfc92220f45af635126c398e18af570ed41..b68c366e013b982d583d03af549afa276ec86d90 100644 --- a/cpu/lm4f120/include/cpu_conf.h +++ b/cpu/lm4f120/include/cpu_conf.h @@ -35,7 +35,6 @@ extern "C" { #include "hw_types.h" #include "cortex-m4-def.h" #include "stellaris_periph/cpu.h" -#include "stellaris_periph/debug.h" #include "stellaris_periph/interrupt.h" #include "stellaris_periph/sysctl.h" #include "stellaris_periph/adc.h" diff --git a/cpu/lm4f120/periph/uart.c b/cpu/lm4f120/periph/uart.c index 73accb9301314dad1835bf7c808647248b751893..283650b50be48ecd6398e677e5dd7f8a715f4ead 100644 --- a/cpu/lm4f120/periph/uart.c +++ b/cpu/lm4f120/periph/uart.c @@ -18,6 +18,7 @@ #include <stdint.h> +#include "assert.h" #include "cpu.h" #include "sched.h" #include "thread.h" @@ -79,7 +80,7 @@ static const unsigned long g_ulUARTInt[3] = int uart_init(uart_t uart, uint32_t baudrate, uart_rx_cb_t rx_cb, uart_tx_cb_t tx_cb, void *arg) { /* Check the arguments */ - ASSERT(uart == 0); + assert(uart == 0); /* Check to make sure the UART peripheral is present */ if(!ROM_SysCtlPeripheralPresent(SYSCTL_PERIPH_UART0)){ return -1; diff --git a/cpu/stellaris_common/include/stellaris_periph/debug.h b/cpu/stellaris_common/include/stellaris_periph/debug.h deleted file mode 100644 index cce40a449b96a8ec5ae2d5ee086617cea04a73b1..0000000000000000000000000000000000000000 --- a/cpu/stellaris_common/include/stellaris_periph/debug.h +++ /dev/null @@ -1,76 +0,0 @@ -//***************************************************************************** -// -// debug.h - Macros for assisting debug of the driver library. -// -// Copyright (c) 2006-2012 Texas Instruments Incorporated. All rights reserved. -// Software License Agreement -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the -// distribution. -// -// Neither the name of Texas Instruments Incorporated nor the names of -// its contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// This is part of revision 9453 of the Stellaris Peripheral Driver Library. -// -//***************************************************************************** - -#ifndef __DEBUG_H__ -#define __DEBUG_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -//***************************************************************************** -// -// Prototype for the function that is called when an invalid argument is passed -// to an API. This is only used when doing a DEBUG build. -// -//***************************************************************************** -extern void __error__(char *pcFilename, unsigned long ulLine); - -//***************************************************************************** -// -// The ASSERT macro, which does the actual assertion checking. Typically, this -// will be for procedure arguments. -// -//***************************************************************************** -#ifdef DEBUG -#define ASSERT(expr) { \ - if(!(expr)) \ - { \ - __error__(RIOT_FILE_RELATIVE, __LINE__); \ - } \ - } -#else -#define ASSERT(expr) -#endif - -#ifdef __cplusplus -} -#endif - -#endif // __DEBUG_H__