Replace device_init() with generalized type_init(). While at it, unify naming convention: type_init([$prefix_]register_types) Also, type_init() is a function, so add preceding blank line where necessary and don't put a semicolon after the closing brace. Signed-off-by: Andreas Färber <afaerber@suse.de> Cc: Anthony Liguori <anthony@codemonkey.ws> Cc: malc <av1474@comtv.ru> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
		
			
				
	
	
		
			127 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			127 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * QEMU IDE Emulation: ISA Bus support.
 | 
						|
 *
 | 
						|
 * Copyright (c) 2003 Fabrice Bellard
 | 
						|
 * Copyright (c) 2006 Openedhand Ltd.
 | 
						|
 *
 | 
						|
 * 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.
 | 
						|
 */
 | 
						|
#include <hw/hw.h>
 | 
						|
#include <hw/pc.h>
 | 
						|
#include <hw/isa.h>
 | 
						|
#include "block.h"
 | 
						|
#include "dma.h"
 | 
						|
 | 
						|
#include <hw/ide/internal.h>
 | 
						|
 | 
						|
/***********************************************************/
 | 
						|
/* ISA IDE definitions */
 | 
						|
 | 
						|
typedef struct ISAIDEState {
 | 
						|
    ISADevice dev;
 | 
						|
    IDEBus    bus;
 | 
						|
    uint32_t  iobase;
 | 
						|
    uint32_t  iobase2;
 | 
						|
    uint32_t  isairq;
 | 
						|
    qemu_irq  irq;
 | 
						|
} ISAIDEState;
 | 
						|
 | 
						|
static void isa_ide_reset(DeviceState *d)
 | 
						|
{
 | 
						|
    ISAIDEState *s = container_of(d, ISAIDEState, dev.qdev);
 | 
						|
 | 
						|
    ide_bus_reset(&s->bus);
 | 
						|
}
 | 
						|
 | 
						|
static const VMStateDescription vmstate_ide_isa = {
 | 
						|
    .name = "isa-ide",
 | 
						|
    .version_id = 3,
 | 
						|
    .minimum_version_id = 0,
 | 
						|
    .minimum_version_id_old = 0,
 | 
						|
    .fields      = (VMStateField []) {
 | 
						|
        VMSTATE_IDE_BUS(bus, ISAIDEState),
 | 
						|
        VMSTATE_IDE_DRIVES(bus.ifs, ISAIDEState),
 | 
						|
        VMSTATE_END_OF_LIST()
 | 
						|
    }
 | 
						|
};
 | 
						|
 | 
						|
static int isa_ide_initfn(ISADevice *dev)
 | 
						|
{
 | 
						|
    ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev);
 | 
						|
 | 
						|
    ide_bus_new(&s->bus, &s->dev.qdev, 0);
 | 
						|
    ide_init_ioport(&s->bus, dev, s->iobase, s->iobase2);
 | 
						|
    isa_init_irq(dev, &s->irq, s->isairq);
 | 
						|
    ide_init2(&s->bus, s->irq);
 | 
						|
    vmstate_register(&dev->qdev, 0, &vmstate_ide_isa, s);
 | 
						|
    return 0;
 | 
						|
};
 | 
						|
 | 
						|
ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
 | 
						|
                        DriveInfo *hd0, DriveInfo *hd1)
 | 
						|
{
 | 
						|
    ISADevice *dev;
 | 
						|
    ISAIDEState *s;
 | 
						|
 | 
						|
    dev = isa_create(bus, "isa-ide");
 | 
						|
    qdev_prop_set_uint32(&dev->qdev, "iobase",  iobase);
 | 
						|
    qdev_prop_set_uint32(&dev->qdev, "iobase2", iobase2);
 | 
						|
    qdev_prop_set_uint32(&dev->qdev, "irq",     isairq);
 | 
						|
    if (qdev_init(&dev->qdev) < 0)
 | 
						|
        return NULL;
 | 
						|
 | 
						|
    s = DO_UPCAST(ISAIDEState, dev, dev);
 | 
						|
    if (hd0)
 | 
						|
        ide_create_drive(&s->bus, 0, hd0);
 | 
						|
    if (hd1)
 | 
						|
        ide_create_drive(&s->bus, 1, hd1);
 | 
						|
    return dev;
 | 
						|
}
 | 
						|
 | 
						|
static Property isa_ide_properties[] = {
 | 
						|
    DEFINE_PROP_HEX32("iobase",  ISAIDEState, iobase,  0x1f0),
 | 
						|
    DEFINE_PROP_HEX32("iobase2", ISAIDEState, iobase2, 0x3f6),
 | 
						|
    DEFINE_PROP_UINT32("irq",    ISAIDEState, isairq,  14),
 | 
						|
    DEFINE_PROP_END_OF_LIST(),
 | 
						|
};
 | 
						|
 | 
						|
static void isa_ide_class_initfn(ObjectClass *klass, void *data)
 | 
						|
{
 | 
						|
    DeviceClass *dc = DEVICE_CLASS(klass);
 | 
						|
    ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
 | 
						|
    ic->init = isa_ide_initfn;
 | 
						|
    dc->fw_name = "ide";
 | 
						|
    dc->reset = isa_ide_reset;
 | 
						|
    dc->props = isa_ide_properties;
 | 
						|
}
 | 
						|
 | 
						|
static TypeInfo isa_ide_info = {
 | 
						|
    .name          = "isa-ide",
 | 
						|
    .parent        = TYPE_ISA_DEVICE,
 | 
						|
    .instance_size = sizeof(ISAIDEState),
 | 
						|
    .class_init    = isa_ide_class_initfn,
 | 
						|
};
 | 
						|
 | 
						|
static void isa_ide_register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&isa_ide_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(isa_ide_register_types)
 |