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

The definition of IRFRAMEDISC (10) is incorrect since the value is dynamic.

Browse Source 
The *DISC definition is only for backward compatibility with deprecated
TIOC[GS]ETD ioctls, and not needed for new TIOC[GS]LINED ioctls.
The value of IRFRAMEDISC has never been correct, so we don't have any
compatibility to be kept.
Just remove the IRFRAMEDISC defintion.
This commit is contained in:
itohy 2005-04-10 14:28:11 +00:00
parent 857a611be2
commit 34088139ab
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/tty_conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tty_conf.c,v 1.44 2004/03/23 13:22:33 junyoung Exp $ */ /* $NetBSD: tty_conf.c,v 1.45 2005/04/10 14:28:11 itohy Exp $ */
/*- /*-
* Copyright (c) 1982, 1986, 1991, 1993 * Copyright (c) 1982, 1986, 1991, 1993
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tty_conf.c,v 1.44 2004/03/23 13:22:33 junyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: tty_conf.c,v 1.45 2005/04/10 14:28:11 itohy Exp $");
#include "opt_compat_freebsd.h" #include "opt_compat_freebsd.h"
#include "opt_compat_43.h" #include "opt_compat_43.h"
@ -143,9 +143,9 @@ struct linesw strip_disc =
#endif #endif
#if NIRFRAMETTY > 0 #if NIRFRAMETTY > 0
struct linesw irframet_disc = struct linesw irframet_disc =
{ "irframe", IRFRAMEDISC, irframetopen, irframetclose, ttyerrio, { "irframe", -1, irframetopen, irframetclose, ttyerrio,
ttyerrio, irframetioctl, irframetinput, irframetstart, ttyerrio, irframetioctl, irframetinput, irframetstart,
ttymodem, ttyerrpoll }; /* 10- IRFRAMEDISC */ ttymodem, ttyerrpoll }; /* irframe */
#endif #endif
/* /*

3
sys/sys/ttycom.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ttycom.h,v 1.16 2005/02/21 22:43:07 heas Exp $ */ /* $NetBSD: ttycom.h,v 1.17 2005/04/10 14:28:11 itohy Exp $ */
/*- /*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994 * Copyright (c) 1982, 1986, 1990, 1993, 1994
@ -160,6 +160,5 @@ typedef char linedn_t[TTLINEDNAMELEN];
#define PPPDISC 5 /* ppp discipline */ #define PPPDISC 5 /* ppp discipline */
#define STRIPDISC 6 /* metricom wireless IP discipline */ #define STRIPDISC 6 /* metricom wireless IP discipline */
#define HDLCDISC 9 /* HDLC discipline */ #define HDLCDISC 9 /* HDLC discipline */
#define IRFRAMEDISC 10 /* IrDA frame discipline */
#endif /* !_SYS_TTYCOM_H_ */ #endif /* !_SYS_TTYCOM_H_ */