Commit 0ba98885 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by John Snow
Browse files

macio: remove remainder_len DBDMA_io property 



Since the block alignment code is now effectively independent of the DMA
implementation, this variable is no longer required and can be removed.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 1433455177-21243-5-git-send-email-mark.cave-ayland@ilande.co.uk
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent b01d44cd

hw/ide/macio.c

+0 −13
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ static void pmac_ide_transfer_cb(void *opaque, int ret) 
        MACIO_DPRINTF("DMA error: %d\n", ret);

        m->aiocb = NULL;

        ide_dma_error(s);

        io->remainder_len = 0;

        goto done;

    }
@@ -509,9 +508,6 @@ static void ide_dbdma_start(IDEDMA *dma, IDEState *s, 
                            BlockCompletionFunc *cb)

{

    MACIOIDEState *m = container_of(dma, MACIOIDEState, dma);

    DBDMAState *dbdma = m->dbdma;

    DBDMA_io *io;

    int i;



    s->io_buffer_index = 0;

    if (s->drive_kind == IDE_CD) {
@@ -526,15 +522,6 @@ static void ide_dbdma_start(IDEDMA *dma, IDEState *s, 
    MACIO_DPRINTF("lba: %x    size: %x\n", s->lba, s->io_buffer_size);

    MACIO_DPRINTF("-------------------------\n");



    for (i = 0; i < DBDMA_CHANNELS; i++) {

        io = &dbdma->channels[i].io;



        if (io->opaque == m) {

            io->remainder_len = 0;

        }

    }



    MACIO_DPRINTF("\n");

    m->dma_active = true;

    DBDMA_kick(m->dbdma);

}

include/hw/ppc/mac_dbdma.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct DBDMA_io { 
    /* unaligned last sector of a request */

    uint8_t head_remainder[0x200];

    uint8_t tail_remainder[0x200];

    int remainder_len;

    QEMUIOVector iov;

};