From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnEss-00062C-F5 for qemu-devel@nongnu.org; Tue, 28 Apr 2015 19:25:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnEsn-00034r-VI for qemu-devel@nongnu.org; Tue, 28 Apr 2015 19:25:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnEsn-00034f-PO for qemu-devel@nongnu.org; Tue, 28 Apr 2015 19:25:41 -0400 From: John Snow Date: Tue, 28 Apr 2015 19:25:28 -0400 Message-Id: <1430263537-7786-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1430263537-7786-1-git-send-email-jsnow@redhat.com> References: <1430263537-7786-1-git-send-email-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/10] fdc: remove sparc sun4m mutations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= From: Herv=C3=A9 Poussineau They were introduced in 6f7e9aec5eb5bdfa57a9e458e391b785c283a007 and 82407d1a4035e5bfefb53ffdcb270872f813b34c and lots of bug fixes were done = after that. This fixes (at least) the detection of the floppy controller on Debian 4.= 0r9/SPARC, and SS-5's OBP initialization routine still works. Signed-off-by: Herv=C3=A9 Poussineau Tested-by: Mark Cave-Ayland Message-id: 1426351846-6497-1-git-send-email-hpoussin@reactos.org Signed-off-by: John Snow --- hw/block/fdc.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 2bf87c9..f72a392 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -535,8 +535,6 @@ struct FDCtrl { uint8_t pwrd; /* Floppy drives */ uint8_t num_floppies; - /* Sun4m quirks? */ - int sun4m; FDrive drives[MAX_FD]; int reset_sensei; uint32_t check_media_rate; @@ -885,13 +883,6 @@ static void fdctrl_reset_irq(FDCtrl *fdctrl) =20 static void fdctrl_raise_irq(FDCtrl *fdctrl) { - /* Sparc mutation */ - if (fdctrl->sun4m && (fdctrl->msr & FD_MSR_CMDBUSY)) { - /* XXX: not sure */ - fdctrl->msr &=3D ~FD_MSR_CMDBUSY; - fdctrl->msr |=3D FD_MSR_RQM | FD_MSR_DIO; - return; - } if (!(fdctrl->sra & FD_SRA_INTPEND)) { qemu_set_irq(fdctrl->irq, 1); fdctrl->sra |=3D FD_SRA_INTPEND; @@ -1080,12 +1071,6 @@ static uint32_t fdctrl_read_main_status(FDCtrl *fd= ctrl) fdctrl->dsr &=3D ~FD_DSR_PWRDOWN; fdctrl->dor |=3D FD_DOR_nRESET; =20 - /* Sparc mutation */ - if (fdctrl->sun4m) { - retval |=3D FD_MSR_DIO; - fdctrl_reset_irq(fdctrl); - }; - FLOPPY_DPRINTF("main status register: 0x%02x\n", retval); =20 return retval; @@ -2241,8 +2226,6 @@ static void sun4m_fdc_initfn(Object *obj) FDCtrlSysBus *sys =3D SYSBUS_FDC(obj); FDCtrl *fdctrl =3D &sys->state; =20 - fdctrl->sun4m =3D 1; - memory_region_init_io(&fdctrl->iomem, obj, &fdctrl_mem_strict_ops, fdctrl, "fdctrl", 0x08); sysbus_init_mmio(sbd, &fdctrl->iomem); --=20 2.1.0