Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: emux: More constifications

Apply const prefix to each possible place: the MIDI data definitions,
the static tables for volume parameters, etc.

Just for minor optimization and no functional changes.

Link: https://lore.kernel.org/r/20200105144823.29547-22-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

+11 -11
+2 -2
sound/synth/emux/emux_nrpn.c
··· 63 63 /* effect sensitivities for GS NRPN: 64 64 * adjusted for chaos 8MB soundfonts 65 65 */ 66 - static int gs_sense[] = 66 + static const int gs_sense[] = 67 67 { 68 68 DEF_FX_CUTOFF, DEF_FX_RESONANCE, DEF_FX_ATTACK, DEF_FX_RELEASE, 69 69 DEF_FX_VIBRATE, DEF_FX_VIBDEPTH, DEF_FX_VIBDELAY ··· 72 72 /* effect sensitivies for XG controls: 73 73 * adjusted for chaos 8MB soundfonts 74 74 */ 75 - static int xg_sense[] = 75 + static const int xg_sense[] = 76 76 { 77 77 DEF_FX_CUTOFF, DEF_FX_RESONANCE, DEF_FX_ATTACK, DEF_FX_RELEASE, 78 78 DEF_FX_VIBRATE, DEF_FX_VIBDEPTH, DEF_FX_VIBDELAY
+5 -5
sound/synth/emux/emux_synth.c
··· 529 529 530 530 #if 0 // not used 531 531 /* table for volume target calculation */ 532 - static unsigned short voltarget[16] = { 532 + static const unsigned short voltarget[16] = { 533 533 0xEAC0, 0xE0C8, 0xD740, 0xCE20, 0xC560, 0xBD08, 0xB500, 0xAD58, 534 534 0xA5F8, 0x9EF0, 0x9830, 0x91C0, 0x8B90, 0x85A8, 0x8000, 0x7A90 535 535 }; ··· 616 616 /* 617 617 * calculate pitch parameter 618 618 */ 619 - static unsigned char pan_volumes[256] = { 619 + static const unsigned char pan_volumes[256] = { 620 620 0x00,0x03,0x06,0x09,0x0c,0x0f,0x12,0x14,0x17,0x1a,0x1d,0x20,0x22,0x25,0x28,0x2a, 621 621 0x2d,0x30,0x32,0x35,0x37,0x3a,0x3c,0x3f,0x41,0x44,0x46,0x49,0x4b,0x4d,0x50,0x52, 622 622 0x54,0x57,0x59,0x5b,0x5d,0x60,0x62,0x64,0x66,0x68,0x6a,0x6c,0x6f,0x71,0x73,0x75, ··· 684 684 */ 685 685 686 686 /* tables for volume->attenuation calculation */ 687 - static unsigned char voltab1[128] = { 687 + static const unsigned char voltab1[128] = { 688 688 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 689 689 0x63, 0x2b, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 690 690 0x21, 0x20, 0x1f, 0x1e, 0x1e, 0x1d, 0x1c, 0x1b, 0x1b, 0x1a, ··· 700 700 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 701 701 }; 702 702 703 - static unsigned char voltab2[128] = { 703 + static const unsigned char voltab2[128] = { 704 704 0x32, 0x31, 0x30, 0x2f, 0x2e, 0x2d, 0x2c, 0x2b, 0x2a, 0x2a, 705 705 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x24, 0x23, 0x22, 0x21, 706 706 0x21, 0x20, 0x1f, 0x1e, 0x1e, 0x1d, 0x1c, 0x1c, 0x1b, 0x1a, ··· 716 716 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 717 717 }; 718 718 719 - static unsigned char expressiontab[128] = { 719 + static const unsigned char expressiontab[128] = { 720 720 0x7f, 0x6c, 0x62, 0x5a, 0x54, 0x50, 0x4b, 0x48, 0x45, 0x42, 721 721 0x40, 0x3d, 0x3b, 0x39, 0x38, 0x36, 0x34, 0x33, 0x31, 0x30, 722 722 0x2f, 0x2d, 0x2c, 0x2b, 0x2a, 0x29, 0x28, 0x27, 0x26, 0x25,
+4 -4
sound/synth/emux/soundfont.c
··· 751 751 752 752 753 753 /* log2_tbl[i] = log2(i+128) * 0x10000 */ 754 - static int log_tbl[129] = { 754 + static const int log_tbl[129] = { 755 755 0x70000, 0x702df, 0x705b9, 0x7088e, 0x70b5d, 0x70e26, 0x710eb, 0x713aa, 756 756 0x71663, 0x71918, 0x71bc8, 0x71e72, 0x72118, 0x723b9, 0x72655, 0x728ed, 757 757 0x72b80, 0x72e0e, 0x73098, 0x7331d, 0x7359e, 0x7381b, 0x73a93, 0x73d08, ··· 857 857 /* convert envelope time parameter to soundfont parameters */ 858 858 859 859 /* attack & decay/release time table (msec) */ 860 - static short attack_time_tbl[128] = { 860 + static const short attack_time_tbl[128] = { 861 861 32767, 32767, 5989, 4235, 2994, 2518, 2117, 1780, 1497, 1373, 1259, 1154, 1058, 970, 890, 816, 862 862 707, 691, 662, 634, 607, 581, 557, 533, 510, 489, 468, 448, 429, 411, 393, 377, 863 863 361, 345, 331, 317, 303, 290, 278, 266, 255, 244, 234, 224, 214, 205, 196, 188, ··· 868 868 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 6, 0, 869 869 }; 870 870 871 - static short decay_time_tbl[128] = { 871 + static const short decay_time_tbl[128] = { 872 872 32767, 32767, 22614, 15990, 11307, 9508, 7995, 6723, 5653, 5184, 4754, 4359, 3997, 3665, 3361, 3082, 873 873 2828, 2765, 2648, 2535, 2428, 2325, 2226, 2132, 2042, 1955, 1872, 1793, 1717, 1644, 1574, 1507, 874 874 1443, 1382, 1324, 1267, 1214, 1162, 1113, 1066, 978, 936, 897, 859, 822, 787, 754, 722, ··· 891 891 892 892 /* search an index for specified time from given time table */ 893 893 static int 894 - calc_parm_search(int msec, short *table) 894 + calc_parm_search(int msec, const short *table) 895 895 { 896 896 int left = 1, right = 127, mid; 897 897 while (left < right) {