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

Define and use zsccf_channel as an alias for cf_loc[ZSCCF_CHANNEL].

Browse Source
This commit is contained in:
thorpej 2004-06-20 18:07:35 +00:00
parent 67e828e7d8
commit 221edc1cb1
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ic/z8530sc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: z8530sc.h,v 1.19 2003/08/07 16:31:04 agc Exp $ */
/* $NetBSD: z8530sc.h,v 1.20 2004/06/20 18:07:35 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@ -83,6 +83,9 @@
* @(#)zsvar.h 8.1 (Berkeley) 6/11/93
*/
#ifdef _KERNEL_OPT
#include "locators.h"
#endif
/*
* Function vector - per channel
@ -176,6 +179,9 @@ struct zsc_attach_args {
/* `consdev' is only valid if ZS_HWFLAG_USE_CONSDEV is set */
struct consdev *consdev;
};
#define zsccf_channel cf_loc[ZSCCF_CHANNEL]
/* In case of split console devices, use these: */
#define ZS_HWFLAG_CONSOLE_INPUT 1
#define ZS_HWFLAG_CONSOLE_OUTPUT 2

8
sys/dev/ic/z8530tty.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: z8530tty.c,v 1.94 2004/01/23 05:01:19 simonb Exp $ */
/* $NetBSD: z8530tty.c,v 1.95 2004/06/20 18:07:35 thorpej Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@ -137,7 +137,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.94 2004/01/23 05:01:19 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.95 2004/06/20 18:07:35 thorpej Exp $");
#include "opt_kgdb.h"
#include "opt_ntp.h"
@ -303,11 +303,11 @@ zstty_match(parent, cf, aux)
struct zsc_attach_args *args = aux;
/* Exact match is better than wildcard. */
if (cf->cf_loc[ZSCCF_CHANNEL] == args->channel)
if (cf->zsccf_channel == args->channel)
return 2;
/* This driver accepts wildcard. */
if (cf->cf_loc[ZSCCF_CHANNEL] == ZSCCF_CHANNEL_DEFAULT)
if (cf->zsccf_channel == ZSCCF_CHANNEL_DEFAULT)
return 1;
return 0;