From b9dd8b026d4e76758c23978514dfe90f6fae3c0d Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 19 Nov 2004 03:56:47 +0000 Subject: [PATCH] Catch up with PHK's sio(4) cuaa->cuad rework [sys/dev/sio/sio.c rev. 1.456]. PR: 73879 Submitted by: Steve Kargl --- usr.sbin/ppp/README.changes | 2 +- usr.sbin/ppp/defs.h | 2 +- usr.sbin/ppp/ppp.8.m4 | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/usr.sbin/ppp/README.changes b/usr.sbin/ppp/README.changes index 5b8a7cd9c87..bf626e3010b 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 cuaa1, then cuaa0 +o The default `device' is cuad1, then cuad0 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 47acb9e8d53..f56ee326698 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/cuaa1\0/dev/cuaa0" /* name of tty device */ +# define MODEM_LIST "/dev/cuad1\0/dev/cuad0" /* 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 e0d27438e47..8100ae92f45 100644 --- a/usr.sbin/ppp/ppp.8.m4 +++ b/usr.sbin/ppp/ppp.8.m4 @@ -572,7 +572,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/cuaa0 +ppp ON awfulhak> set device /dev/cuad0 ppp ON awfulhak> set speed 38400 .Ed .Pp @@ -631,7 +631,7 @@ Name: deflink Phone Number: N/A Defaults: - Device List: /dev/cuaa0 + Device List: /dev/cuad0 Characteristics: 38400bps, cs8, even parity, CTS/RTS on Connect time: 0 secs @@ -1219,10 +1219,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/cuaa1 +ppp ON awfulhak> set device /dev/cuad1 ppp ON awfulhak> set speed 38400 ppp ON awfulhak> term -deflink: Entering terminal mode on /dev/cuaa1 +deflink: Entering terminal mode on /dev/cuad1 Type `~?' for help at OK @@ -2170,11 +2170,11 @@ and .Dq set speed to specify your serial line and speed, for example: .Bd -literal -offset indent -set device /dev/cuaa0 +set device /dev/cuad0 set speed 115200 .Ed .Pp -Cuaa0 is the first serial port on +Cuad0 is the first serial port on .Fx . If you're running .Nm @@ -2536,7 +2536,7 @@ Armed with this information, the following configuration might be used: mp: set timeout 0 set log phase chat - set device /dev/cuaa0 /dev/cuaa1 /dev/cuaa2 + set device /dev/cuad0 /dev/cuad1 /dev/cuad2 set phone "123456789" set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \\"\\" ATZ \e OK-AT-OK \\\\dATDT\\\\T TIMEOUT 45 CONNECT" @@ -2573,9 +2573,9 @@ line above, and specifying the following after the command: .Pp .Bd -literal -offset indent - link 1 set device /dev/cuaa0 - link 2 set device /dev/cuaa1 - link 3 set device /dev/cuaa2 + link 1 set device /dev/cuad0 + link 2 set device /dev/cuad1 + link 3 set device /dev/cuad2 .Ed .Pp Use the @@ -3994,7 +3994,7 @@ The default link name is .Sq deflink . Renaming it to .Sq modem , -.Sq cuaa0 +.Sq cuad0 or .Sq USR may make the log file more readable. -- 2.45.2