arch/arm/src/cxd56xx: Cleaning up header files to match project layout.

This commit is contained in:
Alin Jerpelea 2019-07-04 06:45:17 -06:00 committed by Gregory Nutt
parent 48760b2636
commit 37a24c05fd
23 changed files with 29 additions and 58 deletions

View File

@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_ARCH_CHIP_BATTERY_IOCTL_H
#define __INCLUDE_ARCH_CHIP_BATTERY_IOCTL_H
#ifndef __ARCH_ARM_INCLUDE_CXD56XX_BATTERY_IOCTL_H
#define __ARCH_ARM_INCLUDE_CXD56XX_BATTERY_IOCTL_H
#include <nuttx/fs/ioctl.h>
@ -112,4 +112,4 @@ struct bat_monitor_log_s
int size;
};
#endif /* __INCLUDE_ARCH_CHIP_BATTERY_IOCTL_H */
#endif /* __ARCH_ARM_INCLUDE_CXD56XX_BATTERY_IOCTL_H */

View File

@ -218,21 +218,6 @@
#define NR_VECTORS CXD56_IRQ_NIRQS
#define NR_IRQS CXD56_IRQ_NIRQS
/* Cortex-M0 External interrupts (vectors >= 16) */
#if 0
# define CXD56M0_IRQ_NIRQS (CXD56_IRQ_EXTINT + CXD56M0_IRQ_NEXTINT)
#endif
/* Total number of IRQ numbers (This will need to be revisited if/when the
* Cortex-M0 is supported)
*/
#if 0
# define NR_VECTORS CXD56M0_IRQ_NIRQS
# define NR_IRQS CXD56M0_IRQ_NIRQS
#endif
/****************************************************************************
* Public Types
****************************************************************************/

View File

@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_INCLUDE_CXD56XX_CXD56_SCU_H
#define __ARCH_ARM_INCLUDE_CXD56XX_CXD56_SCU_H
#ifndef __ARCH_ARM_INCLUDE_CXD56XX_SCU_H
#define __ARCH_ARM_INCLUDE_CXD56XX_SCU_H
/****************************************************************************
* include files
@ -557,4 +557,4 @@ void scu_initialize(void);
void scu_uninitialize(void);
#endif /* __ARCH_ARM_INCLUDE_CXD56XX_CXD56_SCU_H */
#endif /* __ARCH_ARM_INCLUDE_CXD56XX_SCU_H */

View File

@ -33,12 +33,12 @@
*
****************************************************************************/
#ifndef __SRC_CXD56_CHARGER_H
#define __SRC_CXD56_CHARGER_H
#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56_CHARGER_H
#define __ARCH_ARM_SRC_CXD56XX_CXD56_CHARGER_H
/* initialize function */
int cxd56_charger_initialize(FAR const char *devpath);
int cxd56_charger_uninitialize(FAR const char *devpath);
#endif /* __SRC_CXD56_CHARGER_H */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_CHARGER_H */

View File

@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56XX_CONFIG_H
#define __ARCH_ARM_SRC_CXD56XX_CXD56XX_CONFIG_H
#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56_CONFIG_H
#define __ARCH_ARM_SRC_CXD56XX_CXD56_CONFIG_H
/****************************************************************************
* Included Files
@ -135,4 +135,4 @@
* Public Functions
****************************************************************************/
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56XX_CONFIG_H */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_CONFIG_H */

View File

@ -58,5 +58,4 @@ void cxd56_emmcuninitialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_EMMC_H */

View File

@ -43,7 +43,7 @@ extern "C"
{
#else
#define EXTERN extern
#endif
#endif /* ARCH_ARM_SRC_CXD56XX_CXD56_FARAPI_H */
void cxd56_farapiinitialize(void);

View File

@ -38,4 +38,4 @@
#define FARAPISTUB_VERSION 17639
#endif
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_FARAPISTUB_H */

View File

@ -33,12 +33,12 @@
*
****************************************************************************/
#ifndef __SRC_CXD56_GAUGE_H
#define __SRC_CXD56_GAUGE_H
#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56_GAUGE_H
#define __ARCH_ARM_SRC_CXD56XX_CXD56_GAUGE_H
/* initialize function */
int cxd56_gauge_initialize(FAR const char *devpath);
int cxd56_gauge_uninitialize(FAR const char *devpath);
#endif /* __SRC_CXD56_GAUGE_H */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_GAUGE_H */

View File

@ -153,6 +153,6 @@ int cxd56_gpio_status(uint32_t pin, cxd56_gpio_status_t *stat);
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_GPIO_H */

View File

@ -46,8 +46,6 @@
#include <nuttx/config.h>
#include "chip.h"
#ifdef CONFIG_CXD56_GPIO_IRQ
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@ -230,8 +228,6 @@ int cxd56_gpioint_status(uint32_t pin, cxd56_gpioint_status_t *stat);
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_CXD56_GPIO_IRQ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_GPIOINT_H */

View File

@ -97,6 +97,6 @@ int cxd56_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_I2C_H */

View File

@ -96,6 +96,6 @@ void cxd56_iccinitialize(void);
#ifdef __cplusplus
}
#endif
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_ICC_H */

View File

@ -221,6 +221,6 @@ int cxd56_pin_status(uint32_t pin, cxd56_pin_status_t *stat);
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_PINCONFIG_H */

View File

@ -46,8 +46,6 @@
#include <stdint.h>
#include <stdbool.h>
#ifdef CONFIG_CXD56_PMIC
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@ -755,7 +753,6 @@ int cxd56_pmic_monitor_get(FAR struct pmic_mon_log_s *ptr);
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_CXD56_PMIC */
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_PMIC_H */

View File

@ -345,6 +345,6 @@ int cxd56_pm_hotsleep(int idletime);
#ifdef __cplusplus
}
#endif
#endif
#endif /* __ASSEMBLY */
#endif /* __ARCH_ARM_SRC_CXD56XX_POWERMGR_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/cxd56xx/cxd56_timerisr.h
* arch/arm/src/cxd56xx/cxd56_powermgr_procfs.h
*
* Copyright 2018 Sony Semiconductor Solutions Corporation
*

View File

@ -98,6 +98,6 @@ FAR struct pwm_lowerhalf_s *cxd56_pwminitialize(uint32_t channel);
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_PWM_H */

View File

@ -187,5 +187,6 @@ FAR struct rtc_lowerhalf_s *cxd56_rtc_lowerhalf(void);
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_RTC_H */

View File

@ -63,4 +63,4 @@ FAR struct mtd_dev_s *cxd56_sfc_initialize(void);
#endif /* __ASSEMBLY__ */
#endif
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_SFC_H */

View File

@ -42,8 +42,6 @@
#include <nuttx/config.h>
#ifdef CONFIG_TIMER
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@ -95,5 +93,4 @@ void cxd56_timer_initialize(FAR const char *devpath, int timer);
#endif
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_TIMER */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_TIMER_H */

View File

@ -269,5 +269,4 @@ void cxd56_udmainitialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_UDMAC_H */

View File

@ -45,8 +45,6 @@
#include "chip.h"
#include "hardware/cxd56_wdt.h"
#ifdef CONFIG_CXD56_WDT
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@ -90,5 +88,4 @@ int cxd56_wdt_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_CXD56_WDT */
#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_WDT_H */