From d0847d9cf12f06b3db641ed0649c40dcff5df4ec Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sun, 3 Oct 1999 17:45:54 +0000 Subject: [PATCH] Detect CTL0044 & CTL0045 as "Creative AWE64 PnP" rather than "SB16 PnP". Reviewed by: dfr --- sys/dev/pcm/isa/sb.c | 5 ++++- sys/dev/sound/isa/sb.c | 5 ++++- sys/dev/sound/isa/sb16.c | 5 ++++- sys/dev/sound/isa/sb8.c | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/dev/pcm/isa/sb.c b/sys/dev/pcm/isa/sb.c index 40c2925700a..94af544cfd1 100644 --- a/sys/dev/pcm/isa/sb.c +++ b/sys/dev/pcm/isa/sb.c @@ -1259,9 +1259,12 @@ sbpnp_probe(device_t dev) case 0x31008c0e: /* CTL0031 */ case 0x41008c0e: /* CTL0041 */ case 0x42008c0e: /* CTL0042 */ + s = "SB16 PnP"; + break; + case 0x44008c0e: /* CTL0044 */ case 0x45008c0e: /* CTL0045 */ - s = "SB16 PnP"; + s = "Creative AWE64 PnP"; break; case 0x01100000: /* @@@1001 */ diff --git a/sys/dev/sound/isa/sb.c b/sys/dev/sound/isa/sb.c index 40c2925700a..94af544cfd1 100644 --- a/sys/dev/sound/isa/sb.c +++ b/sys/dev/sound/isa/sb.c @@ -1259,9 +1259,12 @@ sbpnp_probe(device_t dev) case 0x31008c0e: /* CTL0031 */ case 0x41008c0e: /* CTL0041 */ case 0x42008c0e: /* CTL0042 */ + s = "SB16 PnP"; + break; + case 0x44008c0e: /* CTL0044 */ case 0x45008c0e: /* CTL0045 */ - s = "SB16 PnP"; + s = "Creative AWE64 PnP"; break; case 0x01100000: /* @@@1001 */ diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c index 40c2925700a..94af544cfd1 100644 --- a/sys/dev/sound/isa/sb16.c +++ b/sys/dev/sound/isa/sb16.c @@ -1259,9 +1259,12 @@ sbpnp_probe(device_t dev) case 0x31008c0e: /* CTL0031 */ case 0x41008c0e: /* CTL0041 */ case 0x42008c0e: /* CTL0042 */ + s = "SB16 PnP"; + break; + case 0x44008c0e: /* CTL0044 */ case 0x45008c0e: /* CTL0045 */ - s = "SB16 PnP"; + s = "Creative AWE64 PnP"; break; case 0x01100000: /* @@@1001 */ diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c index 40c2925700a..94af544cfd1 100644 --- a/sys/dev/sound/isa/sb8.c +++ b/sys/dev/sound/isa/sb8.c @@ -1259,9 +1259,12 @@ sbpnp_probe(device_t dev) case 0x31008c0e: /* CTL0031 */ case 0x41008c0e: /* CTL0041 */ case 0x42008c0e: /* CTL0042 */ + s = "SB16 PnP"; + break; + case 0x44008c0e: /* CTL0044 */ case 0x45008c0e: /* CTL0045 */ - s = "SB16 PnP"; + s = "Creative AWE64 PnP"; break; case 0x01100000: /* @@@1001 */