d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetic: Group configuration items in struct physical.

Browse Source
This commit is contained in:
Brian Somers 1998-02-17 19:29:03 +00:00
parent 73a13b5c4d
commit d585f8f51b
3 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
usr.sbin/ppp/modem.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: modem.c,v 1.77.2.20 1998/02/17 19:28:33 brian Exp $
* $Id: modem.c,v 1.77.2.21 1998/02/17 19:28:49 brian Exp $
*
* TODO:
*/
@ -100,9 +100,9 @@ modem_Create(const char *name)
p->link.Close = modem_Hangup;
p->link.Destroy = modem_Destroy;
p->fd = -1;
p->rts_cts = MODEM_CTSRTS;
p->speed = MODEM_SPEED;
p->parity = CS8;
p->cfg.rts_cts = MODEM_CTSRTS;
p->cfg.speed = MODEM_SPEED;
p->cfg.parity = CS8;
p->desc.type = PHYSICAL_DESCRIPTOR;
p->desc.UpdateSet = modem_UpdateSet;
p->desc.IsSet = Physical_IsSet;
@ -345,7 +345,7 @@ modem_SetParity(struct physical *modem, const char *str)
val = GetParityValue(str);
if (val > 0) {
modem->parity = val;
modem->cfg.parity = val;
tcgetattr(modem->fd, &rstio);
rstio.c_cflag &= ~(CSIZE | PARODD | PARENB);
rstio.c_cflag |= val;
@ -598,7 +598,7 @@ modem_Open(struct physical *modem, struct bundle *bundle)
LogPrintf(LogDEBUG, "modem_Open: modem (get): iflag = %x, oflag = %x,"
" cflag = %x\n", rstio.c_iflag, rstio.c_oflag, rstio.c_cflag);
cfmakeraw(&rstio);
if (modem->rts_cts)
if (modem->cfg.rts_cts)
rstio.c_cflag |= CLOCAL | CCTS_OFLOW | CRTS_IFLOW;
else {
rstio.c_cflag |= CLOCAL;
@ -625,10 +625,10 @@ modem_Open(struct physical *modem, struct bundle *bundle)
* If we are working as direct mode, don't change tty speed.
*/
rstio.c_cflag &= ~(CSIZE | PARODD | PARENB);
rstio.c_cflag |= modem->parity;
if (cfsetspeed(&rstio, IntToSpeed(modem->speed)) == -1) {
rstio.c_cflag |= modem->cfg.parity;
if (cfsetspeed(&rstio, IntToSpeed(modem->cfg.speed)) == -1) {
LogPrintf(LogWARN, "Unable to set modem speed (modem %d to %d)\n",
modem->fd, modem->speed);
modem->fd, modem->cfg.speed);
}
}
tcsetattr(modem->fd, TCSADRAIN, &rstio);
@ -700,7 +700,7 @@ modem_Raw(struct physical *modem, struct bundle *bundle)
}
tcgetattr(modem->fd, &rstio);
cfmakeraw(&rstio);
if (modem->rts_cts)
if (modem->cfg.rts_cts)
rstio.c_cflag |= CLOCAL | CCTS_OFLOW | CRTS_IFLOW;
else
rstio.c_cflag |= CLOCAL;
@ -913,9 +913,9 @@ modem_ShowStatus(struct cmdargs const *arg)
if (Physical_IsSync(arg->cx->physical))
prompt_Printf(&prompt, "sync\n");
else
prompt_Printf(&prompt, "%d\n", arg->cx->physical->speed);
prompt_Printf(&prompt, "%d\n", arg->cx->physical->cfg.speed);
switch (arg->cx->physical->parity & CSIZE) {
switch (arg->cx->physical->cfg.parity & CSIZE) {
case CS7:
prompt_Printf(&prompt, "cs7, ");
break;
@ -923,8 +923,8 @@ modem_ShowStatus(struct cmdargs const *arg)
prompt_Printf(&prompt, "cs8, ");
break;
}
if (arg->cx->physical->parity & PARENB) {
if (arg->cx->physical->parity & PARODD)
if (arg->cx->physical->cfg.parity & PARENB) {
if (arg->cx->physical->cfg.parity & PARODD)
prompt_Printf(&prompt, "odd parity, ");
else
prompt_Printf(&prompt, "even parity, ");
@ -932,7 +932,7 @@ modem_ShowStatus(struct cmdargs const *arg)
prompt_Printf(&prompt, "no parity, ");
prompt_Printf(&prompt, "CTS/RTS %s.\n",
(arg->cx->physical->rts_cts ? "on" : "off"));
(arg->cx->physical->cfg.rts_cts ? "on" : "off"));
if (LogIsKept(LogDEBUG))
prompt_Printf(&prompt, "fd = %d, modem control = %o\n",

20
usr.sbin/ppp/physical.c
View File

@ -16,7 +16,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: physical.c,v 1.1.2.8 1998/02/13 05:10:22 brian Exp $
* $Id: physical.c,v 1.1.2.9 1998/02/16 00:00:56 brian Exp $
*
*/
@ -72,7 +72,7 @@ Physical_IsATTY(struct physical *phys) {
int
Physical_IsSync(struct physical *phys) {
return phys->speed == 0;
return phys->cfg.speed == 0;
}
int
@ -103,16 +103,16 @@ Physical_SetDevice(struct physical *phys, const char *new_device_list) {
int
Physical_SetSpeed(struct physical *phys, int speed) {
if (IntToSpeed(speed) != B0) {
phys->speed = speed;
phys->cfg.speed = speed;
return 1;
} else {
return 0;
return 0;
}
}
void
Physical_SetSync(struct physical *phys) {
phys->speed = 0;
phys->cfg.speed = 0;
}
@ -120,7 +120,7 @@ int
Physical_SetRtsCts(struct physical *phys, int enable) {
assert(enable == 0 || enable == 1);
phys->rts_cts = enable;
phys->cfg.rts_cts = enable;
return 1;
}
@ -128,24 +128,24 @@ void
Physical_SetDedicated(struct physical *phys, int enable) {
assert(enable == 0 || enable == 1);
phys->is_dedicated = enable;
phys->cfg.is_dedicated = enable;
}
void
Physical_SetDirect(struct physical *phys, int enable) {
assert(enable == 0 || enable == 1);
phys->is_direct = enable;
phys->cfg.is_direct = enable;
}
int
Physical_IsDirect(struct physical *phys) {
return phys->is_direct;
return phys->cfg.is_direct;
}
int
Physical_IsDedicated(struct physical *phys) {
return phys->is_dedicated;
return phys->cfg.is_dedicated;
}

16
usr.sbin/ppp/physical.h
View File

@ -16,7 +16,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: physical.h,v 1.1.2.7 1998/02/10 03:22:03 brian Exp $
* $Id: physical.h,v 1.1.2.8 1998/02/13 05:10:22 brian Exp $
*
*/
@ -32,16 +32,20 @@ struct physical {
(Possibly this should be
dev_is_not_tcp?) XXX-ML */
unsigned is_dedicated : 1; /* Dedicated mode? XXX-ML - not yet initialized */
unsigned is_direct : 1; /* Direct mode? XXX-ML - not yet initialized */
struct mbuf *out;
int connect_count;
/* XXX-ML Most of the below is device specific, and probably do not
belong in the generic physical struct. It comes from modem.c. */
unsigned rts_cts : 1; /* Is rts/cts enabled? */
unsigned int parity; /* What parity is enabled? (TTY flags) */
unsigned int speed; /* Modem speed */
struct {
unsigned is_dedicated : 1; /* Dedicated mode? XXX-ML - not yet init'd */
unsigned is_direct : 1; /* Direct mode? XXX-ML - not yet initialized */
unsigned rts_cts : 1; /* Is rts/cts enabled? */
unsigned int parity; /* What parity is enabled? (TTY flags) */
unsigned int speed; /* Modem speed */
} cfg;
struct termios ios; /* To be able to reset from raw mode */
};