Commit 4964e18e authored by Kevin Wolf's avatar Kevin Wolf Committed by John Snow
Browse files

fdc-test: Test state for existing cases more thoroughly 



This just adds a few additional checks of the MSR and interrupt pin to
the already existing test cases.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 1432214378-31891-9-git-send-email-kwolf@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 6cc8a11c

tests/fdc-test.c

+34 −0
Original line number Diff line number Diff line
@@ -218,6 +218,10 @@ static uint8_t send_read_no_dma_command(int nb_sect, uint8_t expected_st0) 
        inb(FLOPPY_BASE + reg_fifo);

    }



    msr = inb(FLOPPY_BASE + reg_msr);

    assert_bit_set(msr, BUSY | RQM | DIO);

    g_assert(get_irq(FLOPPY_IRQ));



    st0 = floppy_recv();

    if (st0 != expected_st0) {

        ret = 1;
@@ -228,8 +232,15 @@ static uint8_t send_read_no_dma_command(int nb_sect, uint8_t expected_st0) 
    floppy_recv();

    floppy_recv();

    floppy_recv();

    g_assert(get_irq(FLOPPY_IRQ));

    floppy_recv();



    /* Check that we're back in command phase */

    msr = inb(FLOPPY_BASE + reg_msr);

    assert_bit_clear(msr, BUSY | DIO);

    assert_bit_set(msr, RQM);

    g_assert(!get_irq(FLOPPY_IRQ));



    return ret;

}
@@ -403,6 +414,7 @@ static void test_read_id(void) 
    uint8_t head = 0;

    uint8_t cyl;

    uint8_t st0;

    uint8_t msr;



    /* Seek to track 0 and check with READ ID */

    send_seek(0);
@@ -411,18 +423,29 @@ static void test_read_id(void) 
    g_assert(!get_irq(FLOPPY_IRQ));

    floppy_send(head << 2 | drive);



    msr = inb(FLOPPY_BASE + reg_msr);

    if (!get_irq(FLOPPY_IRQ)) {

        assert_bit_set(msr, BUSY);

        assert_bit_clear(msr, RQM);

    }



    while (!get_irq(FLOPPY_IRQ)) {

        /* qemu involves a timer with READ ID... */

        clock_step(1000000000LL / 50);

    }



    msr = inb(FLOPPY_BASE + reg_msr);

    assert_bit_set(msr, BUSY | RQM | DIO);



    st0 = floppy_recv();

    floppy_recv();

    floppy_recv();

    cyl = floppy_recv();

    head = floppy_recv();

    floppy_recv();

    g_assert(get_irq(FLOPPY_IRQ));

    floppy_recv();

    g_assert(!get_irq(FLOPPY_IRQ));



    g_assert_cmpint(cyl, ==, 0);

    g_assert_cmpint(head, ==, 0);
@@ -443,18 +466,29 @@ static void test_read_id(void) 
    g_assert(!get_irq(FLOPPY_IRQ));

    floppy_send(head << 2 | drive);



    msr = inb(FLOPPY_BASE + reg_msr);

    if (!get_irq(FLOPPY_IRQ)) {

        assert_bit_set(msr, BUSY);

        assert_bit_clear(msr, RQM);

    }



    while (!get_irq(FLOPPY_IRQ)) {

        /* qemu involves a timer with READ ID... */

        clock_step(1000000000LL / 50);

    }



    msr = inb(FLOPPY_BASE + reg_msr);

    assert_bit_set(msr, BUSY | RQM | DIO);



    st0 = floppy_recv();

    floppy_recv();

    floppy_recv();

    cyl = floppy_recv();

    head = floppy_recv();

    floppy_recv();

    g_assert(get_irq(FLOPPY_IRQ));

    floppy_recv();

    g_assert(!get_irq(FLOPPY_IRQ));



    g_assert_cmpint(cyl, ==, 8);

    g_assert_cmpint(head, ==, 1);