| 1 |
Author: dsd |
| 2 |
Date: 2008-04-19 10:09:27 +0000 (Sat, 19 Apr 2008) |
| 3 |
New Revision: 1297 |
| 4 |
|
| 5 |
Modified: |
| 6 |
genpatches-2.6/trunk/2.6.24/2705_alsa-hda-fujitsu.patch |
| 7 |
Log: |
| 8 |
convert to unix line breaks |
| 9 |
|
| 10 |
Modified: genpatches-2.6/trunk/2.6.24/2705_alsa-hda-fujitsu.patch |
| 11 |
=================================================================== |
| 12 |
--- genpatches-2.6/trunk/2.6.24/2705_alsa-hda-fujitsu.patch 2008-04-19 09:58:26 UTC (rev 1296) |
| 13 |
+++ genpatches-2.6/trunk/2.6.24/2705_alsa-hda-fujitsu.patch 2008-04-19 10:09:27 UTC (rev 1297) |
| 14 |
@@ -1,75 +1,75 @@ |
| 15 |
- |
| 16 |
-From: Tony Vroon <chainsaw@g.o> |
| 17 |
- |
| 18 |
-Applied in ALSA upstream, queued for 2.6.25 |
| 19 |
- |
| 20 |
---- a/sound/pci/hda/patch_realtek.c.orig 2008-04-12 13:40:33.000000000 +0100 |
| 21 |
-+++ b/sound/pci/hda/patch_realtek.c 2008-04-12 13:40:40.000000000 +0100 |
| 22 |
-@@ -7939,7 +7939,8 @@ |
| 23 |
- |
| 24 |
- /* |
| 25 |
- * fujitsu model |
| 26 |
-- * 0x14 = headphone/spdif-out, 0x15 = internal speaker |
| 27 |
-+ * 0x14 = headphone/spdif-out, 0x15 = internal speaker, |
| 28 |
-+ * 0x1b = port replicator headphone out |
| 29 |
- */ |
| 30 |
- |
| 31 |
- #define ALC_HP_EVENT 0x37 |
| 32 |
-@@ -7947,6 +7948,8 @@ |
| 33 |
- static struct hda_verb alc262_fujitsu_unsol_verbs[] = { |
| 34 |
- {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT}, |
| 35 |
- {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
| 36 |
-+ {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT}, |
| 37 |
-+ {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
| 38 |
- {} |
| 39 |
- }; |
| 40 |
- |
| 41 |
-@@ -7987,12 +7990,16 @@ |
| 42 |
- unsigned int mute; |
| 43 |
- |
| 44 |
- if (force || !spec->sense_updated) { |
| 45 |
-- unsigned int present; |
| 46 |
-+ unsigned int present_int_hp, present_dock_hp; |
| 47 |
- /* need to execute and sync at first */ |
| 48 |
- snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0); |
| 49 |
-- present = snd_hda_codec_read(codec, 0x14, 0, |
| 50 |
-+ present_int_hp = snd_hda_codec_read(codec, 0x14, 0, |
| 51 |
- AC_VERB_GET_PIN_SENSE, 0); |
| 52 |
-- spec->jack_present = (present & 0x80000000) != 0; |
| 53 |
-+ snd_hda_codec_read(codec, 0x1B, 0, AC_VERB_SET_PIN_SENSE, 0); |
| 54 |
-+ present_dock_hp = snd_hda_codec_read(codec, 0x1b, 0, |
| 55 |
-+ AC_VERB_GET_PIN_SENSE, 0); |
| 56 |
-+ spec->jack_present = (present_int_hp & 0x80000000) != 0; |
| 57 |
-+ spec->jack_present |= (present_dock_hp & 0x80000000) != 0; |
| 58 |
- spec->sense_updated = 1; |
| 59 |
- } |
| 60 |
- if (spec->jack_present) { |
| 61 |
-@@ -8034,12 +8041,13 @@ |
| 62 |
- long *valp = ucontrol->value.integer.value; |
| 63 |
- int change; |
| 64 |
- |
| 65 |
-- change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0, |
| 66 |
-- HDA_AMP_MUTE, |
| 67 |
-- valp[0] ? 0 : HDA_AMP_MUTE); |
| 68 |
-- change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0, |
| 69 |
-- HDA_AMP_MUTE, |
| 70 |
-- valp[1] ? 0 : HDA_AMP_MUTE); |
| 71 |
-+ change = snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, |
| 72 |
-+ HDA_AMP_MUTE, |
| 73 |
-+ valp ? 0 : HDA_AMP_MUTE); |
| 74 |
-+ change |= snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0, |
| 75 |
-+ HDA_AMP_MUTE, |
| 76 |
-+ valp ? 0 : HDA_AMP_MUTE); |
| 77 |
-+ |
| 78 |
- if (change) |
| 79 |
- alc262_fujitsu_automute(codec, 0); |
| 80 |
- return change; |
| 81 |
-@@ -8057,6 +8065,8 @@ |
| 82 |
- }, |
| 83 |
- HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), |
| 84 |
- HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), |
| 85 |
-+ HDA_CODEC_VOLUME("PC Speaker Volume", 0x0b, 0x05, HDA_INPUT), |
| 86 |
-+ HDA_CODEC_MUTE("PC Speaker Switch", 0x0b, 0x05, HDA_INPUT), |
| 87 |
- HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
| 88 |
- HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
| 89 |
- HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 90 |
+ |
| 91 |
+From: Tony Vroon <chainsaw@g.o> |
| 92 |
+ |
| 93 |
+Applied in ALSA upstream, queued for 2.6.25 |
| 94 |
+ |
| 95 |
+--- a/sound/pci/hda/patch_realtek.c.orig 2008-04-12 13:40:33.000000000 +0100 |
| 96 |
++++ b/sound/pci/hda/patch_realtek.c 2008-04-12 13:40:40.000000000 +0100 |
| 97 |
+@@ -7939,7 +7939,8 @@ |
| 98 |
+ |
| 99 |
+ /* |
| 100 |
+ * fujitsu model |
| 101 |
+- * 0x14 = headphone/spdif-out, 0x15 = internal speaker |
| 102 |
++ * 0x14 = headphone/spdif-out, 0x15 = internal speaker, |
| 103 |
++ * 0x1b = port replicator headphone out |
| 104 |
+ */ |
| 105 |
+ |
| 106 |
+ #define ALC_HP_EVENT 0x37 |
| 107 |
+@@ -7947,6 +7948,8 @@ |
| 108 |
+ static struct hda_verb alc262_fujitsu_unsol_verbs[] = { |
| 109 |
+ {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT}, |
| 110 |
+ {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
| 111 |
++ {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT}, |
| 112 |
++ {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
| 113 |
+ {} |
| 114 |
+ }; |
| 115 |
+ |
| 116 |
+@@ -7987,12 +7990,16 @@ |
| 117 |
+ unsigned int mute; |
| 118 |
+ |
| 119 |
+ if (force || !spec->sense_updated) { |
| 120 |
+- unsigned int present; |
| 121 |
++ unsigned int present_int_hp, present_dock_hp; |
| 122 |
+ /* need to execute and sync at first */ |
| 123 |
+ snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0); |
| 124 |
+- present = snd_hda_codec_read(codec, 0x14, 0, |
| 125 |
++ present_int_hp = snd_hda_codec_read(codec, 0x14, 0, |
| 126 |
+ AC_VERB_GET_PIN_SENSE, 0); |
| 127 |
+- spec->jack_present = (present & 0x80000000) != 0; |
| 128 |
++ snd_hda_codec_read(codec, 0x1B, 0, AC_VERB_SET_PIN_SENSE, 0); |
| 129 |
++ present_dock_hp = snd_hda_codec_read(codec, 0x1b, 0, |
| 130 |
++ AC_VERB_GET_PIN_SENSE, 0); |
| 131 |
++ spec->jack_present = (present_int_hp & 0x80000000) != 0; |
| 132 |
++ spec->jack_present |= (present_dock_hp & 0x80000000) != 0; |
| 133 |
+ spec->sense_updated = 1; |
| 134 |
+ } |
| 135 |
+ if (spec->jack_present) { |
| 136 |
+@@ -8034,12 +8041,13 @@ |
| 137 |
+ long *valp = ucontrol->value.integer.value; |
| 138 |
+ int change; |
| 139 |
+ |
| 140 |
+- change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0, |
| 141 |
+- HDA_AMP_MUTE, |
| 142 |
+- valp[0] ? 0 : HDA_AMP_MUTE); |
| 143 |
+- change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0, |
| 144 |
+- HDA_AMP_MUTE, |
| 145 |
+- valp[1] ? 0 : HDA_AMP_MUTE); |
| 146 |
++ change = snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, |
| 147 |
++ HDA_AMP_MUTE, |
| 148 |
++ valp ? 0 : HDA_AMP_MUTE); |
| 149 |
++ change |= snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0, |
| 150 |
++ HDA_AMP_MUTE, |
| 151 |
++ valp ? 0 : HDA_AMP_MUTE); |
| 152 |
++ |
| 153 |
+ if (change) |
| 154 |
+ alc262_fujitsu_automute(codec, 0); |
| 155 |
+ return change; |
| 156 |
+@@ -8057,6 +8065,8 @@ |
| 157 |
+ }, |
| 158 |
+ HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), |
| 159 |
+ HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), |
| 160 |
++ HDA_CODEC_VOLUME("PC Speaker Volume", 0x0b, 0x05, HDA_INPUT), |
| 161 |
++ HDA_CODEC_MUTE("PC Speaker Switch", 0x0b, 0x05, HDA_INPUT), |
| 162 |
+ HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), |
| 163 |
+ HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
| 164 |
+ HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), |
| 165 |
|
| 166 |
-- |
| 167 |
gentoo-commits@l.g.o mailing list |
Archives