sync

13 files changed, 156 insertions, 52 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 4058d731e68..d3795da3572 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.76 2020/07/06 06:11:26 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.77 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -63,6 +63,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -365,6 +366,12 @@ ulpt*)
 	M ulpt$U c 47 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 72 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 70 $n 666;n=$(($n+1));done
@@ -385,8 +392,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 109caff0ffc..180eaca7f8a 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.76 2020/07/06 06:11:26 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.77 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -63,6 +63,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -408,6 +409,12 @@ ulpt*)
 	M ulpt$U c 64 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 100 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 98 $n 666;n=$(($n+1));done
@@ -428,8 +435,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.arm64/MAKEDEV b/etc/etc.arm64/MAKEDEV
index 01fcd8e624b..94186e832da 100644
--- a/etc/etc.arm64/MAKEDEV
+++ b/etc/etc.arm64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.arm64/MAKEDEV.md,v 1.10 2020/07/06 06:11:26 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.arm64/MAKEDEV.md,v 1.11 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -57,6 +57,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -368,6 +369,12 @@ ulpt*)
 	M ulpt$U c 64 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 100 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 98 $n 666;n=$(($n+1));done
@@ -388,8 +395,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.armv7/MAKEDEV b/etc/etc.armv7/MAKEDEV
index 0fb4a86e7e1..bf67b1b25ed 100644
--- a/etc/etc.armv7/MAKEDEV
+++ b/etc/etc.armv7/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.armv7/MAKEDEV.md,v 1.18 2020/07/06 06:11:26 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.armv7/MAKEDEV.md,v 1.19 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -56,6 +56,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -354,6 +355,12 @@ ulpt*)
 	M ulpt$U c 66 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 108 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 106 $n 666;n=$(($n+1));done
@@ -374,8 +381,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index a8fa05a9071..bae9a5dcd8e 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.65 2020/07/06 06:11:26 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.66 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -59,6 +59,7 @@
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ugen*	Generic USB devices
 #	ulpt*	Printer devices
 #	ttyU*	USB serial ports
@@ -337,6 +338,12 @@ ugen*)
 	done
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 63 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 61 $n 666;n=$(($n+1));done
@@ -354,8 +361,9 @@ usb*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 lpt*|lpa*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 43eedf0002e..71e81008dee 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.91 2020/07/06 06:11:27 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.92 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -62,6 +62,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -412,6 +413,12 @@ ulpt*)
 	M ulpt$U c 64 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 100 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 98 $n 666;n=$(($n+1));done
@@ -432,8 +439,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index 9bc8d7e04e2..09470b84201 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.48 2020/07/06 06:11:27 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.49 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -56,6 +56,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -332,6 +333,12 @@ ulpt*)
 	M ulpt$U c 66 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 108 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 106 $n 666;n=$(($n+1));done
@@ -352,8 +359,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index 01f1e58444c..a47835f9ace 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.32 2020/07/06 06:11:27 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.33 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -57,6 +57,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -330,6 +331,12 @@ ulpt*)
 	M ulpt$U c 64 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 90 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 88 $n 666;n=$(($n+1));done
@@ -350,8 +357,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 233c4a58a1d..8c39dacd509 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.75 2020/07/06 06:11:27 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.76 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -59,6 +59,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -361,6 +362,12 @@ ulpt*)
 	M ulpt$U c 64 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 92 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 90 $n 666;n=$(($n+1));done
@@ -388,8 +395,9 @@ ttyU[0-9a-zA-Z])
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 wsmouse[0-9]*)
diff --git a/etc/etc.octeon/MAKEDEV b/etc/etc.octeon/MAKEDEV
index 6ce5f1dcb4a..44c589cca23 100644
--- a/etc/etc.octeon/MAKEDEV
+++ b/etc/etc.octeon/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.octeon/MAKEDEV.md,v 1.19 2020/07/06 06:11:27 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.octeon/MAKEDEV.md,v 1.20 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -58,6 +58,7 @@
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -312,6 +313,12 @@ audio*)
 	M audioctl$U	c 44 $(($U+192)) 660 _sndiop
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 78 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 76 $n 666;n=$(($n+1));done
@@ -328,8 +335,9 @@ usb*)
 	;;
 
 uall)
-	R ttyU0 ttyU1 ttyU2 ttyU3 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ttyU0 ttyU1 ttyU2 ttyU3 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.powerpc64/MAKEDEV b/etc/etc.powerpc64/MAKEDEV
index 81229f85122..415289ba054 100644
--- a/etc/etc.powerpc64/MAKEDEV
+++ b/etc/etc.powerpc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.powerpc64/MAKEDEV.md,v 1.6 2020/10/24 21:10:41 kettenis Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.powerpc64/MAKEDEV.md,v 1.7 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -57,6 +57,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -350,6 +351,12 @@ ulpt*)
 	M ulpt$U c 65 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 94 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 51 $n 666;n=$(($n+1));done
@@ -370,8 +377,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index 6149d1e304c..bb22e3f7688 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.54 2020/07/06 06:11:27 dlg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.55 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -58,6 +58,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -318,6 +319,12 @@ ulpt*)
 	M ulpt$U c 64 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 78 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 76 $n 666;n=$(($n+1));done
@@ -338,8 +345,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index d9ebe3701e6..88572ac5a30 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.95 2020/07/22 14:04:37 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.111 2020/07/06 06:11:26 dlg Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.96 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -71,6 +71,7 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	fido	fido/* nodes
+#	ujoy	ujoy/* nodes
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
@@ -382,6 +383,12 @@ ulpt*)
 	M ulpt$U c 93 $U 600
 	;;
 
+ujoy)
+	RMlist[${#RMlist[*]}]=";mkdir -p ujoy;rm -f" n=0
+	while [ $n -lt 4 ];do M ujoy/$n c 139 $n 444;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 ujoy"
+	;;
+
 fido)
 	RMlist[${#RMlist[*]}]=";mkdir -p fido;rm -f" n=0
 	while [ $n -lt 4 ];do M fido/$n c 137 $n 666;n=$(($n+1));done
@@ -402,8 +409,9 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 fido uhid0 uhid1 uhid2 uhid3 uhid4
-	R uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R ugen6 ugen7 ulpt0 ulpt1 ujoy fido uhid0 uhid1 uhid2 uhid3
+	R uhid4 uhid5 uhid6 uhid7 usb0 usb1 usb2 usb3 usb4 usb5 usb6
+	R usb7
 	;;
 
 ttyU[0-9a-zA-Z])