ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update GeneratedSource and system files for B0S2 using psoc6pdl 1.6.0.4172 RC2

pull/13122/head
Roman Okhrimenko 2020-06-15 21:30:02 +03:00
parent aa3c81e749
commit f99a1c49b9
16 changed files with 87 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Wrapper function to initialize all generated code. * Wrapper function to initialize all generated code.
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.h
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Simple wrapper header containing all generated files. * Simple wrapper header containing all generated files.
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.timestamp
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Sentinel file for determining if generated source is up to date. * Sentinel file for determining if generated source is up to date.
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.c
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Clock configuration * Clock configuration
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.h
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Clock configuration * Clock configuration
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_notices.h
View File

@ -5,10 +5,10 @@
* Contains warnings and errors that occurred while generating code for the * Contains warnings and errors that occurred while generating code for the
* design. * design.
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Peripheral Hardware Block configuration * Peripheral Hardware Block configuration
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.h
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Peripheral Hardware Block configuration * Peripheral Hardware Block configuration
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Pin configuration * Pin configuration
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.h
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Pin configuration * Pin configuration
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_routing.c
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Establishes all necessary connections between hardware elements. * Establishes all necessary connections between hardware elements.
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

20
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_routing.h
View File

@ -4,10 +4,10 @@
* Description: * Description:
* Establishes all necessary connections between hardware elements. * Establishes all necessary connections between hardware elements.
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation
@ -38,20 +38,20 @@ void init_cycfg_routing(void);
#define init_cycfg_connectivity() init_cycfg_routing() #define init_cycfg_connectivity() init_cycfg_routing()
#define ioss_0_port_0_pin_0_ANALOG P0_0_SRSS_WCO_IN #define ioss_0_port_0_pin_0_ANALOG P0_0_SRSS_WCO_IN
#define ioss_0_port_0_pin_1_ANALOG P0_1_SRSS_WCO_OUT #define ioss_0_port_0_pin_1_ANALOG P0_1_SRSS_WCO_OUT
#define ioss_0_port_1_pin_0_HSIOM HSIOM_SEL_AMUXA #define ioss_0_port_1_pin_0_HSIOM HSIOM_SEL_AMUXB
#define ioss_0_port_6_pin_4_HSIOM P6_4_CPUSS_SWJ_SWO_TDO #define ioss_0_port_6_pin_4_HSIOM P6_4_CPUSS_SWJ_SWO_TDO
#define ioss_0_port_6_pin_6_HSIOM P6_6_CPUSS_SWJ_SWDIO_TMS #define ioss_0_port_6_pin_6_HSIOM P6_6_CPUSS_SWJ_SWDIO_TMS
#define ioss_0_port_6_pin_7_HSIOM P6_7_CPUSS_SWJ_SWCLK_TCLK #define ioss_0_port_6_pin_7_HSIOM P6_7_CPUSS_SWJ_SWCLK_TCLK
#define ioss_0_port_7_pin_1_HSIOM HSIOM_SEL_AMUXA #define ioss_0_port_7_pin_1_HSIOM HSIOM_SEL_AMUXB
#define ioss_0_port_7_pin_2_HSIOM HSIOM_SEL_AMUXA #define ioss_0_port_7_pin_2_HSIOM HSIOM_SEL_AMUXB
#define ioss_0_port_7_pin_7_HSIOM HSIOM_SEL_AMUXB #define ioss_0_port_7_pin_7_HSIOM HSIOM_SEL_AMUXA
#define ioss_0_port_8_pin_1_HSIOM HSIOM_SEL_AMUXA #define ioss_0_port_8_pin_1_HSIOM HSIOM_SEL_AMUXA
#define ioss_0_port_8_pin_2_HSIOM HSIOM_SEL_AMUXB #define ioss_0_port_8_pin_2_HSIOM HSIOM_SEL_AMUXB
#define ioss_0_port_8_pin_3_HSIOM HSIOM_SEL_AMUXA #define ioss_0_port_8_pin_3_HSIOM HSIOM_SEL_AMUXA
#define ioss_0_port_8_pin_4_HSIOM HSIOM_SEL_AMUXB #define ioss_0_port_8_pin_4_HSIOM HSIOM_SEL_AMUXA
#define ioss_0_port_8_pin_5_HSIOM HSIOM_SEL_AMUXB #define ioss_0_port_8_pin_5_HSIOM HSIOM_SEL_AMUXA
#define ioss_0_port_8_pin_6_HSIOM HSIOM_SEL_AMUXB #define ioss_0_port_8_pin_6_HSIOM HSIOM_SEL_AMUXB
#define ioss_0_port_8_pin_7_HSIOM HSIOM_SEL_AMUXA #define ioss_0_port_8_pin_7_HSIOM HSIOM_SEL_AMUXB
#if defined(__cplusplus) #if defined(__cplusplus)
} }

30
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_system.c
View File

@ -4,10 +4,10 @@
* Description: * Description:
* System configuration * System configuration
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation
@ -709,7 +709,7 @@ void init_cycfg_system(void)
Cy_SysClk_ClkSlowInit(); Cy_SysClk_ClkSlowInit();
#endif #endif
#if ((CY_CFG_SYSCLK_CLKPATH0_SOURCE_NUM == 0x6UL) && (CY_CFG_SYSCLK_CLKHF0_CLKPATH == 0U)) #if ((CY_CFG_SYSCLK_CLKPATH0_SOURCE_NUM == 0x6UL) && (CY_CFG_SYSCLK_CLKHF0_CLKPATH_NUM == 0U))
/* Configure HFCLK0 to temporarily run from IMO to initialize other clocks */ /* Configure HFCLK0 to temporarily run from IMO to initialize other clocks */
Cy_SysClk_ClkPathSetSource(1UL, CY_SYSCLK_CLKPATH_IN_IMO); Cy_SysClk_ClkPathSetSource(1UL, CY_SYSCLK_CLKPATH_IN_IMO);
Cy_SysClk_ClkHfSetSource(0UL, CY_SYSCLK_CLKHF_IN_CLKPATH1); Cy_SysClk_ClkHfSetSource(0UL, CY_SYSCLK_CLKHF_IN_CLKPATH1);
@ -773,7 +773,7 @@ void init_cycfg_system(void)
Cy_SysClk_ClkHf0Init(); Cy_SysClk_ClkHf0Init();
#if ((CY_CFG_SYSCLK_CLKPATH0_SOURCE_NUM == 0x6UL) && (CY_CFG_SYSCLK_CLKHF0_CLKPATH == 0U)) #if ((CY_CFG_SYSCLK_CLKPATH0_SOURCE_NUM == 0x6UL) && (CY_CFG_SYSCLK_CLKHF0_CLKPATH_NUM == 0U))
#ifdef CY_CFG_SYSCLK_CLKPATH1_ENABLED #ifdef CY_CFG_SYSCLK_CLKPATH1_ENABLED
/* Apply the ClkPath1 user setting */ /* Apply the ClkPath1 user setting */
Cy_SysClk_ClkPath1Init(); Cy_SysClk_ClkPath1Init();
@ -891,13 +891,10 @@ void init_cycfg_system(void)
Cy_SysClk_ClkBakInit(); Cy_SysClk_ClkBakInit();
#endif #endif
/* Configure default enabled clocks */ /* Configure default enabled clocks */
#ifdef CY_CFG_SYSCLK_ILO_ENABLED #ifdef CY_CFG_SYSCLK_ILO_ENABLED
Cy_SysClk_IloInit(); Cy_SysClk_IloInit();
#else #endif
Cy_SysClk_IloDisable();
Cy_SysClk_IloHibernateOn(false);
#endif
#ifndef CY_CFG_SYSCLK_IMO_ENABLED #ifndef CY_CFG_SYSCLK_IMO_ENABLED
#error the IMO must be enabled for proper chip operation #error the IMO must be enabled for proper chip operation
@ -921,6 +918,15 @@ void init_cycfg_system(void)
/* Update System Core Clock values for correct Cy_SysLib_Delay functioning */ /* Update System Core Clock values for correct Cy_SysLib_Delay functioning */
SystemCoreClockUpdate(); SystemCoreClockUpdate();
#ifndef CY_CFG_SYSCLK_ILO_ENABLED
#ifdef CY_CFG_SYSCLK_CLKLF_ENABLED
/* Wait 4 ILO cycles in case of unfinished CLKLF clock source transition */
Cy_SysLib_DelayUs(200U);
#endif
Cy_SysClk_IloDisable();
Cy_SysClk_IloHibernateOn(false);
#endif
#endif /* ((!CY_CPU_CORTEX_M4) || (!defined(CY_DEVICE_SECURE))) */ #endif /* ((!CY_CPU_CORTEX_M4) || (!defined(CY_DEVICE_SECURE))) */

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_system.h
View File

@ -4,10 +4,10 @@
* Description: * Description:
* System configuration * System configuration
* This file was automatically generated and should not be modified. * This file was automatically generated and should not be modified.
* Tools Package 2.1.0.1260 * Tools Package 2.2.0.1747
* psoc6pdl 1.6.0.3875 * psoc6pdl 1.6.0.4172
* personalities_2.0 2.0.0.0 * personalities_2.0 2.0.0.0
* udd 1.2.0.300 * udd 1.2.0.370
* *
******************************************************************************** ********************************************************************************
* Copyright 2020 Cypress Semiconductor Corporation * Copyright 2020 Cypress Semiconductor Corporation

13
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/device/COMPONENT_CM4/system_psoc6_cm4.c
View File

@ -1,6 +1,6 @@
/***************************************************************************//** /***************************************************************************//**
* \file system_psoc6_cm4.c * \file system_psoc6_cm4.c
* \version 2.70.1 * \version 2.80
* *
* The device system-source file. * The device system-source file.
* *
@ -40,6 +40,10 @@
#endif /* defined(CY_DEVICE_PSOC6ABLE2) */ #endif /* defined(CY_DEVICE_PSOC6ABLE2) */
#endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */ #endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
#if defined(CY_DEVICE_SECURE)
#include "cy_pra.h"
#endif /* defined(CY_DEVICE_SECURE) */
/******************************************************************************* /*******************************************************************************
* SystemCoreClockUpdate() * SystemCoreClockUpdate()
@ -160,7 +164,7 @@ void SystemInit(void)
#ifdef __CM0P_PRESENT #ifdef __CM0P_PRESENT
#if (__CM0P_PRESENT == 0) #if (__CM0P_PRESENT == 0)
/* Configure data register (as CM0p in deep sleep state) of IPC structure #7, reserved for the Deep-Sleep operations. */ /* Configure data register (as CM0p in deep sleep state) of IPC structure #7, reserved for the Deep-Sleep operations. */
REG_IPC_STRUCT_DATA(CY_IPC_STRUCT_PTR(CY_IPC_CHAN_DDFT)) = (CY_STARTUP_CM0_DP_STATE << REG_IPC_STRUCT_DATA(CY_IPC_STRUCT_PTR(CY_IPC_CHAN_DDFT)) = (CY_STARTUP_CM0_DP_STATE <<
CY_STARTUP_IPC7_DP_OFFSET); CY_STARTUP_IPC7_DP_OFFSET);
/* Release IPC structure #7 to avoid deadlocks in case of SW or WDT reset during Deep-Sleep entering. */ /* Release IPC structure #7 to avoid deadlocks in case of SW or WDT reset during Deep-Sleep entering. */
@ -233,6 +237,11 @@ void SystemInit(void)
#endif /* defined(CY_DEVICE_PSOC6ABLE2) */ #endif /* defined(CY_DEVICE_PSOC6ABLE2) */
#endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */ #endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
#if defined(CY_DEVICE_SECURE)
/* Initialize Protected Register Access driver */
Cy_PRA_Init();
#endif /* defined(CY_DEVICE_SECURE) */
} }

18
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_064B0S2_4343W/device/system_psoc6.h
View File

@ -1,6 +1,6 @@
/***************************************************************************//** /***************************************************************************//**
* \file system_psoc6.h * \file system_psoc6.h
* \version 2.70.1 * \version 2.80
* *
* \brief Device system header file. * \brief Device system header file.
* *
@ -321,6 +321,16 @@
* <th>Reason for Change</th> * <th>Reason for Change</th>
* </tr> * </tr>
* <tr> * <tr>
* <td rowspan="2">2.80</td>
* <td>Updated linker scripts for PSoC 64 Secure MCU devices.</td>
* <td>Updated FLASH and SRAM memory area definitions in cyb0xxx linker script templates
* in accordance with the PSoC 64 Secure Boot SDK policies.</td>
* </tr>
* <tr>
* <td>Added \ref Cy_PRA_Init() function call to \ref SystemInit() API for CM0+ core of PSoC 64 Secure MCU.</td>
* <td>Updated PSoC 64 Secure MCU startup sequence to initialize the Protected Register Access driver.</td>
* </tr>
* <tr>
* <td>2.70.1</td> * <td>2.70.1</td>
* <td>Updated documentation for the better description of the existing startup implementation.</td> * <td>Updated documentation for the better description of the existing startup implementation.</td>
* <td>User experience enhancement.</td> * <td>User experience enhancement.</td>
@ -538,11 +548,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions * \addtogroup group_system_config_system_functions
* \{ * \{
*/ */
#if defined(__ARMCC_VERSION) extern void SystemInit(void);
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemCoreClockUpdate(void); extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */ /** \} group_system_config_system_functions */