Subject: Re: CVS commit: syssrc
To: Noriyuki Soda <soda@netbsd.org>
From: John Hawkinson <jhawk@MIT.EDU>
List: source-changes
Date: 08/02/2000 17:17:40
| Modified Files:
| 	  syssrc/sys/arch/i386/pci: pci_addr_fixup.c
| 
| Log Message:
| fix oversight introduced in previous my commmitment (revision 1.4),
| pointed out by Michael Shalayeff <mickey@openbsd.org>.
| 
| 
| To generate a diff of this commit:
| cvs rdiff -r1.5 -r1.6 syssrc/sys/arch/i386/pci/pci_addr_fixup.c

This seems backwards to me. Are you certain it is correct?
Should it not still test "if (pcibiosverbose)" not "if (!pcibiosverbose)"?

--jhawk

***************
*** 294,311 ****
        /* write new address to PCI device configuration header */
        pci_conf_write(pc, tag, mapreg, *addr);
        /* check */
! #ifndef PCIBIOSVERBOSE
!       if (pcibiosverbose) {
                printf("pci_addr_fixup: ");
                pciaddr_print_devid(pc, tag);
        }
- #endif 
        if (pciaddr_ioaddr(pci_conf_read(pc, tag, mapreg)) != *addr) {
                pci_conf_write(pc, tag, mapreg, 0); /* clear */
                printf("fixup failed. (new address=%#x)\n", (unsigned)*addr);
                return (1);
        }
!       PCIBIOS_PRINTV(("new address 0x%08x\n", (unsigned)*addr));
  
        return (0);
  }
--- 294,315 ----
        /* write new address to PCI device configuration header */
        pci_conf_write(pc, tag, mapreg, *addr);
        /* check */
! #ifdef PCIBIOSVERBOSE
!       if (!pcibiosverbose)
! #endif 
!       {
                printf("pci_addr_fixup: ");
                pciaddr_print_devid(pc, tag);
        }
        if (pciaddr_ioaddr(pci_conf_read(pc, tag, mapreg)) != *addr) {
                pci_conf_write(pc, tag, mapreg, 0); /* clear */
                printf("fixup failed. (new address=%#x)\n", (unsigned)*addr);
                return (1);
        }
! #ifdef PCIBIOSVERBOSE
!       if (!pcibiosverbose)
! #endif
!               printf("new address 0x%08x\n", (unsigned)*addr);
  
        return (0);
  }