Commit 92a6a6f6 authored by Kevin Wolf's avatar Kevin Wolf Committed by Stefan Hajnoczi
Browse files

ide: Convert DMA read/write commands to ide_cmd_table handler 



Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 0e6498ed

hw/ide/core.c

+38 −31
Original line number Diff line number Diff line
@@ -1152,6 +1152,38 @@ static bool cmd_write_pio(IDEState *s, uint8_t cmd) 
    return false;

}



static bool cmd_read_dma(IDEState *s, uint8_t cmd)

{

    bool lba48 = (cmd == WIN_READDMA_EXT);



    if (!s->bs) {

        ide_abort_command(s);

        return true;

    }



    ide_cmd_lba48_transform(s, lba48);

    ide_sector_start_dma(s, IDE_DMA_READ);



    return false;

}



static bool cmd_write_dma(IDEState *s, uint8_t cmd)

{

    bool lba48 = (cmd == WIN_WRITEDMA_EXT);



    if (!s->bs) {

        ide_abort_command(s);

        return true;

    }



    ide_cmd_lba48_transform(s, lba48);

    ide_sector_start_dma(s, IDE_DMA_WRITE);



    s->media_changed = 1;



    return false;

}



#define HD_OK (1u << IDE_HD)

#define CD_OK (1u << IDE_CD)

#define CFA_OK (1u << IDE_CFATA)
@@ -1175,13 +1207,13 @@ static const struct { 
    [WIN_READ]                    = { cmd_read_pio, ALL_OK },

    [WIN_READ_ONCE]               = { cmd_read_pio, ALL_OK },

    [WIN_READ_EXT]                = { cmd_read_pio, HD_CFA_OK },

    [WIN_READDMA_EXT]             = { NULL, HD_CFA_OK },

    [WIN_READDMA_EXT]             = { cmd_read_dma, HD_CFA_OK },

    [WIN_READ_NATIVE_MAX_EXT]     = { NULL, HD_CFA_OK },

    [WIN_MULTREAD_EXT]            = { cmd_read_multiple, HD_CFA_OK },

    [WIN_WRITE]                   = { cmd_write_pio, HD_CFA_OK },

    [WIN_WRITE_ONCE]              = { cmd_write_pio, HD_CFA_OK },

    [WIN_WRITE_EXT]               = { cmd_write_pio, HD_CFA_OK },

    [WIN_WRITEDMA_EXT]            = { NULL, HD_CFA_OK },

    [WIN_WRITEDMA_EXT]            = { cmd_write_dma, HD_CFA_OK },

    [CFA_WRITE_SECT_WO_ERASE]     = { cmd_write_pio, CFA_OK },

    [WIN_MULTWRITE_EXT]           = { cmd_write_multiple, HD_CFA_OK },

    [WIN_WRITE_VERIFY]            = { cmd_write_pio, HD_CFA_OK },
@@ -1206,10 +1238,10 @@ static const struct { 
    [WIN_MULTREAD]                = { cmd_read_multiple, HD_CFA_OK },

    [WIN_MULTWRITE]               = { cmd_write_multiple, HD_CFA_OK },

    [WIN_SETMULT]                 = { cmd_set_multiple_mode, HD_CFA_OK | SET_DSC },

    [WIN_READDMA]                 = { NULL, HD_CFA_OK },

    [WIN_READDMA_ONCE]            = { NULL, HD_CFA_OK },

    [WIN_WRITEDMA]                = { NULL, HD_CFA_OK },

    [WIN_WRITEDMA_ONCE]           = { NULL, HD_CFA_OK },

    [WIN_READDMA]                 = { cmd_read_dma, HD_CFA_OK },

    [WIN_READDMA_ONCE]            = { cmd_read_dma, HD_CFA_OK },

    [WIN_WRITEDMA]                = { cmd_write_dma, HD_CFA_OK },

    [WIN_WRITEDMA_ONCE]           = { cmd_write_dma, HD_CFA_OK },

    [CFA_WRITE_MULTI_WO_ERASE]    = { cmd_write_multiple, CFA_OK },

    [WIN_STANDBYNOW1]             = { cmd_nop, ALL_OK },

    [WIN_IDLEIMMEDIATE]           = { cmd_nop, ALL_OK },
@@ -1277,31 +1309,6 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) 
    }



    switch(val) {

    case WIN_READDMA_EXT:

        lba48 = 1;

        /* fall through */

    case WIN_READDMA:

    case WIN_READDMA_ONCE:

        if (!s->bs) {

            goto abort_cmd;

        }

	ide_cmd_lba48_transform(s, lba48);

        ide_sector_start_dma(s, IDE_DMA_READ);

        break;



    case WIN_WRITEDMA_EXT:

        lba48 = 1;

        /* fall through */

    case WIN_WRITEDMA:

    case WIN_WRITEDMA_ONCE:

        if (!s->bs) {

            goto abort_cmd;

        }

	ide_cmd_lba48_transform(s, lba48);

        ide_sector_start_dma(s, IDE_DMA_WRITE);

        s->media_changed = 1;

        break;



    case WIN_READ_NATIVE_MAX_EXT:

        lba48 = 1;

        /* fall through */