[SeaBIOS] [PATCH 3/4] block: Rename disk_op_s->drive_gf to drive_fl

[Paolo Bonzini]

On 11/07/2017 18:50, Kevin O'Connor wrote:
> Now that the drive_s struct does not need to be in the f-segment,
> rename references to drive_gf in the generic drive code to drive_fl.
> 
> This is just variable renames - no code changes.
> 
> Signed-off-by: Kevin O'Connor <kevin at koconnor.net>

There are still quite a few:

src/block.c:fill_ata_edd(struct segoff_s edd, struct drive_s *drive_gf)
src/block.c:        drive_gf, struct atadrive_s, drive);
src/block.c:    if (GET_GLOBALFLAT(drive_gf->type) == DTYPE_ATA) {
src/block.c:        u8 translation = GET_GLOBALFLAT(drive_gf->translation);
src/block.c:        edd, drive_gf, SEGOFF(SEG_LOW, (u32)&DefaultDPTE).segoff
src/block.h:int fill_edd(struct segoff_s edd, struct drive_s *drive_gf);
src/cdrom.c:    struct drive_s *drive_gf = GET_LOW(emulated_drive_gf);
src/cdrom.c:    dop.drive_fl = drive_gf;
src/hw/floppy.c:floppy_media_sense(struct drive_s *drive_gf)
src/hw/floppy.c:    u8 ftype = GET_GLOBALFLAT(drive_gf->floppy_type), stype = ftype;
src/hw/floppy.c:    u8 floppyid = GET_GLOBALFLAT(drive_gf->cntl_id);
src/hw/floppy.c:floppy_prep(struct drive_s *drive_gf, u8 cylinder)
src/hw/floppy.c:    u8 floppyid = GET_GLOBALFLAT(drive_gf->cntl_id);
src/hw/floppy.c:        ret = floppy_media_sense(drive_gf);
src/hw/usb-uas.c:    struct uasdrive_s *drive_gf = container_of(
src/hw/usb-uas.c:    ui.command.lun[1] = GET_GLOBALFLAT(drive_gf->lun);
src/hw/usb-uas.c:    int ret = usb_send_bulk(GET_GLOBALFLAT(drive_gf->command),
src/hw/usb-uas.c:    ret = usb_send_bulk(GET_GLOBALFLAT(drive_gf->status),
src/hw/usb-uas.c:        ret = usb_send_bulk(GET_GLOBALFLAT(drive_gf->data_in),
src/hw/usb-uas.c:        ret = usb_send_bulk(GET_GLOBALFLAT(drive_gf->data_out),
src/hw/usb-uas.c:    ret = usb_send_bulk(GET_GLOBALFLAT(drive_gf->status),

plus others that use drive_gf in the name and should probably be changed too:

src/block.c:    struct atadrive_s *adrive_gf = container_of(
src/block.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/block.c:    u8 slave = GET_GLOBALFLAT(adrive_gf->slave);
src/cdrom.c:struct drive_s *emulated_drive_gf VARLOW;
src/cdrom.c:    emulated_drive_gf = drive;
src/hw/ata.c:ata_reset(struct atadrive_s *adrive_gf)
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:    u8 slave = GET_GLOBALFLAT(adrive_gf->slave);
src/hw/ata.c:    dprintf(6, "ata_reset drive=%p\n", &adrive_gf->drive);
src/hw/ata.c:    u8 type=GET_GLOBALFLAT(adrive_gf->drive.type);
src/hw/ata.c:isready(struct atadrive_s *adrive_gf)
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:send_cmd(struct atadrive_s *adrive_gf, struct ata_pio_command *cmd)
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:    u8 slave = GET_GLOBALFLAT(adrive_gf->slave);
src/hw/ata.c:ata_cmd_nondata(struct atadrive_s *adrive_gf, struct ata_pio_command *cmd)
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:    int ret = send_cmd(adrive_gf, cmd);
src/hw/ata.c:    struct atadrive_s *adrive_gf = container_of(
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:    struct atadrive_s *adrive_gf = container_of(
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:    struct atadrive_s *adrive_gf = container_of(
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:    struct atadrive_s *adrive_gf = container_of(
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:    int ret = send_cmd(adrive_gf, cmd);
src/hw/ata.c:    struct atadrive_s *adrive_gf = container_of(
src/hw/ata.c:    int ret = send_cmd(adrive_gf, cmd);
src/hw/ata.c:    struct atadrive_s *adrive_gf = container_of(
src/hw/ata.c:        ata_reset(adrive_gf);
src/hw/ata.c:        return isready(adrive_gf);
src/hw/ata.c:    struct atadrive_s *adrive_gf = container_of(
src/hw/ata.c:    struct ata_channel_s *chan_gf = GET_GLOBALFLAT(adrive_gf->chan_gf);
src/hw/ata.c:    int ret = send_cmd(adrive_gf, &cmd);
src/hw/usb-msc.c:usb_msc_send(struct usbdrive_s *udrive_gf, int dir, void *buf, u32 bytes)
src/hw/usb-msc.c:        pipe = GET_GLOBALFLAT(udrive_gf->bulkout);
src/hw/usb-msc.c:        pipe = GET_GLOBALFLAT(udrive_gf->bulkin);
src/hw/usb-msc.c:    struct usbdrive_s *udrive_gf = container_of(
src/hw/usb-msc.c:    cbw.bCBWLUN = GET_GLOBALFLAT(udrive_gf->lun);
src/hw/usb-msc.c:    int ret = usb_msc_send(udrive_gf, USB_DIR_OUT
src/hw/usb-msc.c:        ret = usb_msc_send(udrive_gf, cbw.bmCBWFlags, op->buf_fl, bytes);
src/hw/usb-msc.c:    ret = usb_msc_send(udrive_gf, USB_DIR_IN
src/hw/virtio-blk.c:    struct virtiodrive_s *vdrive_gf =
src/hw/virtio-blk.c:    struct vring_virtqueue *vq = vdrive_gf->vq;
src/hw/virtio-blk.c:            .length     = vdrive_gf->drive.blksize * op->count,
src/hw/virtio-blk.c:    vring_kick(&vdrive_gf->vp, vq, 1);
src/hw/virtio-blk.c:    vp_get_isr(&vdrive_gf->vp);

Thanks,

Paolo