From fd221086efb2f2aa47c70b46fea051fd850215e6 Mon Sep 17 00:00:00 2001 From: mdodd Date: Mon, 24 Mar 2003 21:01:54 +0000 Subject: Retire sys/pc98/pc98/spkr.c --- sys/dev/speaker/spkr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/dev/speaker') 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); } -- cgit v1.1