[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/13] vt82c686: Simplify vt82c686b_realize()
From: |
BALATON Zoltan |
Subject: |
[PATCH v2 07/13] vt82c686: Simplify vt82c686b_realize() |
Date: |
Sat, 09 Jan 2021 21:16:36 +0100 |
Remove unneeded variables and setting value to 0 on zero initialised
data and replace check for error with error_fatal. Rationalise loop
that sets PCI config header fields read only.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/isa/vt82c686.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index c257926579..58c0bba1d0 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -363,24 +363,16 @@ static void vt82c686b_isa_reset(DeviceState *dev)
static void vt82c686b_realize(PCIDevice *d, Error **errp)
{
VT82C686BISAState *s = VT82C686B_ISA(d);
- uint8_t *pci_conf;
+ DeviceState *dev = DEVICE(d);
ISABus *isa_bus;
- uint8_t *wmask;
int i;
- isa_bus = isa_bus_new(DEVICE(d), get_system_memory(),
- pci_address_space_io(d), errp);
- if (!isa_bus) {
- return;
- }
-
- pci_conf = d->config;
- pci_config_set_prog_interface(pci_conf, 0x0);
+ isa_bus = isa_bus_new(dev, get_system_memory(), pci_address_space_io(d),
+ &error_fatal);
- wmask = d->wmask;
- for (i = 0x00; i < 0xff; i++) {
- if (i <= 0x03 || (i >= 0x08 && i <= 0x3f)) {
- wmask[i] = 0x00;
+ for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
+ if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
+ d->wmask[i] = 0;
}
}
--
2.21.3
- [PATCH v2 01/13] vt82c686: Move superio memory region to SuperIOConfig struct, (continued)
- [PATCH v2 04/13] vt82c686: Fix up power management io base and config, BALATON Zoltan, 2021/01/09
- [PATCH v2 12/13] vt82c686: Add VT8231_SUPERIO based on VIA_SUPERIO, BALATON Zoltan, 2021/01/09
- [PATCH v2 02/13] vt82c686: Reorganise code, BALATON Zoltan, 2021/01/09
- [PATCH v2 07/13] vt82c686: Simplify vt82c686b_realize(),
BALATON Zoltan <=
- [PATCH v2 05/13] vt82c686: Set user_creatable=false for VT82C686B_PM, BALATON Zoltan, 2021/01/09
- [PATCH v2 13/13] vt82c686: Add emulation of VT8231 south bridge, BALATON Zoltan, 2021/01/09
- [PATCH v2 08/13] vt82c686: Move creation of ISA devices to the ISA bridge, BALATON Zoltan, 2021/01/09