From: Bernhard Beschow <[email protected]> Use the existing `rx_smb0` message buffer view for register masks instead of the raw register array. Since all accesses now use the structured view, remove the redundant `rx_smb0_raw` union member.
Signed-off-by: Bernhard Beschow <[email protected]> Tested-by: Pavel Pisa <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-id: [email protected] Signed-off-by: Peter Maydell <[email protected]> --- hw/net/can/flexcan.c | 12 ++++++++++-- include/hw/net/flexcan.h | 5 +---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/net/can/flexcan.c b/hw/net/can/flexcan.c index 205d0d64134..a8bad83cb87 100644 --- a/hw/net/can/flexcan.c +++ b/hw/net/can/flexcan.c @@ -106,7 +106,11 @@ static const FlexcanRegs flexcan_regs_write_mask = { .gfwr_mx6 = 0xFFFFFFFF, ._reserved6 = {0}, ._reserved8 = {0}, - .rx_smb0_raw = {0, 0, 0, 0}, + .rx_smb0 = { + .can_ctrl = 0, + .can_id = 0, + .data = { 0, 0 }, + }, .rx_smb1 = {0, 0, 0, 0}, }; static const FlexcanRegs flexcan_regs_reset_mask = { @@ -145,7 +149,11 @@ static const FlexcanRegs flexcan_regs_reset_mask = { .gfwr_mx6 = 0, ._reserved6 = {0}, ._reserved8 = {0}, - .rx_smb0_raw = {0, 0, 0, 0}, + .rx_smb0 = { + .can_ctrl = 0, + .can_id = 0, + .data = { 0, 0 }, + }, .rx_smb1 = {0, 0, 0, 0}, }; diff --git a/include/hw/net/flexcan.h b/include/hw/net/flexcan.h index 9affdff8372..eee70bad422 100644 --- a/include/hw/net/flexcan.h +++ b/include/hw/net/flexcan.h @@ -81,10 +81,7 @@ typedef struct FlexcanRegs { uint32_t _rx14mask; /* 0xAA8 */ uint32_t _rx15mask; /* 0xAAC */ uint32_t tx_smb[4]; /* 0xAB0 */ - union { /* 0xAC0, used for SMB emulation */ - uint32_t rx_smb0_raw[4]; - FlexcanRegsMessageBuffer rx_smb0; - }; + FlexcanRegsMessageBuffer rx_smb0; /* 0xAC0, used for SMB emulation */ uint32_t rx_smb1[4]; /* 0xAD0 */ uint32_t mecr; /* 0xAE0 */ uint32_t erriar; /* 0xAE4 */ -- 2.43.0
