Changeset 3ac8e1b in buchla-68k for ram/ptdkey.c
- Timestamp:
- 11/11/2017 09:48:40 PM (6 years ago)
- Branches:
- master
- Children:
- 8cc57e6
- Parents:
- 494d8ff
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ram/ptdkey.c
r494d8ff r3ac8e1b 267 267 268 268 if (spec EQ PA_OSC) 269 ptedata = ptedat1 + 4;269 ptedata = (int16_t)ptedat1 + 4; 270 270 else 271 271 ptedata = dtabl9[ptedat1]; … … 394 394 395 395 sprintf(buf2, "%02d", 1 + chan); 396 buf[0] = key + '0';396 buf[0] = (int8_t)(key + '0'); 397 397 UpdVid(7, n ? 25 : 12, buf2, PTDATR); 398 398 } … … 401 401 402 402 if (n) 403 ptestm = (ptestm & 0xE7FF) | ( port << 11);403 ptestm = (ptestm & 0xE7FF) | ((uint16_t)port << 11); 404 404 else 405 ptedef = (ptestm & 0xE7FF) | ( port << 11);405 ptedef = (ptestm & 0xE7FF) | ((uint16_t)port << 11); 406 406 407 407 } else { 408 408 409 buf[0] = key + '0';409 buf[0] = (int8_t)(key + '0'); 410 410 } 411 411 … … 436 436 if (inrange(stccol, dsdecol[1][n][0], dsdecol[1][n][1])) { 437 437 438 ptdebuf[stccol] = key + '0';439 buf[0] = key + '0';438 ptdebuf[stccol] = (int8_t)(key + '0'); 439 buf[0] = (int8_t)(key + '0'); 440 440 buf[1] = '\0'; 441 441 … … 462 462 return; 463 463 464 ptdebuf[stccol] = key + '0';465 buf[0] = key + '0';464 ptdebuf[stccol] = (int8_t)(key + '0'); 465 buf[0] = (int8_t)(key + '0'); 466 466 buf[1] = '\0'; 467 467 … … 526 526 buf[0] = 'L'; 527 527 else 528 buf[0] = key + '0';528 buf[0] = (int8_t)(key + '0'); 529 529 530 530 } else { 531 531 532 buf[0] = key + '0';532 buf[0] = (int8_t)(key + '0'); 533 533 } 534 534 … … 553 553 if (inrange(stccol, 36, 37)) { 554 554 555 ptdebuf[stccol] = key + '0';556 buf[0] = key + '0';555 ptdebuf[stccol] = (int8_t)(key + '0'); 556 buf[0] = (int8_t)(key + '0'); 557 557 buf[1] = '\0'; 558 558 … … 574 574 return; 575 575 576 ptdebuf[stccol] = key + '0';577 buf[0] = key + '0';576 ptdebuf[stccol] = (int8_t)(key + '0'); 577 buf[0] = (int8_t)(key + '0'); 578 578 buf[1] = '\0'; 579 579 … … 591 591 return; 592 592 593 ptdebuf[stccol] = key + 'A';594 buf[0] = key + 'A';593 ptdebuf[stccol] = (int8_t)(key + 'A'); 594 buf[0] = (int8_t)(key + 'A'); 595 595 buf[1] = '\0'; 596 596 … … 605 605 if (inrange(stccol, 32, 33)) { 606 606 607 ptdebuf[stccol] = key + '0';608 buf[0] = key + '0';607 ptdebuf[stccol] = (int8_t)(key + '0'); 608 buf[0] = (int8_t)(key + '0'); 609 609 buf[1] = '\0'; 610 610 … … 631 631 return; 632 632 633 ptdebuf[stccol] = key + '0';634 buf[0] = key + '0';633 ptdebuf[stccol] = (int8_t)(key + '0'); 634 buf[0] = (int8_t)(key + '0'); 635 635 buf[1] = '\0'; 636 636 … … 648 648 return; 649 649 650 ptdebuf[stccol] = key + '0';651 buf[0] = key + '0';650 ptdebuf[stccol] = (int8_t)(key + '0'); 651 buf[0] = (int8_t)(key + '0'); 652 652 buf[1] = '\0'; 653 653 … … 664 664 if (inrange(stccol, 39, 40)) { 665 665 666 vg = ( ptesuba >> 8) & 0x00FF;666 vg = (int16_t)(ptesuba >> 8) & 0x00FF; 667 667 668 668 if (stccol EQ 39) { … … 682 682 683 683 ptesuba = (ptesuba & 0x00FF) | 684 ( vg << 8);684 ((uint16_t)vg << 8); 685 685 686 686 } else { … … 707 707 708 708 ptesuba = (ptesuba & 0x00FF) | 709 ( vg << 8);709 ((uint16_t)vg << 8); 710 710 } 711 711 712 ptdebuf[stccol] = val;713 buf[0] = val;712 ptdebuf[stccol] = (int8_t)val; 713 buf[0] = (int8_t)val; 714 714 buf[1] = '\0'; 715 715 … … 752 752 753 753 if ((key EQ 0) OR (key EQ 1)) 754 buf[0] = key + '0';754 buf[0] = (int8_t)(key + '0'); 755 755 else 756 756 return; … … 761 761 case 46: /* 0..9 */ 762 762 763 buf[0] = key + '0';763 buf[0] = (int8_t)(key + '0'); 764 764 break; 765 765 … … 790 790 return; 791 791 792 buf[0] = key + '0';792 buf[0] = (int8_t)(key + '0'); 793 793 buf[1] = '\0'; 794 794 ptdebuf[stccol] = buf[0]; … … 859 859 case 46: 860 860 861 buf[0] = key + '0';861 buf[0] = (int8_t)(key + '0'); 862 862 break; 863 863 … … 898 898 return; 899 899 else 900 buf[0] = key + '0';900 buf[0] = (int8_t)(key + '0'); 901 901 902 902 } else { 903 903 904 buf[0] = key + '0';904 buf[0] = (int8_t)(key + '0'); 905 905 } 906 906 … … 924 924 case 44: 925 925 926 buf[0] = key +'0';926 buf[0] = (int8_t)(key +'0'); 927 927 break; 928 928 … … 963 963 case 45: 964 964 965 buf[0] = key + '0';965 buf[0] = (int8_t)(key + '0'); 966 966 break; 967 967 … … 996 996 return; 997 997 998 buf[0] = key + 'A';998 buf[0] = (int8_t)(key + 'A'); 999 999 break; 1000 1000 … … 1016 1016 case 46: 1017 1017 1018 buf[0] = key + '0';1018 buf[0] = (int8_t)(key + '0'); 1019 1019 break; 1020 1020 } … … 1132 1132 case 44: 1133 1133 1134 buf[0] = key + '0';1134 buf[0] = (int8_t)(key + '0'); 1135 1135 break; 1136 1136 … … 1157 1157 return; 1158 1158 1159 buf[0] = key + '0';1159 buf[0] = (int8_t)(key + '0'); 1160 1160 ptdebuf[stccol] = buf[0]; 1161 1161 buf[1] = '\0'; … … 1178 1178 return; 1179 1179 1180 buf[0] = key + '0';1180 buf[0] = (int8_t)(key + '0'); 1181 1181 buf[1] = '\0'; 1182 1182 ptdebuf[stccol] = buf[0]; … … 1200 1200 return; 1201 1201 1202 buf[0] = key + '0';1202 buf[0] = (int8_t)(key + '0'); 1203 1203 buf[1] = '\0'; 1204 1204 ptdebuf[stccol] = buf[0]; … … 1221 1221 return; 1222 1222 1223 buf[0] = key + '0';1223 buf[0] = (int8_t)(key + '0'); 1224 1224 buf[1] = '\0'; 1225 1225 ptdebuf[stccol] = buf[0]; … … 1242 1242 return; 1243 1243 1244 buf[0] = key + '0';1244 buf[0] = (int8_t)(key + '0'); 1245 1245 buf[1] = '\0'; 1246 1246 ptdebuf[stccol] = buf[0]; … … 1260 1260 return; 1261 1261 1262 buf[0] = key + '0';1262 buf[0] = (int8_t)(key + '0'); 1263 1263 buf[1] = '\0'; 1264 1264 ptdebuf[stccol] = buf[0];
Note:
See TracChangeset
for help on using the changeset viewer.