| @@ -332,7 +332,7 @@ static int snd_emu10k1_gpr_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl · 331 unmodified lines |
| 332 | 332 | struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); |
| 333 | 333 | struct snd_emu10k1_fx8010_ctl *ctl = |
| 334 | 334 | (struct snd_emu10k1_fx8010_ctl *) kcontrol->private_value; |
| 335 | | − unsigned int nval, val; |
| 335 | + int nval, val; |
| 336 | 336 | unsigned int i, j; |
| 337 | 337 | int change = 0; |
| 338 | 338 | |
| @@ -349,9 +349,16 @@ static int snd_emu10k1_gpr_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl · 10 unmodified lines |
| 349 | 349 | case EMU10K1_GPR_TRANSLATION_NONE: |
| 350 | 350 | snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0, val); |
| 351 | 351 | break; |
| 352 | + case EMU10K1_GPR_TRANSLATION_NEGATE: |
| 353 | + snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0, ~val); |
| 354 | + break; |
| 352 | 355 | case EMU10K1_GPR_TRANSLATION_TABLE100: |
| 353 | 356 | snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0, db_table[val]); |
| 354 | 357 | break; |
| 358 | + case EMU10K1_GPR_TRANSLATION_NEG_TABLE100: |
| 359 | + snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0, |
| 360 | + val == 100 ? 0x80000000 : -(int)db_table[val]); |
| 361 | + break; |
| 355 | 362 | case EMU10K1_GPR_TRANSLATION_BASS: |
| 356 | 363 | if ((ctl->count % 5) != 0 || (ctl->count / 5) != ctl->vcount) { |
| 357 | 364 | change = -EIO; |
| @@ -771,8 +778,10 @@ static int snd_emu10k1_verify_controls(struct snd_emu10k1 *emu, · 413 unmodified lines |
| 771 | 778 | } |
| 772 | 779 | switch (gctl->translation) { |
| 773 | 780 | case EMU10K1_GPR_TRANSLATION_NONE: |
| 781 | + case EMU10K1_GPR_TRANSLATION_NEGATE: |
| 774 | 782 | break; |
| 775 | 783 | case EMU10K1_GPR_TRANSLATION_TABLE100: |
| 784 | + case EMU10K1_GPR_TRANSLATION_NEG_TABLE100: |
| 776 | 785 | if (gctl->min != 0 || gctl->max != 100) { |
| 777 | 786 | err = -EINVAL; |
| 778 | 787 | goto __error; |
| @@ -1137,44 +1146,44 @@ static int snd_emu10k1_ipcm_peek(struct snd_emu10k1 *emu, · 358 unmodified lines |
| 1137 | 1146 | |
| 1138 | 1147 | static void |
| 1139 | 1148 | snd_emu10k1_init_mono_control(struct snd_emu10k1_fx8010_control_gpr *ctl, |
| 1140 | | − const char *name, int gpr, int defval) |
| 1149 | + const char *name, int gpr, int defval) |
| 1141 | 1150 | { |
| 1142 | 1151 | ctl->id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER; |
| 1143 | 1152 | strcpy(ctl->id.name, name); |
| 1144 | 1153 | ctl->vcount = ctl->count = 1; |
| 1145 | 1154 | if (high_res_gpr_volume) { |
| 1146 | | − ctl->min = 0; |
| 1155 | + ctl->min = -1; |
| 1147 | 1156 | ctl->max = 0x7fffffff; |
| 1148 | 1157 | ctl->tlv = snd_emu10k1_db_linear; |
| 1149 | | − ctl->translation = EMU10K1_GPR_TRANSLATION_NONE; |
| 1150 | | − defval = defval * 0x7fffffffLL / 100; |
| 1158 | + ctl->translation = EMU10K1_GPR_TRANSLATION_NEGATE; |
| 1159 | + defval = defval * 0x80000000LL / 100 - 1; |
| 1151 | 1160 | } else { |
| 1152 | 1161 | ctl->min = 0; |
| 1153 | 1162 | ctl->max = 100; |
| 1154 | 1163 | ctl->tlv = snd_emu10k1_db_scale1; |
| 1155 | | − ctl->translation = EMU10K1_GPR_TRANSLATION_TABLE100; |
| 1164 | + ctl->translation = EMU10K1_GPR_TRANSLATION_NEG_TABLE100; |
| 1156 | 1165 | } |
| 1157 | 1166 | ctl->gpr[0] = gpr + 0; ctl->value[0] = defval; |
| 1158 | 1167 | } |
| 1159 | 1168 | |
| 1160 | 1169 | static void |
| 1161 | 1170 | snd_emu10k1_init_stereo_control(struct snd_emu10k1_fx8010_control_gpr *ctl, |
| 1162 | | − const char *name, int gpr, int defval) |
| 1171 | + const char *name, int gpr, int defval) |
| 1163 | 1172 | { |
| 1164 | 1173 | ctl->id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER; |
| 1165 | 1174 | strcpy(ctl->id.name, name); |
| 1166 | 1175 | ctl->vcount = ctl->count = 2; |
| 1167 | 1176 | if (high_res_gpr_volume) { |
| 1168 | | − ctl->min = 0; |
| 1177 | + ctl->min = -1; |
| 1169 | 1178 | ctl->max = 0x7fffffff; |
| 1170 | 1179 | ctl->tlv = snd_emu10k1_db_linear; |
| 1171 | | − ctl->translation = EMU10K1_GPR_TRANSLATION_NONE; |
| 1172 | | − defval = defval * 0x7fffffffLL / 100; |
| 1180 | + ctl->translation = EMU10K1_GPR_TRANSLATION_NEGATE; |
| 1181 | + defval = defval * 0x80000000LL / 100 - 1; |
| 1173 | 1182 | } else { |
| 1174 | 1183 | ctl->min = 0; |
| 1175 | 1184 | ctl->max = 100; |
| 1176 | 1185 | ctl->tlv = snd_emu10k1_db_scale1; |
| 1177 | | − ctl->translation = EMU10K1_GPR_TRANSLATION_TABLE100; |
| 1186 | + ctl->translation = EMU10K1_GPR_TRANSLATION_NEG_TABLE100; |
| 1178 | 1187 | } |
| 1179 | 1188 | ctl->gpr[0] = gpr + 0; ctl->value[0] = defval; |
| 1180 | 1189 | ctl->gpr[1] = gpr + 1; ctl->value[1] = defval; |
| @@ -1293,36 +1302,36 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu) · 112 unmodified lines |
| 1293 | 1302 | |
| 1294 | 1303 | #if 1 |
| 1295 | 1304 | /* PCM front Playback Volume (independent from stereo mix) |
| 1296 | | − * playback = 0 + ( gpr * FXBUS_PCM_LEFT_FRONT >> 31) |
| 1297 | | − * where gpr contains attenuation from corresponding mixer control |
| 1305 | + * playback = -gpr * FXBUS_PCM_LEFT_FRONT >> 31 |
| 1306 | + * where gpr contains negated attenuation from corresponding mixer control |
| 1298 | 1307 | * (snd_emu10k1_init_stereo_control) |
| 1299 | 1308 | */ |
| 1300 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_FRONT)); |
| 1301 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_FRONT)); |
| 1309 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_FRONT)); |
| 1310 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_FRONT)); |
| 1302 | 1311 | snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Front Playback Volume", gpr, 100); |
| 1303 | 1312 | gpr += 2; |
| 1304 | 1313 | |
| 1305 | 1314 | /* PCM Surround Playback (independent from stereo mix) */ |
| 1306 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+2), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_REAR)); |
| 1307 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+3), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_REAR)); |
| 1315 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+2), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_REAR)); |
| 1316 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+3), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_REAR)); |
| 1308 | 1317 | snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Surround Playback Volume", gpr, 100); |
| 1309 | 1318 | gpr += 2; |
| 1310 | 1319 | |
| 1311 | 1320 | /* PCM Side Playback (independent from stereo mix) */ |
| 1312 | 1321 | if (emu->card_capabilities->spk71) { |
| 1313 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+6), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_SIDE)); |
| 1314 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+7), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_SIDE)); |
| 1322 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+6), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_SIDE)); |
| 1323 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+7), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_SIDE)); |
| 1315 | 1324 | snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Side Playback Volume", gpr, 100); |
| 1316 | 1325 | gpr += 2; |
| 1317 | 1326 | } |
| 1318 | 1327 | |
| 1319 | 1328 | /* PCM Center Playback (independent from stereo mix) */ |
| 1320 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+4), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_CENTER)); |
| 1329 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+4), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_CENTER)); |
| 1321 | 1330 | snd_emu10k1_init_mono_control(&controls[nctl++], "PCM Center Playback Volume", gpr, 100); |
| 1322 | 1331 | gpr++; |
| 1323 | 1332 | |
| 1324 | 1333 | /* PCM LFE Playback (independent from stereo mix) */ |
| 1325 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+5), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LFE)); |
| 1334 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+5), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LFE)); |
| 1326 | 1335 | snd_emu10k1_init_mono_control(&controls[nctl++], "PCM LFE Playback Volume", gpr, 100); |
| 1327 | 1336 | gpr++; |
| 1328 | 1337 | |
| @@ -1330,26 +1339,26 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu) · 1 unmodified line |
| 1330 | 1339 | * Stereo Mix |
| 1331 | 1340 | */ |
| 1332 | 1341 | /* Wave (PCM) Playback Volume (will be renamed later) */ |
| 1333 | | − A_OP(icode, &ptr, iMAC0, A_GPR(stereo_mix), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT)); |
| 1334 | | − A_OP(icode, &ptr, iMAC0, A_GPR(stereo_mix+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT)); |
| 1342 | + A_OP(icode, &ptr, iMAC1, A_GPR(stereo_mix), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT)); |
| 1343 | + A_OP(icode, &ptr, iMAC1, A_GPR(stereo_mix+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT)); |
| 1335 | 1344 | snd_emu10k1_init_stereo_control(&controls[nctl++], "Wave Playback Volume", gpr, 100); |
| 1336 | 1345 | gpr += 2; |
| 1337 | 1346 | |
| 1338 | 1347 | /* Synth Playback */ |
| 1339 | | − A_OP(icode, &ptr, iMAC0, A_GPR(stereo_mix+0), A_GPR(stereo_mix+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT)); |
| 1340 | | − A_OP(icode, &ptr, iMAC0, A_GPR(stereo_mix+1), A_GPR(stereo_mix+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT)); |
| 1348 | + A_OP(icode, &ptr, iMAC1, A_GPR(stereo_mix+0), A_GPR(stereo_mix+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT)); |
| 1349 | + A_OP(icode, &ptr, iMAC1, A_GPR(stereo_mix+1), A_GPR(stereo_mix+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT)); |
| 1341 | 1350 | snd_emu10k1_init_stereo_control(&controls[nctl++], "Synth Playback Volume", gpr, 100); |
| 1342 | 1351 | gpr += 2; |
| 1343 | 1352 | |
| 1344 | 1353 | /* Wave (PCM) Capture */ |
| 1345 | | − A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT)); |
| 1346 | | − A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT)); |
| 1354 | + A_OP(icode, &ptr, iMAC1, A_GPR(capture+0), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT)); |
| 1355 | + A_OP(icode, &ptr, iMAC1, A_GPR(capture+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT)); |
| 1347 | 1356 | snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Capture Volume", gpr, 0); |
| 1348 | 1357 | gpr += 2; |
| 1349 | 1358 | |
| 1350 | 1359 | /* Synth Capture */ |
| 1351 | | − A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT)); |
| 1352 | | − A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT)); |
| 1360 | + A_OP(icode, &ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT)); |
| 1361 | + A_OP(icode, &ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT)); |
| 1353 | 1362 | snd_emu10k1_init_stereo_control(&controls[nctl++], "Synth Capture Volume", gpr, 0); |
| 1354 | 1363 | gpr += 2; |
| 1355 | 1364 | |
| @@ -1357,23 +1366,23 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu) · 1 unmodified line |
| 1357 | 1366 | * inputs |
| 1358 | 1367 | */ |
| 1359 | 1368 | #define A_ADD_VOLUME_IN(var,vol,input) \ |
| 1360 | | −A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) |
| 1369 | + A_OP(icode, &ptr, iMAC1, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) |
| 1361 | 1370 | |
| 1362 | 1371 | if (emu->card_capabilities->emu_model) { |
| 1363 | 1372 | /* EMU1010 DSP 0 and DSP 1 Capture */ |
| 1364 | 1373 | // The 24 MSB hold the actual value. We implicitly discard the 16 LSB. |
| 1365 | 1374 | if (emu->card_capabilities->ca0108_chip) { |
| 1366 | 1375 | // For unclear reasons, the EMU32IN cannot be the Y operand! |
| 1367 | | − A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A3_EMU32IN(0x0), A_GPR(gpr)); |
| 1376 | + A_OP(icode, &ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A3_EMU32IN(0x0), A_GPR(gpr)); |
| 1368 | 1377 | // A3_EMU32IN(0) is delayed by one sample, so all other A3_EMU32IN channels |
| 1369 | 1378 | // need to be delayed as well; we use an auxiliary register for that. |
| 1370 | | − A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+2), A_GPR(gpr+1)); |
| 1379 | + A_OP(icode, &ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+2), A_GPR(gpr+1)); |
| 1371 | 1380 | A_OP(icode, &ptr, iACC3, A_GPR(gpr+2), A3_EMU32IN(0x1), A_C_00000000, A_C_00000000); |
| 1372 | 1381 | } else { |
| 1373 | | − A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_P16VIN(0x0)); |
| 1382 | + A_OP(icode, &ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A_P16VIN(0x0), A_GPR(gpr)); |
| 1374 | 1383 | // A_P16VIN(0) is delayed by one sample, so all other A_P16VIN channels |
| 1375 | 1384 | // need to be delayed as well; we use an auxiliary register for that. |
| 1376 | | − A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_GPR(gpr+2)); |
| 1385 | + A_OP(icode, &ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+2), A_GPR(gpr+1)); |
| 1377 | 1386 | A_OP(icode, &ptr, iACC3, A_GPR(gpr+2), A_P16VIN(0x1), A_C_00000000, A_C_00000000); |
| 1378 | 1387 | } |
| 1379 | 1388 | snd_emu10k1_init_stereo_control(&controls[nctl++], "EMU Capture Volume", gpr, 0); |
| @@ -1465,33 +1474,33 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) · 85 unmodified lines |
| 1465 | 1474 | } |
| 1466 | 1475 | |
| 1467 | 1476 | /* Stereo Mix Front Playback Volume */ |
| 1468 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback), A_GPR(playback), A_GPR(gpr), A_GPR(stereo_mix)); |
| 1469 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+1), A_GPR(playback+1), A_GPR(gpr+1), A_GPR(stereo_mix+1)); |
| 1477 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback), A_GPR(playback), A_GPR(gpr), A_GPR(stereo_mix)); |
| 1478 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+1), A_GPR(playback+1), A_GPR(gpr+1), A_GPR(stereo_mix+1)); |
| 1470 | 1479 | snd_emu10k1_init_stereo_control(&controls[nctl++], "Front Playback Volume", gpr, 100); |
| 1471 | 1480 | gpr += 2; |
| 1472 | 1481 | |
| 1473 | 1482 | /* Stereo Mix Surround Playback */ |
| 1474 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+2), A_GPR(playback+2), A_GPR(gpr), A_GPR(stereo_mix)); |
| 1475 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+3), A_GPR(playback+3), A_GPR(gpr+1), A_GPR(stereo_mix+1)); |
| 1483 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+2), A_GPR(playback+2), A_GPR(gpr), A_GPR(stereo_mix)); |
| 1484 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+3), A_GPR(playback+3), A_GPR(gpr+1), A_GPR(stereo_mix+1)); |
| 1476 | 1485 | snd_emu10k1_init_stereo_control(&controls[nctl++], "Surround Playback Volume", gpr, 0); |
| 1477 | 1486 | gpr += 2; |
| 1478 | 1487 | |
| 1479 | 1488 | /* Stereo Mix Center Playback */ |
| 1480 | 1489 | /* Center = sub = Left/2 + Right/2 */ |
| 1481 | 1490 | A_OP(icode, &ptr, iINTERP, A_GPR(tmp), A_GPR(stereo_mix), A_C_40000000, A_GPR(stereo_mix+1)); |
| 1482 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+4), A_GPR(playback+4), A_GPR(gpr), A_GPR(tmp)); |
| 1491 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+4), A_GPR(playback+4), A_GPR(gpr), A_GPR(tmp)); |
| 1483 | 1492 | snd_emu10k1_init_mono_control(&controls[nctl++], "Center Playback Volume", gpr, 0); |
| 1484 | 1493 | gpr++; |
| 1485 | 1494 | |
| 1486 | 1495 | /* Stereo Mix LFE Playback */ |
| 1487 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+5), A_GPR(playback+5), A_GPR(gpr), A_GPR(tmp)); |
| 1496 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+5), A_GPR(playback+5), A_GPR(gpr), A_GPR(tmp)); |
| 1488 | 1497 | snd_emu10k1_init_mono_control(&controls[nctl++], "LFE Playback Volume", gpr, 0); |
| 1489 | 1498 | gpr++; |
| 1490 | 1499 | |
| 1491 | 1500 | if (emu->card_capabilities->spk71) { |
| 1492 | 1501 | /* Stereo Mix Side Playback */ |
| 1493 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+6), A_GPR(playback+6), A_GPR(gpr), A_GPR(stereo_mix)); |
| 1494 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+7), A_GPR(playback+7), A_GPR(gpr+1), A_GPR(stereo_mix+1)); |
| 1502 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+6), A_GPR(playback+6), A_GPR(gpr), A_GPR(stereo_mix)); |
| 1503 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+7), A_GPR(playback+7), A_GPR(gpr+1), A_GPR(stereo_mix+1)); |
| 1495 | 1504 | snd_emu10k1_init_stereo_control(&controls[nctl++], "Side Playback Volume", gpr, 0); |
| 1496 | 1505 | gpr += 2; |
| 1497 | 1506 | } |
| @@ -1579,7 +1588,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) · 81 unmodified lines |
| 1579 | 1588 | |
| 1580 | 1589 | /* Master volume (will be renamed later) */ |
| 1581 | 1590 | for (z = 0; z < 8; z++) |
| 1582 | | − A_OP(icode, &ptr, iMAC0, A_GPR(playback+z), A_C_00000000, A_GPR(gpr), A_GPR(playback+z)); |
| 1591 | + A_OP(icode, &ptr, iMAC1, A_GPR(playback+z), A_C_00000000, A_GPR(gpr), A_GPR(playback+z)); |
| 1583 | 1592 | snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0); |
| 1584 | 1593 | gpr++; |
| 1585 | 1594 | |
| @@ -1731,30 +1740,14 @@ __err_gpr: · 145 unmodified lines |
| 1731 | 1740 | * initial DSP configuration for Emu10k1 |
| 1732 | 1741 | */ |
| 1733 | 1742 | |
| 1734 | | −/* when volume = max, then copy only to avoid volume modification */ |
| 1735 | | −/* with iMAC0 (negative values) */ |
| 1743 | +/* Volumes are in the [-2^31, 0] range, zero being mute. */ |
| 1736 | 1744 | static void _volume(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol) |
| 1737 | 1745 | { |
| 1738 | | − OP(icode, ptr, iMAC0, dst, C_00000000, src, vol); |
| 1739 | | − OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff); |
| 1740 | | − OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000001); |
| 1741 | | − OP(icode, ptr, iACC3, dst, src, C_00000000, C_00000000); |
| 1746 | + OP(icode, ptr, iMAC1, dst, C_00000000, src, vol); |
| 1742 | 1747 | } |
| 1743 | 1748 | static void _volume_add(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol) |
| 1744 | 1749 | { |
| 1745 | | − OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff); |
| 1746 | | − OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000002); |
| 1747 | | − OP(icode, ptr, iMACINT0, dst, dst, src, C_00000001); |
| 1748 | | − OP(icode, ptr, iSKIP, C_00000000, C_7fffffff, C_7fffffff, C_00000001); |
| 1749 | | − OP(icode, ptr, iMAC0, dst, dst, src, vol); |
| 1750 | | −} |
| 1751 | | −static void _volume_out(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol) |
| 1752 | | −{ |
| 1753 | | − OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff); |
| 1754 | | − OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000002); |
| 1755 | | − OP(icode, ptr, iACC3, dst, src, C_00000000, C_00000000); |
| 1756 | | − OP(icode, ptr, iSKIP, C_00000000, C_7fffffff, C_7fffffff, C_00000001); |
| 1757 | | − OP(icode, ptr, iMAC0, dst, C_00000000, src, vol); |
| 1750 | + OP(icode, ptr, iMAC1, dst, dst, src, vol); |
| 1758 | 1751 | } |
| 1759 | 1752 | |
| 1760 | 1753 | #define VOLUME(icode, ptr, dst, src, vol) \ |
| @@ -1766,7 +1759,7 @@ static void _volume_out(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst · 5 unmodified lines |
| 1766 | 1759 | #define VOLUME_ADDIN(icode, ptr, dst, src, vol) \ |
| 1767 | 1760 | _volume_add(icode, ptr, GPR(dst), EXTIN(src), GPR(vol)) |
| 1768 | 1761 | #define VOLUME_OUT(icode, ptr, dst, src, vol) \ |
| 1769 | | − _volume_out(icode, ptr, EXTOUT(dst), GPR(src), GPR(vol)) |
| 1762 | + _volume(icode, ptr, EXTOUT(dst), GPR(src), GPR(vol)) |
| 1770 | 1763 | #define _SWITCH(icode, ptr, dst, src, sw) \ |
| 1771 | 1764 | OP((icode), ptr, iMACINT0, dst, C_00000000, src, sw); |
| 1772 | 1765 | #define SWITCH(icode, ptr, dst, src, sw) \ |