On Wed, 5 Nov 1997, Erik Bertelsen wrote:

> The following diagnostics are output when trying to compile
> z8530tty.c on today's (5 nov) 1.3_ALPHA. 
> 
> Going back to the previous version of z8530tty.c seems to cure
> the problem -- was an update committed to the wrong CVS branch ?

No. An update was committed w/o another needed patch. I'm enclosing a
patch to make this version work.

> cc  -O2 -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
> -msoft-float -I. -I../../../../arch -I../../../.. -nostdinc -DHZ="0x3c"
> -DEXEC_AOUT -DEXEC_SCRIPT -DDIAGNOSTIC -DDDB -DCOMPAT_12 -DFIFO -DFFS
> -DCD9660 -DNFSSERVER -DINET -DPPP_BSDCOMP -DPPP_DEFLATE -DCOMPAT_43
> -DM68040 -DFPSP -DZS_CONSOLE_ABORT -DQUADRA_QUICK_SCSI -DMAXUSERS=16
> -D_KERNEL  -Dmc68020 -Dmac68k  -c ../../../../dev/ic/z8530tty.c
> ../../../../dev/ic/z8530tty.c: In function `zsparam':
> ../../../../dev/ic/z8530tty.c:824: structure has no member named
> `cs_rr0_mask'
> ../../../../dev/ic/z8530tty.c: In function `zstty_stint':
> ../../../../dev/ic/z8530tty.c:1194: structure has no member named
> `cs_rr0_mask'
> ../../../../dev/ic/z8530tty.c:1201: structure has no member named
> `cs_rr0_mask'


*** /sup/sys/dev/ic/z8530sc.h	Sat Oct 18 12:25:31 1997
--- z8530sc.h	Mon Nov  3 18:05:12 1997
***************
*** 1,4 ****
! /*	$NetBSD: z8530sc.h,v 1.7 1997/10/17 23:02:37 gwr Exp $	*/
  
  /*
   * Copyright (c) 1994 Gordon W. Ross
--- 1,4 ----
! /*	$NetBSD: z8530sc.h,v 1.8 1997/11/01 17:09:06 mycroft Exp $	*/
  
  /*
   * Copyright (c) 1994 Gordon W. Ross
***************
*** 98,103 ****
--- 98,104 ----
  
  	u_char	cs_rr0;			/* last rr0 processed */
  	u_char	cs_rr0_delta;		/* rr0 changes at status intr. */
+ 	u_char	cs_rr0_mask;		/* rr0 bits that stop output */
  	u_char	cs_rr0_dcd;		/* which bit to read as DCD */
  	u_char	cs_rr0_cts;		/* which bit to read as CTS */
  	/* the above is set only while CRTSCTS is enabled. */