mirror of https://github.com/proxmox/mirror_qemu
hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory
The M48T59 is a Real Time Clock, not a timer. Move it under the hw/rtc/ subdirectory. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20191003230404.19384-5-philmd@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>master
parent
bcdb90640a
commit
819ce6b2a5
|
@ -1064,9 +1064,9 @@ F: hw/pci-host/prep.[hc]
|
||||||
F: hw/isa/i82378.c
|
F: hw/isa/i82378.c
|
||||||
F: hw/isa/pc87312.c
|
F: hw/isa/pc87312.c
|
||||||
F: hw/dma/i82374.c
|
F: hw/dma/i82374.c
|
||||||
F: hw/timer/m48t59-isa.c
|
F: hw/rtc/m48t59-isa.c
|
||||||
F: include/hw/isa/pc87312.h
|
F: include/hw/isa/pc87312.h
|
||||||
F: include/hw/timer/m48t59.h
|
F: include/hw/rtc/m48t59.h
|
||||||
F: pc-bios/ppc_rom.bin
|
F: pc-bios/ppc_rom.bin
|
||||||
|
|
||||||
sPAPR
|
sPAPR
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "hw/ppc/ppc.h"
|
#include "hw/ppc/ppc.h"
|
||||||
#include "ppc405.h"
|
#include "ppc405.h"
|
||||||
#include "hw/timer/m48t59.h"
|
#include "hw/rtc/m48t59.h"
|
||||||
#include "hw/block/flash.h"
|
#include "hw/block/flash.h"
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "sysemu/qtest.h"
|
#include "sysemu/qtest.h"
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "hw/timer/m48t59.h"
|
#include "hw/rtc/m48t59.h"
|
||||||
#include "hw/char/serial.h"
|
#include "hw/char/serial.h"
|
||||||
#include "hw/block/fdc.h"
|
#include "hw/block/fdc.h"
|
||||||
#include "net/net.h"
|
#include "net/net.h"
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
config M48T59
|
||||||
|
bool
|
||||||
|
|
||||||
config PL031
|
config PL031
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,6 @@
|
||||||
|
common-obj-$(CONFIG_M48T59) += m48t59.o
|
||||||
|
ifeq ($(CONFIG_ISA_BUS),y)
|
||||||
|
common-obj-$(CONFIG_M48T59) += m48t59-isa.o
|
||||||
|
endif
|
||||||
common-obj-$(CONFIG_PL031) += pl031.o
|
common-obj-$(CONFIG_PL031) += pl031.o
|
||||||
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
|
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* QEMU M48T59 and M48T08 NVRAM emulation (ISA bus interface
|
* QEMU M48T59 and M48T08 NVRAM emulation (ISA bus interface)
|
||||||
*
|
*
|
||||||
* Copyright (c) 2003-2005, 2007 Jocelyn Mayer
|
* Copyright (c) 2003-2005, 2007 Jocelyn Mayer
|
||||||
* Copyright (c) 2013 Hervé Poussineau
|
* Copyright (c) 2013 Hervé Poussineau
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "hw/qdev-properties.h"
|
#include "hw/qdev-properties.h"
|
||||||
#include "hw/timer/m48t59.h"
|
#include "hw/rtc/m48t59.h"
|
||||||
#include "m48t59-internal.h"
|
#include "m48t59-internal.h"
|
||||||
#include "qemu/module.h"
|
#include "qemu/module.h"
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "hw/irq.h"
|
#include "hw/irq.h"
|
||||||
#include "hw/qdev-properties.h"
|
#include "hw/qdev-properties.h"
|
||||||
#include "hw/timer/m48t59.h"
|
#include "hw/rtc/m48t59.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "sysemu/runstate.h"
|
#include "sysemu/runstate.h"
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
|
@ -31,7 +31,7 @@
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "hw/sparc/sun4m_iommu.h"
|
#include "hw/sparc/sun4m_iommu.h"
|
||||||
#include "hw/timer/m48t59.h"
|
#include "hw/rtc/m48t59.h"
|
||||||
#include "migration/vmstate.h"
|
#include "migration/vmstate.h"
|
||||||
#include "hw/sparc/sparc32_dma.h"
|
#include "hw/sparc/sparc32_dma.h"
|
||||||
#include "hw/block/fdc.h"
|
#include "hw/block/fdc.h"
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include "hw/pci-host/sabre.h"
|
#include "hw/pci-host/sabre.h"
|
||||||
#include "hw/char/serial.h"
|
#include "hw/char/serial.h"
|
||||||
#include "hw/char/parallel.h"
|
#include "hw/char/parallel.h"
|
||||||
#include "hw/timer/m48t59.h"
|
#include "hw/rtc/m48t59.h"
|
||||||
#include "migration/vmstate.h"
|
#include "migration/vmstate.h"
|
||||||
#include "hw/input/i8042.h"
|
#include "hw/input/i8042.h"
|
||||||
#include "hw/block/fdc.h"
|
#include "hw/block/fdc.h"
|
||||||
|
|
|
@ -24,9 +24,6 @@ config M41T80
|
||||||
bool
|
bool
|
||||||
depends on I2C
|
depends on I2C
|
||||||
|
|
||||||
config M48T59
|
|
||||||
bool
|
|
||||||
|
|
||||||
config TWL92230
|
config TWL92230
|
||||||
bool
|
bool
|
||||||
depends on I2C
|
depends on I2C
|
||||||
|
|
|
@ -7,10 +7,6 @@ common-obj-$(CONFIG_DS1338) += ds1338.o
|
||||||
common-obj-$(CONFIG_HPET) += hpet.o
|
common-obj-$(CONFIG_HPET) += hpet.o
|
||||||
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
|
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
|
||||||
common-obj-$(CONFIG_M41T80) += m41t80.o
|
common-obj-$(CONFIG_M41T80) += m41t80.o
|
||||||
common-obj-$(CONFIG_M48T59) += m48t59.o
|
|
||||||
ifeq ($(CONFIG_ISA_BUS),y)
|
|
||||||
common-obj-$(CONFIG_M48T59) += m48t59-isa.o
|
|
||||||
endif
|
|
||||||
common-obj-$(CONFIG_PUV3) += puv3_ost.o
|
common-obj-$(CONFIG_PUV3) += puv3_ost.o
|
||||||
common-obj-$(CONFIG_TWL92230) += twl92230.o
|
common-obj-$(CONFIG_TWL92230) += twl92230.o
|
||||||
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
|
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
|
||||||
|
|
|
@ -0,0 +1,57 @@
|
||||||
|
/*
|
||||||
|
* QEMU M48T59 and M48T08 NVRAM emulation
|
||||||
|
*
|
||||||
|
* Copyright (c) 2003-2005, 2007 Jocelyn Mayer
|
||||||
|
* Copyright (c) 2013 Hervé Poussineau
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef HW_RTC_M48T59_H
|
||||||
|
#define HW_RTC_M48T59_H
|
||||||
|
|
||||||
|
#include "exec/hwaddr.h"
|
||||||
|
#include "qom/object.h"
|
||||||
|
|
||||||
|
#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 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;
|
||||||
|
|
||||||
|
Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
|
||||||
|
int base_year, int type);
|
||||||
|
Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
|
||||||
|
uint32_t io_base, uint16_t size, int base_year,
|
||||||
|
int type);
|
||||||
|
|
||||||
|
#endif /* HW_M48T59_H */
|
|
@ -1,32 +0,0 @@
|
||||||
#ifndef HW_M48T59_H
|
|
||||||
#define HW_M48T59_H
|
|
||||||
|
|
||||||
#include "exec/hwaddr.h"
|
|
||||||
#include "qom/object.h"
|
|
||||||
|
|
||||||
#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 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;
|
|
||||||
|
|
||||||
Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
|
|
||||||
int base_year, int type);
|
|
||||||
Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
|
|
||||||
uint32_t io_base, uint16_t size, int base_year,
|
|
||||||
int type);
|
|
||||||
|
|
||||||
#endif /* HW_M48T59_H */
|
|
Loading…
Reference in New Issue