Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'driver_merge_tmp/fix_fifo_struct_header' into 'master'

Browse source 
use uint8_t for fifo struct in uart and i2c

use uint8_t for fifo struct in uart and i2c

See merge request !106
This commit is contained in:
Ivan Grokhotkov 2016-09-22 11:39:16 +08:00
parent b59aa4a282 d2420b667c
commit 226e64bd1e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/esp32/include/soc/i2c_struct.h
View file

@ -97,8 +97,8 @@ typedef volatile struct {
} fifo_conf;
union {
struct {
uint32_t data: 8; /*The register represent the byte data read from rx_fifo when use apb fifo access*/
uint32_t reserved8: 24;
uint8_t data; /*The register represent the byte data read from rx_fifo when use apb fifo access*/
uint8_t reserved[3];
};
uint32_t val;
} fifo_data;

4
components/esp32/include/soc/uart_struct.h
View file

@ -16,8 +16,8 @@
typedef volatile struct {
union {
struct {
uint32_t rw_byte: 8; /*This register stores one byte data read by rx fifo.*/
uint32_t reserved8: 24;
uint8_t rw_byte; /*This register stores one byte data read by rx fifo.*/
uint8_t reserved[3];
};
uint32_t val;
} fifo;