Move the remaining entries from usbd.conf to devd.conf. This now

makes usbd redundant.

PR:		conf/73799
Submitted by:	Anish Mistry

2 files changed, 29 insertions, 28 deletions

diff --git a/etc/devd.conf b/etc/devd.conf
index 7c01828..0c4ed14 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -113,6 +113,35 @@ attach 100 {
 	action "/etc/rc.d/moused start $device-name";
 };
 
+# Firmware download into the ActiveWire board. After the firmware download is
+# done the device detaches and reappears as something new and shiny
+# automatically.
+attach 100 {
+	match "vendor"	"0x0854";
+	match "product"	"0x0100";
+	match "release"	"0x0000";
+	action "/usr/local/bin/ezdownload -f /usr/local/share/usb/firmware/0854.0100.0_01.hex $device-name";
+};
+
+# Firmware download for Entrega Serial DB25 adapter.
+attach 100 {
+	match "vendor"	"0x1645";
+	match "product"	"0x8001";
+	match "release"	"0x0101";
+	action "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi /usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/$device-name";
+};
+
+# This entry starts the ColdSync tool in daemon mode. Make sure you have an up
+# to date /usr/local/etc/palms. We override the 'listen' settings for port and
+# type in /usr/local/etc/coldsync.conf.
+attach 100 {
+	device-name "ugen[0-9]+";
+	match "vendor" "0x082d";
+	match "product" "0x0100";
+	match "release" "0x0100";
+	action "/usr/local/bin/coldsync -md -p /dev/$device-name -t usb";
+};
+
 #
 # Rescan scsi device-names on attach, but not detach.  However, it is
 # disabled by default due to reports of problems.
diff --git a/etc/usbd.conf b/etc/usbd.conf
index fca2aff..4737c72 100644
--- a/etc/usbd.conf
+++ b/etc/usbd.conf
@@ -4,34 +4,6 @@
 #
 # $FreeBSD$
 
-# Firmware download into the ActiveWire board. After the firmware download is
-# done the device detaches and reappears as something new and shiny automatically.
-#
-device "ActiveWire board, firmware download"
-	vendor  0x0854
-	product 0x0100
-	release 0x0000
-	attach "/usr/local/bin/ezdownload -f /usr/local/share/usb/firmware/0854.0100.0_01.hex ${DEVNAME}"
-
-# Firmware download for Entrega Serial DB25 adapter.
-#
-device "Entrega Serial with UART"
-	product 0x8001
-	vendor  0x1645
-	release 0x0101
-	attach "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi"
-	attach "/usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/${DEVNAME}"
-
-# This entry starts the ColdSync tool in daemon mode. Make sure you have an up
-# to date /usr/local/etc/palms. We override the 'listen' settings for port and
-# type in /usr/local/etc/coldsync.conf.
-device "Handspring Visor"
-        devname "ugen[0-9]+"
-        vendor  0x082d
-        product 0x0100
-        release 0x0100
-        attach "/usr/local/bin/coldsync -md -p /dev/${DEVNAME} -t usb"
-
 # The fallthrough entry: Nothing is specified, nothing is done.  And it isn't
 # necessary at all :-).  Just for pretty printing in debugging mode.
 #