From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41586 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Po047-0007dG-4K for qemu-devel@nongnu.org; Fri, 11 Feb 2011 15:58:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Po045-00038l-RZ for qemu-devel@nongnu.org; Fri, 11 Feb 2011 15:58:06 -0500 Received: from mail-fx0-f45.google.com ([209.85.161.45]:60392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Po045-00037c-LB for qemu-devel@nongnu.org; Fri, 11 Feb 2011 15:58:05 -0500 Received: by mail-fx0-f45.google.com with SMTP id 12so3249943fxm.4 for ; Fri, 11 Feb 2011 12:58:05 -0800 (PST) From: Dmitry Eremin-Solenikov Date: Fri, 11 Feb 2011 23:57:38 +0300 Message-Id: <1297457859-15685-6-git-send-email-dbaryshkov@gmail.com> In-Reply-To: <1297457859-15685-1-git-send-email-dbaryshkov@gmail.com> References: <1297457859-15685-1-git-send-email-dbaryshkov@gmail.com> Subject: [Qemu-devel] [PATCH 6/7] max7310: finish qdev'ication List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 1) Move GPIO-related functionality to qdev. Now one can use directly qdev_get_gpio_in()/qdev_connect_gpio_out() on max7310 devices. 2) Make reset to be called through qdev.reset callback. Signed-off-by: Dmitry Eremin-Solenikov --- hw/i2c.h | 5 ----- hw/max7310.c | 26 +++++--------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/hw/i2c.h b/hw/i2c.h index 83fd917..5514402 100644 --- a/hw/i2c.h +++ b/hw/i2c.h @@ -59,11 +59,6 @@ void i2c_register_slave(I2CSlaveInfo *type); DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr); -/* max7310.c */ -void max7310_reset(i2c_slave *i2c); -qemu_irq *max7310_gpio_in_get(i2c_slave *i2c); -void max7310_gpio_out_set(i2c_slave *i2c, int line, qemu_irq handler); - /* wm8750.c */ void wm8750_data_req_set(DeviceState *dev, void (*data_req)(void *, int, int), void *opaque); diff --git a/hw/max7310.c b/hw/max7310.c index c302eb6..c1bdb2e 100644 --- a/hw/max7310.c +++ b/hw/max7310.c @@ -23,9 +23,9 @@ typedef struct { qemu_irq *gpio_in; } MAX7310State; -void max7310_reset(i2c_slave *i2c) +static void max7310_reset(DeviceState *dev) { - MAX7310State *s = (MAX7310State *) i2c; + MAX7310State *s = FROM_I2C_SLAVE(MAX7310State, I2C_SLAVE_FROM_QDEV(dev)); s->level &= s->direction; s->direction = 0xff; s->polarity = 0xf0; @@ -179,33 +179,17 @@ static int max7310_init(i2c_slave *i2c) { MAX7310State *s = FROM_I2C_SLAVE(MAX7310State, i2c); - s->gpio_in = qemu_allocate_irqs(max7310_gpio_set, s, - ARRAY_SIZE(s->handler)); - - max7310_reset(&s->i2c); + qdev_init_gpio_in(&i2c->qdev, max7310_gpio_set, 8); + qdev_init_gpio_out(&i2c->qdev, s->handler, 8); return 0; } -qemu_irq *max7310_gpio_in_get(i2c_slave *i2c) -{ - MAX7310State *s = (MAX7310State *) i2c; - return s->gpio_in; -} - -void max7310_gpio_out_set(i2c_slave *i2c, int line, qemu_irq handler) -{ - MAX7310State *s = (MAX7310State *) i2c; - if (line >= ARRAY_SIZE(s->handler) || line < 0) - hw_error("bad GPIO line"); - - s->handler[line] = handler; -} - static I2CSlaveInfo max7310_info = { .qdev.name = "max7310", .qdev.size = sizeof(MAX7310State), .qdev.vmsd = &vmstate_max7310, + .qdev.reset = max7310_reset, .init = max7310_init, .event = max7310_event, .recv = max7310_rx, -- 1.7.2.3