Commit 6f6695b1 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/isa/superio: Factor out the floppy disc controller code from pc87312.c 



Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180308223946.26784-13-f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cd9526ab

hw/isa/isa-superio.c

+36 −0
Original line number Diff line number Diff line
@@ -11,7 +11,10 @@ 
 */

#include "qemu/osdep.h"

#include "qemu/error-report.h"

#include "qapi/error.h"

#include "sysemu/sysemu.h"

#include "sysemu/block-backend.h"

#include "sysemu/blockdev.h"

#include "chardev/char.h"

#include "hw/isa/superio.h"

#include "hw/char/serial.h"
@@ -25,6 +28,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) 
    ISADevice *isa;

    DeviceState *d;

    Chardev *chr;

    DriveInfo *drive;

    char *name;

    int i;
@@ -107,6 +111,38 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) 
            g_free(name);

        }

    }



    /* Floppy disc */

    if (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0)) {

        isa = isa_create(bus, "isa-fdc");

        d = DEVICE(isa);

        if (k->floppy.get_iobase) {

            qdev_prop_set_uint32(d, "iobase", k->floppy.get_iobase(sio, 0));

        }

        if (k->floppy.get_irq) {

            qdev_prop_set_uint32(d, "irq", k->floppy.get_irq(sio, 0));

        }

        /* FIXME use a qdev drive property instead of drive_get() */

        drive = drive_get(IF_FLOPPY, 0, 0);

        if (drive != NULL) {

            qdev_prop_set_drive(d, "driveA", blk_by_legacy_dinfo(drive),

                                &error_fatal);

        }

        /* FIXME use a qdev drive property instead of drive_get() */

        drive = drive_get(IF_FLOPPY, 0, 1);

        if (drive != NULL) {

            qdev_prop_set_drive(d, "driveB", blk_by_legacy_dinfo(drive),

                                &error_fatal);

        }

        qdev_init_nofail(d);

        sio->floppy = isa;

        trace_superio_create_floppy(0,

                                    k->floppy.get_iobase ?

                                    k->floppy.get_iobase(sio, 0) : -1,

                                    k->floppy.get_irq ?

                                    k->floppy.get_irq(sio, 0) : -1);

    }



}



static void isa_superio_class_init(ObjectClass *oc, void *data)

hw/isa/pc87312.c

+19 −27
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include "hw/isa/pc87312.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "sysemu/block-backend.h"

#include "sysemu/blockdev.h"

#include "trace.h"
@@ -129,16 +127,26 @@ static bool is_uart_enabled(ISASuperIODevice *sio, uint8_t i) 


/* Floppy controller */



static inline bool is_fdc_enabled(PC87312State *s)

static bool is_fdc_enabled(ISASuperIODevice *sio, uint8_t index)

{

    PC87312State *s = PC87312(sio);

    assert(!index);

    return s->regs[REG_FER] & FER_FDC_EN;

}



static inline uint16_t get_fdc_iobase(PC87312State *s)

static uint16_t get_fdc_iobase(ISASuperIODevice *sio, uint8_t index)

{

    PC87312State *s = PC87312(sio);

    assert(!index);

    return (s->regs[REG_FER] & FER_FDC_ADDR) ? 0x370 : 0x3f0;

}



static unsigned int get_fdc_irq(ISASuperIODevice *sio, uint8_t index)

{

    assert(!index);

    return 6;

}





/* IDE controller */
@@ -272,7 +280,6 @@ static void pc87312_realize(DeviceState *dev, Error **errp) 
    DeviceState *d;

    ISADevice *isa;

    ISABus *bus;

    DriveInfo *drive;

    Error *local_err = NULL;



    s = PC87312(dev);
@@ -287,28 +294,6 @@ static void pc87312_realize(DeviceState *dev, Error **errp) 
        return;

    }



    if (is_fdc_enabled(s)) {

        isa = isa_create(bus, "isa-fdc");

        d = DEVICE(isa);

        qdev_prop_set_uint32(d, "iobase", get_fdc_iobase(s));

        qdev_prop_set_uint32(d, "irq", 6);

        /* FIXME use a qdev drive property instead of drive_get() */

        drive = drive_get(IF_FLOPPY, 0, 0);

        if (drive != NULL) {

            qdev_prop_set_drive(d, "driveA", blk_by_legacy_dinfo(drive),

                                &error_fatal);

        }

        /* FIXME use a qdev drive property instead of drive_get() */

        drive = drive_get(IF_FLOPPY, 0, 1);

        if (drive != NULL) {

            qdev_prop_set_drive(d, "driveB", blk_by_legacy_dinfo(drive),

                                &error_fatal);

        }

        qdev_init_nofail(d);

        s->fdc.dev = isa;

        trace_pc87312_info_floppy(get_fdc_iobase(s));

    }



    if (is_ide_enabled(s)) {

        isa = isa_create(bus, "isa-ide");

        d = DEVICE(isa);
@@ -370,6 +355,12 @@ static void pc87312_class_init(ObjectClass *klass, void *data) 
        .get_iobase = get_uart_iobase,

        .get_irq    = get_uart_irq,

    };

    sc->floppy = (ISASuperIOFuncs){

        .count = 1,

        .is_enabled = is_fdc_enabled,

        .get_iobase = get_fdc_iobase,

        .get_irq    = get_fdc_irq,

    };

}



static const TypeInfo pc87312_type_info = {
@@ -378,6 +369,7 @@ static const TypeInfo pc87312_type_info = { 
    .instance_size = sizeof(PC87312State),

    .instance_init = pc87312_initfn,

    .class_init    = pc87312_class_init,

    /* FIXME use a qdev drive property instead of drive_get() */

};



static void pc87312_register_types(void)

hw/isa/trace-events

+1 −1
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
# hw/isa/isa-superio.c

superio_create_parallel(int id, uint16_t base, unsigned int irq) "id=%d, base 0x%03x, irq %u"

superio_create_serial(int id, uint16_t base, unsigned int irq) "id=%d, base 0x%03x, irq %u"

superio_create_floppy(int id, uint16_t base, unsigned int irq) "id=%d, base 0x%03x, irq %u"



# hw/isa/pc87312.c

pc87312_io_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x"

pc87312_io_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x"

pc87312_info_floppy(uint32_t base) "base 0x%x"

pc87312_info_ide(uint32_t base) "base 0x%x"

include/hw/isa/pc87312.h

+0 −4
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ typedef struct PC87312State { 
    uint16_t iobase;

    uint8_t config; /* initial configuration */



    struct {

        ISADevice *dev;

    } fdc;



    struct {

        ISADevice *dev;

    } ide;

include/hw/isa/superio.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ typedef struct ISASuperIODevice { 


    ISADevice *parallel[MAX_PARALLEL_PORTS];

    ISADevice *serial[MAX_SERIAL_PORTS];

    ISADevice *floppy;

} ISASuperIODevice;



typedef struct ISASuperIOFuncs {
@@ -47,6 +48,7 @@ typedef struct ISASuperIOClass { 


    ISASuperIOFuncs parallel;

    ISASuperIOFuncs serial;

    ISASuperIOFuncs floppy;

} ISASuperIOClass;



#endif /* HW_ISA_SUPERIO_H */