[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/7] floppy: move cmos_get_fd_drive_type
From: |
Gerd Hoffmann |
Subject: |
[PATCH 5/7] floppy: move cmos_get_fd_drive_type |
Date: |
Wed, 4 Aug 2021 16:27:35 +0200 |
Needed by pc machine init.
Move to separate source file so we can keep it in core qemu
when building floppy as module.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/block/fdc-isa.c | 25 -------------------------
hw/block/fdc-module.c | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
index 36c246efa822..a5a124fb9236 100644
--- a/hw/block/fdc-isa.c
+++ b/hw/block/fdc-isa.c
@@ -162,31 +162,6 @@ 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;
diff --git a/hw/block/fdc-module.c b/hw/block/fdc-module.c
index 3682b5c1ebd1..7e2aaf86a0c0 100644
--- a/hw/block/fdc-module.c
+++ b/hw/block/fdc-module.c
@@ -98,3 +98,28 @@ FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i)
return isa->state.drives[i].drive;
}
+
+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;
+}
--
2.31.1
- [PATCH 0/7] floppy: build as modules., Gerd Hoffmann, 2021/08/04
- [PATCH 2/7] floppy: move isa_fdc_init_drives + fdctrl_init_drives, Gerd Hoffmann, 2021/08/04
- [PATCH 1/7] floppy: move isa_fdc_get_drive_type to separate source file., Gerd Hoffmann, 2021/08/04
- [PATCH 4/7] floppy: move sun4m_fdctrl_init, Gerd Hoffmann, 2021/08/04
- [PATCH 5/7] floppy: move cmos_get_fd_drive_type,
Gerd Hoffmann <=
- [PATCH 3/7] floppy: move fdctrl_init_sysbus, Gerd Hoffmann, 2021/08/04
- [PATCH 7/7] pc: add floppy=OnOffAuto, Gerd Hoffmann, 2021/08/04
- [PATCH 6/7] floppy: build as modules., Gerd Hoffmann, 2021/08/04
- Re: [PATCH 0/7] floppy: build as modules., Philippe Mathieu-Daudé, 2021/08/04