summaryrefslogtreecommitdiffstats
path: root/sys/dev/speaker
diff options
context:
space:
mode:
authormdodd <mdodd@FreeBSD.org>2003-03-24 21:01:54 +0000
committermdodd <mdodd@FreeBSD.org>2003-03-24 21:01:54 +0000
commitfd221086efb2f2aa47c70b46fea051fd850215e6 (patch)
treee45099f4bcdd774964d4775183160cf0e7175242 /sys/dev/speaker
parent9c463e3581a4b73b63e70579fa9d13d84d543b04 (diff)
downloadFreeBSD-src-fd221086efb2f2aa47c70b46fea051fd850215e6.zip
FreeBSD-src-fd221086efb2f2aa47c70b46fea051fd850215e6.tar.gz
Retire sys/pc98/pc98/spkr.c
Diffstat (limited to 'sys/dev/speaker')
-rw-r--r--sys/dev/speaker/spkr.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 97fa4e6..f51f460 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -61,6 +61,7 @@ static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer");
* XXX PPI control values should be in a header and used in clock.c.
*/
#ifdef PC98
+#define SPKR_DESC "PC98 speaker"
#define PPI_SPKR 0x08 /* turn these PPI bits on to pass sound */
#define PIT_COUNT 0x3fdb /* PIT count address */
@@ -73,6 +74,7 @@ static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer");
outb(PIT_COUNT, (val >> 8)); \
}
#else
+#define SPKR_DESC "PC speaker"
#define PPI_SPKR 0x03 /* turn these PPI bits on to pass sound */
#define SPEAKER_ON outb(IO_PPI, inb(IO_PPI) | PPI_SPKR)
@@ -602,7 +604,7 @@ spkrioctl(dev, cmd, cmdarg, flags, td)
*/
static struct isa_pnp_id speaker_ids[] = {
#ifndef PC98
- { 0x0008d041 /* PNP0800 */, "PC speaker" },
+ { 0x0008d041 /* PNP0800 */, SPKR_DESC },
#endif
{ 0 }
};
@@ -628,7 +630,7 @@ speaker_probe(device_t dev)
if (strncmp(device_get_name(dev), "speaker", 9))
return (ENXIO);
- device_set_desc(dev, "PC speaker");
+ device_set_desc(dev, SPKR_DESC);
return (0);
}
OpenPOWER on IntegriCloud