From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0H-0000Ss-MW for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYi0E-0000Xy-HC for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0E-0000Xn-9M for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:47:58 -0500 From: Kevin Wolf Date: Wed, 14 Nov 2012 19:47:19 +0100 Message-Id: <1352918847-3696-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1352918847-3696-1-git-send-email-kwolf@redhat.com> References: <1352918847-3696-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 18/26] fdc-test: Check READ ID List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org ST0 shouldn't include 0x20 (FD_SR0_SEEK) after READ ID. Signed-off-by: Kevin Wolf Tested-by: Herv=C3=A9 Poussineau --- tests/fdc-test.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/tests/fdc-test.c b/tests/fdc-test.c index 1156112..e8ce686 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -48,6 +48,7 @@ enum { =20 enum { CMD_SENSE_INT =3D 0x08, + CMD_READ_ID =3D 0x0a, CMD_SEEK =3D 0x0f, CMD_READ =3D 0xe6, CMD_RELATIVE_SEEK_OUT =3D 0x8f, @@ -392,6 +393,70 @@ static void test_relative_seek(void) g_assert(pcn =3D=3D 0); } =20 +static void test_read_id(void) +{ + uint8_t drive =3D 0; + uint8_t head =3D 0; + uint8_t cyl; + uint8_t st0; + + /* Seek to track 0 and check with READ ID */ + send_seek(0); + + floppy_send(CMD_READ_ID); + g_assert(!get_irq(FLOPPY_IRQ)); + floppy_send(head << 2 | drive); + + while (!get_irq(FLOPPY_IRQ)) { + /* qemu involves a timer with READ ID... */ + clock_step(1000000000LL / 50); + } + + st0 =3D floppy_recv(); + floppy_recv(); + floppy_recv(); + cyl =3D floppy_recv(); + head =3D floppy_recv(); + floppy_recv(); + floppy_recv(); + + g_assert_cmpint(cyl, =3D=3D, 0); + g_assert_cmpint(head, =3D=3D, 0); + g_assert_cmpint(st0, =3D=3D, head << 2); + + /* Seek to track 8 on head 1 and check with READ ID */ + head =3D 1; + cyl =3D 8; + + floppy_send(CMD_SEEK); + floppy_send(head << 2 | drive); + g_assert(!get_irq(FLOPPY_IRQ)); + floppy_send(cyl); + g_assert(get_irq(FLOPPY_IRQ)); + ack_irq(NULL); + + floppy_send(CMD_READ_ID); + g_assert(!get_irq(FLOPPY_IRQ)); + floppy_send(head << 2 | drive); + + while (!get_irq(FLOPPY_IRQ)) { + /* qemu involves a timer with READ ID... */ + clock_step(1000000000LL / 50); + } + + st0 =3D floppy_recv(); + floppy_recv(); + floppy_recv(); + cyl =3D floppy_recv(); + head =3D floppy_recv(); + floppy_recv(); + floppy_recv(); + + g_assert_cmpint(cyl, =3D=3D, 8); + g_assert_cmpint(head, =3D=3D, 1); + g_assert_cmpint(st0, =3D=3D, head << 2); +} + static void test_read_no_dma_1(void) { uint8_t ret; @@ -471,6 +536,7 @@ int main(int argc, char **argv) qtest_add_func("/fdc/media_change", test_media_change); qtest_add_func("/fdc/sense_interrupt", test_sense_interrupt); qtest_add_func("/fdc/relative_seek", test_relative_seek); + qtest_add_func("/fdc/read_id", test_read_id); qtest_add_func("/fdc/media_insert", test_media_insert); qtest_add_func("/fdc/read_no_dma_1", test_read_no_dma_1); qtest_add_func("/fdc/read_no_dma_18", test_read_no_dma_18); --=20 1.7.6.5