From nobody Tue Nov 18 10:37:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707112; cv=none; d=zohomail.com; s=zohoarc; b=Tb/5KKHDuTfI8R3cAy+joFa1pzhssfvYWuR9fIXAHT6bEOnZAGQqr179ItHvathKmHRCKKz6eKTF1XTunJuwGlY6yINu44CYW8Fj+JGqOxQLpD1dWyMPIJLE2p/P0vhM1v8njSNVVRK9jtr/6QYgI15GZhMzm+GPfLUQ0yMZkB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vk9FSJH/4u3dFdJmIzeghhHRNBV/JjI+CeCTMbnyQds=; b=R/qTFZztJ6xuQIWut77HsYJ+e6dPeWMg1yFFFQm6fhBb59SesG2VgLRNoTClsBVy+gRcXXexb63VVZ/st/Ud8Lj/yyCtjWf6Ey6+AJ+bcVxJnXUAWuLEei8UkdV0Hpm74/dGHw5M/YIkhrKK0DCDOWK9Vm85n0xOAaddPPkc9Ho= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1609707112859675.8505585172176; Sun, 3 Jan 2021 12:51:52 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id y17so29462479wrr.10 for ; Sun, 03 Jan 2021 12:51:52 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id y2sm29613750wma.6.2021.01.03.12.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vk9FSJH/4u3dFdJmIzeghhHRNBV/JjI+CeCTMbnyQds=; b=FvC9Wq/sFBjseNC5QpYpGKEJXZzl4y/HZXwpiEBprR1yzzZkhrLiJG5xMSJN+3HRZK Hnu9lKYnR4iaKrY5XS0CnTKk1YPX6lTUu7YYIKqj0N0QqnA7xpxIsjvLos9etE3Cq0XH xiNZefj9DpmOMd0csTOln2NthzCOyyGoyAwKAuKoh4N3CNBPQ3lUzukVJyIHi06AdG6a zyhFVYnL4C9md3eEKn08sDdh5YMmTm498MqSffqDT4IZT20BcYPF4ZVzWfl/sw6rb98+ Zep0KVcWqu5O/sIY6SSqnYUaT9m/o5SJhi/anqyqcXbhNWNVCUECktAC3BTPSzfoHe5K D1xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vk9FSJH/4u3dFdJmIzeghhHRNBV/JjI+CeCTMbnyQds=; b=BHg7HWKhrwA1S4tPmYqaGdvWc7UXy6a1a1SLPJPBxBL2rkjfEmN917uSSfGqoCqtHZ btuft31uDq+AvHV6JS5eFdLsrtd9227Bf3sBpSr9UU5Lx6sjd3XeR2WZrEpdfVx5SBrC x2e4b0z3K5tz6xad5T9Ee7WN7Ne3SGXN52AR1+qOPNhJQWofysLJPWccSOijJJoNFB+g DryBgTUN9J+kCr0YTPulj6Vo3XCaDMaSkwaHDfes7ErphddtVv9qrnm0O1RSQGJqdA3l MUH/eYMXEJxEt5SvyRYkFVtJOE+RBGNYcEU7sBff4L2DFI+ZVxo/kHyISeJp3kl2TI7Z KNVg== X-Gm-Message-State: AOAM5317hCSwrMSmhPCR41UO/uu/uKyGgYiXNGEV4OGu+Y3rrw504buX 2HpBAxBZNVhiKsYTWy90S9v/qyiQhy8= X-Google-Smtp-Source: ABdhPJzvSriJLfYQ22y9K8hhEBCL4LBS4shx6hERf4LyGKqaAQLJDsSDutV8Jzt5KdnewvZuNdwl/Q== X-Received: by 2002:adf:dc8b:: with SMTP id r11mr78603595wrj.131.1609707111008; Sun, 03 Jan 2021 12:51:51 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 18/35] vt82c686: Rename superio config related parts Date: Sun, 3 Jan 2021 21:50:04 +0100 Message-Id: <20210103205021.2837760-19-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: BALATON Zoltan Use less confusing naming for superio config register handling related parts that makes it clearer what belongs to this part. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <4d30a2b4b771b2ad651509885daae79d7c4fe7a8.1609584216.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 2633cfe7dc7..a6f5a0843d0 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -27,7 +27,7 @@ #include "trace.h" =20 typedef struct SuperIOConfig { - uint8_t config[0x100]; + uint8_t regs[0x100]; uint8_t index; uint8_t data; } SuperIOConfig; @@ -35,23 +35,23 @@ typedef struct SuperIOConfig { struct VT82C686BISAState { PCIDevice dev; MemoryRegion superio; - SuperIOConfig superio_conf; + SuperIOConfig superio_cfg; }; =20 OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) =20 -static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data, - unsigned size) +static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, + unsigned size) { - SuperIOConfig *superio_conf =3D opaque; + SuperIOConfig *sc =3D opaque; =20 if (addr =3D=3D 0x3f0) { /* config index register */ - superio_conf->index =3D data & 0xff; + sc->index =3D data & 0xff; } else { bool can_write =3D true; /* 0x3f1, config data register */ - trace_via_superio_write(superio_conf->index, data & 0xff); - switch (superio_conf->index) { + trace_via_superio_write(sc->index, data & 0xff); + switch (sc->index) { case 0x00 ... 0xdf: case 0xe4: case 0xe5: @@ -69,23 +69,23 @@ static void superio_ioport_writeb(void *opaque, hwaddr = addr, uint64_t data, =20 } if (can_write) { - superio_conf->config[superio_conf->index] =3D data & 0xff; + sc->regs[sc->index] =3D data & 0xff; } } } =20 -static uint64_t superio_ioport_readb(void *opaque, hwaddr addr, unsigned s= ize) +static uint64_t superio_cfg_read(void *opaque, hwaddr addr, unsigned size) { - SuperIOConfig *superio_conf =3D opaque; - uint8_t val =3D superio_conf->config[superio_conf->index]; + SuperIOConfig *sc =3D opaque; + uint8_t val =3D sc->regs[sc->index]; =20 - trace_via_superio_read(superio_conf->index, val); + trace_via_superio_read(sc->index, val); return val; } =20 -static const MemoryRegionOps superio_ops =3D { - .read =3D superio_ioport_readb, - .write =3D superio_ioport_writeb, +static const MemoryRegionOps superio_cfg_ops =3D { + .read =3D superio_cfg_read, + .write =3D superio_cfg_write, .endianness =3D DEVICE_NATIVE_ENDIAN, .impl =3D { .min_access_size =3D 1, @@ -112,12 +112,12 @@ static void vt82c686b_isa_reset(DeviceState *dev) pci_conf[0x5f] =3D 0x04; pci_conf[0x77] =3D 0x10; /* GPIO Control 1/2/3/4 */ =20 - s->superio_conf.config[0xe0] =3D 0x3c; - s->superio_conf.config[0xe2] =3D 0x03; - s->superio_conf.config[0xe3] =3D 0xfc; - s->superio_conf.config[0xe6] =3D 0xde; - s->superio_conf.config[0xe7] =3D 0xfe; - s->superio_conf.config[0xe8] =3D 0xbe; + s->superio_cfg.regs[0xe0] =3D 0x3c; /* Device ID */ + s->superio_cfg.regs[0xe2] =3D 0x03; /* Function select */ + s->superio_cfg.regs[0xe3] =3D 0xfc; /* Floppy ctrl base addr */ + s->superio_cfg.regs[0xe6] =3D 0xde; /* Parallel port base addr */ + s->superio_cfg.regs[0xe7] =3D 0xfe; /* Serial port 1 base addr */ + s->superio_cfg.regs[0xe8] =3D 0xbe; /* Serial port 2 base addr */ } =20 /* write config pci function0 registers. PCI-ISA bridge */ @@ -311,8 +311,8 @@ static void vt82c686b_realize(PCIDevice *d, Error **err= p) } } =20 - memory_region_init_io(&s->superio, OBJECT(d), &superio_ops, - &s->superio_conf, "superio", 2); + memory_region_init_io(&s->superio, OBJECT(d), &superio_cfg_ops, + &s->superio_cfg, "superio", 2); memory_region_set_enabled(&s->superio, false); /* * The floppy also uses 0x3f0 and 0x3f1. --=20 2.26.2