diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-03-05 02:04:44 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2020-03-09 15:59:31 +0100 |
| commit | 3b6b3a279ad3c32903b0c0fdf3cacf24b02541f2 (patch) | |
| tree | 3c75f762436bdc006f32b1f34ad10cff45e51f7e /hw/net/e1000.c | |
| parent | 02f7a1644dd140d0036de054cafa62b90bcff9a4 (diff) | |
| download | focaccia-qemu-3b6b3a279ad3c32903b0c0fdf3cacf24b02541f2.tar.gz focaccia-qemu-3b6b3a279ad3c32903b0c0fdf3cacf24b02541f2.zip | |
hw/net/e1000: Add readops/writeops typedefs
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>
Diffstat (limited to 'hw/net/e1000.c')
| -rw-r--r-- | hw/net/e1000.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 0b833d5a15..972d9b5083 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1150,7 +1150,8 @@ set_ims(E1000State *s, int index, uint32_t val) } #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(WUFC), getreg(TDT), getreg(CTRL), getreg(LEDCTL), 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) }; #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(TDBAL), putreg(TDBAH), putreg(TXDCTL), putreg(RDBAH), putreg(RDBAL), putreg(LEDCTL), putreg(VET), putreg(FCRUC), |