From 7cbbad2ad0fe44c156d07bcf40c5b19f71f2d884 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sat, 25 Jun 2005 14:59:02 -0700 Subject: [PATCH] --- yaml --- r: 3395 b: refs/heads/master c: f25ad2d3b886e61d7ec03a3bdefc22871c14e9da h: refs/heads/master i: 3393: 28ff891dc812b9f972766a983fa1757a559981d2 3391: 4e8fe94113d6e001977b8d48dce08be8fea0f1d9 v: v3 --- [refs] | 2 +- trunk/sound/oss/sscape.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d0f1a1709fda..de3f27b91db4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4cd16e2e8f0924d8e3a2391edc51556cad26d99 +refs/heads/master: f25ad2d3b886e61d7ec03a3bdefc22871c14e9da diff --git a/trunk/sound/oss/sscape.c b/trunk/sound/oss/sscape.c index 50ca64629450..9ed5211c3168 100644 --- a/trunk/sound/oss/sscape.c +++ b/trunk/sound/oss/sscape.c @@ -991,7 +991,6 @@ static void __init sscape_pnp_init_hw(sscape_info* devc) unsigned i; static char code_file_name[23] = "/sndscape/sndscape.cox"; - int sscape_sb_enable = 0; int sscape_joystic_enable = 0x7f; int sscape_mic_enable = 0; int sscape_ext_midi = 0; @@ -1015,14 +1014,9 @@ static void __init sscape_pnp_init_hw(sscape_info* devc) sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40); sscape_write( devc, 3, ( devc -> dma << 4) | 0x80); - if ( sscape_sb_enable ) - sscape_write (devc, 4, 0xF0 | (sb_irq << 2) | midi_irq); - else - sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq); + sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq); i = 0x10; //sscape_read(devc, 9) & (devc->ic_type == IC_ODIE ? 0xf0 : 0xc0); - if ( sscape_sb_enable ) - i |= devc->ic_type == IC_ODIE ? 0x05 : 0x07; if (sscape_joystic_enable) i |= 8; sscape_write (devc, 9, i);