Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pulldown from marc-pcmcia branch: minimal changes to avoid namespace

Browse Source 
collision between Pica port "com" (now "pcom") driver and more heavily-used
"com" driver.
This commit is contained in:
thorpej 1997-10-15 23:00:50 +00:00
parent 9ba1ceb091
commit e500671d62
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/pica/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.8 1997/08/23 19:18:45 mjacob Exp $
# $NetBSD: GENERIC,v 1.9 1997/10/15 23:00:50 thorpej Exp $
#
# Generic configuration file for MIPS R4400 PICA system
#
@ -70,8 +70,8 @@ pica* at mainbus0
clock0 at pica?
pc0 at pica?
pms0 at pica?
com0 at pica?
com1 at pica?
pcom0 at pica?
pcom1 at pica?
lpt0 at pica?
sn0 at pica?

6
sys/arch/pica/conf/PICA
View File

@ -1,4 +1,4 @@
# $NetBSD: PICA,v 1.10 1997/06/23 02:56:39 jonathan Exp $
# $NetBSD: PICA,v 1.11 1997/10/15 23:00:54 thorpej Exp $
#
#
include "arch/pica/conf/std.pica"
@ -61,8 +61,8 @@ pica* at mainbus0
clock0 at pica?
pc0 at pica?
pms0 at pica?
com0 at pica?
com1 at pica?
pcom0 at pica?
pcom1 at pica?
lpt0 at pica?
sn0 at pica?

8
sys/arch/pica/conf/files.pica
View File

@ -1,4 +1,4 @@
# $NetBSD: files.pica,v 1.8 1997/08/27 11:25:55 bouyer Exp $
# $NetBSD: files.pica,v 1.9 1997/10/15 23:00:56 thorpej Exp $
maxpartitions 8
maxusers 2 8 64
@ -39,9 +39,9 @@ attach asc at pica
file arch/pica/dev/asc.c asc needs-count
# NS16450/16550 Serial line driver
device com
attach com at pica
file arch/pica/dev/com.c com needs-count
device pcom
attach pcom at pica
file arch/pica/dev/com.c pcom needs-count
# Parallel printer port driver
device lpt

8
sys/arch/pica/dev/com.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com.c,v 1.4 1996/10/13 03:31:20 christos Exp $ */
/* $NetBSD: com.c,v 1.5 1997/10/15 23:01:02 thorpej Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@ -101,12 +101,12 @@ void compoll __P((void *));
int comparam __P((struct tty *, struct termios *));
void comstart __P((struct tty *));
struct cfattach com_ca = {
struct cfattach pcom_ca = {
sizeof(struct com_softc), commatch, comattach
};
struct cfdriver com_cd = {
NULL, "com", DV_TTY
struct cfdriver pcom_cd = {
NULL, "pcom", DV_TTY
};
int comdefaultrate = TTYDEF_SPEED;

8
sys/arch/pica/pica/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.9 1997/10/13 00:46:49 explorer Exp $ */
/* $NetBSD: conf.c,v 1.10 1997/10/15 23:01:09 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@ -134,7 +134,7 @@ bdev_decl(fd);
cdev_decl(vnd);
#include "bpfilter.h"
cdev_decl(bpf);
#include "com.h"
#include "pcom.h"
cdev_decl(com);
#include "lpt.h"
cdev_decl(lpt);
@ -168,7 +168,7 @@ struct cdevsw cdevsw[] =
cdev_pc_init(1,pc), /* 14: builtin pc style console dev */
cdev_mouse_init(1,pms), /* 15: builtin PS2 style mouse */
cdev_lpt_init(NLPT,lpt), /* 16: lpt paralell printer interface */
cdev_tty_init(NCOM,com), /* 17: com 16C450 serial interface */
cdev_tty_init(NPCOM,com), /* 17: com 16C450 serial interface */
cdev_notdef(), /* 18: */
cdev_notdef(), /* 19: */
cdev_tty_init(NPTY,pts), /* 20: pseudo-tty slave */
@ -327,7 +327,7 @@ struct consdev constab[] = {
#if NPC + NVT > 0
cons_init(pc),
#endif
#if NCOM > 0
#if NPCOM > 0
cons_init(com),
#endif
{ 0 },