mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/net/e1000: Add readops/writeops typedefs

Browse Source 
Express the macreg[] arrays using typedefs.
No logical changes introduced here.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dmitry Fleytman <dmitry.fleytman@gmail.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20200305010446.17029-2-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Philippe Mathieu-Daudé 2020-03-05 02:04:44 +01:00 committed by Laurent Vivier
parent 02f7a1644d
commit 3b6b3a279a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/net/e1000.c
View File

@ -1150,7 +1150,8 @@ set_ims(E1000State *s, int index, uint32_t val)
} }
#define getreg(x) [x] = mac_readreg #define getreg(x) [x] = mac_readreg
static uint32_t (*macreg_readops[])(E1000State *, int) = { typedef uint32_t (*readops)(E1000State *, int);
static readops macreg_readops[] = {
getreg(PBA), getreg(RCTL), getreg(TDH), getreg(TXDCTL), getreg(PBA), getreg(RCTL), getreg(TDH), getreg(TXDCTL),
getreg(WUFC), getreg(TDT), getreg(CTRL), getreg(LEDCTL), getreg(WUFC), getreg(TDT), getreg(CTRL), getreg(LEDCTL),
getreg(MANC), getreg(MDIC), getreg(SWSM), getreg(STATUS), getreg(MANC), getreg(MDIC), getreg(SWSM), getreg(STATUS),
@ -1205,7 +1206,8 @@ static uint32_t (*macreg_readops[])(E1000State *, int) = {
enum { NREADOPS = ARRAY_SIZE(macreg_readops) }; enum { NREADOPS = ARRAY_SIZE(macreg_readops) };
#define putreg(x) [x] = mac_writereg #define putreg(x) [x] = mac_writereg
static void (*macreg_writeops[])(E1000State *, int, uint32_t) = { typedef void (*writeops)(E1000State *, int, uint32_t);
static writeops macreg_writeops[] = {
putreg(PBA), putreg(EERD), putreg(SWSM), putreg(WUFC), putreg(PBA), putreg(EERD), putreg(SWSM), putreg(WUFC),
putreg(TDBAL), putreg(TDBAH), putreg(TXDCTL), putreg(RDBAH), putreg(TDBAL), putreg(TDBAH), putreg(TXDCTL), putreg(RDBAH),
putreg(RDBAL), putreg(LEDCTL), putreg(VET), putreg(FCRUC), putreg(RDBAL), putreg(LEDCTL), putreg(VET), putreg(FCRUC),

6
hw/net/e1000e_core.c
View File

@ -2855,7 +2855,8 @@ e1000e_set_gcr(E1000ECore *core, int index, uint32_t val)
} }
#define e1000e_getreg(x) [x] = e1000e_mac_readreg #define e1000e_getreg(x) [x] = e1000e_mac_readreg
static uint32_t (*e1000e_macreg_readops[])(E1000ECore *, int) = { typedef uint32_t (*readops)(E1000ECore *, int);
static readops e1000e_macreg_readops[] = {
e1000e_getreg(PBA), e1000e_getreg(PBA),
e1000e_getreg(WUFC), e1000e_getreg(WUFC),
e1000e_getreg(MANC), e1000e_getreg(MANC),
@ -3061,7 +3062,8 @@ static uint32_t (*e1000e_macreg_readops[])(E1000ECore *, int) = {
enum { E1000E_NREADOPS = ARRAY_SIZE(e1000e_macreg_readops) }; enum { E1000E_NREADOPS = ARRAY_SIZE(e1000e_macreg_readops) };
#define e1000e_putreg(x) [x] = e1000e_mac_writereg #define e1000e_putreg(x) [x] = e1000e_mac_writereg
static void (*e1000e_macreg_writeops[])(E1000ECore *, int, uint32_t) = { typedef void (*writeops)(E1000ECore *, int, uint32_t);
static writeops e1000e_macreg_writeops[] = {
e1000e_putreg(PBA), e1000e_putreg(PBA),
e1000e_putreg(SWSM), e1000e_putreg(SWSM),
e1000e_putreg(WUFC), e1000e_putreg(WUFC),