Skip to content
Snippets Groups Projects
Commit 695d1d93 authored by Gregory Nutt's avatar Gregory Nutt
Browse files

Some cosmetic typo fixes

parent 0da9aaeb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 154 deletions
configs/sama5d3-xplained/src/sam_adc.c
+ 2
− 2
View file @ 695d1d93
/************************************************************************************
* configs/sama5d3-xplained/src/up_adc.c
* configs/sama5d3-xplained/src/sam_adc.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......@@ -115,4 +115,4 @@ int adc_devinit(void)
#endif
}
#endif /* CONFIG_ADC */
\ No newline at end of file
#endif /* CONFIG_ADC */
configs/sama5d3-xplained/src/sam_can.c
+ 1
− 1
View file @ 695d1d93
/************************************************************************************
* configs/sama5d3-xplained/src/up_can.c
* configs/sama5d3-xplained/src/sam_can.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/sama5d3-xplained/src/sam_spi.c
+ 1
− 1
View file @ 695d1d93
/************************************************************************************
* configs/sama5d3-xplained/src/up_spi.c
* configs/sama5d3-xplained/src/sam_spi.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/sama5d3-xplained/src/sam_usbmsc.c
+ 1
− 1
View file @ 695d1d93
/****************************************************************************
* configs/sama5d3-xplained/src/up_usbmsc.c
* configs/sama5d3-xplained/src/sam_usbmsc.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/sama5d3x-ek/src/sam_adc.c
+ 2
− 2
View file @ 695d1d93
/************************************************************************************
* configs/sama5d3x-ek/src/up_adc.c
* configs/sama5d3x-ek/src/sam_adc.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......@@ -115,4 +115,4 @@ int adc_devinit(void)
#endif
}
#endif /* CONFIG_ADC */
\ No newline at end of file
#endif /* CONFIG_ADC */
configs/sama5d3x-ek/src/sam_can.c
+ 1
− 1
View file @ 695d1d93
/************************************************************************************
* configs/sama5d3x-ek/src/up_can.c
* configs/sama5d3x-ek/src/sam_can.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/sama5d3x-ek/src/sam_spi.c
+ 1
− 1
View file @ 695d1d93
/************************************************************************************
* configs/sama5d3x-ek/src/up_spi.c
* configs/sama5d3x-ek/src/sam_spi.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/sama5d3x-ek/src/sam_usbmsc.c
+ 1
− 1
View file @ 695d1d93
/****************************************************************************
* configs/sama5d3x-ek/src/up_usbmsc.c
* configs/sama5d3x-ek/src/sam_usbmsc.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/sama5d4-ek/src/sam_adc.c
+ 2
− 2
View file @ 695d1d93
/************************************************************************************
* configs/sama5d4-ek/src/up_adc.c
* configs/sama5d4-ek/src/sam_adc.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......@@ -115,4 +115,4 @@ int adc_devinit(void)
#endif
}
#endif /* CONFIG_ADC */
\ No newline at end of file
#endif /* CONFIG_ADC */
configs/sama5d4-ek/src/sam_can.c deleted 100644 → 0
+ 0
− 140
View file @ 0da9aaeb
/************************************************************************************
* configs/sama5d4-ek/src/up_can.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. 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.
* 3. Neither the name NuttX 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.
*
************************************************************************************/
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/can.h>
#include <arch/board/board.h>
#include "chip.h"
#include "up_arch.h"
#include "sam_can.h"
#include "sama5d4-ek.h"
#if defined(CONFIG_CAN) && (defined(CONFIG_SAMA5_CAN0) || defined(CONFIG_SAMA5_CAN1))
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/* Configuration ********************************************************************/
#if defined(CONFIG_SAMA5_CAN0) && defined(CONFIG_SAMA5_CAN1)
# warning "Both CAN0 and CAN1 are enabled. Assuming only CAN0."
# undef CONFIG_SAMA5_CAN1
#endif
#ifdef CONFIG_SAMA5_CAN0
# define CAN_PORT 0
#else
# define CAN_PORT 1
#endif
/* Debug ***************************************************************************/
/* Non-standard debug that may be enabled just for testing CAN */
#ifdef CONFIG_DEBUG_CAN
# define candbg dbg
# define canvdbg vdbg
# define canlldbg lldbg
# define canllvdbg llvdbg
#else
# define candbg(x...)
# define canvdbg(x...)
# define canlldbg(x...)
# define canllvdbg(x...)
#endif
/************************************************************************************
* Private Functions
************************************************************************************/
/************************************************************************************
* Public Functions
************************************************************************************/
/************************************************************************************
* Name: can_devinit
*
* Description:
* All STM32 architectures must provide the following interface to work with
* examples/can.
*
************************************************************************************/
int can_devinit(void)
{
static bool initialized = false;
struct can_dev_s *can;
int ret;
/* Check if we have already initialized */
if (!initialized)
{
/* Call stm32_caninitialize() to get an instance of the CAN interface */
can = sam_caninitialize(CAN_PORT);
if (can == NULL)
{
candbg("ERROR: Failed to get CAN interface\n");
return -ENODEV;
}
/* Register the CAN driver at "/dev/can0" */
ret = can_register("/dev/can0", can);
if (ret < 0)
{
candbg("ERROR: can_register failed: %d\n", ret);
return ret;
}
/* Now we are initialized */
initialized = true;
}
return OK;
}
#endif /* CONFIG_CAN && (CONFIG_SAMA5_CAN0 || CONFIG_SAMA5_CAN1) */
configs/sama5d4-ek/src/sam_spi.c
+ 1
− 1
View file @ 695d1d93
/************************************************************************************
* configs/sama5d4-ek/src/up_spi.c
* configs/sama5d4-ek/src/sam_spi.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
configs/sama5d4-ek/src/sam_usbmsc.c
+ 1
− 1
View file @ 695d1d93
/****************************************************************************
* configs/sama5d4-ek/src/up_usbmsc.c
* configs/sama5d4-ek/src/sam_usbmsc.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment