summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/files.amd645
-rw-r--r--sys/arch/amd64/include/isa_machdep.h8
-rw-r--r--sys/arch/amd64/isa/clock.c61
-rw-r--r--sys/arch/arm/footbridge/isa/sysbeep_isa.c90
-rw-r--r--sys/arch/arm/include/isa_machdep.h3
-rw-r--r--sys/arch/cats/conf/GENERIC3
-rw-r--r--sys/arch/cats/conf/RAMDISK3
-rw-r--r--sys/arch/cats/conf/files.cats6
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/files.i3865
-rw-r--r--sys/arch/i386/isa/clock.c54
-rw-r--r--sys/arch/i386/isa/isa_machdep.h8
-rw-r--r--sys/dev/wscons/wsmoused.h4
14 files changed, 13 insertions, 243 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 9fbbb784a7f..370d2c83095 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.110 2006/02/10 08:32:54 brad Exp $
+# $OpenBSD: GENERIC,v 1.111 2006/02/12 19:55:36 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -201,7 +201,6 @@ wsmouse* at pms? mux 0
wsmouse* at pmsi? mux 0
pcppi0 at isa?
-sysbeep0 at pcppi?
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index a037af47783..7d40cbcf4a3 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.18 2006/01/29 17:29:29 marco Exp $
+# $OpenBSD: files.amd64,v 1.19 2006/02/12 19:55:36 miod Exp $
maxpartitions 16
maxusers 2 16 128
@@ -147,9 +147,6 @@ include "dev/pckbc/files.pckbc"
file arch/amd64/amd64/wscons_machdep.c wsdisplay
-device sysbeep
-attach sysbeep at pcppi
-
# Floppy disk controller
device fdc {[drive = -1]}
attach fdc at isa
diff --git a/sys/arch/amd64/include/isa_machdep.h b/sys/arch/amd64/include/isa_machdep.h
index 9b7107dd161..42e647dffdb 100644
--- a/sys/arch/amd64/include/isa_machdep.h
+++ b/sys/arch/amd64/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.4 2005/12/13 00:18:19 jsg Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.5 2006/02/12 19:55:38 miod Exp $ */
/* $NetBSD: isa_machdep.h,v 1.2 2003/05/09 23:51:28 fvdl Exp $ */
/*-
@@ -201,10 +201,4 @@ extern u_long atdevbase; /* kernel virtual address of "hole" */
*/
#define ISA_HOLE_VADDR(p) ((void *) ((u_long)(p) - IOM_BEGIN + atdevbase))
-
-/*
- * Miscellanous functions.
- */
-void sysbeep(int, int); /* beep with the system speaker */
-
#endif /* _I386_ISA_MACHDEP_H_ XXX */
diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c
index a44d65b9966..92bcb8b40c5 100644
--- a/sys/arch/amd64/isa/clock.c
+++ b/sys/arch/amd64/isa/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.8 2005/12/13 00:18:19 jsg Exp $ */
+/* $OpenBSD: clock.c,v 1.9 2006/02/12 19:55:38 miod Exp $ */
/* $NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */
/*-
@@ -109,37 +109,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dev/clock_subr.h>
#include <machine/specialreg.h>
-#include "pcppi.h"
-#if (NPCPPI > 0)
-#include <dev/isa/pcppivar.h>
-
-#ifdef CLOCKDEBUG
-int clock_debug = 0;
-#define DPRINTF(arg) if (clock_debug) printf arg
-#else
-#define DPRINTF(arg)
-#endif
-
-int sysbeepmatch(struct device *, void *, void *);
-void sysbeepattach(struct device *, struct device *, void *);
-
-struct cfattach sysbeep_ca = {
- sizeof(struct device), sysbeepmatch, sysbeepattach
-};
-
-struct cfdriver sysbeep_cd = {
- NULL, "sysbeep", DV_DULL
-};
-
-static int ppi_attached;
-static pcppi_tag_t ppicookie;
-#endif /* PCPPI */
-
void spinwait(int);
int clockintr(void *);
int rtcintr(void *);
int gettick(void);
-void sysbeep(int, int);
void rtcdrain(void *v);
int rtcget(mc_todregs *);
void rtcput(mc_todregs *);
@@ -412,38 +385,6 @@ i8254_delay(int n)
}
}
-#if (NPCPPI > 0)
-int
-sysbeepmatch(parent, match, aux)
- struct device *parent;
- void *match;
- void *aux;
-{
- return (!ppi_attached);
-}
-
-void
-sysbeepattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-{
- printf("\n");
-
- ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
- ppi_attached = 1;
-}
-#endif
-
-void
-sysbeep(pitch, period)
- int pitch, period;
-{
-#if (NPCPPI > 0)
- if (ppi_attached)
- pcppi_bell(ppicookie, pitch, period, 0);
-#endif
-}
-
unsigned int delaycount; /* calibrated loop variable (1 millisecond) */
#define FIRST_GUESS 0x2000
diff --git a/sys/arch/arm/footbridge/isa/sysbeep_isa.c b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
deleted file mode 100644
index 2919c5cb34d..00000000000
--- a/sys/arch/arm/footbridge/isa/sysbeep_isa.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* $OpenBSD: sysbeep_isa.c,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
-/* $NetBSD: sysbeep_isa.c,v 1.4 2002/10/02 15:45:10 thorpej Exp $ */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Mark Brinicombe of Causality Limited.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <dev/isa/isavar.h>
-
-#include <dev/isa/pcppivar.h>
-
-/* Prototypes */
-int sysbeep_isa_match (struct device *parent, void *cf, void *aux);
-void sysbeep_isa_attach (struct device *parent, struct device *self, void *aux);
-void sysbeep_isa (int pitch, int period);
-
-/* device attach structure */
-struct cfattach sysbeep_isa_ca = {
- sizeof (struct device), sysbeep_isa_match, sysbeep_isa_attach
-};
-
-struct cfdriver sysbeep_cd = {
- NULL, "sysbeep_isa", DV_DULL
-};
-
-static int ppi_attached;
-static pcppi_tag_t ppicookie;
-
-int
-sysbeep_isa_match(parent, match, aux)
- struct device *parent;
- void *match;
- void *aux;
-{
- return (!ppi_attached);
-}
-
-void
-sysbeep_isa_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-{
- printf("\n");
-
- ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
- ppi_attached = 1;
-}
-
-void
-sysbeep(pitch, period)
- int pitch, period;
-{
- if (ppi_attached)
- pcppi_bell(ppicookie, pitch, period, 0);
-}
diff --git a/sys/arch/arm/include/isa_machdep.h b/sys/arch/arm/include/isa_machdep.h
index c06c8b828ac..a26c861168f 100644
--- a/sys/arch/arm/include/isa_machdep.h
+++ b/sys/arch/arm/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.2 2005/10/02 18:55:23 brad Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.3 2006/02/12 19:55:39 miod Exp $ */
/* $NetBSD: isa_machdep.h,v 1.3 2002/01/07 22:58:07 chris Exp $ */
/*-
@@ -186,7 +186,6 @@ void isa_intr_init(void);
/*
* Miscellanous functions.
*/
-void sysbeep(int, int); /* beep with the system speaker */
void isa_fillw(u_int val, void *addr, size_t len);
#endif /* _ARM32_ISA_MACHDEP_H_ XXX */
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 7a7f41d1a06..02ea16259ff 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.30 2005/12/27 20:05:34 drahn Exp $
+# $OpenBSD: GENERIC,v 1.31 2006/02/12 19:55:39 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -241,7 +241,6 @@ wskbd* at pckbd? mux 1
wsmouse* at pms? mux 0
pcppi0 at isa?
-sysbeep0 at pcppi?
# ISA Plug-and-Play serial interfaces
#com* at isapnp? # Modems and serial boards
diff --git a/sys/arch/cats/conf/RAMDISK b/sys/arch/cats/conf/RAMDISK
index 64b1491f55b..36a9eb316e7 100644
--- a/sys/arch/cats/conf/RAMDISK
+++ b/sys/arch/cats/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.16 2005/12/27 20:05:34 drahn Exp $
+# $OpenBSD: RAMDISK,v 1.17 2006/02/12 19:55:39 miod Exp $
machine cats arm
@@ -191,7 +191,6 @@ pckbd* at pckbc? # PC keyboard
wskbd* at pckbd? mux 1
#pcppi0 at isa?
-#sysbeep0 at pcppi?
# ISA Plug-and-Play serial interfaces
#com* at isapnp? # Modems and serial boards
diff --git a/sys/arch/cats/conf/files.cats b/sys/arch/cats/conf/files.cats
index cc4910918f3..7ba9d2116d4 100644
--- a/sys/arch/cats/conf/files.cats
+++ b/sys/arch/cats/conf/files.cats
@@ -1,4 +1,4 @@
-# $OpenBSD: files.cats,v 1.4 2005/03/08 20:00:23 tdeval Exp $
+# $OpenBSD: files.cats,v 1.5 2006/02/12 19:55:39 miod Exp $
# $NetBSD: files.cats,v 1.27 2003/10/21 08:15:40 skrll Exp $
#
# CATS-specific configuration info
@@ -71,10 +71,6 @@ file arch/arm/footbridge/isa/isa_io_asm.S isa
# CATS boards have an EBSA285 based core with an ISA bus
file arch/arm/footbridge/isa/isa_machdep.c isa
-device sysbeep
-attach sysbeep at pcppi with sysbeep_isa
-file arch/arm/footbridge/isa/sysbeep_isa.c sysbeep_isa
-
device ds1687rtc: todservice
attach ds1687rtc at isa
file arch/arm/footbridge/isa/dsrtc.c ds1687rtc
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8a18f0f86cf..511a62ecc70 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.468 2006/02/05 09:20:58 damien Exp $
+# $OpenBSD: GENERIC,v 1.469 2006/02/12 19:55:39 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -254,7 +254,6 @@ wsmouse* at pms? mux 0
wsmouse* at pmsi? mux 0
pcppi0 at isa?
-sysbeep0 at pcppi?
pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports
pccom1 at isa? port 0x2f8 irq 3
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 15d54da0c37..8dd8e70e341 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.142 2006/01/29 17:29:29 marco Exp $
+# $OpenBSD: files.i386,v 1.143 2006/02/12 19:55:39 miod Exp $
#
# new style config file for i386 architecture
#
@@ -191,9 +191,6 @@ file arch/i386/isa/mms.c mms needs-flag
include "dev/wscons/files.wscons"
include "dev/pckbc/files.pckbc"
-device sysbeep
-attach sysbeep at pcppi
-
# Floppy disk controller
# XXX temporarily conflicts with arc, will soon move to files.isa
device fdc {[drive = -1]}
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 7d12127563f..af7ce370ac3 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.33 2006/01/02 05:21:30 brad Exp $ */
+/* $OpenBSD: clock.c,v 1.34 2006/02/12 19:55:39 miod Exp $ */
/* $NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $ */
/*-
@@ -105,30 +105,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <i386/isa/nvram.h>
#include <i386/isa/timerreg.h>
-#include "pcppi.h"
-#if (NPCPPI > 0)
-#include <dev/isa/pcppivar.h>
-
-int sysbeepmatch(struct device *, void *, void *);
-void sysbeepattach(struct device *, struct device *, void *);
-
-struct cfattach sysbeep_ca = {
- sizeof(struct device), sysbeepmatch, sysbeepattach
-};
-
-struct cfdriver sysbeep_cd = {
- NULL, "sysbeep", DV_DULL
-};
-
-static int ppi_attached;
-static pcppi_tag_t ppicookie;
-#endif /* PCPPI */
-
void spinwait(int);
void findcpuspeed(void);
int clockintr(void *);
int gettick(void);
-void sysbeep(int, int);
int rtcget(mc_todregs *);
void rtcput(mc_todregs *);
int hexdectodec(int);
@@ -378,38 +358,6 @@ i8254_delay(n)
}
}
-#if (NPCPPI > 0)
-int
-sysbeepmatch(parent, match, aux)
- struct device *parent;
- void *match;
- void *aux;
-{
- return (!ppi_attached);
-}
-
-void
-sysbeepattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-{
- printf("\n");
-
- ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
- ppi_attached = 1;
-}
-#endif
-
-void
-sysbeep(pitch, period)
- int pitch, period;
-{
-#if (NPCPPI > 0)
- if (ppi_attached)
- pcppi_bell(ppicookie, pitch, period, 0);
-#endif
-}
-
unsigned int delaycount; /* calibrated loop variable (1 millisecond) */
#define FIRST_GUESS 0x2000
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 9847f0e4db6..40493393d6d 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.20 2005/11/23 09:32:46 mickey Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.21 2006/02/12 19:55:39 miod Exp $ */
/* $NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $ */
/*-
@@ -216,10 +216,4 @@ extern u_long atdevbase; /* kernel virtual address of "hole" */
*/
#define ISA_HOLE_VADDR(p) ((void *) ((u_long)(p) - IOM_BEGIN + atdevbase))
-
-/*
- * Miscellanous functions.
- */
-void sysbeep(int, int); /* beep with the system speaker */
-
#endif /* _I386_ISA_MACHDEP_H_ XXX */
diff --git a/sys/dev/wscons/wsmoused.h b/sys/dev/wscons/wsmoused.h
index d791f3e7387..fd2c441d15d 100644
--- a/sys/dev/wscons/wsmoused.h
+++ b/sys/dev/wscons/wsmoused.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmoused.h,v 1.4 2002/03/27 18:54:09 jbm Exp $ */
+/* $OpenBSD: wsmoused.h,v 1.5 2006/02/12 19:55:39 miod Exp $ */
/*
* Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon
@@ -77,8 +77,6 @@ void mouse_remove(struct wsdisplay_softc *);
void wsmoused_release(struct wsdisplay_softc *);
void wsmoused_wakeup(struct wsdisplay_softc *);
-void sysbeep(int, int);
-
extern char *Copybuffer; /* buffer that contains mouse selections */
extern u_int Copybuffer_size;
extern char Paste_avail; /* flag, to indicate whether a selection is in the
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 09:45:42 +0000