mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'fix/rng_register_prefix_discrepency_newer_targets' into 'master' 

Fix: RNG register prefix discrepancy for ESP32C6 and ESP32H2

Closes DOC-5161 and DOC-5175

See merge request espressif/esp-idf!27212
pull/12501/merge
Mahavir Jain 2023-11-20 10:53:09 +08:00
rodzic 1d7132ce6b 91af44d6e8
commit 9fb38d82a3
4 zmienionych plików z 18 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
components/soc/esp32c6/include/soc/lpperi_reg.h
Wyświetl plik

@ -1,5 +1,5 @@
/**
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -137,13 +137,13 @@ extern "C" {
* need_des
*/
#define LPPERI_RNG_DATA_REG (DR_REG_LPPERI_BASE + 0x8)
/** LPPERI_RND_DATA : RO; bitpos: [31:0]; default: 0;
/** LPPERI_RNG_DATA : RO; bitpos: [31:0]; default: 0;
* need_des
*/
#define LPPERI_RND_DATA 0xFFFFFFFFU
#define LPPERI_RND_DATA_M (LPPERI_RND_DATA_V << LPPERI_RND_DATA_S)
#define LPPERI_RND_DATA_V 0xFFFFFFFFU
#define LPPERI_RND_DATA_S 0
#define LPPERI_RNG_DATA 0xFFFFFFFFU
#define LPPERI_RNG_DATA_M (LPPERI_RNG_DATA_V << LPPERI_RNG_DATA_S)
#define LPPERI_RNG_DATA_V 0xFFFFFFFFU
#define LPPERI_RNG_DATA_S 0
/** LPPERI_CPU_REG register
* need_des

6
components/soc/esp32c6/include/soc/lpperi_struct.h
Wyświetl plik

@ -1,5 +1,5 @@
/**
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -101,10 +101,10 @@ typedef union {
*/
typedef union {
struct {
/** rnd_data : RO; bitpos: [31:0]; default: 0;
/** rng_data : RO; bitpos: [31:0]; default: 0;
* need_des
*/
uint32_t rnd_data:32;
uint32_t rng_data:32;
};
uint32_t val;
} lpperi_rng_data_reg_t;

12
components/soc/esp32h2/include/soc/lpperi_reg.h
Wyświetl plik

@ -1,5 +1,5 @@
/**
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -144,13 +144,13 @@ extern "C" {
* need_des
*/
#define LPPERI_RNG_DATA_REG (DR_REG_LPPERI_BASE + 0x8)
/** LPPERI_RND_DATA : RO; bitpos: [31:0]; default: 0;
/** LPPERI_RNG_DATA : RO; bitpos: [31:0]; default: 0;
* need_des
*/
#define LPPERI_RND_DATA 0xFFFFFFFFU
#define LPPERI_RND_DATA_M (LPPERI_RND_DATA_V << LPPERI_RND_DATA_S)
#define LPPERI_RND_DATA_V 0xFFFFFFFFU
#define LPPERI_RND_DATA_S 0
#define LPPERI_RNG_DATA 0xFFFFFFFFU
#define LPPERI_RND_GATA_M (LPPERI_RND_GATA_V << LPPERI_RND_GATA_S)
#define LPPERI_RND_GATA_V 0xFFFFFFFFU
#define LPPERI_RND_GATA_S 0
/** LPPERI_CPU_REG register
* need_des

6
components/soc/esp32h2/include/soc/lpperi_struct.h
Wyświetl plik

@ -1,5 +1,5 @@
/**
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -104,10 +104,10 @@ typedef union {
*/
typedef union {
struct {
/** rnd_data : RO; bitpos: [31:0]; default: 0;
/** rng_data : RO; bitpos: [31:0]; default: 0;
* need_des
*/
uint32_t rnd_data:32;
uint32_t rng_data:32;
};
uint32_t val;
} lpperi_rng_data_reg_t;