sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Several nxstyle fixes.

Browse Source
This commit is contained in:
Johannes Schock 2020-08-05 08:53:27 +02:00 committed by Alan Carvalho de Assis
parent c760db7fd0
commit a32912040f
7 changed files with 215 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/include/kinetis/kinetis_sim.h
View File

@ -845,7 +845,7 @@
# define KINETIS_SIM_HAS_SCGC1_UART4 1 /* SoC has SCGC1[UART4] */
# undef KINETIS_SIM_HAS_SCGC1_I2C3 /* SoC has SCGC1[I2C3] */
# undef KINETIS_SIM_HAS_SCGC1_I2C2 /* SoC has SCGC1[I2C2] */
# define KINETIS_SIM_HAS_SCGC1_OSC1 1 /* SoC has SCGC1[OSC1] */
# define KINETIS_SIM_HAS_SCGC1_OSC1 1 /* SoC has SCGC1[OSC1] */
# define KINETIS_SIM_HAS_SCGC2 1 /* SoC has SCGC2 Register */
# define KINETIS_SIM_HAS_SCGC2_ENET 1 /* SoC has SCGC2[ENET] */
# undef KINETIS_SIM_HAS_SCGC2_LPUART0 /* SoC has SCGC2[LPUART0] */
@ -1193,10 +1193,12 @@
* MK66FX1M0VLQ18 180 MHz 144 LQFP 1.25 MB 1 MB 4 KB 256 KB 100
*/
#elif defined(CONFIG_ARCH_CHIP_MK66FN2M0VMD18) || defined(CONFIG_ARCH_CHIP_MK66FX1M0VMD18) || \
defined(CONFIG_ARCH_CHIP_MK66FN2M0VLQ18) || defined(CONFIG_ARCH_CHIP_MK66FX1M0VLQ18)
#elif defined(CONFIG_ARCH_CHIP_MK66FN2M0VMD18) || \
defined(CONFIG_ARCH_CHIP_MK66FX1M0VMD18) || \
defined(CONFIG_ARCH_CHIP_MK66FN2M0VLQ18) || \
defined(CONFIG_ARCH_CHIP_MK66FX1M0VLQ18)
/* Verified to Document Number: Document Number: K66P144M180SF5RMV2 Rev. 2, May 2015 */
/* Verified to Document Number: K66P144M180SF5RMV2 Rev. 2, May 2015 */
# define KINETIS_SIM_VERSION KINETIS_SIM_VERSION_06
@ -1461,7 +1463,9 @@
# error "Unsupported Kinetis chip"
#endif
/* Use the catch all configuration for the SIM based on the implementations in nuttx prior 2/16/2017 */
/* Use the catch all configuration for the SIM based on the
* implementations in nuttx prior 2/16/2017
*/
#if KINETIS_SIM_VERSION == KINETIS_SIM_VERSION_UKN

2
arch/arm/src/kinetis/hardware/kinetis_usbhs.h
View File

@ -871,8 +871,6 @@
# define USBPHY_PLL_SICn_PLL_DIV_SEL_16MHZ (1 << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT) /* 16Mhz XTAL */
# define USBPHY_PLL_SICn_PLL_DIV_SEL_12MHZ (2 << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT) /* 12Mhz XTAL */
/* USB PHY VBUS Detect Control Register */
#define USBPHY_USB1_VBUS_DETECTn_EN_CHARGER_RESISTOR (1 << 31) /* Bit 31: Enables resistors used for an older method of resistive battery charger detection */

362
arch/arm/src/kinetis/kinetis_usbhshost.c
View File

File diff suppressed because it is too large Load Diff

36
arch/arm/src/kinetis/kinetis_usbhshost.h
View File

@ -1,4 +1,4 @@
/*****************************************************************************
/******************************************************************************
* arch/arm/src/kinetis/kinetis_usbhshost.h
*
* Copyright (C) 2012, 2015, 2019 Gregory Nutt. All rights reserved.
@ -32,31 +32,31 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*****************************************************************************/
******************************************************************************/
#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_USBHSHOST_H
#define __ARCH_ARM_SRC_KINETIS_KINETIS_USBHSHOST_H
/*****************************************************************************
/******************************************************************************
* Included Files
*****************************************************************************/
******************************************************************************/
#include <nuttx/config.h>
#include "chip.h"
/*****************************************************************************
/******************************************************************************
* Pre-processor Definitions
*****************************************************************************/
******************************************************************************/
/*****************************************************************************
/******************************************************************************
* Public Types
*****************************************************************************/
******************************************************************************/
#ifndef __ASSEMBLY__
/*****************************************************************************
/******************************************************************************
* Public Data
*****************************************************************************/
******************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
@ -67,11 +67,11 @@ extern "C"
#define EXTERN extern
#endif
/*****************************************************************************
/******************************************************************************
* Public Function Prototypes
*****************************************************************************/
******************************************************************************/
/*****************************************************************************
/******************************************************************************
* Name: kinetis_usbhost_vbusdrive
*
* Description:
@ -87,11 +87,11 @@ extern "C"
* Returned Value:
* None
*
*****************************************************************************/
******************************************************************************/
extern void kinetis_usbhost_vbusdrive(int rhport, bool enable);
/*****************************************************************************
/******************************************************************************
* Name: kinetis_setup_overcurrent
*
* Description:
@ -106,11 +106,11 @@ extern void kinetis_usbhost_vbusdrive(int rhport, bool enable);
* Zero (OK) returned on success; a negated errno value is returned on
* failure.
*
*****************************************************************************/
******************************************************************************/
extern int kinetis_setup_overcurrent(xcpt_t handler, void *arg);
/*****************************************************************************
/******************************************************************************
* Name: kinetis_ehci_initialize
*
* Description:
@ -133,7 +133,7 @@ extern int kinetis_setup_overcurrent(xcpt_t handler, void *arg);
* - Class drivers should be initialized prior to calling this function.
* Otherwise, there is a race condition if the device is already connected.
*
****************************************************************************/
******************************************************************************/
#if defined(CONFIG_KINETIS_USBHS) && defined(CONFIG_USBHOST)
struct usbhost_connection_s;

11
boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h
View File

@ -145,9 +145,9 @@
* BLUE PTE8
*/
#define GPIO_LED_R (GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO | PIN_PORTE | PIN6)
#define GPIO_LED_G (GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO | PIN_PORTE | PIN7)
#define GPIO_LED_B (GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO | PIN_PORTE | PIN8)
#define GPIO_LED_R (GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO | PIN_PORTE | PIN6)
#define GPIO_LED_G (GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO | PIN_PORTE | PIN7)
#define GPIO_LED_B (GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO | PIN_PORTE | PIN8)
/* Two push buttons, SW2 and SW3, are available on FRDM-K28F board, where SW2
* is connected to PTA4 and SW3 is connected to PTD0.
@ -156,7 +156,7 @@
* Also, only SW3 can be a non-maskable interrupt.
*
* Switch GPIO Function
* --------- ---------------------------------------------------------------
* --------- --------------------------------------------------------------
* SW2 PTA4/NMI_B
* SW3 PTD0/LLWU_P12
*/
@ -321,7 +321,8 @@ void k28_automount_initialize(void);
* Name: k28_automount_event
*
* Description:
* The SDHC card detection logic has detected an insertion or removal event.
* The SDHC card detection logic has detected an insertion or removal
* event.
* It has already scheduled the MMC/SD block driver operations.
* Now we need to schedule the auto-mount event which will occur with a
* substantial delay to make sure that everything has settle down.

1
boards/arm/kinetis/freedom-k28f/src/k28_bringup.c
View File

@ -157,7 +157,6 @@ int k28_bringup(void)
k28_usbhost_initialize();
#endif
UNUSED(ret);
return OK;
}

4
boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c
View File

@ -369,7 +369,7 @@ void kinetis_usbhost_vbusdrive(int rhport, bool enable)
}
}
/****************************************************************************
/*****************************************************************************
* Name: kinetis_setup_overcurrent
*
* Description:
@ -384,7 +384,7 @@ void kinetis_usbhost_vbusdrive(int rhport, bool enable)
* Zero (OK) returned on success; a negated errno value is returned on
* failure.
*
****************************************************************************/
*****************************************************************************/
#if 0 /* Not ready yet */
int kinetis_setup_overcurrent(xcpt_t handler, void *arg)