diff options
| author | Markus Armbruster <armbru@redhat.com> | 2012-07-10 11:12:27 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-07-17 16:48:29 +0200 |
| commit | 61a8d649ff1e125966b51d688ff43dc6ef6ca63b (patch) | |
| tree | d9ec8477cde6fa07b501b2d0b19190a4b4915c1a /hw/fdc.h | |
| parent | 19db9b9042657ef80ddd4c94b1748dc2368aab70 (diff) | |
| download | qemu-61a8d649ff1e125966b51d688ff43dc6ef6ca63b.zip qemu-61a8d649ff1e125966b51d688ff43dc6ef6ca63b.tar.gz qemu-61a8d649ff1e125966b51d688ff43dc6ef6ca63b.tar.bz2 | |
fdc: Move floppy geometry guessing back from block.c
Commit 5bbdbb46 moved it to block.c because "other geometry guessing
functions already reside in block.c". Device-specific functionality
should be kept in device code, not the block layer. Move it back.
Disk geometry guessing is still in block.c. To be moved out in a
later patch series.
Bonus: the floppy type used in pc_cmos_init() now obviously matches
the one in the FDrive. Before, we relied on
bdrv_get_floppy_geometry_hint() picking the same type both in
fd_revalidate() and in pc_cmos_init().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/fdc.h')
| -rw-r--r-- | hw/fdc.h | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -6,11 +6,19 @@ /* fdc.c */ #define MAX_FD 2 +typedef enum FDriveType { + FDRIVE_DRV_144 = 0x00, /* 1.44 MB 3"5 drive */ + FDRIVE_DRV_288 = 0x01, /* 2.88 MB 3"5 drive */ + FDRIVE_DRV_120 = 0x02, /* 1.2 MB 5"25 drive */ + FDRIVE_DRV_NONE = 0x03, /* No drive connected */ +} FDriveType; + ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds); void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, target_phys_addr_t mmio_base, DriveInfo **fds); void sun4m_fdctrl_init(qemu_irq irq, target_phys_addr_t io_base, DriveInfo **fds, qemu_irq *fdc_tc); -void fdc_get_bs(BlockDriverState *bs[], ISADevice *dev); + +FDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); #endif |