From 0d87694024c1d353fd7cb52fb1cd547c81a4cac2 Mon Sep 17 00:00:00 2001 From: SPRESENSE <41312067+SPRESENSE@users.noreply.github.com> Date: Thu, 20 Oct 2022 22:31:17 +0900 Subject: [PATCH] arch: cxd56xx: Fix duplicate definitions in battery_ioctl.h Fix duplicate definitions of arch/arm/include/cxd56xx/battery_ioctl.h with include/nuttx/power/battery_ioctl.h. --- arch/arm/include/cxd56xx/battery_ioctl.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/arm/include/cxd56xx/battery_ioctl.h b/arch/arm/include/cxd56xx/battery_ioctl.h index a26bf32d77..ea04d4ccd9 100644 --- a/arch/arm/include/cxd56xx/battery_ioctl.h +++ b/arch/arm/include/cxd56xx/battery_ioctl.h @@ -33,16 +33,15 @@ /* ioctl commands */ -#define BATIOC_GET_CHGVOLTAGE _BATIOC(0x0010) -#define BATIOC_GET_CHGCURRENT _BATIOC(0x0012) -#define BATIOC_GET_RECHARGEVOL _BATIOC(0x0013) -#define BATIOC_SET_RECHARGEVOL _BATIOC(0x0014) -#define BATIOC_GET_COMPCURRENT _BATIOC(0x0015) -#define BATIOC_SET_COMPCURRENT _BATIOC(0x0016) -#define BATIOC_GET_TEMPTABLE _BATIOC(0x0017) -#define BATIOC_SET_TEMPTABLE _BATIOC(0x0018) -#define BATIOC_GET_CURRENT _BATIOC(0x0019) -#define BATIOC_GET_VOLTAGE _BATIOC(0x001a) +#define BATIOC_GET_CHGVOLTAGE _BATIOC(0x0020) +#define BATIOC_GET_CHGCURRENT _BATIOC(0x0021) +#define BATIOC_GET_RECHARGEVOL _BATIOC(0x0022) +#define BATIOC_SET_RECHARGEVOL _BATIOC(0x0023) +#define BATIOC_GET_COMPCURRENT _BATIOC(0x0024) +#define BATIOC_SET_COMPCURRENT _BATIOC(0x0025) +#define BATIOC_GET_TEMPTABLE _BATIOC(0x0026) +#define BATIOC_SET_TEMPTABLE _BATIOC(0x0027) +#define BATIOC_GET_CURRENT _BATIOC(0x0028) #define BATIOC_MONITOR_ENABLE _BATIOC(0x0030) #define BATIOC_MONITOR_STATUS _BATIOC(0x0031)