A number of places in the source tree still reference cuad.* after

sio(4) was deprecated by uart(4).

s/cuad/cuau/g/

PR:		docs/171533
Reviewed by:	imp
Approved by:	cperciva (implicit)
MFC after:	3 weeks

19 files changed, 50 insertions, 50 deletions

diff --git a/release/picobsd/floppy.tree/etc/ppp/ppp.conf b/release/picobsd/floppy.tree/etc/ppp/ppp.conf
index 30981ef..e9ddabf 100644
--- a/release/picobsd/floppy.tree/etc/ppp/ppp.conf
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.conf
@@ -2,7 +2,7 @@
 #  	PPP  Sample Configuration File
 #	  Written by Toshiharu OHNO
 default:
- set device /dev/cuad1
+ set device /dev/cuau1
  set speed 38400
  disable lqr
  deny lqr
diff --git a/release/picobsd/mfs_tree/etc/remote b/release/picobsd/mfs_tree/etc/remote
index f881f6b..523a4c2 100644
--- a/release/picobsd/mfs_tree/etc/remote
+++ b/release/picobsd/mfs_tree/etc/remote
@@ -41,10 +41,10 @@ dos1200|1200 Baud dial-out to a DOS system:\
 # Rackmount:	U U D U D U D D U D
 #
 dial2400|2400 Baud Hayes attributes:\
-	:dv=/dev/cuad0:br#2400:cu=/dev/cuad0:at=hayes:du:
+	:dv=/dev/cuau0:br#2400:cu=/dev/cuau0:at=hayes:du:
 dial1200|1200 Baud Hayes attributes:\
-	:dv=/dev/cuad0:br#1200:cu=/dev/cuad0:at=hayes:du:
+	:dv=/dev/cuau0:br#1200:cu=/dev/cuau0:at=hayes:du:
 
 # Hardwired line
-cuad0b|cua0b:dv=/dev/cuad0:br#2400
-cuad0c|cua0c:dv=/dev/cuad0:br#9600
+cuau0b|cua0b:dv=/dev/cuau0:br#2400
+cuau0c|cua0c:dv=/dev/cuau0:br#9600
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 87a7630..ec12dee 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -49,7 +49,7 @@ startup script.
 .Bl -tag -width /dev/ttyd? -compact
 .It Pa /dev/ttyd?
 dialin devices, hardwired terminals
-.It Pa /dev/cuad?
+.It Pa /dev/cuau?
 dialout devices
 .El
 .Sh SEE ALSO
diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample
index 7863eaa..2572644 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -29,7 +29,7 @@
 #
 default:
  set log Phase Chat LCP IPCP CCP tun command
- set device /dev/cuad1
+ set device /dev/cuau1
  set speed 115200
  set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \"\" AT \
            OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT"
@@ -145,7 +145,7 @@ TA:
  set timeout 60 300	# The minimum charge period is 5 minutes, so don't
 			# hangup before then
 
- set device /dev/cuad0	# Or whatever
+ set device /dev/cuau0	# Or whatever
  set speed 115200	# Use as high a speed as possible
 
  enable dns		# Ask the peer what to put in resolv.conf
@@ -315,7 +315,7 @@ dodgy:
 dodgynet:
     set log Phase                               # Log link uptime
     allow mode auto                             # For autoconnect only
-    set device /dev/cuad1                       # Define modem device and speed
+    set device /dev/cuau1                       # Define modem device and speed
     set speed 115200
     deny lqr                                    # Don't support LQR
     set phone 0W1194                            # Remote system phone number,
@@ -472,7 +472,7 @@ radius-server:
 #
 direct-client:
  set dial
- set device /dev/cuad0
+ set device /dev/cuau0
  set sp 115200
  set timeout 900
  set lqrperiod 10
@@ -651,7 +651,7 @@ callback-server:
  set cbcp
  set log +cbcp
  set redial 3 1
- set device /dev/cuad0
+ set device /dev/cuau0
  set speed 115200
  set dial "TIMEOUT 10 \"\" AT OK-AT-OK ATDT\\T CONNECT"
 
@@ -678,7 +678,7 @@ callback-server-client-decides:
 #
 mloop:
  load loop
- set device /dev/cuad0 /dev/cuad1 /dev/cuad2   # Use any of these devices
+ set device /dev/cuau0 /dev/cuau1 /dev/cuau2   # Use any of these devices
  set mode interactive
  set mrru 1500
  set mru 1504                                  # Room for the MP header
diff --git a/share/examples/ppp/ppp.conf.span-isp b/share/examples/ppp/ppp.conf.span-isp
index 446cee3..11084de 100644
--- a/share/examples/ppp/ppp.conf.span-isp
+++ b/share/examples/ppp/ppp.conf.span-isp
@@ -104,7 +104,7 @@
 
 default:
   set speed 115200
-  set device /dev/cuad0 /dev/cuad1 /dev/cuad2 /dev/cuad3
+  set device /dev/cuau0 /dev/cuau1 /dev/cuau2 /dev/cuau3
   set dial "ABORT BUSY ABORT NO\\sCARRIER ABORT NO\\sDIAL\\sTONE TIMEOUT 4 \
             \"\" ATZ OK-ATZ-OK ATDT\\T TIMEOUT 60 CONNECT \\c \\n"
   set login
diff --git a/share/man/man4/gdb.4 b/share/man/man4/gdb.4
index 3a502c8..f81ef40 100644
--- a/share/man/man4/gdb.4
+++ b/share/man/man4/gdb.4
@@ -252,7 +252,7 @@ Finally, establish connection:
 GNU gdb 5.2.1 (FreeBSD)
 .Em "(political statements omitted)"
 Ready to go.  Enter 'tr' to connect to the remote target
-with /dev/cuad0, 'tr /dev/cuad1' to connect to a different port
+with /dev/cuau0, 'tr /dev/cuau1' to connect to a different port
 or 'trf portno' to connect to the remote target with the firewire
 interface.  portno defaults to 5556.
 
@@ -370,10 +370,10 @@ instead.
 Debug a remote system via the specified serial or firewire interface.
 .It Ic tr0
 Debug a remote system via serial interface
-.Pa /dev/cuad0 .
+.Pa /dev/cuau0 .
 .It Ic tr1
 Debug a remote system via serial interface
-.Pa /dev/cuad1 .
+.Pa /dev/cuau1 .
 .It Ic trf
 Debug a remote system via firewire interface at default port 5556.
 .El
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index f50fc01..816936a 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -379,7 +379,7 @@ command.
 .El
 .Sh FILES
 .Bl -tag -width /dev/sysmouseXX -compact
-.It Pa /dev/cuad%d
+.It Pa /dev/cuau%d
 serial ports
 .It Pa /dev/mse%d
 bus and InPort mouse device
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index d9497b9..5024b2c 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -3324,7 +3324,7 @@ is set to
 .Dq Li YES ,
 this is the actual port the mouse is on.
 It might be
-.Pa /dev/cuad0
+.Pa /dev/cuau0
 for a COM1 serial mouse,
 .Pa /dev/psm0
 for a PS/2 mouse or
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 666608d..1eb9bfc 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -194,7 +194,7 @@ the phone number for arpavax (in this case an @ character so that it
 is retrieved from the environment).
 .Bd -literal
 UNIX-57600:\e
-:dv=/dev/cuad0:el=^D^U^C^S^Q^O@:oe=^D:du:at=hayes:br#115200:pa=none:
+:dv=/dev/cuau0:el=^D^U^C^S^Q^O@:oe=^D:du:at=hayes:br#115200:pa=none:
 arpavax|ax:\e
 :pn=\e@:tc=UNIX-57600
 .Ed
diff --git a/tools/debugscripts/dot.gdbinit b/tools/debugscripts/dot.gdbinit
index e57ac16..1a340c0 100644
--- a/tools/debugscripts/dot.gdbinit
+++ b/tools/debugscripts/dot.gdbinit
@@ -36,16 +36,16 @@ target remote $arg0
 end
 
 document tr
-Debug a remote system via serial or firewire interface.  For example, specify 'tr /dev/cuad0' to use first serial port, or 'tr localhost:5556' for default firewire port.  See also tr0, tr1 and trf commands.
+Debug a remote system via serial or firewire interface.  For example, specify 'tr /dev/cuau0' to use first serial port, or 'tr localhost:5556' for default firewire port.  See also tr0, tr1 and trf commands.
 end
 
 # Convenience functions.  These call tr.
-# debug via cuad0
+# debug via cuau0
 define tr0
-tr /dev/cuad0
+tr /dev/cuau0
 end
 define tr1
-tr /dev/cuad1
+tr /dev/cuau1
 end
 # Firewire
 define trf
@@ -53,10 +53,10 @@ tr localhost:5556
 end
 
 document tr0
-Debug a remote system via serial interface /dev/cuad0.  See also tr, tr1 and trf commands.
+Debug a remote system via serial interface /dev/cuau0.  See also tr, tr1 and trf commands.
 end
 document tr1
-Debug a remote system via serial interface /dev/cuad1.  See also tr, tr0 and trf commands.
+Debug a remote system via serial interface /dev/cuau1.  See also tr, tr0 and trf commands.
 end
 document trf
 Debug a remote system via firewire interface at default port 5556.  See also tr, tr0 and tr1 commands.
@@ -107,7 +107,7 @@ source gdbinit.kernel
 source gdbinit.machine
 
 echo Ready to go.  Enter 'tr' to connect to the remote target\n
-echo with /dev/cuad0, 'tr /dev/cuad1' to connect to a different port\n
+echo with /dev/cuau0, 'tr /dev/cuau1' to connect to a different port\n
 echo or 'trf portno' to connect to the remote target with the firewire\n
 echo interface.  portno defaults to 5556.\n
 echo \n
diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile
index f0110ed..5c4a065 100644
--- a/tools/test/ppsapi/Makefile
+++ b/tools/test/ppsapi/Makefile
@@ -8,4 +8,4 @@ WARNS?=	5
 .include <bsd.prog.mk>
 
 test:	${PROG}
-	./${PROG} /dev/cuad0
+	./${PROG} /dev/cuau0
diff --git a/tools/test/ppsapi/README b/tools/test/ppsapi/README
index ad8dacf..ea0c3e8 100644
--- a/tools/test/ppsapi/README
+++ b/tools/test/ppsapi/README
@@ -16,7 +16,7 @@ Options:
 
 The output looks like:
 
-# ./ppsapitest -C /dev/cuad4
+# ./ppsapitest -C /dev/cuau4
 1070915603 .703680117 119 1070915940 .902275676 121
 1070915941 .703657317 120 1070915941 .902327516 122
 1070915942 .703657077 121 1070915942 .902367957 123
@@ -36,7 +36,7 @@ Columns:
 (If the -C option had not been specified, twice as many lines would
 be output:
 
-# ./ppsapitest /dev/cuad4
+# ./ppsapitest /dev/cuau4
 1070916432 .703624557 125 1070915945 .902527078 126
 1070916432 .703624557 125 1070916432 .902303156 127
 1070916433 .703624557 126 1070916432 .902303156 127
diff --git a/usr.bin/tip/tip/cu.1 b/usr.bin/tip/tip/cu.1
index b67b19d..aba5c40 100644
--- a/usr.bin/tip/tip/cu.1
+++ b/usr.bin/tip/tip/cu.1
@@ -69,9 +69,9 @@ Echo characters locally (half-duplex mode).
 .It Fl l Ar line
 Specify the line to use.
 Either of the forms like
-.Pa cuad0
+.Pa cuau0
 or
-.Pa /dev/cuad0
+.Pa /dev/cuau0
 are permitted.
 .It Fl o
 Use odd parity.
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.8 b/usr.sbin/bluetooth/hcseriald/hcseriald.8
index 111b28c..8d2dd47 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.8
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.8
@@ -54,7 +54,7 @@ Do not disassociate from the controlling terminal, i.e., run in foreground.
 .It Fl f Ar device
 Callout device name.
 Example:
-.Fl f Pa /dev/cuad0 .
+.Fl f Pa /dev/cuau0 .
 .It Fl h
 Display usage message and exit.
 .It Fl n Ar node_name
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.c b/usr.sbin/bluetooth/hcseriald/hcseriald.c
index b811c1d..440b0d4 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.c
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.c
@@ -257,7 +257,7 @@ usage(void)
 {
 	fprintf(stderr, "Usage: %s -f device -n node_name [-s speed -d -h]\n" \
 			"Where:\n" \
-			"\t-f device    tty device name, ex. /dev/cuad1\n" \
+			"\t-f device    tty device name, ex. /dev/cuau1\n" \
 			"\t-n node_name set Netgraph node name to node_name\n" \
 			"\t-s speed     set tty speed, ex. 115200\n" \
 			"\t-d           run in foreground\n" \
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 30b2200..5e4dd43 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -296,7 +296,7 @@ information are:
 .Bl -tag -compact -width modelxxx
 .It Ar port
 Port (device file) name, i.e.\&
-.Pa /dev/cuad0 ,
+.Pa /dev/cuau0 ,
 .Pa /dev/mse0
 and
 .Pa /dev/psm0 .
@@ -564,7 +564,7 @@ There may be more than one serial port to which the serial
 mouse can be attached.
 Many people often assign the first, built-in
 serial port
-.Pa /dev/cuad0
+.Pa /dev/cuau0
 to the mouse.
 You can attach multiple USB mice to your system or to your USB hub.
 They are accessible as
@@ -731,16 +731,16 @@ utility
 UNIX-domain stream socket for X10 MouseRemote events
 .El
 .Sh EXAMPLES
-.Dl "moused -p /dev/cuad0 -i type"
+.Dl "moused -p /dev/cuau0 -i type"
 .Pp
 Let the
 .Nm
 utility determine the protocol type of the mouse at the serial port
-.Pa /dev/cuad0 .
+.Pa /dev/cuau0 .
 If successful, the command will print the type, otherwise it will say
 .Dq Li unknown .
 .Bd -literal -offset indent
-moused -p /dev/cuad0
+moused -p /dev/cuau0
 vidcontrol -m on
 .Ed
 .Pp
diff --git a/usr.sbin/ppp/README.changes b/usr.sbin/ppp/README.changes
index bf626e3..4ed3da6 100644
--- a/usr.sbin/ppp/README.changes
+++ b/usr.sbin/ppp/README.changes
@@ -53,7 +53,7 @@ o Errors in `add' and `delete' are logged as warnings rather than being
   written to the TCP/IP log.
 o Any number of diagnostic prompts are allowed, and they are allowed in
   interactive mode.
-o The default `device' is cuad1, then cuad0
+o The default `device' is cuau1, then cuau0
 o A password of "*" in ppp.secret causes a passwd database lookup in
   pap mode.
 o The value of the CONNECT environment variable is logged in the
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index f56ee32..d7cc799 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -30,7 +30,7 @@
 
 /* Check the following definitions for your machine environment */
 #ifdef __FreeBSD__
-# define  MODEM_LIST	"/dev/cuad1\0/dev/cuad0"	/* name of tty device */
+# define  MODEM_LIST	"/dev/cuau1\0/dev/cuau0"	/* name of tty device */
 #else
 # ifdef __OpenBSD__
 #  define MODEM_LIST	"/dev/cua01\0/dev/cua00"	/* name of tty device */
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index 7d3f6d2..91b9c51 100644
--- a/usr.sbin/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp.8.m4
@@ -551,7 +551,7 @@ and have not authenticated yourself using the correct password.
 .Pp
 You can start by specifying the device name and speed:
 .Bd -literal -offset indent
-ppp ON awfulhak> set device /dev/cuad0
+ppp ON awfulhak> set device /dev/cuau0
 ppp ON awfulhak> set speed 38400
 .Ed
 .Pp
@@ -610,7 +610,7 @@ Name: deflink
  Phone Number:    N/A
 
 Defaults:
- Device List:     /dev/cuad0
+ Device List:     /dev/cuau0
  Characteristics: 38400bps, cs8, even parity, CTS/RTS on
 
 Connect time: 0 secs
@@ -1216,10 +1216,10 @@ It is usually also necessary to train your modem to the same DTR speed
 as the getty:
 .Bd -literal -offset indent
 # ppp
-ppp ON awfulhak> set device /dev/cuad1
+ppp ON awfulhak> set device /dev/cuau1
 ppp ON awfulhak> set speed 38400
 ppp ON awfulhak> term
-deflink: Entering terminal mode on /dev/cuad1
+deflink: Entering terminal mode on /dev/cuau1
 Type `~?' for help
 at
 OK
@@ -2164,7 +2164,7 @@ and
 .Dq set speed
 to specify your serial line and speed, for example:
 .Bd -literal -offset indent
-set device /dev/cuad0
+set device /dev/cuau0
 set speed 115200
 .Ed
 .Pp
@@ -2529,7 +2529,7 @@ Armed with this information, the following configuration might be used:
 mp:
  set timeout 0
  set log phase chat
- set device /dev/cuad0 /dev/cuad1 /dev/cuad2
+ set device /dev/cuau0 /dev/cuau1 /dev/cuau2
  set phone "123456789"
  set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \\"\\" ATZ \e
            OK-AT-OK \\\\dATDT\\\\T TIMEOUT 45 CONNECT"
@@ -2563,9 +2563,9 @@ line above, and specifying the following after the
 .Dq clone
 command:
 .Bd -literal -offset indent
- link 1 set device /dev/cuad0
- link 2 set device /dev/cuad1
- link 3 set device /dev/cuad2
+ link 1 set device /dev/cuau0
+ link 2 set device /dev/cuau1
+ link 3 set device /dev/cuau2
 .Ed
 .Pp
 Use the
@@ -4073,7 +4073,7 @@ The default link name is
 .Sq deflink .
 Renaming it to
 .Sq modem ,
-.Sq cuad0
+.Sq cuau0
 or
 .Sq USR
 may make the log file more readable.