Wed Jul 29 11:58:31 2009 UTC ()
Fix (commented out) gpioow usage.


(mbalmer)
diff -r1.939 -r1.940 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.939 -r1.940 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2009/07/29 11:55:40 1.939
+++ src/sys/arch/i386/conf/GENERIC 2009/07/29 11:58:31 1.940
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.939 2009/07/29 11:55:40 mbalmer Exp $ 1# $NetBSD: GENERIC,v 1.940 2009/07/29 11:58:31 mbalmer Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.939 $" 25#ident "GENERIC-$Revision: 1.940 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# For GENERIC, we build the exec formats as modules by default. 29# For GENERIC, we build the exec formats as modules by default.
30no options EXEC_AOUT # exec a.out binaries 30no options EXEC_AOUT # exec a.out binaries
31no options EXEC_ELF32 # exec ELF binaries 31no options EXEC_ELF32 # exec ELF binaries
32no options EXEC_SCRIPT # exec #! scripts 32no options EXEC_SCRIPT # exec #! scripts
33no options COREDUMP 33no options COREDUMP
34 34
35# CPU-related options. 35# CPU-related options.
36options VM86 # virtual 8086 emulation 36options VM86 # virtual 8086 emulation
37options USER_LDT # user-settable LDT; used by WINE 37options USER_LDT # user-settable LDT; used by WINE
38 38
@@ -665,27 +665,28 @@ iic* at piixpm? # SMBus on PIIX4 @@ -665,27 +665,28 @@ iic* at piixpm? # SMBus on PIIX4
665#spdmem* at iic? addr 0x53 665#spdmem* at iic? addr 0x53
666 666
667# I2O devices 667# I2O devices
668iop* at pci? dev ? function ? # I/O processor 668iop* at pci? dev ? function ? # I/O processor
669iopsp* at iop? tid ? # SCSI/FC-AL ports 669iopsp* at iop? tid ? # SCSI/FC-AL ports
670ld* at iop? tid ? # block devices 670ld* at iop? tid ? # block devices
671dpti* at iop? tid 0 # DPT/Adaptec control interface 671dpti* at iop? tid 0 # DPT/Adaptec control interface
672 672
673# GPIO devices 673# GPIO devices
674#gpio* at gscpcib? 674#gpio* at gscpcib?
675#gpio* at gpiosim? 675#gpio* at gpiosim?
676 676
677# 1-Wire support 677# 1-Wire support
678#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio 678#gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio
 679#gpioow* at gpio?
679#onewire* at gpioow? 680#onewire* at gpioow?
680 681
681# 1-Wire devices 682# 1-Wire devices
682#owtemp* at onewire? # Temperature sensors 683#owtemp* at onewire? # Temperature sensors
683 684
684# SCSI Controllers and Devices 685# SCSI Controllers and Devices
685 686
686# PCI SCSI controllers 687# PCI SCSI controllers
687adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI 688adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
688adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI 689adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
689ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI 690ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
690ahd* at pci? dev ? function ? # Adaptec 29320, 39320 (aic790x) SCSI 691ahd* at pci? dev ? function ? # Adaptec 29320, 39320 (aic790x) SCSI
691bha* at pci? dev ? function ? # BusLogic 9xx SCSI 692bha* at pci? dev ? function ? # BusLogic 9xx SCSI