Changeset 7258c6a in buchla-68k for ram/asgdsp.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/asgdsp.c
r0292fbb r7258c6a 60 60 /* things defined elsewhere */ 61 61 62 extern void (*point)( short x, short y, short pen);63 extern u nsigned exp_c(unsignedc);64 65 extern short stcrow, stccol, cxval, cyval;66 extern short curtun, tunmod;62 extern void (*point)(int16_t x, int16_t y, int16_t pen); 63 extern uint16_t exp_c(uint16_t c); 64 65 extern int16_t stcrow, stccol, cxval, cyval; 66 extern int16_t curtun, tunmod; 67 67 68 68 #if DEBUGIT … … 70 70 #endif 71 71 72 extern u nsigned*obj0, *obj2;73 74 extern charbfs[];75 extern char*adbxlb[];76 extern charcaname[];77 78 extern short adbox[][8];79 80 extern short admctl; /* assignment menu control */81 extern short adnamsw; /* vitrual typewriter switch */82 extern short asgfks; /* first key selected */83 extern short asghit; /* row hit / assignment in progress */84 extern short asgmod; /* assignment number or table modified */85 extern short auxctl; /* aux control flag */86 extern short curasg; /* current assignment table */87 extern short curmop; /* current MIDI output port */88 extern short curvce; /* current voice being edited */89 extern short prgchan; /* MIDI program change channel (port 1) */90 extern short ps_dpth; /* phase shifter -- depth */91 extern short ps_intn; /* phase shifter -- intensity */92 extern short ps_rate; /* phase shifter -- rate */93 extern short submenu; /* submenu flag */94 95 extern short grpdyn[12]; /* group dynamics table (0..9) */96 extern short ins2grp[12]; /* instrument to group table (00..NINST-1) */97 extern short mctlnum[4]; /* MIDI controller number table (-1, 00..99) */98 extern short s_inst[12]; /* instrument assignments */99 extern short vce2grp[12]; /* voice to group table (-1, 1..12)*/100 101 extern short grp2prt[12][2]; /* group to port and channel table */72 extern uint16_t *obj0, *obj2; 73 74 extern int8_t bfs[]; 75 extern int8_t *adbxlb[]; 76 extern int8_t caname[]; 77 78 extern int16_t adbox[][8]; 79 80 extern int16_t admctl; /* assignment menu control */ 81 extern int16_t adnamsw; /* vitrual typewriter switch */ 82 extern int16_t asgfks; /* first key selected */ 83 extern int16_t asghit; /* row hit / assignment in progress */ 84 extern int16_t asgmod; /* assignment number or table modified */ 85 extern int16_t auxctl; /* aux control flag */ 86 extern int16_t curasg; /* current assignment table */ 87 extern int16_t curmop; /* current MIDI output port */ 88 extern int16_t curvce; /* current voice being edited */ 89 extern int16_t prgchan; /* MIDI program change channel (port 1) */ 90 extern int16_t ps_dpth; /* phase shifter -- depth */ 91 extern int16_t ps_intn; /* phase shifter -- intensity */ 92 extern int16_t ps_rate; /* phase shifter -- rate */ 93 extern int16_t submenu; /* submenu flag */ 94 95 extern int16_t grpdyn[12]; /* group dynamics table (0..9) */ 96 extern int16_t ins2grp[12]; /* instrument to group table (00..NINST-1) */ 97 extern int16_t mctlnum[4]; /* MIDI controller number table (-1, 00..99) */ 98 extern int16_t s_inst[12]; /* instrument assignments */ 99 extern int16_t vce2grp[12]; /* voice to group table (-1, 1..12)*/ 100 101 extern int16_t grp2prt[12][2]; /* group to port and channel table */ 102 102 /* port [0] = 0..4, channel [1] = -1, 1..16 */ 103 103 104 extern short key2grp[88]; /* port 1 key to group assignment table */104 extern int16_t key2grp[88]; /* port 1 key to group assignment table */ 105 105 /* bit n = group n */ 106 106 107 107 extern struct asgent asgtab[NASGS]; /* assignment table library */ 108 108 109 extern u nsigned*asgob;109 extern uint16_t *asgob; 110 110 111 111 extern struct octent *adoct; … … 115 115 */ 116 116 117 char*gprep[] = {" ", "1", "2", "L"};118 119 char*asgsrc[] = { /* source labels */117 int8_t *gprep[] = {" ", "1", "2", "L"}; 118 119 int8_t *asgsrc[] = { /* source labels */ 120 120 121 121 "1 Pch/Hor", … … 129 129 /* keys are 5 pixels wide on top, except the last one, which is 8 pixels wide */ 130 130 131 short asgkble[88] = { /* key left edge offsets */131 int16_t asgkble[88] = { /* key left edge offsets */ 132 132 133 133 /* piano MIDI */ … … 155 155 */ 156 156 157 short asgkbtp[AK_WIDTH] = { /* keyboard icon top lines */157 int16_t asgkbtp[AK_WIDTH] = { /* keyboard icon top lines */ 158 158 159 159 AKW_7, AKW_C, AKW_1, AKW_F, … … 196 196 */ 197 197 198 short asgkbbt[AK_WIDTH] = { /* keyboard icon bottom lines */198 int16_t asgkbbt[AK_WIDTH] = { /* keyboard icon bottom lines */ 199 199 200 200 AKW_7, AKW_F, AKW_7, AKW_F, … … 237 237 */ 238 238 239 short asgpal[16][3] = { /* assignment editor color palette */239 int16_t asgpal[16][3] = { /* assignment editor color palette */ 240 240 241 241 {0, 0, 0}, /* 0 */ … … 257 257 }; 258 258 259 short dyntab[10] = { /* dynamics translation table */259 int16_t dyntab[10] = { /* dynamics translation table */ 260 260 261 261 0, /* 0 */ … … 283 283 void advacur(void) 284 284 { 285 register short newcol;285 register int16_t newcol; 286 286 287 287 if (infield(stcrow, stccol, curfet)) … … 307 307 void bspacur(void) 308 308 { 309 register short newcol;309 register int16_t newcol; 310 310 311 311 if (infield(stcrow, stccol, curfet)) … … 333 333 */ 334 334 335 void keycpyw(u nsigned *dest, unsigned *src, short len, unsigned wk, unsignedbk)336 { 337 register u nsignedwkey, bkey, theword;338 register short i;335 void keycpyw(uint16_t *dest, uint16_t *src, int16_t len, uint16_t wk, uint16_t bk) 336 { 337 register uint16_t wkey, bkey, theword; 338 register int16_t i; 339 339 340 340 wkey = exp_c(wk); … … 360 360 void asgkb(void) 361 361 { 362 register u nsigned*p;363 register u nsignedakline;364 register short i, j;362 register uint16_t *p; 363 register uint16_t akline; 364 register int16_t i, j; 365 365 366 366 akline = exp_c(AK_LINE); 367 p = asgob + ( long)AKSTART;367 p = asgob + (int32_t)AKSTART; 368 368 369 369 for (j = 0; j < 12; j++) { … … 407 407 */ 408 408 409 void drawk2g( short grp)410 { 411 register short i;412 register short n;413 register short key;414 register short line;415 register char*bfsp;416 register u nsigned*lp;409 void drawk2g(int16_t grp) 410 { 411 register int16_t i; 412 register int16_t n; 413 register int16_t key; 414 register int16_t line; 415 register int8_t *bfsp; 416 register uint16_t *lp; 417 417 418 418 n = 7; /* key to group window */ 419 419 420 420 line = (14 * grp) + AK_BASE; 421 lp = asgob + (( long)line << 7) + 6L;421 lp = asgob + ((int32_t)line << 7) + 6L; 422 422 423 423 for (i = 0; i < 4; i++) { … … 460 460 */ 461 461 462 void adpoint( short x, short y, short pen)462 void adpoint(int16_t x, int16_t y, int16_t pen) 463 463 { 464 464 if (v_regs[5] & 0x0180) … … 474 474 */ 475 475 476 char *numblk(char *buf, short n)476 int8_t *numblk(int8_t *buf, int16_t n) 477 477 { 478 478 if (n EQ -1) { … … 498 498 */ 499 499 500 void adswin( short n)501 { 502 register short cx, i;503 register char*bfsp;504 charbuf1[4], buf2[4];500 void adswin(int16_t n) 501 { 502 register int16_t cx, i; 503 register int8_t *bfsp; 504 int8_t buf1[4], buf2[4]; 505 505 506 506 if ((n EQ 7) AND (admctl NE -1)) … … 783 783 */ 784 784 785 void initat( short n)785 void initat(int16_t n) 786 786 { 787 787 register struct asgent *ap; 788 register short i;788 register int16_t i; 789 789 790 790 ap = &asgtab[n]; … … 839 839 */ 840 840 841 void setaux( short aux)842 { 843 register short psgdata;844 register char*psg;841 void setaux(int16_t aux) 842 { 843 register int16_t psgdata; 844 register int8_t *psg; 845 845 846 846 auxctl = aux; … … 867 867 */ 868 868 869 void getasg( short n)869 void getasg(int16_t n) 870 870 { 871 871 register struct asgent *ap; 872 register short i, grp, vce;872 register int16_t i, grp, vce; 873 873 874 874 ap = &asgtab[n]; … … 921 921 */ 922 922 923 void putasg( short n)923 void putasg(int16_t n) 924 924 { 925 925 register struct asgent *ap; 926 register short i;926 register int16_t i; 927 927 928 928 for (i = 0; i < 12; i++) /* fix old tables */ … … 959 959 void awins(void) 960 960 { 961 register short i;961 register int16_t i; 962 962 963 963 for (i = 0; i < 11; i++) … … 973 973 void inital(void) 974 974 { 975 register short n;975 register int16_t n; 976 976 977 977 for (n = 0; n < NASGS; n++)
Note:
See TracChangeset
for help on using the changeset viewer.