nrf52820_hic: I2C address configuration to RTE_Device.h

Author: mbrossard

source/hic_hal/nordic/nrf52820/I2C_Slave_nRF52820.c

@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * Copyright (c) 2013-2021 Arm Limited (or its affiliates). All 
+ * Copyright (c) 2013-2021 Arm Limited (or its affiliates). All
  * rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -51,7 +51,7 @@ static const ARM_DRIVER_VERSION DriverVersion = {
 };
 
 /* Driver Capabilities */
-static const ARM_I2C_CAPABILITIES DriverCapabilities = { 
+static const ARM_I2C_CAPABILITIES DriverCapabilities = {
   0U                    // Does not support 10-bit addressing
 #if (defined(ARM_I2C_API_VERSION) && (ARM_I2C_API_VERSION >= 0x203U))
 , 0U                    // Reserved bits
@@ -164,8 +164,8 @@ static int32_t I2C_Initialize (ARM_I2C_SignalEvent_t cb_event, I2C_RESOURCES *i2
   }
 
   // TWIS Configuration
-  i2c->info->config.addr[0]   = NRFX_TWIS_DEFAULT_CONFIG_ADDR0;
-  i2c->info->config.addr[1]   = NRFX_TWIS_DEFAULT_CONFIG_ADDR1;
+  i2c->info->config.addr[0]   = RTE_TWIS0_ADDR0;
+  i2c->info->config.addr[1]   = RTE_TWIS0_ADDR1;
   i2c->info->config.scl       = RTE_TWIS0_SCL_PIN_NUM;
   i2c->info->config.scl_pull  = NRF_GPIO_PIN_NOPULL;
   i2c->info->config.sda       = RTE_TWIS0_SDA_PIN_NUM;
@@ -217,8 +217,8 @@ static int32_t I2C_PowerControl (ARM_POWER_STATE state, I2C_RESOURCES *i2c) {
     return ARM_DRIVER_ERROR;
   }
 
-  if ((state != ARM_POWER_OFF)  && 
-      (state != ARM_POWER_FULL) && 
+  if ((state != ARM_POWER_OFF)  &&
+      (state != ARM_POWER_FULL) &&
       (state != ARM_POWER_LOW)) {
     return ARM_DRIVER_ERROR_PARAMETER;
   }

source/hic_hal/nordic/nrf52820/RTE_Device.h

@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * Copyright (c) 2013-2021 Arm Limited (or its affiliates). All 
+ * Copyright (c) 2013-2021 Arm Limited (or its affiliates). All
  * rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -65,5 +65,7 @@
 #define RTE_TWIS0_SDA_PIN_NUM           I2C_SDA_PIN
 // </e>
 
+#define RTE_TWIS0_ADDR0                 0x70
+#define RTE_TWIS0_ADDR1                 0x72
 
 #endif /* __RTE_DEVICE_H */

source/hic_hal/nordic/nrf52820/nrfx/nrfx_config_nrf52820.h

@@ -1264,36 +1264,6 @@
 #define NRFX_TWIS_NO_SYNC_MODE 0
 #endif
 
-// <o> NRFX_TWIS_DEFAULT_CONFIG_ADDR0 - Address0
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_ADDR0
-#define NRFX_TWIS_DEFAULT_CONFIG_ADDR0 0
-#endif
-
-// <o> NRFX_TWIS_DEFAULT_CONFIG_ADDR1 - Address1
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_ADDR1
-#define NRFX_TWIS_DEFAULT_CONFIG_ADDR1 0
-#endif
-
-// <o> NRFX_TWIS_DEFAULT_CONFIG_SCL_PULL  - SCL pin pull configuration
-
-// <0=> Disabled
-// <1=> Pull down
-// <3=> Pull up
-
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_SCL_PULL
-#define NRFX_TWIS_DEFAULT_CONFIG_SCL_PULL 0
-#endif
-
-// <o> NRFX_TWIS_DEFAULT_CONFIG_SDA_PULL  - SDA pin pull configuration
-
-// <0=> Disabled
-// <1=> Pull down
-// <3=> Pull up
-
-#ifndef NRFX_TWIS_DEFAULT_CONFIG_SDA_PULL
-#define NRFX_TWIS_DEFAULT_CONFIG_SDA_PULL 0
-#endif
-
 // <o> NRFX_TWIS_DEFAULT_CONFIG_IRQ_PRIORITY  - Interrupt priority
 
 // <0=> 0 (highest)
@@ -1611,9 +1581,9 @@
 // <e> NRFX_USBD_ENABLED - nrfx_usbd - USBD peripheral driver
 //==========================================================
 #ifndef NRFX_USBD_ENABLED
-#define NRFX_USBD_ENABLED 1
+#define NRFX_USBD_ENABLED 0
 #endif
-// <o> NRFX_USBD_CONFIG_IRQ_PRIORITY  - Interrupt priority
+// <o> NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY  - Interrupt priority
 
 // <0=> 0 (highest)
 // <1=> 1
@@ -1624,8 +1594,8 @@
 // <6=> 6
 // <7=> 7
 
-#ifndef NRFX_USBD_CONFIG_IRQ_PRIORITY
-#define NRFX_USBD_CONFIG_IRQ_PRIORITY 7
+#ifndef NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY
+#define NRFX_USBD_DEFAULT_CONFIG_IRQ_PRIORITY 7
 #endif
 
 // <q> USBD_CONFIG_DMASCHEDULER_ISO_BOOST  - Give priority to isochronous transfers