From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2YRG-0004xg-1I for qemu-devel@nongnu.org; Thu, 25 Jul 2013 23:11:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2YRE-0001Xk-0G for qemu-devel@nongnu.org; Thu, 25 Jul 2013 23:11:29 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:57608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2YRD-0001XQ-KL for qemu-devel@nongnu.org; Thu, 25 Jul 2013 23:11:27 -0400 Received: by mail-pa0-f52.google.com with SMTP id kq13so2722263pab.39 for ; Thu, 25 Jul 2013 20:11:27 -0700 (PDT) Date: Fri, 26 Jul 2013 05:04:39 +0200 From: "Edgar E. Iglesias" Message-ID: <20130726030438.GE25811@smtp.vpn> References: <1374702140-13771-1-git-send-email-afaerber@suse.de> <1374702140-13771-4-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1374702140-13771-4-git-send-email-afaerber@suse.de> Subject: Re: [Qemu-devel] [PATCH qom-next for-1.6 03/14] etraxfs_ser: QOM'ify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?iso-8859-1?Q?F=E4rber?= Cc: qemu-devel@nongnu.org On Wed, Jul 24, 2013 at 11:42:08PM +0200, Andreas Färber wrote: > Rename etrax_serial to ETRAXSerial, introduce type constant and use QOM > casts. Acked-by: Edgar E. Iglesias > > Signed-off-by: Andreas Färber > --- > hw/char/etraxfs_ser.c | 37 +++++++++++++++++++++---------------- > 1 file changed, 21 insertions(+), 16 deletions(-) > > diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c > index d19af00..460094e 100644 > --- a/hw/char/etraxfs_ser.c > +++ b/hw/char/etraxfs_ser.c > @@ -44,9 +44,13 @@ > #define STAT_TR_IDLE 22 > #define STAT_TR_RDY 24 > > -struct etrax_serial > -{ > - SysBusDevice busdev; > +#define TYPE_ETRAX_FS_SERIAL "etraxfs,serial" > +#define ETRAX_SERIAL(obj) \ > + OBJECT_CHECK(ETRAXSerial, (obj), TYPE_ETRAX_FS_SERIAL) > + > +typedef struct ETRAXSerial { > + SysBusDevice parent_obj; > + > MemoryRegion mmio; > CharDriverState *chr; > qemu_irq irq; > @@ -59,9 +63,9 @@ struct etrax_serial > > /* Control registers. */ > uint32_t regs[R_MAX]; > -}; > +} ETRAXSerial; > > -static void ser_update_irq(struct etrax_serial *s) > +static void ser_update_irq(ETRAXSerial *s) > { > > if (s->rx_fifo_len) { > @@ -77,7 +81,7 @@ static void ser_update_irq(struct etrax_serial *s) > static uint64_t > ser_read(void *opaque, hwaddr addr, unsigned int size) > { > - struct etrax_serial *s = opaque; > + ETRAXSerial *s = opaque; > uint32_t r = 0; > > addr >>= 2; > @@ -112,7 +116,7 @@ static void > ser_write(void *opaque, hwaddr addr, > uint64_t val64, unsigned int size) > { > - struct etrax_serial *s = opaque; > + ETRAXSerial *s = opaque; > uint32_t value = val64; > unsigned char ch = val64; > > @@ -156,7 +160,7 @@ static const MemoryRegionOps ser_ops = { > > static void serial_receive(void *opaque, const uint8_t *buf, int size) > { > - struct etrax_serial *s = opaque; > + ETRAXSerial *s = opaque; > int i; > > /* Got a byte. */ > @@ -177,7 +181,7 @@ static void serial_receive(void *opaque, const uint8_t *buf, int size) > > static int serial_can_receive(void *opaque) > { > - struct etrax_serial *s = opaque; > + ETRAXSerial *s = opaque; > int r; > > /* Is the receiver enabled? */ > @@ -196,7 +200,7 @@ static void serial_event(void *opaque, int event) > > static void etraxfs_ser_reset(DeviceState *d) > { > - struct etrax_serial *s = container_of(d, typeof(*s), busdev.qdev); > + ETRAXSerial *s = ETRAX_SERIAL(d); > > /* transmitter begins ready and idle. */ > s->regs[RS_STAT_DIN] |= (1 << STAT_TR_RDY); > @@ -208,7 +212,7 @@ static void etraxfs_ser_reset(DeviceState *d) > > static int etraxfs_ser_init(SysBusDevice *dev) > { > - struct etrax_serial *s = FROM_SYSBUS(typeof (*s), dev); > + ETRAXSerial *s = ETRAX_SERIAL(dev); > > sysbus_init_irq(dev, &s->irq); > memory_region_init_io(&s->mmio, OBJECT(s), &ser_ops, s, > @@ -216,10 +220,11 @@ static int etraxfs_ser_init(SysBusDevice *dev) > sysbus_init_mmio(dev, &s->mmio); > > s->chr = qemu_char_get_next_serial(); > - if (s->chr) > + if (s->chr) { > qemu_chr_add_handlers(s->chr, > - serial_can_receive, serial_receive, > - serial_event, s); > + serial_can_receive, serial_receive, > + serial_event, s); > + } > return 0; > } > > @@ -233,9 +238,9 @@ static void etraxfs_ser_class_init(ObjectClass *klass, void *data) > } > > static const TypeInfo etraxfs_ser_info = { > - .name = "etraxfs,serial", > + .name = TYPE_ETRAX_FS_SERIAL, > .parent = TYPE_SYS_BUS_DEVICE, > - .instance_size = sizeof(struct etrax_serial), > + .instance_size = sizeof(ETRAXSerial), > .class_init = etraxfs_ser_class_init, > }; > > -- > 1.8.1.4 >