head	1.11;
access;
symbols
	netbsd-11-0-RC5:1.11
	netbsd-11-0-RC4:1.11
	netbsd-11-0-RC3:1.11
	netbsd-11-0-RC2:1.11
	netbsd-11-0-RC1:1.11
	perseant-exfatfs-base-20250801:1.11
	netbsd-11:1.11.0.18
	netbsd-11-base:1.11
	netbsd-10-1-RELEASE:1.11
	perseant-exfatfs-base-20240630:1.11
	perseant-exfatfs:1.11.0.16
	perseant-exfatfs-base:1.11
	netbsd-8-3-RELEASE:1.3
	netbsd-9-4-RELEASE:1.5
	netbsd-10-0-RELEASE:1.11
	netbsd-10-0-RC6:1.11
	netbsd-10-0-RC5:1.11
	netbsd-10-0-RC4:1.11
	netbsd-10-0-RC3:1.11
	netbsd-10-0-RC2:1.11
	thorpej-ifq:1.11.0.14
	thorpej-ifq-base:1.11
	thorpej-altq-separation:1.11.0.12
	thorpej-altq-separation-base:1.11
	netbsd-10-0-RC1:1.11
	netbsd-10:1.11.0.10
	netbsd-10-base:1.11
	bouyer-sunxi-drm:1.11.0.8
	bouyer-sunxi-drm-base:1.11
	netbsd-9-3-RELEASE:1.5
	thorpej-i2c-spi-conf2:1.11.0.6
	thorpej-i2c-spi-conf2-base:1.11
	thorpej-futex2:1.11.0.4
	thorpej-futex2-base:1.11
	thorpej-cfargs2:1.11.0.2
	thorpej-cfargs2-base:1.11
	cjep_sun2x-base1:1.10
	cjep_sun2x:1.10.0.8
	cjep_sun2x-base:1.10
	cjep_staticlib_x-base1:1.10
	netbsd-9-2-RELEASE:1.5
	cjep_staticlib_x:1.10.0.6
	cjep_staticlib_x-base:1.10
	thorpej-i2c-spi-conf:1.10.0.4
	thorpej-i2c-spi-conf-base:1.11
	thorpej-cfargs:1.10.0.2
	thorpej-cfargs-base:1.10
	thorpej-futex:1.9.0.2
	thorpej-futex-base:1.10
	netbsd-9-1-RELEASE:1.5
	bouyer-xenpvh-base2:1.7
	phil-wifi-20200421:1.7
	bouyer-xenpvh-base1:1.7
	phil-wifi-20200411:1.7
	bouyer-xenpvh:1.7.0.4
	bouyer-xenpvh-base:1.7
	is-mlppp:1.7.0.2
	is-mlppp-base:1.7
	phil-wifi-20200406:1.7
	netbsd-8-2-RELEASE:1.3
	ad-namecache-base3:1.7
	netbsd-9-0-RELEASE:1.5
	netbsd-9-0-RC2:1.5
	ad-namecache-base2:1.6
	ad-namecache-base1:1.6
	ad-namecache:1.5.0.6
	ad-namecache-base:1.5
	netbsd-9-0-RC1:1.5
	phil-wifi-20191119:1.5
	netbsd-9:1.5.0.4
	netbsd-9-base:1.5
	phil-wifi-20190609:1.5
	netbsd-8-1-RELEASE:1.3
	netbsd-8-1-RC1:1.3
	isaki-audio2:1.5.0.2
	isaki-audio2-base:1.5
	pgoyette-compat-merge-20190127:1.4.4.1
	pgoyette-compat-20190127:1.5
	pgoyette-compat-20190118:1.5
	pgoyette-compat-1226:1.5
	pgoyette-compat-1126:1.5
	pgoyette-compat-1020:1.5
	pgoyette-compat-0930:1.5
	pgoyette-compat-0906:1.5
	pgoyette-compat-0728:1.4
	netbsd-8-0-RELEASE:1.3
	phil-wifi:1.4.0.6
	phil-wifi-base:1.4
	pgoyette-compat-0625:1.4
	netbsd-8-0-RC2:1.3
	pgoyette-compat-0521:1.4
	pgoyette-compat-0502:1.4
	pgoyette-compat-0422:1.4
	netbsd-8-0-RC1:1.3
	pgoyette-compat-0415:1.4
	pgoyette-compat-0407:1.4
	pgoyette-compat-0330:1.4
	pgoyette-compat-0322:1.4
	pgoyette-compat-0315:1.4
	pgoyette-compat:1.4.0.4
	pgoyette-compat-base:1.4
	tls-maxphys:1.4.0.2
	tls-maxphys-base-20171202:1.4
	matt-nb8-mediatek:1.3.0.12
	matt-nb8-mediatek-base:1.3
	nick-nhusb-base-20170825:1.3
	perseant-stdc-iso10646:1.3.0.10
	perseant-stdc-iso10646-base:1.3
	netbsd-8:1.3.0.8
	netbsd-8-base:1.3
	prg-localcount2-base3:1.3
	prg-localcount2-base2:1.3
	prg-localcount2-base1:1.3
	prg-localcount2:1.3.0.6
	prg-localcount2-base:1.3
	pgoyette-localcount-20170426:1.3
	bouyer-socketcan-base1:1.3
	jdolecek-ncq:1.3.0.4
	jdolecek-ncq-base:1.3
	pgoyette-localcount-20170320:1.3
	nick-nhusb-base-20170204:1.3
	bouyer-socketcan:1.3.0.2
	bouyer-socketcan-base:1.3
	pgoyette-localcount-20170107:1.3
	nick-nhusb-base-20161204:1.1
	pgoyette-localcount-20161104:1.1
	nick-nhusb-base-20161004:1.1
	localcount-20160914:1.1
	pgoyette-localcount-20160806:1.1
	pgoyette-localcount-20160726:1.1
	pgoyette-localcount:1.1.0.4
	pgoyette-localcount-base:1.1
	nick-nhusb-base-20160907:1.1
	nick-nhusb-base-20160529:1.1
	nick-nhusb-base-20160422:1.1
	nick-nhusb:1.1.0.2
	nick-nhusb-base-20160319:1.1;
locks; strict;
comment	@# @;


1.11
date	2021.06.29.10.22.35;	author nia;	state Exp;
branches;
next	1.10;
commitid	QPI2BQJ2iwG0V0ZC;

1.10
date	2021.01.21.06.18.22;	author nia;	state Exp;
branches
	1.10.4.1;
next	1.9;
commitid	nTwUEU5RFKE9GyEC;

1.9
date	2020.08.16.10.27.47;	author jdolecek;	state Exp;
branches
	1.9.2.1;
next	1.8;
commitid	hiElzZTPZjJX4hkC;

1.8
date	2020.05.16.13.46.11;	author maya;	state Exp;
branches;
next	1.7;
commitid	wvQjMNRJMrTmbt8C;

1.7
date	2020.01.29.18.39.01;	author maya;	state Exp;
branches;
next	1.6;
commitid	ZtvQzUFFF7grfCUB;

1.6
date	2020.01.17.05.20.21;	author jklos;	state Exp;
branches;
next	1.5;
commitid	BEJVq8ZiBKdmf0TB;

1.5
date	2018.08.01.20.04.11;	author maxv;	state Exp;
branches
	1.5.6.1;
next	1.4;
commitid	UbIHSaPqOzfNisMA;

1.4
date	2017.11.25.04.53.24;	author christos;	state Exp;
branches
	1.4.2.1
	1.4.4.1
	1.4.6.1;
next	1.3;
commitid	dKBuTpGGax5LgngA;

1.3
date	2016.12.13.20.42.17;	author christos;	state Exp;
branches;
next	1.2;
commitid	DChNb4lHFyTOFRxz;

1.2
date	2016.12.08.11.31.10;	author nat;	state Exp;
branches;
next	1.1;
commitid	r0h4avej48pZLaxz;

1.1
date	2016.03.12.00.41.30;	author jklos;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;
commitid	W8KmmeuceIaMShYy;

1.10.4.1
date	2021.08.01.22.42.07;	author thorpej;	state Exp;
branches;
next	;
commitid	NihqK3haIgTUWj3D;

1.9.2.1
date	2021.04.03.22.28.22;	author thorpej;	state Exp;
branches;
next	;
commitid	1gqS07EfPjskJTNC;

1.5.6.1
date	2020.01.17.21.47.25;	author ad;	state Exp;
branches;
next	1.5.6.2;
commitid	T9pwLWote7xbI5TB;

1.5.6.2
date	2020.02.29.20.18.22;	author ad;	state Exp;
branches;
next	;
commitid	3HPOJ2wqM6gUPBYB;

1.4.2.1
date	2017.11.25.04.53.24;	author jdolecek;	state dead;
branches;
next	1.4.2.2;
commitid	XcIYRZTAh1LmerhA;

1.4.2.2
date	2017.12.03.11.36.03;	author jdolecek;	state Exp;
branches;
next	;
commitid	XcIYRZTAh1LmerhA;

1.4.4.1
date	2018.09.06.06.55.30;	author pgoyette;	state Exp;
branches;
next	;
commitid	HCi1bXD317XIK0RA;

1.4.6.1
date	2019.06.10.22.06.04;	author christos;	state Exp;
branches;
next	1.4.6.2;
commitid	jtc8rnCzWiEEHGqB;

1.4.6.2
date	2020.04.08.14.07.34;	author martin;	state Exp;
branches;
next	;
commitid	Qli2aW9E74UFuA3C;

1.1.2.1
date	2016.03.12.00.41.30;	author skrll;	state dead;
branches;
next	1.1.2.2;
commitid	2PHKtPSg1vDV9fZy;

1.1.2.2
date	2016.03.19.11.29.58;	author skrll;	state Exp;
branches;
next	1.1.2.3;
commitid	2PHKtPSg1vDV9fZy;

1.1.2.3
date	2017.02.05.13.40.07;	author skrll;	state Exp;
branches;
next	;
commitid	8hwpk1aHl2UuyLEz;

1.1.4.1
date	2017.01.07.08.56.13;	author pgoyette;	state Exp;
branches;
next	;
commitid	uEL0C1YuiJrlV0Bz;


desc
@@


1.11
log
@Remove uscanner(4) driver

This exists for compatibility with a Linux interface which was apparently
deprecated in Linux 2.6. There are various mailing list threads going
back to 2004 where the usefulness of this driver is discussed, but
the conclusion is that scanner software has all moved to using ugen(4)
instead, and enabling this driver will not help you scan things.
@
text
@# Configuration file for PogoPlug version 4, Pink and Mobile

include "arch/evbarm/conf/SHEEVAPLUG"

no options	DIAGNOSTIC
no options	DEBUG
no uaudio*
#no umidi*
no uberry*
no uvisor*
no ukyopon*
no usscanner*
no utoppy*
no udsbr*
no radio*
no sbt*
no ubt*
no uep*
no aubtfwl*
no bthub*
no bthidev*
no btms*
no wsmouse*
no ukbd*
no ums*
no btkbd*
no wskbd*
no btmagic*
no btsco*
no audio*
no spkr* at audio?
no config netbsd

# Use ld0 for SD slot in Mobile and v4 or sd0 for USB disk
config netbsd root on ld0a type ?

# Uncomment these for PogoPlug v4. Note that MVSDIO_MAX_CLOCK is mandatory
#options 	MVSDIO_MAX_CLOCK="(19 * 1000)"
#xhci*		at pci? dev ? function ?	# eXtensible Host Controller
#usb*		at xhci?

options 	GATEWAY			# packet forwarding

pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
@


1.10
log
@remove "no options" for compat_ossaudio now it's disabled by default
@
text
@a11 1
#no uscanner*
@


1.10.4.1
log
@Sync with HEAD.
@
text
@d12 1
@


1.9
log
@make COMPAT_LINUX option disabled by default

leave the option enabled only in amd64/i386 ALL kernels to make
sure it continues to be compilable also when included in kernel
@
text
@a4 1
no options	COMPAT_OSSAUDIO
@


1.9.2.1
log
@Sync with HEAD.
@
text
@d5 1
@


1.8
log
@Remove uyap, USB YAP phone firmware loader.

And the associated ezload EZ-USB code, which is only used by uyap.
It could theoretically be used by other drivers, but none of them are
in tree.

I suspect that this device isn't in use, as phone technology has improved
a lot since 2001 when uyap(4) was added to the tree.

Proposed with no objections on netbsd-users on 13 April 2020
@
text
@a5 1
no options	COMPAT_LINUX
@


1.7
log
@remove urio(4), a driver for the Rio500 MP3 player.

At this point it is highly unlikely this 1999 device still has users,
but it still comes up in the context of maxv's USB-fuzzing (and any device
could pretend to be a urio(4)), so it's best to get rid of it.

Renamed all major entries to obsolete, as was done in previous removals.

This still requires an update to sanitizers, but they're located in
"external", perhaps it should be first committed upstream?

Proposed on tech-kern a month ago.
@
text
@a16 1
no uyap*
@


1.6
log
@Remove npf in POGO because it's now in SHEEVAPLUG.
@
text
@a11 1
no urio*
@


1.5
log
@Unreference IPF/PF from all the config files, and enable NPF instead when
wanted. This also fixes some inconsistencies I saw in several files (eg
IPF options while IPF was not compiled, IPF+PF enabled by default, etc).
@
text
@d39 2
a40 2
# Use ld0a for SD slot in Mobile and v4 or sd0a for USB disk
config netbsd root on ld0a type ffs
d43 3
a45 3
options 	MVSDIO_MAX_CLOCK="(19 * 1000)"
xhci*		at pci? dev ? function ?	# eXtensible Host Controller
usb*		at xhci?
d47 1
a47 1
options	GATEWAY		# packet forwarding
d49 3
a51 7
# Uncomment for npf
pseudo-device		npf			# NPF packet filter
options 		BPFJIT

pseudo-device		tun			# network tunneling over tty
pseudo-device		gre			# generic L3 over IP tunnel
pseudo-device		gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
@


1.5.6.1
log
@Sync with head.
@
text
@d39 2
a40 2
# Use ld0 for SD slot in Mobile and v4 or sd0 for USB disk
config netbsd root on ld0a type ?
d43 3
a45 3
#options 	MVSDIO_MAX_CLOCK="(19 * 1000)"
#xhci*		at pci? dev ? function ?	# eXtensible Host Controller
#usb*		at xhci?
d47 1
a47 1
options 	GATEWAY			# packet forwarding
d49 7
a55 3
pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
@


1.5.6.2
log
@Sync with head.
@
text
@d12 1
@


1.4
log
@comment out duplicate options and unknown devices
@
text
@a46 3
# If you plan to use your PogoPlug to do NAT / firewalling, uncomment this
#   and either the ipfilter or the npf section.

a48 5
# Uncomment for ipfilter
#options		IPFILTER_LOG		# ipmon(8) log support
#options		IPFILTER_LOOKUP		# ippool(8) support
#options		IPFILTER_COMPAT		# Compat for IP-Filter

a49 1
no pseudo-device	ipfilter		# IP filter (firewall) and NAT
@


1.4.6.1
log
@Sync with HEAD
@
text
@d47 3
d52 5
d58 1
@


1.4.6.2
log
@Merge changes from current as of 20200406
@
text
@d12 1
d39 2
a40 2
# Use ld0 for SD slot in Mobile and v4 or sd0 for USB disk
config netbsd root on ld0a type ?
d43 3
a45 3
#options 	MVSDIO_MAX_CLOCK="(19 * 1000)"
#xhci*		at pci? dev ? function ?	# eXtensible Host Controller
#usb*		at xhci?
d47 1
a47 1
options 	GATEWAY			# packet forwarding
d49 7
a55 3
pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
@


1.4.4.1
log
@Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)
@
text
@d47 3
d52 5
d58 1
@


1.4.2.1
log
@file POGO was added on branch tls-maxphys on 2017-12-03 11:36:03 +0000
@
text
@d1 64
@


1.4.2.2
log
@update from HEAD
@
text
@a0 64
# Configuration file for PogoPlug version 4, Pink and Mobile

include "arch/evbarm/conf/SHEEVAPLUG"

no options	COMPAT_OSSAUDIO
no options	COMPAT_LINUX
no options	DIAGNOSTIC
no options	DEBUG
no uaudio*
#no umidi*
no uberry*
no urio*
no uvisor*
no ukyopon*
#no uscanner*
no usscanner*
no utoppy*
no uyap*
no udsbr*
no radio*
no sbt*
no ubt*
no uep*
no aubtfwl*
no bthub*
no bthidev*
no btms*
no wsmouse*
no ukbd*
no ums*
no btkbd*
no wskbd*
no btmagic*
no btsco*
no audio*
no spkr* at audio?
no config netbsd

# Use ld0a for SD slot in Mobile and v4 or sd0a for USB disk
config netbsd root on ld0a type ffs

# Uncomment these for PogoPlug v4. Note that MVSDIO_MAX_CLOCK is mandatory
options 	MVSDIO_MAX_CLOCK="(19 * 1000)"
xhci*		at pci? dev ? function ?	# eXtensible Host Controller
usb*		at xhci?

# If you plan to use your PogoPlug to do NAT / firewalling, uncomment this
#   and either the ipfilter or the npf section.

options	GATEWAY		# packet forwarding

# Uncomment for ipfilter
#options		IPFILTER_LOG		# ipmon(8) log support
#options		IPFILTER_LOOKUP		# ippool(8) support
#options		IPFILTER_COMPAT		# Compat for IP-Filter

# Uncomment for npf
no pseudo-device	ipfilter		# IP filter (firewall) and NAT
pseudo-device		npf			# NPF packet filter
options 		BPFJIT

pseudo-device		tun			# network tunneling over tty
pseudo-device		gre			# generic L3 over IP tunnel
pseudo-device		gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
@


1.3
log
@wildcard speaker attachments, now that we can handle many of them.
@
text
@d10 1
a10 1
no umidi*
d15 1
a15 1
no uscanner*
@


1.2
log
@Add a synthesized pc beeper and keyboard bell for platforms with an audio
device.
@
text
@d36 1
a36 1
no spkr0 at audio0
@


1.1
log
@Add kernel configuration file for PogoPlug Pink, PogoPlug Mobile and
PogoPlug v4. Add conditional because PogoPlug v4 can't run SD interface at
50 MHz.
@
text
@d36 1
@


1.1.4.1
log
@Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)
@
text
@a35 1
no spkr* at audio?
@


1.1.2.1
log
@file POGO was added on branch nick-nhusb on 2016-03-19 11:29:58 +0000
@
text
@d1 63
@


1.1.2.2
log
@Sync with HEAD
@
text
@a0 63
# Configuration file for PogoPlug version 4, Pink and Mobile

include "arch/evbarm/conf/SHEEVAPLUG"

no options	COMPAT_OSSAUDIO
no options	COMPAT_LINUX
no options	DIAGNOSTIC
no options	DEBUG
no uaudio*
no umidi*
no uberry*
no urio*
no uvisor*
no ukyopon*
no uscanner*
no usscanner*
no utoppy*
no uyap*
no udsbr*
no radio*
no sbt*
no ubt*
no uep*
no aubtfwl*
no bthub*
no bthidev*
no btms*
no wsmouse*
no ukbd*
no ums*
no btkbd*
no wskbd*
no btmagic*
no btsco*
no audio*
no config netbsd

# Use ld0a for SD slot in Mobile and v4 or sd0a for USB disk
config netbsd root on ld0a type ffs

# Uncomment these for PogoPlug v4. Note that MVSDIO_MAX_CLOCK is mandatory
options 	MVSDIO_MAX_CLOCK="(19 * 1000)"
xhci*		at pci? dev ? function ?	# eXtensible Host Controller
usb*		at xhci?

# If you plan to use your PogoPlug to do NAT / firewalling, uncomment this
#   and either the ipfilter or the npf section.

options	GATEWAY		# packet forwarding

# Uncomment for ipfilter
#options		IPFILTER_LOG		# ipmon(8) log support
#options		IPFILTER_LOOKUP		# ippool(8) support
#options		IPFILTER_COMPAT		# Compat for IP-Filter

# Uncomment for npf
no pseudo-device	ipfilter		# IP filter (firewall) and NAT
pseudo-device		npf			# NPF packet filter
options 		BPFJIT

pseudo-device		tun			# network tunneling over tty
pseudo-device		gre			# generic L3 over IP tunnel
pseudo-device		gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
@


1.1.2.3
log
@Sync with HEAD
@
text
@a35 1
no spkr* at audio?
@