From: Li Qiang <liq3ea@gmail.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"Qemu Developers" <qemu-devel@nongnu.org>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"John Snow" <jsnow@redhat.com>
Subject: Re: [PATCH v2 7/8] hw/input/lm832x: Convert reset handler to DeviceReset
Date: Thu, 10 Oct 2019 09:14:45 +0800 [thread overview]
Message-ID: <CAKXe6SJbRv5xDNA91k+AKLghog6KKbzE_mCK4JuZWKnLctY_5A@mail.gmail.com> (raw)
In-Reply-To: <20191008142539.7793-8-philmd@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 2305 bytes --]
Philippe Mathieu-Daudé <philmd@redhat.com> 于2019年10月8日周二 下午10:38写道:
> The LM8323 key-scan controller is a I2C device, it will be reset
> when the I2C bus it stands on is reset.
>
> Convert its reset handler into a proper Device reset method.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
> ---
> hw/input/lm832x.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
> index a37eb854b9..aa629ddbf1 100644
> --- a/hw/input/lm832x.c
> +++ b/hw/input/lm832x.c
> @@ -24,7 +24,6 @@
> #include "migration/vmstate.h"
> #include "qemu/module.h"
> #include "qemu/timer.h"
> -#include "sysemu/reset.h"
> #include "ui/console.h"
>
> #define TYPE_LM8323 "lm8323"
> @@ -94,8 +93,10 @@ static void lm_kbd_gpio_update(LM823KbdState *s)
> {
> }
>
> -static void lm_kbd_reset(LM823KbdState *s)
> +static void lm_kbd_reset(DeviceState *dev)
> {
> + LM823KbdState *s = LM8323(dev);
> +
> s->config = 0x80;
> s->status = INT_NOINIT;
> s->acttime = 125;
> @@ -273,7 +274,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg,
> int byte, uint8_t value)
>
> case LM832x_CMD_RESET:
> if (value == 0xaa)
> - lm_kbd_reset(s);
> + lm_kbd_reset(DEVICE(s));
> else
> lm_kbd_error(s, ERR_BADPAR);
> s->reg = LM832x_GENERAL_ERROR;
> @@ -476,10 +477,6 @@ static void lm8323_realize(DeviceState *dev, Error
> **errp)
> s->pwm.tm[1] = timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm1_tick, s);
> s->pwm.tm[2] = timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm2_tick, s);
> qdev_init_gpio_out(dev, &s->nirq, 1);
> -
> - lm_kbd_reset(s);
> -
> - qemu_register_reset((void *) lm_kbd_reset, s);
> }
>
> void lm832x_key_event(DeviceState *dev, int key, int state)
> @@ -507,6 +504,7 @@ static void lm8323_class_init(ObjectClass *klass, void
> *data)
> DeviceClass *dc = DEVICE_CLASS(klass);
> I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
>
> + dc->reset = lm_kbd_reset;
> dc->realize = lm8323_realize;
> k->event = lm_i2c_event;
> k->recv = lm_i2c_rx;
> --
> 2.21.0
>
>
>
[-- Attachment #2: Type: text/html, Size: 3334 bytes --]
next prev parent reply other threads:[~2019-10-10 1:19 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-08 14:25 [PATCH v2 0/8] hw: Convert various reset() handler to DeviceReset Philippe Mathieu-Daudé
2019-10-08 14:25 ` [PATCH v2 1/8] hw/acpi/piix4: Convert reset " Philippe Mathieu-Daudé
2019-10-09 0:58 ` Li Qiang
2019-10-09 19:17 ` Michael S. Tsirkin
2019-10-08 14:25 ` [PATCH v2 2/8] hw/isa/piix4: " Philippe Mathieu-Daudé
2019-10-09 1:02 ` Li Qiang
2019-10-08 14:25 ` [PATCH v2 3/8] hw/ide/piix: " Philippe Mathieu-Daudé
2019-10-09 1:08 ` Li Qiang
2019-10-09 19:50 ` Philippe Mathieu-Daudé
2019-10-08 14:25 ` [PATCH v2 4/8] hw/ide/sii3112: " Philippe Mathieu-Daudé
2019-10-10 1:08 ` Li Qiang
2019-10-08 14:25 ` [PATCH v2 5/8] hw/ide/via82c: " Philippe Mathieu-Daudé
2019-10-10 1:10 ` Li Qiang
2019-10-08 14:25 ` [PATCH v2 6/8] hw/isa/vt82c686: " Philippe Mathieu-Daudé
2019-10-10 1:12 ` Li Qiang
2019-10-08 14:25 ` [PATCH v2 7/8] hw/input/lm832x: " Philippe Mathieu-Daudé
2019-10-10 1:14 ` Li Qiang [this message]
2019-10-08 14:34 ` [PATCH v2 8/8] hw/misc/vmcoreinfo: Add comment about reset handler Philippe Mathieu-Daudé
2019-10-08 15:23 ` Marc-André Lureau
2019-10-10 1:18 ` Li Qiang
2019-10-09 2:28 ` [PATCH v2 0/8] hw: Convert various reset() handler to DeviceReset Li Qiang
2019-10-09 19:54 ` Philippe Mathieu-Daudé
2019-10-10 1:05 ` Li Qiang
2019-10-10 13:08 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKXe6SJbRv5xDNA91k+AKLghog6KKbzE_mCK4JuZWKnLctY_5A@mail.gmail.com \
--to=liq3ea@gmail.com \
--cc=amarkovic@wavecomp.com \
--cc=arikalo@wavecomp.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).