Mon Jun 12 07:12:49 2017 UTC ()
Revert previous - it's no longer needed since data structure sizes no
longer depend on which wscons child devices exist


(pgoyette)
diff -r1.3 -r1.4 src/sys/dev/wscons/wsbell.c
cvs diff -r1.3 -r1.4 src/sys/dev/wscons/wsbell.c (expand / switch to unified diff)

--- src/sys/dev/wscons/wsbell.c 2017/06/12 06:59:19 1.3
+++ src/sys/dev/wscons/wsbell.c 2017/06/12 07:12:49 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wsbell.c,v 1.3 2017/06/12 06:59:19 pgoyette Exp $ */ 1/* $NetBSD: wsbell.c,v 1.4 2017/06/12 07:12:49 pgoyette Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2017 Nathanial Sloss <nathanialsloss@yahoo.com.au> 4 * Copyright (c) 2017 Nathanial Sloss <nathanialsloss@yahoo.com.au>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Copyright (c) 2006 The NetBSD Foundation, Inc. 7 * Copyright (c) 2006 The NetBSD Foundation, Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * 9 *
10 * This code is derived from software contributed to The NetBSD Foundation 10 * This code is derived from software contributed to The NetBSD Foundation
11 * by Julio M. Merino Vidal. 11 * by Julio M. Merino Vidal.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -97,31 +97,30 @@ @@ -97,31 +97,30 @@
97 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 97 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
98 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 98 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
99 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 99 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
100 * SUCH DAMAGE. 100 * SUCH DAMAGE.
101 * 101 *
102 * @(#)ms.c 8.1 (Berkeley) 6/11/93 102 * @(#)ms.c 8.1 (Berkeley) 6/11/93
103 */ 103 */
104 104
105/* 105/*
106 * Keyboard Bell driver. 106 * Keyboard Bell driver.
107 */ 107 */
108 108
109#include <sys/cdefs.h> 109#include <sys/cdefs.h>
110__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.3 2017/06/12 06:59:19 pgoyette Exp $"); 110__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.4 2017/06/12 07:12:49 pgoyette Exp $");
111 111
112#if defined(_KERNEL_OPT) 112#if defined(_KERNEL_OPT)
113#include "wsmux.h" 113#include "wsmux.h"
114#include "wsdisplay.h" 
115#endif 114#endif
116 115
117#include <sys/param.h> 116#include <sys/param.h>
118#include <sys/conf.h> 117#include <sys/conf.h>
119#include <sys/ioctl.h> 118#include <sys/ioctl.h>
120#include <sys/poll.h> 119#include <sys/poll.h>
121#include <sys/fcntl.h> 120#include <sys/fcntl.h>
122#include <sys/kernel.h> 121#include <sys/kernel.h>
123#include <sys/condvar.h> 122#include <sys/condvar.h>
124#include <sys/mutex.h> 123#include <sys/mutex.h>
125#include <sys/kthread.h> 124#include <sys/kthread.h>
126#include <sys/proc.h> 125#include <sys/proc.h>
127#include <sys/syslog.h> 126#include <sys/syslog.h>