@@ -243,22 +243,20 @@ static void fd_recalibrate(FDrive *drv)
static FDriveType get_default_drive_type(FDrive *drv);
-static void pick_geometry(BlockBackend *blk, int *nb_heads,
- int *max_track, int *last_sect,
- FDriveType drive_in, FDriveType *drive,
- FDriveRate *rate)
+static void pick_geometry(FDrive *drv, int *nb_heads)
{
+ BlockBackend *blk = drv->blk;
const FDFormat *parse;
uint64_t nb_sectors, size;
int i, first_match, match;
/* Pick a default drive type if there's no media inserted AND we have
* not yet announced our drive type to the CMOS. */
- if (!blk_is_inserted(blk) && drive_in == FDRIVE_DRV_NONE) {
+ if (!blk_is_inserted(blk) && drv->drive == FDRIVE_DRV_NONE) {
for (i = 0; ; i++) {
parse = &fd_formats[i];
if ((parse->drive == FDRIVE_DRV_NONE) ||
- (parse->drive == *drive)) {
+ (parse->drive == get_default_drive_type(drv))) {
break;
}
}
@@ -273,8 +271,8 @@ static void pick_geometry(BlockBackend *blk, int *nb_heads,
if (parse->drive == FDRIVE_DRV_NONE) {
break;
}
- if (drive_in == parse->drive ||
- drive_in == FDRIVE_DRV_NONE) {
+ if (drv->drive == parse->drive ||
+ drv->drive == FDRIVE_DRV_NONE) {
size = (parse->max_head + 1) * parse->max_track *
parse->last_sect;
if (nb_sectors == size) {
@@ -297,40 +295,33 @@ static void pick_geometry(BlockBackend *blk, int *nb_heads,
out:
*nb_heads = parse->max_head + 1;
- *max_track = parse->max_track;
- *last_sect = parse->last_sect;
- *drive = parse->drive;
- *rate = parse->rate;
+ drv->max_track = parse->max_track;
+ drv->last_sect = parse->last_sect;
+ drv->drive = parse->drive;
+ drv->media_rate = parse->rate;
}
/* Revalidate a disk drive after a disk change */
static void fd_revalidate(FDrive *drv)
{
- int nb_heads, max_track, last_sect, ro;
- FDriveType drive = get_default_drive_type(drv);
- FDriveRate rate;
+ int nb_heads = -1;
FLOPPY_DPRINTF("revalidate\n");
if (drv->blk != NULL) {
- ro = blk_is_read_only(drv->blk);
- pick_geometry(drv->blk, &nb_heads, &max_track,
- &last_sect, drv->drive, &drive, &rate);
+ drv->ro = blk_is_read_only(drv->blk);
+ pick_geometry(drv, &nb_heads);
if (!blk_is_inserted(drv->blk)) {
FLOPPY_DPRINTF("No disk in drive\n");
} else {
FLOPPY_DPRINTF("Floppy disk (%d h %d t %d s) %s\n", nb_heads,
- max_track, last_sect, ro ? "ro" : "rw");
+ drv->max_track, drv->last_sect,
+ drv->ro ? "ro" : "rw");
}
if (nb_heads == 1) {
drv->flags &= ~FDISK_DBL_SIDES;
} else {
drv->flags |= FDISK_DBL_SIDES;
}
- drv->max_track = max_track;
- drv->last_sect = last_sect;
- drv->ro = ro;
- drv->drive = drive;
- drv->media_rate = rate;
} else {
FLOPPY_DPRINTF("No drive connected\n");
drv->last_sect = 0;
Lessen the number of parameters it takes. Signed-off-by: John Snow <jsnow@redhat.com> --- hw/block/fdc.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-)