From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoAnk-0001vf-5P for qemu-devel@nongnu.org; Mon, 09 Jul 2012 06:02:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoAne-0006wi-Mj for qemu-devel@nongnu.org; Mon, 09 Jul 2012 06:02:43 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:57108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoAne-0006wB-42 for qemu-devel@nongnu.org; Mon, 09 Jul 2012 06:02:38 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 9 Jul 2012 12:02:26 +0200 Message-Id: <1341828152-15199-6-git-send-email-hpoussin@reactos.org> In-Reply-To: <1341828152-15199-1-git-send-email-hpoussin@reactos.org> References: <1341828152-15199-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 05/10] esp: support future change of chip_id List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Kevin Wolf Signed-off-by: Herv=C3=A9 Poussineau --- hw/esp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/esp.c b/hw/esp.c index 85078e0..a1f5b8a 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -50,6 +50,7 @@ struct ESPState { uint8_t wregs[ESP_REGS]; qemu_irq irq; uint32_t it_shift; + uint8_t chip_id; int32_t ti_size; uint32_t ti_rptr, ti_wptr; uint32_t status; @@ -475,7 +476,7 @@ static void esp_hard_reset(DeviceState *d) =20 memset(s->rregs, 0, ESP_REGS); memset(s->wregs, 0, ESP_REGS); - s->rregs[ESP_TCHI] =3D TCHI_FAS100A; // Indicate fas100a + s->rregs[ESP_TCHI] =3D s->chip_id; s->ti_size =3D 0; s->ti_rptr =3D 0; s->ti_wptr =3D 0; @@ -759,6 +760,7 @@ static int esp_init1(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq); assert(s->it_shift !=3D -1); =20 + s->chip_id =3D TCHI_FAS100A; memory_region_init_io(&s->iomem, &esp_mem_ops, s, "esp", ESP_REGS << s->it_shift); sysbus_init_mmio(dev, &s->iomem); --=20 1.7.10.4