diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-06-08 01:51:34 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-06-08 01:51:34 +0000 |
| commit | 5147e37d2a7a6649472c65ac31868c7986f4690d (patch) | |
| tree | f5343526aff4279b04e0118639bc5c7e31dd51ed /sys | |
| parent | 3216cd60fef5dc927cce03a72125035aecac75ce (diff) | |
move cnspeed func and comspeed proto in places
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/stand/libsa/bioscons.c | 15 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/biosdev.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/dev_i386.c | 13 |
3 files changed, 15 insertions, 17 deletions
diff --git a/sys/arch/i386/stand/libsa/bioscons.c b/sys/arch/i386/stand/libsa/bioscons.c index cf8db53580d..28ae82f16ac 100644 --- a/sys/arch/i386/stand/libsa/bioscons.c +++ b/sys/arch/i386/stand/libsa/bioscons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bioscons.c,v 1.17 1999/08/25 00:54:19 mickey Exp $ */ +/* $OpenBSD: bioscons.c,v 1.18 2000/06/08 01:51:32 mickey Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -43,19 +43,6 @@ #include <lib/libsa/stand.h> #include "debug.h" -int comspeed __P((dev_t, int)); - -int -cnspeed(dev, sp) - dev_t dev; - int sp; -{ - if (major(dev) == 8) /* comN */ - return comspeed(dev, sp); - /* pc0 and anything else */ - return 9600; -} - /* XXX cannot trust NVRAM on this. Maybe later we make a real probe. */ #if 0 #define PRESENT_MASK (NVRAM_EQUIPMENT_KBD|NVRAM_EQUIPMENT_DISPLAY) diff --git a/sys/arch/i386/stand/libsa/biosdev.h b/sys/arch/i386/stand/libsa/biosdev.h index f7e7a49b3ad..ad523bf686b 100644 --- a/sys/arch/i386/stand/libsa/biosdev.h +++ b/sys/arch/i386/stand/libsa/biosdev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdev.h,v 1.24 1997/11/30 21:51:40 mickey Exp $ */ +/* $OpenBSD: biosdev.h,v 1.25 2000/06/08 01:51:33 mickey Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -57,7 +57,7 @@ void pc_putc __P((dev_t, int)); void pc_pollc __P((dev_t, int)); void com_probe __P((struct consdev *)); void com_init __P((struct consdev *)); -int com_setsp __P((int)); +int comspeed __P((dev_t, int)); int com_getc __P((dev_t)); void com_putc __P((dev_t, int)); void com_pollc __P((dev_t, int)); diff --git a/sys/arch/i386/stand/libsa/dev_i386.c b/sys/arch/i386/stand/libsa/dev_i386.c index 82c7468f096..48fa458b549 100644 --- a/sys/arch/i386/stand/libsa/dev_i386.c +++ b/sys/arch/i386/stand/libsa/dev_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_i386.c,v 1.22 1999/08/25 00:54:19 mickey Exp $ */ +/* $OpenBSD: dev_i386.c,v 1.23 2000/06/08 01:51:32 mickey Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -188,3 +188,14 @@ ttydev(name) return (makedev(i, unit)); return (NODEV); } + +int +cnspeed(dev, sp) + dev_t dev; + int sp; +{ + if (major(dev) == 8) /* comN */ + return comspeed(dev, sp); + /* pc0 and anything else */ + return 9600; +} |