Changeset 7258c6a in buchla-68k for ram/wdfield.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/wdfield.c
r0292fbb r7258c6a 26 26 27 27 extern void select(void); 28 extern short whatbox(void);28 extern int16_t whatbox(void); 29 29 extern void nokey(void); 30 extern short nonf(short k);31 extern short stdctp1(void);30 extern int16_t nonf(int16_t k); 31 extern int16_t stdctp1(void); 32 32 extern void cxkstd(void); 33 33 extern void cykstd(void); 34 34 extern void stdmkey(void); 35 extern void stddkey( short k);36 37 extern short et_null(short n);38 extern short ef_null(short n);39 extern short rd_null(short n);40 extern short nd_null(short n, short k);41 extern short et_wavs(short n);42 extern short ef_wavs(short n);43 extern short rd_wavs(short n);44 extern short nd_wavs(short n, short k);45 extern short et_wvce(short n);46 extern short ef_wvce(short n);47 extern short rd_wvce(short n);48 extern short nd_wvce(short n, short k);49 extern short et_wslt(short n);50 extern short ef_wslt(short n);51 extern short rd_wslt(short n);52 extern short nd_wslt(short n, short k);53 extern short et_wpnt(short n);54 extern short ef_wpnt(short n);55 extern short rd_wpnt(short n);56 extern short nd_wpnt(short n, short k);57 extern short et_woff(short n);58 extern short ef_woff(short n);59 extern short rd_woff(short n);60 extern short nd_woff(short n, short k);61 extern short et_whar(short n);62 extern short ef_whar(short n);63 extern short rd_whar(short n);64 extern short nd_whar(short n, short k);65 extern short et_whrv(short n);66 extern short ef_whrv(short n);67 extern short rd_whrv(short n);68 extern short nd_whrv(short n, short k);69 70 extern void vcputsv(int *obase, int nw, int fg, int bg, int row, int col, char *str, int pitch);71 72 extern void *memset(void *vp, char c, int n);73 74 /* 75 76 */ 77 78 extern short astat;79 extern short cmtype;80 extern short curfunc;81 extern short curinst;82 extern short curslim;83 extern short curvce;84 extern short curwave;85 extern short curwdth;86 extern short curwfnl;87 extern short curwhrm;88 extern short curwhrv;89 extern short curwoff;90 extern short curwpnt;91 extern short curwslt;92 extern short cxrate;93 extern short cxval;94 extern short cyrate;95 extern short cyval;96 extern short hitbox;97 extern short lstwoff;98 extern short lstwpnt;99 extern short stccol;100 extern short stcrow;101 extern short wdupdfl;102 extern short wplast;103 extern short wpntsv;104 extern short wvlast;105 106 /* 107 108 */ 109 110 extern short crate1[];111 extern short offsets[NUMWPCAL];112 extern short vmtab[NUMHARM];113 extern short wsbuf[NUMWPCAL];114 115 extern short wsnmod[12][2];116 117 extern u nsigned*waveob;118 119 extern charbfs[];35 extern void stddkey(int16_t k); 36 37 extern int16_t et_null(int16_t n); 38 extern int16_t ef_null(int16_t n); 39 extern int16_t rd_null(int16_t n); 40 extern int16_t nd_null(int16_t n, int16_t k); 41 extern int16_t et_wavs(int16_t n); 42 extern int16_t ef_wavs(int16_t n); 43 extern int16_t rd_wavs(int16_t n); 44 extern int16_t nd_wavs(int16_t n, int16_t k); 45 extern int16_t et_wvce(int16_t n); 46 extern int16_t ef_wvce(int16_t n); 47 extern int16_t rd_wvce(int16_t n); 48 extern int16_t nd_wvce(int16_t n, int16_t k); 49 extern int16_t et_wslt(int16_t n); 50 extern int16_t ef_wslt(int16_t n); 51 extern int16_t rd_wslt(int16_t n); 52 extern int16_t nd_wslt(int16_t n, int16_t k); 53 extern int16_t et_wpnt(int16_t n); 54 extern int16_t ef_wpnt(int16_t n); 55 extern int16_t rd_wpnt(int16_t n); 56 extern int16_t nd_wpnt(int16_t n, int16_t k); 57 extern int16_t et_woff(int16_t n); 58 extern int16_t ef_woff(int16_t n); 59 extern int16_t rd_woff(int16_t n); 60 extern int16_t nd_woff(int16_t n, int16_t k); 61 extern int16_t et_whar(int16_t n); 62 extern int16_t ef_whar(int16_t n); 63 extern int16_t rd_whar(int16_t n); 64 extern int16_t nd_whar(int16_t n, int16_t k); 65 extern int16_t et_whrv(int16_t n); 66 extern int16_t ef_whrv(int16_t n); 67 extern int16_t rd_whrv(int16_t n); 68 extern int16_t nd_whrv(int16_t n, int16_t k); 69 70 extern void vcputsv(int16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch); 71 72 extern void *memset(void *vp, int8_t c, int16_t n); 73 74 /* 75 76 */ 77 78 extern int16_t astat; 79 extern int16_t cmtype; 80 extern int16_t curfunc; 81 extern int16_t curinst; 82 extern int16_t curslim; 83 extern int16_t curvce; 84 extern int16_t curwave; 85 extern int16_t curwdth; 86 extern int16_t curwfnl; 87 extern int16_t curwhrm; 88 extern int16_t curwhrv; 89 extern int16_t curwoff; 90 extern int16_t curwpnt; 91 extern int16_t curwslt; 92 extern int16_t cxrate; 93 extern int16_t cxval; 94 extern int16_t cyrate; 95 extern int16_t cyval; 96 extern int16_t hitbox; 97 extern int16_t lstwoff; 98 extern int16_t lstwpnt; 99 extern int16_t stccol; 100 extern int16_t stcrow; 101 extern int16_t wdupdfl; 102 extern int16_t wplast; 103 extern int16_t wpntsv; 104 extern int16_t wvlast; 105 106 /* 107 108 */ 109 110 extern int16_t crate1[]; 111 extern int16_t offsets[NUMWPCAL]; 112 extern int16_t vmtab[NUMHARM]; 113 extern int16_t wsbuf[NUMWPCAL]; 114 115 extern int16_t wsnmod[12][2]; 116 117 extern uint16_t *waveob; 118 119 extern int8_t bfs[]; 120 120 121 121 extern struct instdef vbufs[]; … … 127 127 128 128 void wdxkey(void); 129 short wdnfld(short k);129 int16_t wdnfld(int16_t k); 130 130 void wdcxupd(void); 131 131 void wdcyupd(void); … … 137 137 */ 138 138 139 #include "wdcurtb.h" /* short wdcurtb[]; short wdcurct[8][2]; */140 141 short wxrate = 1; /* WS interpolate X movement increment */139 #include "wdcurtb.h" /* int16_t wdcurtb[]; int16_t wdcurct[8][2]; */ 140 141 int16_t wxrate = 1; /* WS interpolate X movement increment */ 142 142 143 143 struct fet wd_fet1[] = { … … 155 155 }; 156 156 157 short wdbox[][8] = { /* display box parameters */157 int16_t wdbox[][8] = { /* display box parameters */ 158 158 159 159 { 1, 1, 510, 307, WCFBX00, WCBBX00, 0, 1}, /* 0 */ … … 165 165 }; 166 166 167 char*wdbxlb0[] = { /* display box labels -- row 0 */167 int8_t *wdbxlb0[] = { /* display box labels -- row 0 */ 168 168 169 169 "", /* 0 */ … … 179 179 }; 180 180 181 char*wdbxlb1[] = { /* display box labels -- row 1 */181 int8_t *wdbxlb1[] = { /* display box labels -- row 1 */ 182 182 183 183 "", /* 0 */ … … 230 230 void updfpu(void) 231 231 { 232 register short i;233 register short *wsp1, *wsp2;232 register int16_t i; 233 register int16_t *wsp1, *wsp2; 234 234 235 235 /* calculate instrument source and FPU destination pointers */ … … 270 270 void wsupd(void) 271 271 { 272 register short i;273 register short *wsp1, *wsp2;272 register int16_t i; 273 register int16_t *wsp1, *wsp2; 274 274 275 275 /* update the offsets[] array from the instrument definition */ … … 303 303 void whupd(void) 304 304 { 305 register short i;306 register short *wsp1;305 register int16_t i; 306 register int16_t *wsp1; 307 307 308 308 /* update the final values in the instrument definition */ … … 330 330 { 331 331 register struct instdef *ip; 332 short *ov;333 register short i, j, k, tv, curdif;334 short cwnp, cwin;332 int16_t *ov; 333 register int16_t i, j, k, tv, curdif; 334 int16_t cwnp, cwin; 335 335 336 336 ip = &vbufs[curvce]; /* instrument definition */ … … 406 406 { 407 407 register struct instdef *ip; 408 register short *ov;409 register short i, j, k, n;408 register int16_t *ov; 409 register int16_t i, j, k, n; 410 410 register long t; 411 short to, from;411 int16_t to, from; 412 412 413 413 to = curwpnt; … … 436 436 437 437 for (i = 0; i < n; i++) 438 ov[j++] = (( short)((t * (1 + i)) >> 16) + k) << 5;438 ov[j++] = ((int16_t)((t * (1 + i)) >> 16) + k) << 5; 439 439 } 440 440 … … 509 509 { 510 510 register struct instdef *ip; 511 register short *ov, *hv;512 register short i, j, k, tv;513 register charwsgn;514 short wval, cwnp, cwin;511 register int16_t *ov, *hv; 512 register int16_t i, j, k, tv; 513 register int8_t wsgn; 514 int16_t wval, cwnp, cwin; 515 515 516 516 ip = &vbufs[curvce]; … … 669 669 */ 670 670 671 short wdnfld(short k)672 { 673 register short *hv;671 int16_t wdnfld(int16_t k) 672 { 673 register int16_t *hv; 674 674 register struct instdef *ip; 675 675
Note:
See TracChangeset
for help on using the changeset viewer.