[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/9] hw/net/e1000: Add readops/writeops typedefs
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 4/9] hw/net/e1000: Add readops/writeops typedefs |
Date: |
Thu, 5 Mar 2020 13:45:20 +0100 |
Express the macreg[] arrays using typedefs.
No logical changes introduced here.
Reviewed-by: Dmitry Fleytman <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/net/e1000.c | 6 ++++--
hw/net/e1000e_core.c | 6 ++++--
2 files changed, 8 insertions(+), 4 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),
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index 94ea34dca5..38bdb90114 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -2855,7 +2855,8 @@ e1000e_set_gcr(E1000ECore *core, int index, uint32_t val)
}
#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(WUFC),
e1000e_getreg(MANC),
@@ -3061,7 +3062,8 @@ static uint32_t (*e1000e_macreg_readops[])(E1000ECore *,
int) = {
enum { E1000E_NREADOPS = ARRAY_SIZE(e1000e_macreg_readops) };
#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(SWSM),
e1000e_putreg(WUFC),
--
2.21.1
- Re: [PATCH v2 1/9] hw/audio/fmopl: Fix a typo twice, (continued)
[PATCH v2 3/9] hw/audio/intel-hda: Use memory region alias to reduce .rodata by 4.34MB, Philippe Mathieu-Daudé, 2020/03/05
[PATCH v2 4/9] hw/net/e1000: Add readops/writeops typedefs,
Philippe Mathieu-Daudé <=
[PATCH v2 5/9] hw/net/e1000: Move macreg[] arrays to .rodata to save 1MiB of .data, Philippe Mathieu-Daudé, 2020/03/05
[PATCH v2 6/9] hw/usb/quirks: Use smaller types to reduce .rodata by 10KiB, Philippe Mathieu-Daudé, 2020/03/05
[PATCH v2 8/9] ui/curses: Move arrays to .heap to save 74KiB of .bss, Philippe Mathieu-Daudé, 2020/03/05
[PATCH v2 7/9] ui/curses: Make control_characters[] array const, Philippe Mathieu-Daudé, 2020/03/05
[PATCH v2 9/9] virtfs-proxy-helper: Make the helper_opts[] array const, Philippe Mathieu-Daudé, 2020/03/05
Re: [PATCH v2 0/9] hw, ui, virtfs-proxy-helper: Reduce QEMU .data/.rodata/.bss footprint, no-reply, 2020/03/05
Re: [PATCH v2 0/9] hw, ui, virtfs-proxy-helper: Reduce QEMU .data/.rodata/.bss footprint, no-reply, 2020/03/05
Re: [PATCH v2 0/9] hw, ui, virtfs-proxy-helper: Reduce QEMU .data/.rodata/.bss footprint, Daniel P . Berrangé, 2020/03/05