motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-10 02:54:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Solaris breakage

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3531 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2007-11-04 16:58:07 +00:00
parent cf965d2406
commit a06e5a3c64
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hw/fdc.c
View file

@ -396,7 +396,7 @@ struct fdctrl_t {
/* Power down config (also with status regB access mode */ /* Power down config (also with status regB access mode */
uint8_t pwrd; uint8_t pwrd;
/* Sun4m quirks? */ /* Sun4m quirks? */
int sun; int sun4m;
/* Floppy drives */ /* Floppy drives */
fdrive_t drives[2]; fdrive_t drives[2];
}; };
@ -408,7 +408,7 @@ static uint32_t fdctrl_read (void *opaque, uint32_t reg)
switch (reg & 0x07) { switch (reg & 0x07) {
case 0x00: case 0x00:
if (fdctrl->sun) { if (fdctrl->sun4m) {
// Identify to Linux as S82078B // Identify to Linux as S82078B
retval = fdctrl_read_statusB(fdctrl); retval = fdctrl_read_statusB(fdctrl);
} else { } else {
@ -602,7 +602,7 @@ fdctrl_t *fdctrl_init (qemu_irq irq, int dma_chann, int mem_mapped,
fdctrl->dma_chann = dma_chann; fdctrl->dma_chann = dma_chann;
fdctrl->io_base = io_base; fdctrl->io_base = io_base;
fdctrl->config = 0x60; /* Implicit seek, polling & FIFO enabled */ fdctrl->config = 0x60; /* Implicit seek, polling & FIFO enabled */
fdctrl->sun = 0; fdctrl->sun4m = 0;
if (fdctrl->dma_chann != -1) { if (fdctrl->dma_chann != -1) {
fdctrl->dma_en = 1; fdctrl->dma_en = 1;
DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl); DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl);
@ -642,7 +642,7 @@ fdctrl_t *sun4m_fdctrl_init (qemu_irq irq, target_phys_addr_t io_base,
fdctrl_t *fdctrl; fdctrl_t *fdctrl;
fdctrl = fdctrl_init(irq, 0, 1, io_base, fds); fdctrl = fdctrl_init(irq, 0, 1, io_base, fds);
fdctrl->sun = 1; fdctrl->sun4m = 1;
return fdctrl; return fdctrl;
} }
@ -664,7 +664,7 @@ static void fdctrl_reset_irq (fdctrl_t *fdctrl)
static void fdctrl_raise_irq (fdctrl_t *fdctrl, uint8_t status) static void fdctrl_raise_irq (fdctrl_t *fdctrl, uint8_t status)
{ {
// Sparc mutation // Sparc mutation
if (fdctrl->sun && !fdctrl->dma_en) { if (fdctrl->sun4m && !fdctrl->dma_en) {
fdctrl->state &= ~FD_CTRL_BUSY; fdctrl->state &= ~FD_CTRL_BUSY;
fdctrl->int_status = status; fdctrl->int_status = status;
return; return;