- 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/msl.c
r0292fbb r7258c6a 58 58 extern void (*cx_key)(void); 59 59 extern void (*cy_key)(void); 60 extern void (*d_key)( short k);60 extern void (*d_key)(int16_t k); 61 61 extern void (*e_key)(void); 62 62 extern void (*m_key)(void); … … 65 65 extern LPF (*swpt)[]; 66 66 67 extern short aflag;68 extern short amplval;69 extern short ancmsw;70 extern short angroup;71 extern short asig;72 extern short astat;73 extern short aval;74 extern short clkctl;75 extern short clkrun;76 extern short ctrsw;77 extern short cxrate;78 extern short cxval;79 extern short cyrate;80 extern short cyval;81 extern short dsp_ok;82 extern short editss;83 extern short editsw;84 extern short lampsw;85 extern short ndisp;86 extern short nxtflag;87 extern short pchsw;88 extern short recsw;89 extern short runit;90 extern short swback;91 extern short swctrl;92 extern short swdelta;93 extern short swdir;94 extern short swfiin;95 extern short swflag;96 extern short swlast;97 extern short swndx;98 extern short swstop;99 extern short swthr;100 extern short swtime;101 extern short swwait;102 extern short sd;103 extern short se;104 extern short stcrow;105 extern short stccol;106 extern short tglclk;107 extern short tglpch;108 extern short timemlt;109 extern short tmpomlt;110 extern short tmpoval;111 extern short tuneval;112 extern short vtpcol;113 extern short vtprow;114 115 /* 116 117 */ 118 119 extern u nsigned*obj8;120 121 extern longafi;122 extern longlcdtime;123 extern longswcount;124 extern longswrate;125 extern longswrmin;126 extern longswtemp;127 128 extern short grpmode[];129 extern short grpstat[];130 extern short prstab[];131 extern short simled[];132 extern short swfifo[NSWFIFO];133 extern short tmultab[];134 extern short vce2trg[];135 extern short veltab[];136 137 extern chartrgtab[];138 139 extern short grp2prt[][2];140 extern short sigtab[][2];141 extern short varmode[][16];67 extern int16_t aflag; 68 extern int16_t amplval; 69 extern int16_t ancmsw; 70 extern int16_t angroup; 71 extern int16_t asig; 72 extern int16_t astat; 73 extern int16_t aval; 74 extern int16_t clkctl; 75 extern int16_t clkrun; 76 extern int16_t ctrsw; 77 extern int16_t cxrate; 78 extern int16_t cxval; 79 extern int16_t cyrate; 80 extern int16_t cyval; 81 extern int16_t dsp_ok; 82 extern int16_t editss; 83 extern int16_t editsw; 84 extern int16_t lampsw; 85 extern int16_t ndisp; 86 extern int16_t nxtflag; 87 extern int16_t pchsw; 88 extern int16_t recsw; 89 extern int16_t runit; 90 extern int16_t swback; 91 extern int16_t swctrl; 92 extern int16_t swdelta; 93 extern int16_t swdir; 94 extern int16_t swfiin; 95 extern int16_t swflag; 96 extern int16_t swlast; 97 extern int16_t swndx; 98 extern int16_t swstop; 99 extern int16_t swthr; 100 extern int16_t swtime; 101 extern int16_t swwait; 102 extern int16_t sd; 103 extern int16_t se; 104 extern int16_t stcrow; 105 extern int16_t stccol; 106 extern int16_t tglclk; 107 extern int16_t tglpch; 108 extern int16_t timemlt; 109 extern int16_t tmpomlt; 110 extern int16_t tmpoval; 111 extern int16_t tuneval; 112 extern int16_t vtpcol; 113 extern int16_t vtprow; 114 115 /* 116 117 */ 118 119 extern uint16_t *obj8; 120 121 extern int32_t afi; 122 extern int32_t lcdtime; 123 extern int32_t swcount; 124 extern int32_t swrate; 125 extern int32_t swrmin; 126 extern int32_t swtemp; 127 128 extern int16_t grpmode[]; 129 extern int16_t grpstat[]; 130 extern int16_t prstab[]; 131 extern int16_t simled[]; 132 extern int16_t swfifo[NSWFIFO]; 133 extern int16_t tmultab[]; 134 extern int16_t vce2trg[]; 135 extern int16_t veltab[]; 136 137 extern int8_t trgtab[]; 138 139 extern int16_t grp2prt[][2]; 140 extern int16_t sigtab[][2]; 141 extern int16_t varmode[][16]; 142 142 143 143 extern struct gdsel *gdstbc[]; … … 145 145 extern struct wordq ptefifo; 146 146 147 u nsigned short fifoval;147 uint16_t fifoval; 148 148 149 149 /* … … 157 157 */ 158 158 159 void clk_ped( short stat)159 void clk_ped(int16_t stat) 160 160 { 161 161 if (stat) … … 169 169 */ 170 170 171 void pch_ped( short stat)171 void pch_ped(int16_t stat) 172 172 { 173 173 if (stat AND pchsw) … … 187 187 void msl(void) 188 188 { 189 register char*ioadr;190 register u nsigned*fpu;189 register int8_t *ioadr; 190 register uint16_t *fpu; 191 191 register struct s_entry *ep; 192 register short i, ti, val;193 register longrt;194 u nsigned short chan, crel, oldsr, port, trg, trig, vel;195 short cxprev, cyprev, esi, newsig, oldclk, oldrec;196 longfctemp;192 register int16_t i, ti, val; 193 register int32_t rt; 194 uint16_t chan, crel, oldsr, port, trg, trig, vel; 195 int16_t cxprev, cyprev, esi, newsig, oldclk, oldrec; 196 int32_t fctemp; 197 197 198 198 #if DEBUGIT … … 398 398 ep->e_type = EV_ANVL; 399 399 ep->e_data1 = i; 400 ep->e_dn = (struct s_entry *)(( long)val << 16);400 ep->e_dn = (struct s_entry *)((int32_t)val << 16); 401 401 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd; 402 402 ctrsw = TRUE; … … 435 435 ep->e_type = EV_ANVL; 436 436 ep->e_data1 = 0x0010 | i; 437 ep->e_dn = (struct s_entry *)(( long)val << 16);437 ep->e_dn = (struct s_entry *)((int32_t)val << 16); 438 438 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd; 439 439 ctrsw = TRUE; … … 480 480 ep->e_type = EV_ANVL; 481 481 ep->e_data1 = 0x0020 | i; 482 ep->e_dn = (struct s_entry *)(( long)val << 16);482 ep->e_dn = (struct s_entry *)((int32_t)val << 16); 483 483 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd; 484 484 ctrsw = TRUE; … … 543 543 #else 544 544 ti = (tmpomlt + 50) * tmpoval; 545 ti = ( short)( (19200000L / ti) - 1);545 ti = (int16_t)( (19200000L / ti) - 1); 546 546 #endif 547 547 TIME_T2H = ti >> 8; … … 661 661 ep->e_type = EV_ANVL; 662 662 ep->e_data1 = 0x0040 | i; 663 ep->e_dn = (struct s_entry *)(( long)val << 16);663 ep->e_dn = (struct s_entry *)((int32_t)val << 16); 664 664 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd; 665 665 ctrsw = TRUE; … … 699 699 ep->e_type = EV_ANVL; 700 700 ep->e_data1 = 0x0030 | i; 701 ep->e_dn = (struct s_entry *)(( long)val << 16);701 ep->e_dn = (struct s_entry *)((int32_t)val << 16); 702 702 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd; 703 703 ctrsw = TRUE;
Note:
See TracChangeset
for help on using the changeset viewer.