diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-05-24 18:44:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-24 18:44:14 -0700 |
| commit | 5ec9222adbece389694f95cd904ccedd745f5575 (patch) | |
| tree | e536ddc1954518d76303dc77f67c2da20572bb3e /sound | |
| parent | 245d91566bec7884548ca22af0a60a2d23503ab6 (diff) | |
| download | history-5ec9222adbece389694f95cd904ccedd745f5575.tar.gz | |
[PATCH] isapnp sb16 virtual pc
From: David Sanders <linux@sandersweb.net>
Patch adds support for the emulated Soundblaster 16 in Virtual PC 2004.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/sb/sb16.c | 2 | ||||
| -rw-r--r-- | sound/oss/sb_card.c | 7 | ||||
| -rw-r--r-- | sound/oss/sb_card.h | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c index 09ff7c697f3646..cdf00d3069a44e 100644 --- a/sound/isa/sb/sb16.c +++ b/sound/isa/sb/sb16.c @@ -248,6 +248,8 @@ static struct pnp_card_device_id snd_sb16_pnpids[] = { { .id = "CTLXXXX" , .devs = { { "CTL0044" }, { "CTL0023" } } }, { .id = "CTLXXXX" , .devs = { { "CTL0045" }, { "CTL0022" } } }, #endif /* SNDRV_SBAWE */ + /* Sound Blaster 16 PnP (Virtual PC 2004)*/ + { .id = "tBA03b0", .devs = { { "PNPb003" } } }, { .id = "", } }; diff --git a/sound/oss/sb_card.c b/sound/oss/sb_card.c index 18f7498fc2e2bd..b5f5ecbf25a95d 100644 --- a/sound/oss/sb_card.c +++ b/sound/oss/sb_card.c @@ -181,6 +181,13 @@ static void sb_dev2cfg(struct pnp_dev *dev, struct sb_card_config *scc) scc->mpucnf.io_base = pnp_port_start(dev,1); return; } + if(!strncmp("tBA",scc->card_id,3)) { + scc->conf.io_base = pnp_port_start(dev,0); + scc->conf.irq = pnp_irq(dev,0); + scc->conf.dma = pnp_dma(dev,0); + scc->conf.dma2 = pnp_dma(dev,1); + return; + } if(!strncmp("ESS",scc->card_id,3)) { scc->conf.io_base = pnp_port_start(dev,0); scc->conf.irq = pnp_irq(dev,0); diff --git a/sound/oss/sb_card.h b/sound/oss/sb_card.h index 6425c13cc57f40..5535cff800df01 100644 --- a/sound/oss/sb_card.h +++ b/sound/oss/sb_card.h @@ -140,6 +140,8 @@ static struct pnp_card_device_id sb_pnp_card_table[] = { {.id = "RTL3000", .driver_data = 0, .devs = { {.id="@@@2001"}, {.id="@X@2001"}, {.id="@H@0001"}, } }, + /* Sound Blaster 16 (Virtual PC 2004) */ + {.id = "tBA03b0", .driver_data = 0, .devs = { {.id="PNPb003"}, } }, /* -end- */ {.id = "", } }; |