gwj / at91sam9263 · Commits

Commit a06e5a3c6448befb8d5c1ac046cb41fc100f2cac

Authored by blueswir1
1 parent cf965d24

Fix Solaris breakage 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3531 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
hw/fdc.c
  View file @a06e5a3
... ... @@ -396,7 +396,7 @@ struct fdctrl_t {
396 396 /* Power down config (also with status regB access mode */
397 397 uint8_t pwrd;
398 398 /* Sun4m quirks? */
399   - int sun;
  399 + int sun4m;
400 400 /* Floppy drives */
401 401 fdrive_t drives[2];
402 402 };
... ... @@ -408,7 +408,7 @@ static uint32_t fdctrl_read (void *opaque, uint32_t reg)
408 408  
409 409 switch (reg & 0x07) {
410 410 case 0x00:
411   - if (fdctrl->sun) {
  411 + if (fdctrl->sun4m) {
412 412 // Identify to Linux as S82078B
413 413 retval = fdctrl_read_statusB(fdctrl);
414 414 } else {
... ... @@ -602,7 +602,7 @@ fdctrl_t *fdctrl_init (qemu_irq irq, int dma_chann, int mem_mapped,
602 602 fdctrl->dma_chann = dma_chann;
603 603 fdctrl->io_base = io_base;
604 604 fdctrl->config = 0x60; /* Implicit seek, polling & FIFO enabled */
605   - fdctrl->sun = 0;
  605 + fdctrl->sun4m = 0;
606 606 if (fdctrl->dma_chann != -1) {
607 607 fdctrl->dma_en = 1;
608 608 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,
642 642 fdctrl_t *fdctrl;
643 643  
644 644 fdctrl = fdctrl_init(irq, 0, 1, io_base, fds);
645   - fdctrl->sun = 1;
  645 + fdctrl->sun4m = 1;
646 646  
647 647 return fdctrl;
648 648 }
... ... @@ -664,7 +664,7 @@ static void fdctrl_reset_irq (fdctrl_t *fdctrl)
664 664 static void fdctrl_raise_irq (fdctrl_t *fdctrl, uint8_t status)
665 665 {
666 666 // Sparc mutation
667   - if (fdctrl->sun && !fdctrl->dma_en) {
  667 + if (fdctrl->sun4m && !fdctrl->dma_en) {
668 668 fdctrl->state &= ~FD_CTRL_BUSY;
669 669 fdctrl->int_status = status;
670 670 return;
... ...