Attachment 127672 Details for Bug 171533 – file.diff

[patch] file.diff

file.diff (text/plain), 13.80 KB, created by Enji Cooper on 2012-09-11 04:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Enji Cooper

Created: 2012-09-11 04:20:02 UTC

Size: 13.80 KB

patch

obsolete

>Index: usr.sbin/ppp/README.changes
>===================================================================
>--- usr.sbin/ppp/README.changes	(revision 240155)
>+++ usr.sbin/ppp/README.changes	(working copy)
>@@ -53,7 +53,7 @@
>   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
>Index: tools/test/ppsapi/README
>===================================================================
>--- tools/test/ppsapi/README	(revision 240155)
>+++ tools/test/ppsapi/README	(working copy)
>@@ -16,7 +16,7 @@
> 
> 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 @@
> (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
>Index: tools/debugscripts/dot.gdbinit
>===================================================================
>--- tools/debugscripts/dot.gdbinit	(revision 240155)
>+++ tools/debugscripts/dot.gdbinit	(working copy)
>@@ -36,16 +36,16 @@
> 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 @@
> 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.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
>Index: release/picobsd/mfs_tree/etc/remote
>===================================================================
>--- release/picobsd/mfs_tree/etc/remote	(revision 240155)
>+++ release/picobsd/mfs_tree/etc/remote	(working copy)
>@@ -41,10 +41,10 @@
> # 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
>Index: release/picobsd/floppy.tree/etc/ppp/ppp.conf
>===================================================================
>--- release/picobsd/floppy.tree/etc/ppp/ppp.conf	(revision 240155)
>+++ release/picobsd/floppy.tree/etc/ppp/ppp.conf	(working copy)
>@@ -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
>Index: share/examples/ppp/ppp.conf.span-isp
>===================================================================
>--- share/examples/ppp/ppp.conf.span-isp	(revision 240155)
>+++ share/examples/ppp/ppp.conf.span-isp	(working copy)
>@@ -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
>Index: share/examples/ppp/ppp.conf.sample
>===================================================================
>--- share/examples/ppp/ppp.conf.sample	(revision 240155)
>+++ share/examples/ppp/ppp.conf.sample	(working copy)
>@@ -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 @@
>  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 @@
> 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 @@
> #
> 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 @@
>  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 @@
> #
> 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
>Index: share/man/man5/remote.5
>===================================================================
>--- share/man/man5/remote.5	(revision 240155)
>+++ share/man/man5/remote.5	(working copy)
>@@ -194,7 +194,7 @@
> 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
>Index: share/man/man4/gdb.4
>===================================================================
>--- share/man/man4/gdb.4	(revision 240155)
>+++ share/man/man4/gdb.4	(working copy)
>@@ -252,7 +252,7 @@
> 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 @@
> 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
>Index: share/man/man4/mouse.4
>===================================================================
>--- share/man/man4/mouse.4	(revision 240155)
>+++ share/man/man4/mouse.4	(working copy)
>@@ -379,7 +379,7 @@
> .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
>Index: share/man/man5/rc.conf.5
>===================================================================
>--- share/man/man5/rc.conf.5	(revision 240155)
>+++ share/man/man5/rc.conf.5	(working copy)
>@@ -3280,7 +3280,7 @@
> .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
>Index: tools/test/ppsapi/Makefile
>===================================================================
>--- tools/test/ppsapi/Makefile	(revision 240155)
>+++ tools/test/ppsapi/Makefile	(working copy)
>@@ -8,4 +8,4 @@
> .include <bsd.prog.mk>
> 
> test:	${PROG}
>-	./${PROG} /dev/cuad0
>+	./${PROG} /dev/cuau0
>Index: sbin/comcontrol/comcontrol.8
>===================================================================
>--- sbin/comcontrol/comcontrol.8	(revision 240155)
>+++ sbin/comcontrol/comcontrol.8	(working copy)
>@@ -49,7 +49,7 @@
> .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
>Index: usr.sbin/moused/moused.8
>===================================================================
>--- usr.sbin/moused/moused.8	(revision 240155)
>+++ usr.sbin/moused/moused.8	(working copy)
>@@ -296,7 +296,7 @@
> .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 @@
> 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 @@
> 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
>Index: usr.sbin/ppp/ppp.8.m4
>===================================================================
>--- usr.sbin/ppp/ppp.8.m4	(revision 240155)
>+++ usr.sbin/ppp/ppp.8.m4	(working copy)
>@@ -551,7 +551,7 @@
> .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 @@
>  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
>@@ -1218,10 +1218,10 @@
> 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
>@@ -2169,7 +2169,7 @@
> .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
>@@ -2535,7 +2535,7 @@
> 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"
>@@ -2572,9 +2572,9 @@
> command:
> .Pp
> .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
>@@ -4085,7 +4085,7 @@
> .Sq deflink .
> Renaming it to
> .Sq modem ,
>-.Sq cuad0
>+.Sq cuau0
> or
> .Sq USR
> may make the log file more readable.
>Index: usr.sbin/ppp/defs.h
>===================================================================
>--- usr.sbin/ppp/defs.h	(revision 240155)
>+++ usr.sbin/ppp/defs.h	(working copy)
>@@ -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 */
>Index: usr.sbin/bluetooth/hcseriald/hcseriald.8
>===================================================================
>--- usr.sbin/bluetooth/hcseriald/hcseriald.8	(revision 240155)
>+++ usr.sbin/bluetooth/hcseriald/hcseriald.8	(working copy)
>@@ -54,7 +54,7 @@
> .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
>Index: usr.sbin/bluetooth/hcseriald/hcseriald.c
>===================================================================
>--- usr.sbin/bluetooth/hcseriald/hcseriald.c	(revision 240155)
>+++ usr.sbin/bluetooth/hcseriald/hcseriald.c	(working copy)
>@@ -257,7 +257,7 @@
> {
> 	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" \

Actions: View | Diff

Attachments on bug 171533: 127672