From nobody Tue Feb 10 03:38:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) client-ip=209.85.221.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1600660385; cv=none; d=zohomail.com; s=zohoarc; b=f6opA+Gi41VJ9TfW52c+gMEjs1leLAG+g/H3+mGLwkC3Crf/gw+xObe3+BsSAjvfVXR2iwizG10vdv6+NrBiB6ih+71X7bz0SCqDlemcQDeucb3VAEv65lX6kUQtWthr2WzBWoSMt+3CjodJQV/iuYB+TBNDJmiShJk0j5HYq8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600660385; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ru9JeznwCHjcxiZ+MKIheuMQIUXnKfc2N76bXeVgo8I=; b=mFq3MfDPFYOYV5VrJXw3wsqeNbAJOJ5PGxvOPX1OXzmLNNFDxg8lsdbwdINAg3sqDmh6K9PLfR+c7vG+D26+YQvWI0PtBVJmFkBxpWWFlXKUr6fvqit5CQEcDCLax/Ax3BE50aDvCvfe/vkPR6MaEatbKS9WECi9q5m/GVg9+p4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.zohomail.com with SMTPS id 1600660385545828.0330353492982; Sun, 20 Sep 2020 20:53:05 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id t10so11169946wrv.1 for ; Sun, 20 Sep 2020 20:53:04 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id a17sm19633754wra.24.2020.09.20.20.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Sep 2020 20:53:02 -0700 (PDT) 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=ru9JeznwCHjcxiZ+MKIheuMQIUXnKfc2N76bXeVgo8I=; b=j4EPgoACtbawzAMU0zuW5i3OqBG0cvFkbOQ9n3J8ucxO5GbxBi/HaymyxL3AG8Qekx FQIAj//lkghxK5lH1iDFtCHAB+YWbQ3hd3I9yphiyENJvPiZYGoCxLzNm/fl9kZquuCA uIqfZmdVOvedIukuwn/HaIbGwaWA1M6F6y/dnCHYfLs2MKX3Z7GWcGvVmSQT63OM/4zN 4r2aluZNKP5J1CKBMAZvJvn8GBYUu4lOrd6Tx1Vhqo6s1vR77Xudv2whByt9jUbOXQzE mN44gIU/o+303RUOS1PMW35VVpiB47cBwtlCL3YgPU6HdccetMTBnIEm1PMSCq8MRptU FZCA== 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=ru9JeznwCHjcxiZ+MKIheuMQIUXnKfc2N76bXeVgo8I=; b=aCYNYMKyHV/iOLYzEsJfE0PRAeN+JRcHlvcuwaUt7ebYnwURwdYwFmOMRNXftx0iu7 Ms8t5JwWw5Q82NnaXg875lZOP5kJe30xVoz7havlD9ZEN0nC8XYtvvBs4c97WZqbS14Z Lf7/62Do6Hw87PhebBwlYvVndfTTbmT+QlvNpRE0WPWZ3n5GqnWkYiXdHPcTxwZxwZqv ipwX/9XoTYAbEMPkT990+JUYB/BsiDHmDka1YQBaxN8hIfqVvB0c6XtR88JeZtDvdQk+ G+u+F3vBLiisRUnT7mUdikqHZJonfZIh2GDup0Y8UTrIx5sOxgytLeVYO4Ja04CtygTI norw== X-Gm-Message-State: AOAM5312vMXID3riRrLGWWmDTI63RKkuKKQzGxYB7QF04waNxx1zZfM2 Vk5MfvbSp6JHKZk77KyASCaeEDR/u2E= X-Google-Smtp-Source: ABdhPJyVIWrp7r8mU64GTnfYsu5n3D8mz+YO90QF6G19xfiFEcA5/4JagQ/cWpbzrcOjI//VllREDw== X-Received: by 2002:adf:eb04:: with SMTP id s4mr53790580wrn.81.1600660383647; Sun, 20 Sep 2020 20:53:03 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrew Baumann , Luc Michel , qemu-arm@nongnu.org, Peter Maydell , Niek Linnenbank , Paul Zimmerman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/5] hw/timer/bcm2835: Rename variable holding CTRL_STATUS register Date: Mon, 21 Sep 2020 05:52:55 +0200 Message-Id: <20200921035257.434532-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200921035257.434532-1-f4bug@amsat.org> References: <20200921035257.434532-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The variable holding the CTRL_STATUS register is misnamed 'status'. Rename it 'ctrl_status' to make it more obvious this register is also used to control the peripheral. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- include/hw/timer/bcm2835_systmr.h | 2 +- hw/timer/bcm2835_systmr.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_s= ystmr.h index 11272837a6b..e0db9e9e12b 100644 --- a/include/hw/timer/bcm2835_systmr.h +++ b/include/hw/timer/bcm2835_systmr.h @@ -29,7 +29,7 @@ struct BCM2835SystemTimerState { qemu_irq irq; =20 struct { - uint32_t status; + uint32_t ctrl_status; uint32_t compare[BCM2835_SYSTIMER_COUNT]; } reg; }; diff --git a/hw/timer/bcm2835_systmr.c b/hw/timer/bcm2835_systmr.c index ff8c5536610..b234e83824f 100644 --- a/hw/timer/bcm2835_systmr.c +++ b/hw/timer/bcm2835_systmr.c @@ -30,7 +30,7 @@ REG32(COMPARE3, 0x18) =20 static void bcm2835_systmr_update_irq(BCM2835SystemTimerState *s) { - bool enable =3D !!s->reg.status; + bool enable =3D !!s->reg.ctrl_status; =20 trace_bcm2835_systmr_irq(enable); qemu_set_irq(s->irq, enable); @@ -52,7 +52,7 @@ static uint64_t bcm2835_systmr_read(void *opaque, hwaddr = offset, =20 switch (offset) { case A_CTRL_STATUS: - r =3D s->reg.status; + r =3D s->reg.ctrl_status; break; case A_COMPARE0 ... A_COMPARE3: r =3D s->reg.compare[(offset - A_COMPARE0) >> 2]; @@ -82,7 +82,7 @@ static void bcm2835_systmr_write(void *opaque, hwaddr off= set, trace_bcm2835_systmr_write(offset, value); switch (offset) { case A_CTRL_STATUS: - s->reg.status &=3D ~value; /* Ack */ + s->reg.ctrl_status &=3D ~value; /* Ack */ bcm2835_systmr_update_irq(s); break; case A_COMPARE0 ... A_COMPARE3: @@ -133,7 +133,7 @@ static const VMStateDescription bcm2835_systmr_vmstate = =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(reg.status, BCM2835SystemTimerState), + VMSTATE_UINT32(reg.ctrl_status, BCM2835SystemTimerState), VMSTATE_UINT32_ARRAY(reg.compare, BCM2835SystemTimerState, BCM2835_SYSTIMER_COUNT), VMSTATE_END_OF_LIST() --=20 2.26.2