From cd0c9b1f7e5aa54251768cbf8e6f6e56358dba5e Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 14 Apr 2004 02:25:31 +0000 Subject: sx was randomly added to NOTES. Instead, place it in the misc hardware in properly sorted order. Fix a little disorder while I'm here. Submitted by: bde --- sys/i386/conf/NOTES | 7 +++---- sys/pc98/conf/NOTES | 15 +++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index a93a49d..ba779ca 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -681,6 +681,9 @@ device digi_Xr device spic hint.spic.0.at="isa" hint.spic.0.port="0x10a0" +# sx device is i386 and pc98 only at the moment. +device sx +options SX_DEBUG # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu @@ -931,10 +934,6 @@ device "i4bcapi" # #--------------------------------------------------------------------------- -# sx device is i386 and pc98 only at the moment. -device sx -options SX_DEBUG - # # Set the number of PV entries per process. Increasing this can # stop panics related to heavy use of shared memory. However, that can diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES index eb2b051..bdb008e 100644 --- a/sys/pc98/conf/NOTES +++ b/sys/pc98/conf/NOTES @@ -467,10 +467,6 @@ device apm hint.apm.0.flags="0x20" device canbus device canbepm -device pmc -hint.pmc.0.at="isa" -hint.pmc.0.port="0x8f0" -device pmtimer # Adjust system timer at wakeup time device cy 1 options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi @@ -485,6 +481,13 @@ device digi_Xr device olpt hint.olpt.0.at="isa" hint.olpt.0.port="0x040" +device pmc +hint.pmc.0.at="isa" +hint.pmc.0.port="0x8f0" +device pmtimer # Adjust system timer at wakeup time +# sx device is i386 and pc98 only at the moment. +device sx +options SX_DEBUG # # Laptop/Notebook options: @@ -639,10 +642,6 @@ device "i4bcapi" # #--------------------------------------------------------------------------- -# sx device is i386 and pc98 only at the moment. -device sx -options SX_DEBUG - # # Set the number of PV entries per process. Increasing this can # stop panics related to heavy use of shared memory. However, that can -- cgit v1.1