[src/netbsd-1-5]: src/sys/arch/i386/conf Pull up to netbsd-1-5 branch

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-1-5]: src/sys/arch/i386/conf Pull up to netbsd-1-5 branch
From: soda <soda%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 07:19:28 +0000

details:   https://anonhg.NetBSD.org/src/rev/d5a3134cfeae
branches:  netbsd-1-5
changeset: 489040:d5a3134cfeae
user:      soda <soda%NetBSD.org@localhost>
date:      Thu Aug 10 23:10:28 2000 +0000

description:
Pull up to netbsd-1-5 branch
Approved by: thorpej

- remove quotation from hexadecimal constant in "options" value.

 Revisions pulled up:
 > cvs rdiff -r1.17 -r1.18 syssrc/sys/arch/i386/conf/CARDBUS
 > cvs rdiff -r1.21 -r1.22 syssrc/sys/arch/i386/conf/DR-EVIL
 > cvs rdiff -r1.360 -r1.361 syssrc/sys/arch/i386/conf/GENERIC
 > cvs rdiff -r1.5 -r1.6 syssrc/sys/arch/i386/conf/IOPENER

- add commented out PCIBIOS_INTR_GUESS.

 Revisions pulled up:
 > cvs rdiff -r1.19 -r1.20 syssrc/sys/arch/i386/conf/CARDBUS
 > cvs rdiff -r1.23 -r1.24 syssrc/sys/arch/i386/conf/DR-EVIL
 > cvs rdiff -r1.364 -r1.365 syssrc/sys/arch/i386/conf/GENERIC
 > cvs rdiff -r1.7 -r1.8 syssrc/sys/arch/i386/conf/IOPENER

diffstat:

 sys/arch/i386/conf/CARDBUS |   9 +++++----
 sys/arch/i386/conf/DR-EVIL |   9 +++++----
 sys/arch/i386/conf/GENERIC |  11 ++++++-----
 sys/arch/i386/conf/IOPENER |  11 ++++++-----
 4 files changed, 22 insertions(+), 18 deletions(-)

diffs (122 lines):

diff -r ef1f53b81f67 -r d5a3134cfeae sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS        Thu Aug 10 23:07:45 2000 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Thu Aug 10 23:10:28 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CARDBUS,v 1.14.2.3 2000/07/27 02:10:46 mycroft Exp $
+#      $NetBSD: CARDBUS,v 1.14.2.4 2000/08/10 23:10:28 soda Exp $
 #
 #      CARDBUS -- GENERIC + CardBus support
 #      from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -228,11 +228,12 @@
 # Configure PCI using BIOS information
 #options       PCIBIOS                 # PCI BIOS support
 #options       PCIBIOSVERBOSE          # PCI BIOS verbose info
+#options       PCIBIOS_ADDR_FIXUP      # fixup PCI I/O addresses
+#options       PCIBIOS_BUS_FIXUP       # fixup PCI bus numbering
 #options       PCIBIOS_INTR_FIXUP      # fixup PCI interrupt routing
-#options       PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
+#options       PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
+#options       PCIBIOS_INTR_GUESS      # see pcibios(4)
 #options       PCIINTR_DEBUG           # super-verbose PCI interrupt fixup
-#options       PCIBIOS_BUS_FIXUP       # fixup PCI bus numbering
-#options       PCIBIOS_ADDR_FIXUP      # fixup PCI I/O addresses
 
 # PCI bridges
 pchb*  at pci? dev ? function ?        # PCI-Host bridges
diff -r ef1f53b81f67 -r d5a3134cfeae sys/arch/i386/conf/DR-EVIL
--- a/sys/arch/i386/conf/DR-EVIL        Thu Aug 10 23:07:45 2000 +0000
+++ b/sys/arch/i386/conf/DR-EVIL        Thu Aug 10 23:10:28 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DR-EVIL,v 1.21 2000/06/16 03:49:12 thorpej Exp $
+#      $NetBSD: DR-EVIL,v 1.21.2.1 2000/08/10 23:10:28 soda Exp $
 #
 #      DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej%netbsd.org@localhost
 #
@@ -237,8 +237,9 @@
 options        PCIBIOS                 # PCI BIOS support
 options        PCIBIOSVERBOSE          # PCI BIOS verbose info
 options        PCIBIOS_INTR_FIXUP      # fixup PCI interrupt routing
-#options       PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
-#options       PCIINTR_DEBUG           # super-verbse PCI interrupt fixup
+#options       PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
+#options       PCIBIOS_INTR_GUESS      # see pcibios(4)
+#options       PCIINTR_DEBUG           # super-verbose PCI interrupt fixup
 options        PCIBIOS_BUS_FIXUP       # fixup PCI bus numbering
 #options       PCIBIOS_ADDR_FIXUP      # fixup PCI I/O addresses
 
@@ -268,7 +269,7 @@
 #pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
 #tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x4000
 
-#options       PCIC_ISA_INTR_ALLOC_MASK="0x8200"
+#options       PCIC_ISA_INTR_ALLOC_MASK=0x8200
 
 # PCI PCMCIA controllers
 #pcic* at pci? dev? function ?
diff -r ef1f53b81f67 -r d5a3134cfeae sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Thu Aug 10 23:07:45 2000 +0000
+++ b/sys/arch/i386/conf/GENERIC        Thu Aug 10 23:10:28 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.354.2.5 2000/08/01 22:35:52 augustss Exp $
+#      $NetBSD: GENERIC,v 1.354.2.6 2000/08/10 23:10:28 soda Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.354.2.5 $"
+#ident                 "GENERIC-$Revision: 1.354.2.6 $"
 
 maxusers       32              # estimated number of users
 
@@ -229,11 +229,12 @@
 # Configure PCI using BIOS information
 #options       PCIBIOS                 # PCI BIOS support
 #options       PCIBIOSVERBOSE          # PCI BIOS verbose info
+#options       PCIBIOS_ADDR_FIXUP      # fixup PCI I/O addresses
+#options       PCIBIOS_BUS_FIXUP       # fixup PCI bus numbering
 #options       PCIBIOS_INTR_FIXUP      # fixup PCI interrupt routing
-#options       PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
+#options       PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
+#options       PCIBIOS_INTR_GUESS      # see pcibios(4)
 #options       PCIINTR_DEBUG           # super-verbose PCI interrupt fixup
-#options       PCIBIOS_BUS_FIXUP       # fixup PCI bus numbering
-#options       PCIBIOS_ADDR_FIXUP      # fixup PCI I/O addresses
 
 # PCI bridges
 pchb*  at pci? dev ? function ?        # PCI-Host bridges
diff -r ef1f53b81f67 -r d5a3134cfeae sys/arch/i386/conf/IOPENER
--- a/sys/arch/i386/conf/IOPENER        Thu Aug 10 23:07:45 2000 +0000
+++ b/sys/arch/i386/conf/IOPENER        Thu Aug 10 23:10:28 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: IOPENER,v 1.3.2.2 2000/07/27 02:10:52 mycroft Exp $
+#      $NetBSD: IOPENER,v 1.3.2.3 2000/08/10 23:10:29 soda Exp $
 #
 #      IOPENER -- GENERIC-like kernel for the Netpliance i-opener
 #      from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -6,7 +6,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "IOPENER-$Revision: 1.3.2.2 $"
+#ident                 "IOPENER-$Revision: 1.3.2.3 $"
 
 maxusers       32              # estimated number of users
 
@@ -191,11 +191,12 @@
 # Configure PCI using BIOS information
 #options       PCIBIOS                 # PCI BIOS support
 #options       PCIBIOSVERBOSE          # PCI BIOS verbose info
+#options       PCIBIOS_ADDR_FIXUP      # fixup PCI I/O addresses
+#options       PCIBIOS_BUS_FIXUP       # fixup PCI bus numbering
 #options       PCIBIOS_INTR_FIXUP      # fixup PCI interrupt routing
-#options       PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
+#options       PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
+#options       PCIBIOS_INTR_GUESS      # see pcibios(4)
 #options       PCIINTR_DEBUG           # super-verbose PCI interrupt fixup
-#options       PCIBIOS_BUS_FIXUP       # fixup PCI bus numbering
-#options       PCIBIOS_ADDR_FIXUP      # fixup PCI I/O addresses
 
 # PCI bridges
 pchb*  at pci? dev ? function ?        # PCI-Host bridges

Prev by Date: [src/netbsd-1-5]: src/share/examples/supfiles Pull up to netbsd-1-5 branch
Next by Date: [src/netbsd-1-5]: src/share/man/man8 Pullup rev 1.37. Approved by thorpej.
Previous by Thread: [src/netbsd-1-5]: src/share/examples/supfiles Pull up to netbsd-1-5 branch
Next by Thread: [src/netbsd-1-5]: src/share/man/man8 Pullup rev 1.37. Approved by thorpej.
Indexes:

Home | Main Index | Thread Index | Old Index