From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXzny-0003CO-2G for qemu-devel@nongnu.org; Thu, 02 May 2013 16:08:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXznw-0000xJ-QW for qemu-devel@nongnu.org; Thu, 02 May 2013 16:08:37 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 2 May 2013 22:09:02 +0200 Message-Id: <1367525344-7755-6-git-send-email-hpoussin@reactos.org> In-Reply-To: <1367525344-7755-1-git-send-email-hpoussin@reactos.org> References: <1367525344-7755-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 5/7] m48t59: add a Nvram interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/timer/m48t59.c | 61 +++++++++++++++++++++++++++++++++++++++= ++++++ include/hw/timer/m48t59.h | 24 ++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 23a6ab3..3ecb14e 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -796,6 +796,24 @@ static int m48t59_init1(SysBusDevice *dev) return 0; } =20 +static uint32_t m48txx_isa_read(Nvram *obj, uint32_t addr) +{ + M48txxISAState *d =3D M48TXX_ISA(obj); + return m48t59_read(&d->state, addr); +} + +static void m48txx_isa_write(Nvram *obj, uint32_t addr, uint32_t val) +{ + M48txxISAState *d =3D M48TXX_ISA(obj); + m48t59_write(&d->state, addr, val); +} + +static void m48txx_isa_toggle_lock(Nvram *obj, int lock) +{ + M48txxISAState *d =3D M48TXX_ISA(obj); + m48t59_toggle_lock(&d->state, lock); +} + static Property m48t59_isa_properties[] =3D { DEFINE_PROP_HEX32("iobase", M48txxISAState, io_base, 0x74), DEFINE_PROP_END_OF_LIST(), @@ -805,6 +823,7 @@ static void m48txx_isa_class_init(ObjectClass *klass,= void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); ISADeviceClass *ic =3D ISA_DEVICE_CLASS(klass); + NvramClass *nc =3D NVRAM_CLASS(klass); M48txxISADeviceClass *u =3D M48TXX_ISA_CLASS(klass); M48txxInfo *info =3D data; =20 @@ -814,13 +833,36 @@ static void m48txx_isa_class_init(ObjectClass *klas= s, void *data) if (info) { dc->props =3D m48t59_isa_properties; u->info =3D *info; + } else { + nc->read =3D m48txx_isa_read; + nc->write =3D m48txx_isa_write; + nc->toggle_lock =3D m48txx_isa_toggle_lock; } } =20 +static uint32_t m48txx_sysbus_read(Nvram *obj, uint32_t addr) +{ + M48txxSysBusState *d =3D M48TXX_SYS_BUS(obj); + return m48t59_read(&d->state, addr); +} + +static void m48txx_sysbus_write(Nvram *obj, uint32_t addr, uint32_t val) +{ + M48txxSysBusState *d =3D M48TXX_SYS_BUS(obj); + m48t59_write(&d->state, addr, val); +} + +static void m48txx_sysbus_toggle_lock(Nvram *obj, int lock) +{ + M48txxSysBusState *d =3D M48TXX_SYS_BUS(obj); + m48t59_toggle_lock(&d->state, lock); +} + static void m48txx_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + NvramClass *nc =3D NVRAM_CLASS(klass); M48txxSysBusDeviceClass *u =3D M48TXX_SYS_BUS_CLASS(klass); M48txxInfo *info =3D data; =20 @@ -828,15 +870,29 @@ static void m48txx_sysbus_class_init(ObjectClass *k= lass, void *data) dc->reset =3D m48t59_reset_sysbus; if (info) { u->info =3D *info; + } else { + nc->read =3D m48txx_sysbus_read; + nc->write =3D m48txx_sysbus_write; + nc->toggle_lock =3D m48txx_sysbus_toggle_lock; } } =20 +static const TypeInfo nvram_info =3D { + .name =3D TYPE_NVRAM, + .parent =3D TYPE_INTERFACE, + .class_size =3D sizeof(NvramClass), +}; + static const TypeInfo m48txx_sysbus_type_info =3D { .name =3D TYPE_M48TXX_SYS_BUS, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(M48txxSysBusState), .abstract =3D true, .class_init =3D m48txx_sysbus_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_NVRAM }, + { } + } }; =20 static const TypeInfo m48txx_isa_type_info =3D { @@ -845,6 +901,10 @@ static const TypeInfo m48txx_isa_type_info =3D { .instance_size =3D sizeof(M48txxISAState), .abstract =3D true, .class_init =3D m48txx_isa_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_NVRAM }, + { } + } }; =20 static void m48t59_register_types(void) @@ -861,6 +921,7 @@ static void m48t59_register_types(void) }; int i; =20 + type_register_static(&nvram_info); type_register_static(&m48txx_sysbus_type_info); type_register_static(&m48txx_isa_type_info); =20 diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h index 59337fa..72b7ac1 100644 --- a/include/hw/timer/m48t59.h +++ b/include/hw/timer/m48t59.h @@ -1,6 +1,9 @@ #ifndef NVRAM_H #define NVRAM_H =20 +#include "qemu-common.h" +#include "qom/object.h" + /* NVRAM helpers */ typedef uint32_t (*nvram_read_t)(void *private, uint32_t addr); typedef void (*nvram_write_t)(void *private, uint32_t addr, uint32_t val= ); @@ -31,4 +34,25 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t io_= base, uint16_t size, M48t59State *m48t59_init(qemu_irq IRQ, hwaddr mem_base, uint32_t io_base, uint16_t size, int type); =20 +#define TYPE_NVRAM "nvram" + +#define NVRAM_CLASS(klass) \ + OBJECT_CLASS_CHECK(NvramClass, (klass), TYPE_NVRAM) +#define NVRAM_GET_CLASS(obj) \ + OBJECT_GET_CLASS(NvramClass, (obj), TYPE_NVRAM) +#define NVRAM(obj) \ + INTERFACE_CHECK(Nvram, (obj), TYPE_NVRAM) + +typedef struct Nvram { + Object parent; +} Nvram; + +typedef struct NvramClass { + InterfaceClass parent; + + uint32_t (*read)(Nvram *obj, uint32_t addr); + void (*write)(Nvram *obj, uint32_t addr, uint32_t val); + void (*toggle_lock)(Nvram *obj, int lock); +} NvramClass; + #endif /* !NVRAM_H */ --=20 1.7.10.4