Changeset 7258c6a in buchla-68k for ram/lcdlbls.c
- Timestamp:
- 07/09/2017 04:45:34 PM (7 years ago)
- Branches:
- master
- Children:
- 8618599
- Parents:
- 0292fbb
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ram/lcdlbls.c
r0292fbb r7258c6a 48 48 49 49 */ 50 extern char gain2eq(short gain);51 52 extern u nsigned setsr(unsignedsr);53 54 extern void (*d_key)( short k);50 extern int8_t gain2eq(int16_t gain); 51 52 extern uint16_t setsr(uint16_t sr); 53 54 extern void (*d_key)(int16_t k); 55 55 extern void (*e_key)(void); 56 56 extern void (*m_key)(void); 57 57 extern void (*x_key)(void); 58 extern void (*olddkey)( short k);58 extern void (*olddkey)(int16_t k); 59 59 extern void (*oldekey)(void); 60 60 extern void (*oldmkey)(void); 61 61 extern void (*oldxkey)(void); 62 extern void (*point)( short x, short y, short pen);62 extern void (*point)(int16_t x, int16_t y, int16_t pen); 63 63 64 64 extern LPF (*oldsw)[]; … … 67 67 extern LPF aswtbl[14]; 68 68 69 extern short asig;70 extern short asmode;71 extern short astat;72 extern short aval;73 extern short clkrun;74 extern short ctrsw;75 extern short curasg;76 extern short gomode;77 extern short ismode;78 extern short lampio;79 extern short lampsw;80 extern short loadrow;81 extern short loadsw;82 extern short ltagged;83 extern short ndisp;84 extern short oldpk;85 extern short oldsl;86 extern short pkctrl;87 extern short recsw;88 extern short sliders;89 extern short tagslot;90 extern short tmpomlt;91 extern short tmpoval;92 extern short tuneval;93 94 extern u nsigned short seqdupd;95 96 extern short BGeq[];97 extern short BGother[];98 extern short BGprmtr[];99 100 extern short articen[];101 extern short grpmode[];102 extern short grpsel[];103 extern short grpstat[];104 extern short ins2grp[];105 extern short lastart[];106 extern short s_trns[];107 extern short vce2grp[];108 extern short vce2trg[];109 110 extern short anrs[][16];111 112 extern longiotime;113 extern longlcdontm;114 extern longlcdtime;69 extern int16_t asig; 70 extern int16_t asmode; 71 extern int16_t astat; 72 extern int16_t aval; 73 extern int16_t clkrun; 74 extern int16_t ctrsw; 75 extern int16_t curasg; 76 extern int16_t gomode; 77 extern int16_t ismode; 78 extern int16_t lampio; 79 extern int16_t lampsw; 80 extern int16_t loadrow; 81 extern int16_t loadsw; 82 extern int16_t ltagged; 83 extern int16_t ndisp; 84 extern int16_t oldpk; 85 extern int16_t oldsl; 86 extern int16_t pkctrl; 87 extern int16_t recsw; 88 extern int16_t sliders; 89 extern int16_t tagslot; 90 extern int16_t tmpomlt; 91 extern int16_t tmpoval; 92 extern int16_t tuneval; 93 94 extern uint16_t seqdupd; 95 96 extern int16_t BGeq[]; 97 extern int16_t BGother[]; 98 extern int16_t BGprmtr[]; 99 100 extern int16_t articen[]; 101 extern int16_t grpmode[]; 102 extern int16_t grpsel[]; 103 extern int16_t grpstat[]; 104 extern int16_t ins2grp[]; 105 extern int16_t lastart[]; 106 extern int16_t s_trns[]; 107 extern int16_t vce2grp[]; 108 extern int16_t vce2trg[]; 109 110 extern int16_t anrs[][16]; 111 112 extern int32_t iotime; 113 extern int32_t lcdontm; 114 extern int32_t lcdtime; 115 115 116 116 extern struct gdsel *gdstbc[]; … … 124 124 /* forward references */ 125 125 126 void l_none( short _1, short _2);127 void l_prmtr( short stat, short sig);128 void l_other( short stat, short sig);129 void l_voice( short stat, short vce);130 void l_init( short stat, short sig);131 void l_clock( short stat, short _2);132 void l_eq( short stat, short sig);133 void trapper( short stat, short _2);134 void setlamp( short stat, short _2);135 void rpctl( short stat, short _2);136 void quiet( short _1, short _2);137 void l_group( short stat, short grp);138 void l_dflt( short stat, short _2);139 void l_inst( short stat, short _2);140 void l_goto( short stat, short _2);141 void l_asgn( short stat, short _2);142 void l_adfl( short stat, short _2);143 void l_load( short stat, short _2);126 void l_none(int16_t _1, int16_t _2); 127 void l_prmtr(int16_t stat, int16_t sig); 128 void l_other(int16_t stat, int16_t sig); 129 void l_voice(int16_t stat, int16_t vce); 130 void l_init(int16_t stat, int16_t sig); 131 void l_clock(int16_t stat, int16_t _2); 132 void l_eq(int16_t stat, int16_t sig); 133 void trapper(int16_t stat, int16_t _2); 134 void setlamp(int16_t stat, int16_t _2); 135 void rpctl(int16_t stat, int16_t _2); 136 void quiet(int16_t _1, int16_t _2); 137 void l_group(int16_t stat, int16_t grp); 138 void l_dflt(int16_t stat, int16_t _2); 139 void l_inst(int16_t stat, int16_t _2); 140 void l_goto(int16_t stat, int16_t _2); 141 void l_asgn(int16_t stat, int16_t _2); 142 void l_adfl(int16_t stat, int16_t _2); 143 void l_load(int16_t stat, int16_t _2); 144 144 145 145 /* initialized stuff */ … … 147 147 /* BarType -- LCD slider bar graph type table -- 0 = bottom, 1 = centered */ 148 148 149 short BarType[14] = { 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0 };150 151 short artitab[] = { /* articulation pot initialization values */149 int16_t BarType[14] = { 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0 }; 150 151 int16_t artitab[] = { /* articulation pot initialization values */ 152 152 153 153 ARTIVAL(500), /* locn */ … … 170 170 /* sigtab[ 25 26 27 28 29 30 31 32 33 34 35 36 37 38] */ 171 171 172 short arpar[] = { 4, 2, 9, 11, 12, 1, 3, 5, 7, 13, 14, 15, 10, 6};173 174 /* 175 176 */ 177 178 short sl2gain[32] = { /* slider value to EQ gain conversion table */172 int16_t arpar[] = { 4, 2, 9, 11, 12, 1, 3, 5, 7, 13, 14, 15, 10, 6}; 173 174 /* 175 176 */ 177 178 int16_t sl2gain[32] = { /* slider value to EQ gain conversion table */ 179 179 180 180 -12, -12, -12, -12, -12, -11, -10, -9 ,-8 ,-7, -6, -5, -4, -3, -2, -1, … … 182 182 }; 183 183 184 short vmasks[16] = { /* variable resolution masks */184 int16_t vmasks[16] = { /* variable resolution masks */ 185 185 186 186 0x8000, 0xC000, 0xE000, 0xF000, … … 190 190 }; 191 191 192 short src2var[14] = { /* source number to analog variable number map */192 int16_t src2var[14] = { /* source number to analog variable number map */ 193 193 194 194 -1, -1, 3, -1, -1, -1, 5, -1, 4, -1, -1, 0, 1, 2 }; 195 195 196 char*potlbls[] = { /* LCD pot labels */196 int8_t *potlbls[] = { /* LCD pot labels */ 197 197 198 198 /* Pot: 25 26 27 28 29 30 31 32 33 34 35 36 37 38 */ … … 209 209 210 210 #if ROMPOK 211 char*swtlbls[] = { /* LCD switch labels -- ROMP ENABLED */211 int8_t *swtlbls[] = { /* LCD switch labels -- ROMP ENABLED */ 212 212 213 213 /* 0 */ "Quiet ROMP Lamp Clock P/R Go To Instr Asgmt Load Other Voice Init ", … … 234 234 #endif 235 235 236 char*aslbls[] = { /* Assignment select key labels */236 int8_t *aslbls[] = { /* Assignment select key labels */ 237 237 238 238 "Asgmt", /* 0 */ … … 446 446 */ 447 447 448 void l_none( short _1, short _2)448 void l_none(int16_t _1, int16_t _2) 449 449 { 450 450 } … … 460 460 */ 461 461 462 void quiet( short _1, short _2)463 { 464 register short vce;462 void quiet(int16_t _1, int16_t _2) 463 { 464 register int16_t vce; 465 465 466 466 for (vce = 0; vce < 12; vce++) /* for each voice ... */ … … 483 483 */ 484 484 485 void rpctl( short stat, short _2)485 void rpctl(int16_t stat, int16_t _2) 486 486 { 487 487 if (NOT stat) … … 502 502 */ 503 503 504 void trapper( short stat, short _2)504 void trapper(int16_t stat, int16_t _2) 505 505 { 506 506 if (stat) … … 514 514 */ 515 515 516 void l_clock( short stat, short _2)516 void l_clock(int16_t stat, int16_t _2) 517 517 { 518 518 if (NOT stat) … … 557 557 void preio(void) 558 558 { 559 short oldipl;559 int16_t oldipl; 560 560 561 561 oldipl = setipl(TIM_DI); … … 577 577 void postio(void) 578 578 { 579 short oldipl;579 int16_t oldipl; 580 580 581 581 oldipl = setipl(TIM_DI); … … 602 602 */ 603 603 604 void setlamp( short stat, short _2)605 { 606 register short oldi;604 void setlamp(int16_t stat, int16_t _2) 605 { 606 register int16_t oldi; 607 607 608 608 if (NOT stat) /* only act on key closures */ … … 637 637 void lcd_on(void) 638 638 { 639 register short oldi;639 register int16_t oldi; 640 640 641 641 oldi = setipl(TIM_DI); /* disable interrupts to keep out the timer */ … … 657 657 */ 658 658 659 void loadkey( short key)659 void loadkey(int16_t key) 660 660 { 661 661 if (NOT astat) … … 694 694 */ 695 695 696 void pcancel( short pm)696 void pcancel(int16_t pm) 697 697 { 698 698 point = GLCplot; /* setup to plot on LCD */ … … 743 743 */ 744 744 745 void l_load( short stat, short _2)745 void l_load(int16_t stat, int16_t _2) 746 746 { 747 747 if (NOT stat) … … 823 823 void lcdlbls(void) 824 824 { 825 register short i, barval;826 charbuf[8];827 chardsp[86];825 register int16_t i, barval; 826 int8_t buf[8]; 827 int8_t dsp[86]; 828 828 829 829 point = GLCplot; /* set up to plot on the LCD */ … … 984 984 */ 985 985 986 void selasg( short n)986 void selasg(int16_t n) 987 987 { 988 988 register struct s_entry *ep; … … 1037 1037 */ 1038 1038 1039 void l_adfl( short stat, short _2)1039 void l_adfl(int16_t stat, int16_t _2) 1040 1040 { 1041 1041 if (NOT stat) … … 1055 1055 */ 1056 1056 1057 void l_asgn( short stat, short _2)1057 void l_asgn(int16_t stat, int16_t _2) 1058 1058 { 1059 1059 if (NOT stat) /* only do this on key closure */ … … 1128 1128 */ 1129 1129 1130 void l_inst( short stat, short _2)1130 void l_inst(int16_t stat, int16_t _2) 1131 1131 { 1132 1132 if (NOT stat) … … 1205 1205 */ 1206 1206 1207 void selins( short ival)1208 { 1209 register short n;1207 void selins(int16_t ival) 1208 { 1209 register int16_t n; 1210 1210 register struct s_entry *ep; 1211 1211 … … 1267 1267 */ 1268 1268 1269 void l_dflt( short stat, short _2)1269 void l_dflt(int16_t stat, int16_t _2) 1270 1270 { 1271 1271 if (NOT stat) … … 1285 1285 */ 1286 1286 1287 void l_goto( short stat, short _2)1287 void l_goto(int16_t stat, int16_t _2) 1288 1288 { 1289 1289 if (NOT stat) /* only do this on key closure */ … … 1359 1359 */ 1360 1360 1361 void newpps( short trg, short grp, short src, short ival)1361 void newpps(int16_t trg, int16_t grp, int16_t src, int16_t ival) 1362 1362 { 1363 1363 register struct sment *smf, *smp; 1364 register u nsigned*fpu;1365 register longltmp;1366 register short val;1367 register short vce;1368 short gs, oldi;1364 register uint16_t *fpu; 1365 register int32_t ltmp; 1366 register int16_t val; 1367 register int16_t vce; 1368 int16_t gs, oldi; 1369 1369 1370 1370 gs = (grp << 4) | src; /* calculate group/source index */ … … 1394 1394 case 10: /* filtr */ 1395 1395 1396 ltmp = (( long)ival >> 1) + ((long)ival >> 2);1397 1398 if (ltmp > ( long)VALMAX)1399 ltmp = ( long)VALMAX;1400 else if (ltmp < ( long)VALMIN)1401 ltmp = ( long)VALMIN;1402 1403 val = ( short)ltmp;1396 ltmp = ((int32_t)ival >> 1) + ((int32_t)ival >> 2); 1397 1398 if (ltmp > (int32_t)VALMAX) 1399 ltmp = (int32_t)VALMAX; 1400 else if (ltmp < (int32_t)VALMIN) 1401 ltmp = (int32_t)VALMIN; 1402 1403 val = (int16_t)ltmp; 1404 1404 break; 1405 1405 … … 1433 1433 */ 1434 1434 1435 short newsv(short grp, short src, short ival)1435 int16_t newsv(int16_t grp, int16_t src, int16_t ival) 1436 1436 { 1437 1437 register struct sment *smf, *smp; 1438 register u nsigned*fpu;1439 register longltmp;1440 register short val;1441 register short gs;1442 register short oldi;1443 short vmask, var;1438 register uint16_t *fpu; 1439 register int32_t ltmp; 1440 register int16_t val; 1441 register int16_t gs; 1442 register int16_t oldi; 1443 int16_t vmask, var; 1444 1444 1445 1445 gs = (grp << 4) | src; /* calculate grp/src index */ … … 1484 1484 case 10: /* filtr */ 1485 1485 1486 ltmp = (( long)ival >> 1) + ((long)ival >> 2);1487 1488 if (ltmp > ( long)VALMAX)1489 ltmp = ( long)VALMAX;1490 else if (ltmp < ( long)VALMIN)1491 ltmp = ( long)VALMIN;1492 1493 val = ( short)ltmp;1486 ltmp = ((int32_t)ival >> 1) + ((int32_t)ival >> 2); 1487 1488 if (ltmp > (int32_t)VALMAX) 1489 ltmp = (int32_t)VALMAX; 1490 else if (ltmp < (int32_t)VALMIN) 1491 ltmp = (int32_t)VALMIN; 1492 1493 val = (int16_t)ltmp; 1494 1494 break; 1495 1495 … … 1524 1524 */ 1525 1525 1526 void setsv( short grp, short src, short ival)1526 void setsv(int16_t grp, int16_t src, int16_t ival) 1527 1527 { 1528 1528 register struct sment *smf, *smp; 1529 register u nsigned*fpu;1530 register longltmp;1531 register short val;1532 register short gs;1533 register short oldi;1529 register uint16_t *fpu; 1530 register int32_t ltmp; 1531 register int16_t val; 1532 register int16_t gs; 1533 register int16_t oldi; 1534 1534 1535 1535 gs = (grp << 4) | src; /* calculate grp/src index */ … … 1558 1558 case 10: /* filtr */ 1559 1559 1560 ltmp = (( long)ival >> 1) + ((long)ival >> 2);1561 1562 if (ltmp > ( long)VALMAX)1563 ltmp = ( long)VALMAX;1564 else if (ltmp < ( long)VALMIN)1565 ltmp = ( long)VALMIN;1566 1567 val = ( short)ltmp;1560 ltmp = ((int32_t)ival >> 1) + ((int32_t)ival >> 2); 1561 1562 if (ltmp > (int32_t)VALMAX) 1563 ltmp = (int32_t)VALMAX; 1564 else if (ltmp < (int32_t)VALMIN) 1565 ltmp = (int32_t)VALMIN; 1566 1567 val = (int16_t)ltmp; 1568 1568 break; 1569 1569 … … 1596 1596 */ 1597 1597 1598 void l_prmtr( short stat, short sig)1598 void l_prmtr(int16_t stat, int16_t sig) 1599 1599 { 1600 1600 if (NOT stat) … … 1633 1633 */ 1634 1634 1635 void l_voice( short stat, short vce)1636 { 1637 register short ap, j, par;1638 register u nsigned*fpu;1639 1640 charbuf[8];1635 void l_voice(int16_t stat, int16_t vce) 1636 { 1637 register int16_t ap, j, par; 1638 register uint16_t *fpu; 1639 1640 int8_t buf[8]; 1641 1641 1642 1642 if (NOT stat) … … 1679 1679 */ 1680 1680 1681 void l_group( short stat, short grp)1682 { 1683 charbuf[8];1681 void l_group(int16_t stat, int16_t grp) 1682 { 1683 int8_t buf[8]; 1684 1684 1685 1685 if (NOT stat) … … 1702 1702 */ 1703 1703 1704 void l_other( short stat, short sig)1704 void l_other(int16_t stat, int16_t sig) 1705 1705 { 1706 1706 if (NOT stat) … … 1723 1723 */ 1724 1724 1725 void l_eq( short stat, short sig)1725 void l_eq(int16_t stat, int16_t sig) 1726 1726 { 1727 1727 if (NOT stat) … … 1750 1750 void artclr(void) 1751 1751 { 1752 register short i;1752 register int16_t i; 1753 1753 1754 1754 for (i = 0; i < 14; i++) … … 1766 1766 */ 1767 1767 1768 void l_init( short stat, short sig)1769 { 1770 register u nsigned*fpu;1771 register short barval, i, j;1772 charbuf[16];1768 void l_init(int16_t stat, int16_t sig) 1769 { 1770 register uint16_t *fpu; 1771 register int16_t barval, i, j; 1772 int8_t buf[16]; 1773 1773 1774 1774 if (NOT stat) … … 1846 1846 */ 1847 1847 1848 void sendart( short vce, short par, short ival)1849 { 1850 register u nsigned*fpu;1851 register short val, oldi, mult;1852 short nop;1848 void sendart(int16_t vce, int16_t par, int16_t ival) 1849 { 1850 register uint16_t *fpu; 1851 register int16_t val, oldi, mult; 1852 int16_t nop; 1853 1853 1854 1854 lastart[par] = ival; … … 1919 1919 void doslide(void) 1920 1920 { 1921 register short arp, bar, barval, i, slval;1921 register int16_t arp, bar, barval, i, slval; 1922 1922 1923 1923 slval = ART_VAL(aval); /* scaled articulation value */ … … 2029 2029 */ 2030 2030 2031 void settmpo( short val)2032 { 2033 register short timeval;2031 void settmpo(int16_t val) 2032 { 2033 register int16_t timeval; 2034 2034 2035 2035 tmpoval = val; 2036 2036 timeval = ( ( (tmpomlt + 50) * tmpoval) / 100); 2037 timeval = ( short)( (192000L / timeval) - 1);2037 timeval = (int16_t)( (192000L / timeval) - 1); 2038 2038 TIME_T2H = timeval >> 8; 2039 2039 TIME_T2L = timeval & 0x00FF; … … 2052 2052 void settune(void) 2053 2053 { 2054 register short oldi, i, grp;2055 register u nsigned*fpu;2056 register longtrval, trmax;2057 short nop;2054 register int16_t oldi, i, grp; 2055 register uint16_t *fpu; 2056 register int32_t trval, trmax; 2057 int16_t nop; 2058 2058 2059 2059 trmax = PCHMAX; … … 2067 2067 if (-1 NE (grp = vce2grp[i])) { 2068 2068 2069 trval = ( long)tuneval + ((long)s_trns[grp - 1] << 1);2069 trval = (int32_t)tuneval + ((int32_t)s_trns[grp - 1] << 1); 2070 2070 2071 2071 if (trval > trmax) … … 2074 2074 } else { 2075 2075 2076 trval = ( long)tuneval;2076 trval = (int32_t)tuneval; 2077 2077 } 2078 2078 2079 2079 fpu = io_fpu + FPU_OFNC + (i << 8) + 0x0010; /* freq 1 */ 2080 2080 2081 *(fpu + FPU_TCV3) = (u nsigned)(0x0000FFFFL & trval);2081 *(fpu + FPU_TCV3) = (uint16_t)(0x0000FFFFL & trval); 2082 2082 ++nop; ++nop; ++nop; 2083 2083 *(fpu + FPU_TSF3) = 0x7FFF;
Note:
See TracChangeset
for help on using the changeset viewer.