From 6d8200ff0c1e1847fd90a969ae8dcf86feb4c28c Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 11 Nov 2005 09:57:32 +0000 Subject: Add /dev/speaker support to amd64. The following repo-copies were made (by Mark Murray): sys/i386/isa/spkr.c -> sys/dev/speaker/spkr.c sys/i386/include/speaker.h -> sys/dev/speaker/speaker.h share/man/man4/man4.i386/spkr.4 -> share/man/man4/spkr.4 --- sys/i386/include/speaker.h | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'sys/i386/include') diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h index 6b1f0211e516..2950b4760feb 100644 --- a/sys/i386/include/speaker.h +++ b/sys/i386/include/speaker.h @@ -1,29 +1,16 @@ /* - * speaker.h -- interface definitions for speaker ioctl() - * - * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 - * modified for FreeBSD by Andrew A. Chernov - * * $FreeBSD$ */ #ifndef _MACHINE_SPEAKER_H_ #define _MACHINE_SPEAKER_H_ -#include +#include -#define SPKRTONE _IOW('S', 1, tone_t) /* emit tone */ -#define SPKRTUNE _IO('S', 2) /* emit tone sequence*/ +#ifdef __CC_SUPPORTS_WARNING +#warning "machine/speaker.h is deprecated. Include dev/speaker/speaker.h instead." +#endif -typedef struct -{ - int frequency; /* in hertz */ - int duration; /* in 1/100ths of a second */ -} tone_t; - -/* - * Strings written to the speaker device are interpreted as tunes and played; - * see the spkr(4) man page for details. - */ +#include #endif /* !_MACHINE_SPEAKER_H_ */ -- cgit v1.2.3