From 0b58f8252ddc218585e959a8b8f8a5e6b269a4d9 Mon Sep 17 00:00:00 2001
From: Alexander Yurchenko <grange@cvs.openbsd.org>
Date: Wed, 27 Sep 2006 08:54:45 +0000
Subject: Add Maxim/Dallas DS2490 USB 1-Wire adapter driver.

---
 sys/arch/alpha/conf/GENERIC   |  9 ++++++++-
 sys/arch/amd64/conf/GENERIC   |  9 ++++++++-
 sys/arch/armish/conf/GENERIC  |  9 ++++++++-
 sys/arch/cats/conf/GENERIC    |  9 ++++++++-
 sys/arch/hppa/conf/GENERIC    |  9 ++++++++-
 sys/arch/hppa64/conf/GENERIC  |  9 ++++++++-
 sys/arch/i386/conf/GENERIC    | 11 +++++++----
 sys/arch/macppc/conf/GENERIC  |  9 ++++++++-
 sys/arch/sparc64/conf/GENERIC |  9 ++++++++-
 sys/arch/zaurus/conf/GENERIC  |  9 ++++++++-
 10 files changed, 79 insertions(+), 13 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 11a7567d79b..a426da5dddb 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.183 2006/09/27 04:48:34 brad Exp $
+#	$OpenBSD: GENERIC,v 1.184 2006/09/27 08:54:44 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -124,6 +124,8 @@ radio*	at udsbr?			# USB radio
 ugen*	at uhub?			# USB Generic driver
 ural*	at uhub?			# Ralink RT2500USB
 rum*	at uhub?			# Ralink RT2501USB/RT2601USB
+uow*	at uhub?			# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
 
 # EV6 Tsunami Core Logic
 tsc*	at	mainbus0
@@ -417,6 +419,11 @@ ubsec*	at pci?				# Bluesteel Networks 5xxx crypto card
 safe*	at pci?				# SafeNet SafeXcel 1141/1741
 #ises*	at pci?				# Pijnenburg PCC-ISES
 
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid*	at onewire?			# ID
+owtemp* at onewire?			# Temperature
+
 #pseudo-device	raid		4	# RAIDframe disk driver
 pseudo-device	crypto		1
 pseudo-device	sequencer	1
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index af90636f505..39dcd52ad10 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.156 2006/09/19 22:11:19 mglocker Exp $
+#	$OpenBSD: GENERIC,v 1.157 2006/09/27 08:54:44 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -195,6 +195,8 @@ radio*	at udsbr?		# USB radio
 ugen*	at uhub?		# USB Generic driver
 ural*	at uhub?		# Ralink RT2500USB
 rum*	at uhub?		# Ralink RT2501USB/RT2601USB
+uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
 
 puc*	at pci?			# PCI "universal" communication device
 #puc*	at cardbus?
@@ -488,6 +490,11 @@ scsibus* at ioprbs?
 iopsp*	at iop?			# I2O SCSI pass-through
 scsibus* at iopsp?
 
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid*	at onewire?		# ID
+owtemp* at onewire?		# Temperature
+
 pseudo-device	sequencer	1
 #pseudo-device	raid		4	# RAIDframe disk driver
 pseudo-device	bio		1	# ioctl multiplexing device
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 8ee8af7a0c1..210941951b7 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.11 2006/08/26 10:47:34 kettenis Exp $ 
+# $OpenBSD: GENERIC,v 1.12 2006/09/27 08:54:44 grange Exp $ 
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -144,6 +144,8 @@ ugen*	at uhub?		# USB Generic driver
 ural*	at uhub?		# Ralink RT2500USB
 rum*	at uhub?		# Ralink RT2501USB/RT2601USB
 #udcf*	at uhub?		# Gude Expert mouseCLOCK
+uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
 
 amphy*		at mii?		# AMD 79C873 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
@@ -171,6 +173,11 @@ rlphy*		at mii?		# Realtek 8139 internal PHYs
 ciphy*		at mii?		# Cicada CS8201 10/100/1000 copper PHY
 ukphy*		at mii?		# generic unknown PHYs
 
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid*	at onewire?		# ID
+owtemp* at onewire?		# Temperature
+
 # mouse & keyboard multiplexor pseudo-devices
 #pseudo-device	wsmux		2
 pseudo-device	crypto		1
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 6337a3adbb4..e0d49db6b27 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.34 2006/08/18 23:14:43 jason Exp $
+#	$OpenBSD: GENERIC,v 1.35 2006/09/27 08:54:44 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -217,6 +217,8 @@ udsbr*	at uhub?		# D-Link DSB-R100 radio
 radio*	at udsbr?		# USB radio
 #ubt*	at uhub?		# USB Bluetooth
 ugen*	at uhub?		# USB Generic driver
+uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
 
 # Audio Devices
 
@@ -304,6 +306,11 @@ midi*	at pcppi?		# MIDI interface to the PC speaker
 
 hifn*	at pci?			# Hi/fn 7751 crypto card
 
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid*	at onewire?		# ID
+owtemp* at onewire?		# Temperature
+
 # Pseudo-Devices
 pseudo-device	wsmux		2	# mouse & keyboard multiplexor
 pseudo-device	crypto		1
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 85e6974d17a..3a6dc93f630 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.88 2006/08/18 23:14:43 jason Exp $
+#	$OpenBSD: GENERIC,v 1.89 2006/09/27 08:54:44 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -156,6 +156,8 @@ radio*	at udsbr?		# USB radio
 ugen*	at uhub?		# USB Generic driver
 ural*	at uhub?		# Ralink RT2500USB
 rum*	at uhub?		# Ralink RT2501USB/RT2601USB
+uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
 
 sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
 sti0	at phantomas0 irq 11	# builtin graphics on BC*
@@ -315,5 +317,10 @@ safte*	at scsibus?
 ses*	at scsibus?
 uk*	at scsibus?
 
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid*	at onewire?		# ID
+owtemp* at onewire?		# Temperature
+
 pseudo-device	hotplug	1	# devices hot plugging
 pseudo-device	wsmux	2	# mouse and keyboard multiplexor
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC
index 3c9935ba5e9..dbb2a28c592 100644
--- a/sys/arch/hppa64/conf/GENERIC
+++ b/sys/arch/hppa64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.11 2006/08/14 08:34:21 jsg Exp $
+#	$OpenBSD: GENERIC,v 1.12 2006/09/27 08:54:44 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -118,6 +118,8 @@ pci*	at ppb?
 #udsbr*	at uhub?		# D-Link DSB-R100 radio
 #radio*	at udsbr?		# USB radio
 #ugen*	at uhub?		# USB Generic driver
+#uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+#onewire* at uow?
 
 #sti*	at pci?			# EG-PCI, FX*
 #wsdisplay*	at sti?
@@ -190,4 +192,9 @@ ukphy*		at mii?		# generic unknown PHYs
 #safte*	at scsibus?
 #ses*	at scsibus?
 
+# 1-Wire devices
+#option ONEWIREVERBOSE
+#owid*	at onewire?		# ID
+#owtemp* at onewire?		# Temperature
+
 #pseudo-device	wsmux	2	# mouse and keyboard multiplexor
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a892cf1c2cf..4cf6779b8a1 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.525 2006/09/16 13:21:24 damien Exp $
+#	$OpenBSD: GENERIC,v 1.526 2006/09/27 08:54:44 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -73,7 +73,6 @@ pci*	at mainbus0
 option		PCIVERBOSE
 option		EISAVERBOSE
 option		USBVERBOSE
-option		ONEWIREVERBOSE
 
 pchb*	at pci?			# PCI-Host bridges
 ppb*	at pci?			# PCI-PCI bridges
@@ -248,6 +247,9 @@ rum*	at uhub?		# Ralink RT2501USB/RT2601USB
 #option	NATM
 #ueagle* at uhub?		# Analog Devices Eagle ADSL
 udcf*	at uhub?		# Gude Expert mouseCLOCK
+uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
+
 puc*	at pci?			# PCI "universal" communication device
 #puc*	at cardbus?
 
@@ -680,8 +682,9 @@ scsibus* at iopsp?
 #onewire* at gpioow?
 
 # 1-Wire devices
-#owid*	at onewire?			# ID
-#owtemp* at onewire?			# Temperature
+option ONEWIREVERBOSE
+owid*	at onewire?		# ID
+owtemp* at onewire?		# Temperature
 
 pseudo-device	pctr		1
 pseudo-device	mtrr		1	# Memory range attributes control
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 8c41a664b60..7703bf23776 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.150 2006/08/18 23:14:43 jason Exp $g
+#	$OpenBSD: GENERIC,v 1.151 2006/09/27 08:54:44 grange Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -271,6 +271,8 @@ ugen*	at uhub?		# USB Generic driver
 ural*	at uhub?		# Ralink RT2500USB
 rum*	at uhub?		# Ralink RT2501USB/RT2601USB
 udcf*	at uhub?		# Gude Expert mouseCLOCK
+uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
 
 # I2C bus support
 iic*		at ki2c?
@@ -333,5 +335,10 @@ safte*		at scsibus?
 ses*		at scsibus?
 uk*		at scsibus?
 
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid*	at onewire?		# ID
+owtemp* at onewire?		# Temperature
+
 pseudo-device	hotplug	1	# devices hot plugging
 pseudo-device	wsmux	2	# mouse & keyboard multiplexor
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 6710f804957..b24906937b2 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.158 2006/09/27 07:18:14 brad Exp $
+#	$OpenBSD: GENERIC,v 1.159 2006/09/27 08:54:44 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -185,6 +185,8 @@ radio*	at udsbr?		# USB radio
 #ubt*	at uhub?		# USB Bluetooth
 ugen*	at uhub?		# USB Generic driver
 udcf*	at uhub?		# Gude Expert mouseCLOCK
+uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
 
 #### Standard system devices -- all required for a given architecture
 
@@ -396,6 +398,11 @@ fdc*	at sbus?
 #fdc*	at ebus?
 fd*	at fdc?
 
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid*	at onewire?			# ID
+owtemp* at onewire?			# Temperature
+
 pseudo-device	hotplug	1		# devices hot plugging
 
 # mouse & keyboard multiplexor pseudo-devices
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 6a8d34b3c27..a4a7b1d265f 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.53 2006/08/18 23:14:43 jason Exp $
+#	$OpenBSD: GENERIC,v 1.54 2006/09/27 08:54:44 grange Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -127,6 +127,8 @@ udsbr*		at uhub?		# D-Link DSB-R100 radio
 radio*		at udsbr?		# USB radio
 #ubt*		at uhub?		# USB Bluetooth
 ugen*		at uhub?		# USB Generic driver
+uow*		at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
+onewire* at uow?
 
 sd*		at scsibus?		# SCSI disk drives
 #st*		at scsibus?		# SCSI tape drives
@@ -194,6 +196,11 @@ audio*		at zaudio?
 zrc0		at pxaip?		# Zaurus remote control
 wskbd*		at zrc? mux 1
 
+# 1-Wire devices
+option ONEWIREVERBOSE
+owid*	at onewire?			# ID
+owtemp* at onewire?			# Temperature
+
 # Pseudo-Devices
 pseudo-device	wsmux		2	# mouse & keyboard multiplexor
 pseudo-device	hotplug		1	# devices hot plugging
-- 
cgit v1.2.3