Commit 89ed90e3 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Michael S. Tsirkin
Browse files

floppy: move cmos_get_fd_drive_type() from pc 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: default avatarJohn Snow <jsnow@redhat.com>
Message-Id: <20200619091905.21676-6-kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ffdf43ed

hw/block/fdc.c

+25 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qemu/timer.h"

#include "hw/i386/pc.h"

#include "hw/acpi/aml-build.h"

#include "hw/irq.h"

#include "hw/isa/isa.h"
@@ -2812,6 +2811,31 @@ static Aml *build_fdinfo_aml(int idx, FloppyDriveType type) 
    return dev;

}



int cmos_get_fd_drive_type(FloppyDriveType fd0)

{

    int val;



    switch (fd0) {

    case FLOPPY_DRIVE_TYPE_144:

        /* 1.44 Mb 3"5 drive */

        val = 4;

        break;

    case FLOPPY_DRIVE_TYPE_288:

        /* 2.88 Mb 3"5 drive */

        val = 5;

        break;

    case FLOPPY_DRIVE_TYPE_120:

        /* 1.2 Mb 5"5 drive */

        val = 2;

        break;

    case FLOPPY_DRIVE_TYPE_NONE:

    default:

        val = 0;

        break;

    }

    return val;

}



static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)

{

    Aml *dev;

hw/i386/pc.c

+0 −25
Original line number Diff line number Diff line
@@ -386,31 +386,6 @@ static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size) 


#define REG_EQUIPMENT_BYTE          0x14



int cmos_get_fd_drive_type(FloppyDriveType fd0)

{

    int val;



    switch (fd0) {

    case FLOPPY_DRIVE_TYPE_144:

        /* 1.44 Mb 3"5 drive */

        val = 4;

        break;

    case FLOPPY_DRIVE_TYPE_288:

        /* 2.88 Mb 3"5 drive */

        val = 5;

        break;

    case FLOPPY_DRIVE_TYPE_120:

        /* 1.2 Mb 5"5 drive */

        val = 2;

        break;

    case FLOPPY_DRIVE_TYPE_NONE:

    default:

        val = 0;

        break;

    }

    return val;

}



static void cmos_init_hd(ISADevice *s, int type_ofs, int info_ofs,

                         int16_t cylinders, int8_t heads, int8_t sectors)

{

include/hw/block/fdc.h

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, 
                       DriveInfo **fds, qemu_irq *fdc_tc);



FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i);

int cmos_get_fd_drive_type(FloppyDriveType fd0);



#endif

include/hw/i386/pc.h

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ typedef void (*cpu_set_smm_t)(int smm, void *arg); 
void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs);



ISADevice *pc_find_fdc0(void);

int cmos_get_fd_drive_type(FloppyDriveType fd0);



/* port92.c */

#define PORT92_A20_LINE "a20"