From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bV6Xn-0001Ru-C5 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 20:29:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bV6Xl-0004Qu-F7 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 20:29:51 -0400 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]:32780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bV6Xl-0004Qq-8m for qemu-devel@nongnu.org; Wed, 03 Aug 2016 20:29:49 -0400 Received: by mail-oi0-x243.google.com with SMTP id l9so21619005oih.0 for ; Wed, 03 Aug 2016 17:29:49 -0700 (PDT) MIME-Version: 1.0 Sender: alistair23@gmail.com In-Reply-To: <3565566f-9251-845c-664e-8da191e406e5@greensocs.com> References: <1465835259-21449-1-git-send-email-fred.konrad@greensocs.com> <1465835259-21449-7-git-send-email-fred.konrad@greensocs.com> <3565566f-9251-845c-664e-8da191e406e5@greensocs.com> From: Alistair Francis Date: Wed, 3 Aug 2016 17:29:18 -0700 Message-ID: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC PATCH 06/11] introduce fixed-clock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: KONRAD Frederic Cc: Alistair Francis , Edgar Iglesias , Peter Maydell , Mark Burton , "qemu-devel@nongnu.org Developers" On Tue, Aug 2, 2016 at 4:56 AM, KONRAD Frederic wrote: > > > Le 02/07/2016 =C3=A0 01:07, Alistair Francis a =C3=A9crit : >> >> On Mon, Jun 13, 2016 at 9:27 AM, wrote: >>> >>> From: KONRAD Frederic >>> >>> This is a fixed clock device. >>> It justs behave as an empty device with a parametrable output rate. >>> >>> Signed-off-by: KONRAD Frederic >>> --- >>> hw/misc/Makefile.objs | 2 + >>> hw/misc/fixed-clock.c | 87 >>> +++++++++++++++++++++++++++++++++++++++++++ >>> include/hw/misc/fixed-clock.h | 30 +++++++++++++++ >>> 3 files changed, 119 insertions(+) >>> create mode 100644 hw/misc/fixed-clock.c >>> create mode 100644 include/hw/misc/fixed-clock.h >>> >>> diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs >>> index e504463..e8b8855 100644 >>> --- a/hw/misc/Makefile.objs >>> +++ b/hw/misc/Makefile.objs >>> @@ -52,3 +52,5 @@ obj-$(CONFIG_MIPS_ITU) +=3D mips_itu.o >>> obj-$(CONFIG_PVPANIC) +=3D pvpanic.o >>> obj-$(CONFIG_EDU) +=3D edu.o >>> obj-$(CONFIG_HYPERV_TESTDEV) +=3D hyperv_testdev.o >>> + >>> +obj-y +=3D fixed-clock.o >>> diff --git a/hw/misc/fixed-clock.c b/hw/misc/fixed-clock.c >>> new file mode 100644 >>> index 0000000..c273a91 >>> --- /dev/null >>> +++ b/hw/misc/fixed-clock.c >>> @@ -0,0 +1,87 @@ >>> +/* >>> + * Fixed clock >>> + * >>> + * Copyright (C) 2016 : GreenSocs Ltd >>> + * http://www.greensocs.com/ , email: info@greensocs.com >>> + * >>> + * Frederic Konrad >>> + * >>> + * This program is free software; you can redistribute it and/or modif= y >>> + * it under the terms of the GNU General Public License as published b= y >>> + * the Free Software Foundation, either version 2 of the License, or >>> + * (at your option) any later version. >>> + * >>> + * This program is distributed in the hope that it will be useful, >>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>> + * GNU General Public License for more details. >>> + * >>> + * You should have received a copy of the GNU General Public License >>> along >>> + * with this program; if not, see . >>> + * >>> + */ >>> + >>> +#include "qemu/osdep.h" >>> +#include "hw/qdev.h" >>> +#include "hw/misc/fixed-clock.h" >>> +#include "qemu/qemu-clock.h" >>> +#include "qapi/error.h" >>> + >>> +/* #define DEBUG_FIXED_CLOCK */ >> >> Don't include this. >> >>> + >>> +#ifdef DEBUG_FIXED_CLOCK >>> +#define DPRINTF(fmt, ...) \ >>> +do { printf("fixed-clock: " fmt , ## __VA_ARGS__); } while (0) >> >> It might be better to use __func__ here. >> >> It should also be qemu_log instead of printf(). >> >>> +#else >>> +#define DPRINTF(fmt, ...) do { } while (0) >>> +#endif >>> + >>> +typedef struct { >>> + DeviceState parent_obj; >>> + >>> + uint32_t rate; >>> + struct qemu_clk out; >>> +} FixedClock; >> >> Doesn't this need to be in the header file? > > > I think it's not necessary as we get the clock through the API? True, I always assumed it was general convention, although I noticed that the qemu_irq infrastructure does it like this. So I don't think it matters. Thanks, Alistair > >> >>> + >>> +static Property fixed_clock_properties[] =3D { >>> + DEFINE_PROP_UINT32("rate", FixedClock, rate, 0), >>> + DEFINE_PROP_END_OF_LIST() >>> +}; >>> + >>> +static void fixed_clock_realizefn(DeviceState *d, Error **errp) >> >> dev instead of d >> >> Thanks, >> >> Alistair >> >>> +{ >>> + FixedClock *s =3D FIXED_CLOCK(d); >>> + >>> + qemu_clk_update_rate(&s->out, s->rate); >>> +} >>> + >>> +static void fixed_clock_instance_init(Object *obj) >>> +{ >>> + FixedClock *s =3D FIXED_CLOCK(obj); >>> + >>> + object_initialize(&s->out, sizeof(s->out), TYPE_CLOCK); >>> + qemu_clk_attach_to_device(DEVICE(obj), &s->out, "clk_out"); >>> +} >>> + >>> +static void fixed_clock_class_init(ObjectClass *klass, void *data) >>> +{ >>> + DeviceClass *dc =3D DEVICE_CLASS(klass); >>> + >>> + dc->realize =3D fixed_clock_realizefn; >>> + dc->props =3D fixed_clock_properties; >>> +} >>> + >>> +static const TypeInfo fixed_clock_info =3D { >>> + .name =3D TYPE_FIXED_CLOCK, >>> + .parent =3D TYPE_DEVICE, >>> + .instance_size =3D sizeof(FixedClock), >>> + .instance_init =3D fixed_clock_instance_init, >>> + .class_init =3D fixed_clock_class_init, >>> +}; >>> + >>> +static void fixed_clock_register_types(void) >>> +{ >>> + type_register_static(&fixed_clock_info); >>> +} >>> + >>> +type_init(fixed_clock_register_types); >>> diff --git a/include/hw/misc/fixed-clock.h >>> b/include/hw/misc/fixed-clock.h >>> new file mode 100644 >>> index 0000000..1376444 >>> --- /dev/null >>> +++ b/include/hw/misc/fixed-clock.h >>> @@ -0,0 +1,30 @@ >>> +/* >>> + * Fixed clock >>> + * >>> + * Copyright (C) 2016 : GreenSocs Ltd >>> + * http://www.greensocs.com/ , email: info@greensocs.com >>> + * >>> + * Frederic Konrad >>> + * >>> + * This program is free software; you can redistribute it and/or modif= y >>> + * it under the terms of the GNU General Public License as published b= y >>> + * the Free Software Foundation, either version 2 of the License, or >>> + * (at your option) any later version. >>> + * >>> + * This program is distributed in the hope that it will be useful, >>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>> + * GNU General Public License for more details. >>> + * >>> + * You should have received a copy of the GNU General Public License >>> along >>> + * with this program; if not, see . >>> + * >>> + */ >>> + >>> +#ifndef FIXED_CLOCK_H >>> +#define FIXED_CLOCK_H >>> + >>> +#define TYPE_FIXED_CLOCK "fixed-clock" >>> +#define FIXED_CLOCK(obj) OBJECT_CHECK(FixedClock, (obj), >>> TYPE_FIXED_CLOCK) >>> + >>> +#endif /* FIXED_CLOCK_H */ >>> -- >>> 2.5.5 >>> >>> > >