From aca7e7fa24bede37c948f175912d012cb902882e Mon Sep 17 00:00:00 2001 From: pk Date: Sun, 19 Mar 2000 14:58:02 +0000 Subject: [PATCH] Just don't force the baud rate in the driver, ever. --- sys/arch/sparc/dev/zs.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c index 03f0596f7d29..350efc386e66 100644 --- a/sys/arch/sparc/dev/zs.c +++ b/sys/arch/sparc/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.76 2000/03/19 13:22:14 pk Exp $ */ +/* $NetBSD: zs.c,v 1.77 2000/03/19 14:58:02 pk Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -127,16 +127,6 @@ struct zsdevice { /* ZS channel used as the console device (if any) */ void *zs_conschan_get, *zs_conschan_put; -/* Default speed for each channel */ -static int zs_defspeed[NZS][2] = { - { 9600, /* ttya */ - 9600 }, /* ttyb */ - { 1200, /* keyboard */ - 1200 }, /* mouse */ - { 9600, /* ttyc */ - 9600 }, /* ttyd */ -}; - static u_char zs_init_reg[16] = { 0, /* 0: CMD (reset, etc.) */ 0, /* 1: No interrupts yet. */ @@ -420,12 +410,8 @@ zs_attach(zsc, zsd, pri) bcopy(zs_init_reg, cs->cs_creg, 16); bcopy(zs_init_reg, cs->cs_preg, 16); - /* XXX: Get these from the PROM properties! */ - /* XXX: See the mvme167 code. Better. */ - if (zsc_args.hwflags & ZS_HWFLAG_CONSOLE) - cs->cs_defspeed = zs_get_speed(cs); - else - cs->cs_defspeed = zs_defspeed[zsc->zsc_promunit][channel]; + /* XXX: Consult PROM properties for this?! */ + cs->cs_defspeed = zs_get_speed(cs); cs->cs_defcflag = zs_def_cflag; /* Make these correspond to cs_defcflag (-crtscts) */