From a100107d5612ba568c817f22c628b2c9eeb431bf Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 5 Feb 2013 12:27:44 +0100 Subject: hw: move watchdogs to hw/watchdog, configure via default-configs/ Signed-off-by: Paolo Bonzini --- hw/i386/Makefile.objs | 1 - hw/watchdog/Makefile.objs | 3 +- hw/watchdog/wdt_ib700.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++ hw/wdt_ib700.c | 145 ---------------------------------------------- 4 files changed, 147 insertions(+), 147 deletions(-) create mode 100644 hw/watchdog/wdt_ib700.c delete mode 100644 hw/wdt_ib700.c (limited to 'hw') diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index c813b1ef78..5559a8ba5c 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,6 @@ obj-y += mc146818rtc.o obj-y += apic_common.o apic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o -obj-y += wdt_ib700.o obj-y += debugcon.o debugexit.o obj-y += pc_sysfw.o obj-y += lpc_ich9.o q35.o diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs index f57133b729..4b0374a555 100644 --- a/hw/watchdog/Makefile.objs +++ b/hw/watchdog/Makefile.objs @@ -1,2 +1,3 @@ common-obj-y += watchdog.o -common-obj-$(CONFIG_PCI) += wdt_i6300esb.o +common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o +common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c new file mode 100644 index 0000000000..b8c4be85ff --- /dev/null +++ b/hw/watchdog/wdt_ib700.c @@ -0,0 +1,145 @@ +/* + * Virtual hardware watchdog. + * + * Copyright (C) 2009 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by 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 . + * + * By Richard W.M. Jones (rjones@redhat.com). + */ + +#include "qemu-common.h" +#include "qemu/timer.h" +#include "sysemu/watchdog.h" +#include "hw/hw.h" +#include "hw/isa/isa.h" +#include "hw/i386/pc.h" + +/*#define IB700_DEBUG 1*/ + +#ifdef IB700_DEBUG +#define ib700_debug(fs,...) \ + fprintf(stderr,"ib700: %s: "fs,__func__,##__VA_ARGS__) +#else +#define ib700_debug(fs,...) +#endif + +typedef struct IB700state { + ISADevice dev; + QEMUTimer *timer; +} IB700State; + +/* This is the timer. We use a global here because the watchdog + * code ensures there is only one watchdog (it is located at a fixed, + * unchangeable IO port, so there could only ever be one anyway). + */ + +/* A write to this register enables the timer. */ +static void ib700_write_enable_reg(void *vp, uint32_t addr, uint32_t data) +{ + IB700State *s = vp; + static int time_map[] = { + 30, 28, 26, 24, 22, 20, 18, 16, + 14, 12, 10, 8, 6, 4, 2, 0 + }; + int64_t timeout; + + ib700_debug("addr = %x, data = %x\n", addr, data); + + timeout = (int64_t) time_map[data & 0xF] * get_ticks_per_sec(); + qemu_mod_timer(s->timer, qemu_get_clock_ns (vm_clock) + timeout); +} + +/* A write (of any value) to this register disables the timer. */ +static void ib700_write_disable_reg(void *vp, uint32_t addr, uint32_t data) +{ + IB700State *s = vp; + + ib700_debug("addr = %x, data = %x\n", addr, data); + + qemu_del_timer(s->timer); +} + +/* This is called when the watchdog expires. */ +static void ib700_timer_expired(void *vp) +{ + IB700State *s = vp; + + ib700_debug("watchdog expired\n"); + + watchdog_perform_action(); + qemu_del_timer(s->timer); +} + +static const VMStateDescription vmstate_ib700 = { + .name = "ib700_wdt", + .version_id = 0, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .fields = (VMStateField []) { + VMSTATE_TIMER(timer, IB700State), + VMSTATE_END_OF_LIST() + } +}; + +static int wdt_ib700_init(ISADevice *dev) +{ + IB700State *s = DO_UPCAST(IB700State, dev, dev); + + ib700_debug("watchdog init\n"); + + s->timer = qemu_new_timer_ns(vm_clock, ib700_timer_expired, s); + register_ioport_write(0x441, 2, 1, ib700_write_disable_reg, s); + register_ioport_write(0x443, 2, 1, ib700_write_enable_reg, s); + + return 0; +} + +static void wdt_ib700_reset(DeviceState *dev) +{ + IB700State *s = DO_UPCAST(IB700State, dev.qdev, dev); + + ib700_debug("watchdog reset\n"); + + qemu_del_timer(s->timer); +} + +static WatchdogTimerModel model = { + .wdt_name = "ib700", + .wdt_description = "iBASE 700", +}; + +static void wdt_ib700_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); + ic->init = wdt_ib700_init; + dc->reset = wdt_ib700_reset; + dc->vmsd = &vmstate_ib700; +} + +static const TypeInfo wdt_ib700_info = { + .name = "ib700", + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof(IB700State), + .class_init = wdt_ib700_class_init, +}; + +static void wdt_ib700_register_types(void) +{ + watchdog_add_model(&model); + type_register_static(&wdt_ib700_info); +} + +type_init(wdt_ib700_register_types) diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c deleted file mode 100644 index b8c4be85ff..0000000000 --- a/hw/wdt_ib700.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Virtual hardware watchdog. - * - * Copyright (C) 2009 Red Hat Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by 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 . - * - * By Richard W.M. Jones (rjones@redhat.com). - */ - -#include "qemu-common.h" -#include "qemu/timer.h" -#include "sysemu/watchdog.h" -#include "hw/hw.h" -#include "hw/isa/isa.h" -#include "hw/i386/pc.h" - -/*#define IB700_DEBUG 1*/ - -#ifdef IB700_DEBUG -#define ib700_debug(fs,...) \ - fprintf(stderr,"ib700: %s: "fs,__func__,##__VA_ARGS__) -#else -#define ib700_debug(fs,...) -#endif - -typedef struct IB700state { - ISADevice dev; - QEMUTimer *timer; -} IB700State; - -/* This is the timer. We use a global here because the watchdog - * code ensures there is only one watchdog (it is located at a fixed, - * unchangeable IO port, so there could only ever be one anyway). - */ - -/* A write to this register enables the timer. */ -static void ib700_write_enable_reg(void *vp, uint32_t addr, uint32_t data) -{ - IB700State *s = vp; - static int time_map[] = { - 30, 28, 26, 24, 22, 20, 18, 16, - 14, 12, 10, 8, 6, 4, 2, 0 - }; - int64_t timeout; - - ib700_debug("addr = %x, data = %x\n", addr, data); - - timeout = (int64_t) time_map[data & 0xF] * get_ticks_per_sec(); - qemu_mod_timer(s->timer, qemu_get_clock_ns (vm_clock) + timeout); -} - -/* A write (of any value) to this register disables the timer. */ -static void ib700_write_disable_reg(void *vp, uint32_t addr, uint32_t data) -{ - IB700State *s = vp; - - ib700_debug("addr = %x, data = %x\n", addr, data); - - qemu_del_timer(s->timer); -} - -/* This is called when the watchdog expires. */ -static void ib700_timer_expired(void *vp) -{ - IB700State *s = vp; - - ib700_debug("watchdog expired\n"); - - watchdog_perform_action(); - qemu_del_timer(s->timer); -} - -static const VMStateDescription vmstate_ib700 = { - .name = "ib700_wdt", - .version_id = 0, - .minimum_version_id = 0, - .minimum_version_id_old = 0, - .fields = (VMStateField []) { - VMSTATE_TIMER(timer, IB700State), - VMSTATE_END_OF_LIST() - } -}; - -static int wdt_ib700_init(ISADevice *dev) -{ - IB700State *s = DO_UPCAST(IB700State, dev, dev); - - ib700_debug("watchdog init\n"); - - s->timer = qemu_new_timer_ns(vm_clock, ib700_timer_expired, s); - register_ioport_write(0x441, 2, 1, ib700_write_disable_reg, s); - register_ioport_write(0x443, 2, 1, ib700_write_enable_reg, s); - - return 0; -} - -static void wdt_ib700_reset(DeviceState *dev) -{ - IB700State *s = DO_UPCAST(IB700State, dev.qdev, dev); - - ib700_debug("watchdog reset\n"); - - qemu_del_timer(s->timer); -} - -static WatchdogTimerModel model = { - .wdt_name = "ib700", - .wdt_description = "iBASE 700", -}; - -static void wdt_ib700_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); - ic->init = wdt_ib700_init; - dc->reset = wdt_ib700_reset; - dc->vmsd = &vmstate_ib700; -} - -static const TypeInfo wdt_ib700_info = { - .name = "ib700", - .parent = TYPE_ISA_DEVICE, - .instance_size = sizeof(IB700State), - .class_init = wdt_ib700_class_init, -}; - -static void wdt_ib700_register_types(void) -{ - watchdog_add_model(&model); - type_register_static(&wdt_ib700_info); -} - -type_init(wdt_ib700_register_types) -- cgit v1.2.1