Revision 81a322d4 hw/fdc.c
b/hw/fdc.c | ||
---|---|---|
1933 | 1933 |
return fdctrl; |
1934 | 1934 |
} |
1935 | 1935 |
|
1936 |
static void fdctrl_init_common(fdctrl_t *fdctrl)
|
|
1936 |
static int fdctrl_init_common(fdctrl_t *fdctrl)
|
|
1937 | 1937 |
{ |
1938 | 1938 |
int i, j; |
1939 | 1939 |
static int command_tables_inited = 0; |
... | ... | |
1961 | 1961 |
fdctrl_external_reset(fdctrl); |
1962 | 1962 |
register_savevm("fdc", -1, 2, fdc_save, fdc_load, fdctrl); |
1963 | 1963 |
qemu_register_reset(fdctrl_external_reset, fdctrl); |
1964 |
return 0; |
|
1964 | 1965 |
} |
1965 | 1966 |
|
1966 |
static void isabus_fdc_init1(ISADevice *dev)
|
|
1967 |
static int isabus_fdc_init1(ISADevice *dev)
|
|
1967 | 1968 |
{ |
1968 | 1969 |
fdctrl_isabus_t *isa = DO_UPCAST(fdctrl_isabus_t, busdev, dev); |
1969 | 1970 |
fdctrl_t *fdctrl = &isa->state; |
... | ... | |
1978 | 1979 |
&fdctrl_write_port, fdctrl); |
1979 | 1980 |
isa_init_irq(&isa->busdev, &fdctrl->irq); |
1980 | 1981 |
|
1981 |
fdctrl_init_common(fdctrl); |
|
1982 |
return fdctrl_init_common(fdctrl);
|
|
1982 | 1983 |
} |
1983 | 1984 |
|
1984 |
static void sysbus_fdc_init1(SysBusDevice *dev)
|
|
1985 |
static int sysbus_fdc_init1(SysBusDevice *dev)
|
|
1985 | 1986 |
{ |
1986 | 1987 |
fdctrl_t *fdctrl = &(FROM_SYSBUS(fdctrl_sysbus_t, dev)->state); |
1987 | 1988 |
int io; |
... | ... | |
1991 | 1992 |
sysbus_init_irq(dev, &fdctrl->irq); |
1992 | 1993 |
qdev_init_gpio_in(&dev->qdev, fdctrl_handle_tc, 1); |
1993 | 1994 |
|
1994 |
fdctrl_init_common(fdctrl); |
|
1995 |
return fdctrl_init_common(fdctrl);
|
|
1995 | 1996 |
} |
1996 | 1997 |
|
1997 |
static void sun4m_fdc_init1(SysBusDevice *dev)
|
|
1998 |
static int sun4m_fdc_init1(SysBusDevice *dev)
|
|
1998 | 1999 |
{ |
1999 | 2000 |
fdctrl_t *fdctrl = &(FROM_SYSBUS(fdctrl_sysbus_t, dev)->state); |
2000 | 2001 |
int io; |
... | ... | |
2006 | 2007 |
qdev_init_gpio_in(&dev->qdev, fdctrl_handle_tc, 1); |
2007 | 2008 |
|
2008 | 2009 |
fdctrl->sun4m = 1; |
2009 |
fdctrl_init_common(fdctrl); |
|
2010 |
return fdctrl_init_common(fdctrl);
|
|
2010 | 2011 |
} |
2011 | 2012 |
|
2012 | 2013 |
static ISADeviceInfo isa_fdc_info = { |
Also available in: Unified diff