From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9ha1-0003kp-O6 for qemu-devel@nongnu.org; Thu, 06 Sep 2012 15:17:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9hZv-0002DO-Qo for qemu-devel@nongnu.org; Thu, 06 Sep 2012 15:17:33 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:56763) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9hZv-0002Ct-8M for qemu-devel@nongnu.org; Thu, 06 Sep 2012 15:17:27 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 6 Sep 2012 21:17:54 +0200 Message-Id: <1346959079-8307-4-git-send-email-hpoussin@reactos.org> In-Reply-To: <1346959079-8307-1-git-send-email-hpoussin@reactos.org> References: <1346959079-8307-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 3/8] fdc-test: Check READ ID List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Herv=C3=A9=20Poussineau?= From: Kevin Wolf ST0 shouldn't include 0x20 (FD_SR0_SEEK) after READ ID. Signed-off-by: Kevin Wolf Signed-off-by: Herv=C3=A9 Poussineau --- tests/fdc-test.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 file changed, 66 insertions(+) diff --git a/tests/fdc-test.c b/tests/fdc-test.c index fa74411..18051ef 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, @@ -320,6 +321,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); +} + /* success if no crash or abort */ static void fuzz_registers(void) { @@ -369,6 +434,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/fuzz-registers", fuzz_registers); =20 ret =3D g_test_run(); --=20 1.7.10.4