mirror of
https://github.com/InvisibleUp/uvmac.git
synced 2025-04-01 11:30:48 +00:00
More type/my name standardization
This commit is contained in:
parent
12c2ab0883
commit
b98c8a8646
@ -4,29 +4,29 @@
|
||||
Set x "rd:t1.txt"
|
||||
|
||||
|
||||
Catenate "{my_project_d}"data:src:VIAEMDEV.c > "{x}"
|
||||
Catenate "{project_d}"data:src:VIAEMDEV.c > "{x}"
|
||||
Open "{x}"
|
||||
Set CaseSensitive 1
|
||||
Find ¥ "{x}"
|
||||
Replace -c ° /'VIA1'/ 'VIA2' "{x}"
|
||||
Find ¥ "{x}"
|
||||
Replace -c ° /'VIAEMDEV'/ 'VIA2EMDV' "{x}"
|
||||
Find ¥ "{x}"
|
||||
Replace -c ° /'0x04'([0-9A-FX][0-9A-FX])¨1/ '0x05'¨1 "{x}"
|
||||
Find <EFBFBD> "{x}"
|
||||
Replace -c <EFBFBD> /'VIA1'/ 'VIA2' "{x}"
|
||||
Find <EFBFBD> "{x}"
|
||||
Replace -c <EFBFBD> /'VIAEMDEV'/ 'VIA2EMDV' "{x}"
|
||||
Find <EFBFBD> "{x}"
|
||||
Replace -c <EFBFBD> /'0x04'([0-9A-FX][0-9A-FX])<29>1/ '0x05'<27>1 "{x}"
|
||||
Unset SearchType
|
||||
|
||||
Compare "{my_project_d}"data:src:VIA2EMDV.c "{x}"
|
||||
Compare "{project_d}"data:src:VIA2EMDV.c "{x}"
|
||||
|
||||
|
||||
Catenate "{my_project_d}"data:src:VIA2EMDV.c > "{x}"
|
||||
Catenate "{project_d}"data:src:VIA2EMDV.c > "{x}"
|
||||
Open "{x}"
|
||||
Set CaseSensitive 1
|
||||
Find ¥ "{x}"
|
||||
Replace -c ° /'VIA2EMDV'/ 'VIAEMDEV' "{x}"
|
||||
Find ¥ "{x}"
|
||||
Replace -c ° /'VIA2'/ 'VIA1' "{x}"
|
||||
Find ¥ "{x}"
|
||||
Replace -c ° /'0x05'([0-9A-FX][0-9A-FX])¨1/ '0x04'¨1 "{x}"
|
||||
Find <EFBFBD> "{x}"
|
||||
Replace -c <EFBFBD> /'VIA2EMDV'/ 'VIAEMDEV' "{x}"
|
||||
Find <EFBFBD> "{x}"
|
||||
Replace -c <EFBFBD> /'VIA2'/ 'VIA1' "{x}"
|
||||
Find <EFBFBD> "{x}"
|
||||
Replace -c <EFBFBD> /'0x05'([0-9A-FX][0-9A-FX])<29>1/ '0x04'<27>1 "{x}"
|
||||
Unset SearchType
|
||||
|
||||
Compare "{my_project_d}"data:src:VIAEMDEV.c "{x}"
|
||||
Compare "{project_d}"data:src:VIAEMDEV.c "{x}"
|
||||
|
@ -40,7 +40,7 @@ IMPORTFUNC uint8_t ADB_ShiftInData(void);
|
||||
|
||||
#include "ADBSHARE.h"
|
||||
|
||||
LOCALVAR blnr ADB_ListenDatBuf;
|
||||
LOCALVAR bool ADB_ListenDatBuf;
|
||||
LOCALVAR uint8_t ADB_IndexDatBuf;
|
||||
|
||||
GLOBALPROC ADB_DoNewState(void)
|
||||
@ -54,11 +54,11 @@ GLOBALPROC ADB_DoNewState(void)
|
||||
switch (state) {
|
||||
case 0: /* Start a new command */
|
||||
if (ADB_ListenDatBuf) {
|
||||
ADB_ListenDatBuf = falseblnr;
|
||||
ADB_ListenDatBuf = false;
|
||||
ADB_SzDatBuf = ADB_IndexDatBuf;
|
||||
ADB_EndListen();
|
||||
}
|
||||
ADB_TalkDatBuf = falseblnr;
|
||||
ADB_TalkDatBuf = false;
|
||||
ADB_IndexDatBuf = 0;
|
||||
ADB_CurCmd = ADB_ShiftInData();
|
||||
/* which sets interrupt, acknowleding command */
|
||||
@ -86,7 +86,7 @@ GLOBALPROC ADB_DoNewState(void)
|
||||
"Reserved ADB command");
|
||||
break;
|
||||
case 2: /* listen */
|
||||
ADB_ListenDatBuf = trueblnr;
|
||||
ADB_ListenDatBuf = true;
|
||||
#ifdef _VIA_Debug
|
||||
fprintf(stderr, "*** listening\n");
|
||||
#endif
|
||||
|
@ -33,13 +33,13 @@
|
||||
#define ADB_MaxSzDatBuf 8
|
||||
|
||||
LOCALVAR uint8_t ADB_SzDatBuf;
|
||||
LOCALVAR blnr ADB_TalkDatBuf = falseblnr;
|
||||
LOCALVAR bool ADB_TalkDatBuf = false;
|
||||
LOCALVAR uint8_t ADB_DatBuf[ADB_MaxSzDatBuf];
|
||||
LOCALVAR uint8_t ADB_CurCmd = 0;
|
||||
LOCALVAR uint8_t NotSoRandAddr = 1;
|
||||
|
||||
LOCALVAR uint8_t MouseADBAddress;
|
||||
LOCALVAR blnr SavedCurMouseButton = falseblnr;
|
||||
LOCALVAR bool SavedCurMouseButton = false;
|
||||
LOCALVAR uint16_t MouseADBDeltaH = 0;
|
||||
LOCALVAR uint16_t MouseADBDeltaV = 0;
|
||||
|
||||
@ -51,8 +51,8 @@ LOCALPROC ADB_DoMouseTalk(void)
|
||||
EvtQEl *p;
|
||||
uint16_t partH;
|
||||
uint16_t partV;
|
||||
blnr overflow = falseblnr;
|
||||
blnr MouseButtonChange = falseblnr;
|
||||
bool overflow = false;
|
||||
bool MouseButtonChange = false;
|
||||
|
||||
if (nullpr != (p = EvtQOutP())) {
|
||||
if (EvtQElKindMouseDelta == p->kind) {
|
||||
@ -71,11 +71,11 @@ LOCALPROC ADB_DoMouseTalk(void)
|
||||
partV = - partV;
|
||||
}
|
||||
if ((partH >> 6) > 0) {
|
||||
overflow = trueblnr;
|
||||
overflow = true;
|
||||
partH = (1 << 6) - 1;
|
||||
}
|
||||
if ((partV >> 6) > 0) {
|
||||
overflow = trueblnr;
|
||||
overflow = true;
|
||||
partV = (1 << 6) - 1;
|
||||
}
|
||||
if ((int16_t)MouseADBDeltaH < 0) {
|
||||
@ -90,14 +90,14 @@ LOCALPROC ADB_DoMouseTalk(void)
|
||||
if (nullpr != (p = EvtQOutP())) {
|
||||
if (EvtQElKindMouseButton == p->kind) {
|
||||
SavedCurMouseButton = p->u.press.down;
|
||||
MouseButtonChange = trueblnr;
|
||||
MouseButtonChange = true;
|
||||
EvtQOutDone();
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((0 != partH) || (0 != partV) || MouseButtonChange) {
|
||||
ADB_SzDatBuf = 2;
|
||||
ADB_TalkDatBuf = trueblnr;
|
||||
ADB_TalkDatBuf = true;
|
||||
ADB_DatBuf[0] = (SavedCurMouseButton ? 0x00 : 0x80)
|
||||
| (partV & 127);
|
||||
ADB_DatBuf[1] = /* 0x00 */ 0x80 | (partH & 127);
|
||||
@ -107,7 +107,7 @@ LOCALPROC ADB_DoMouseTalk(void)
|
||||
break;
|
||||
case 3:
|
||||
ADB_SzDatBuf = 2;
|
||||
ADB_TalkDatBuf = trueblnr;
|
||||
ADB_TalkDatBuf = true;
|
||||
ADB_DatBuf[0] = 0x60 | (NotSoRandAddr & 0x0f);
|
||||
ADB_DatBuf[1] = 0x01;
|
||||
NotSoRandAddr += 1;
|
||||
@ -139,13 +139,13 @@ LOCALPROC ADB_DoMouseListen(void)
|
||||
|
||||
LOCALVAR uint8_t KeyboardADBAddress;
|
||||
|
||||
LOCALFUNC blnr CheckForADBkeyEvt(uint8_t *NextADBkeyevt)
|
||||
LOCALFUNC bool CheckForADBkeyEvt(uint8_t *NextADBkeyevt)
|
||||
{
|
||||
int i;
|
||||
blnr KeyDown;
|
||||
bool KeyDown;
|
||||
|
||||
if (! FindKeyEvent(&i, &KeyDown)) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
} else {
|
||||
#if dbglog_HAVE && 0
|
||||
if (KeyDown) {
|
||||
@ -173,7 +173,7 @@ LOCALFUNC blnr CheckForADBkeyEvt(uint8_t *NextADBkeyevt)
|
||||
break;
|
||||
}
|
||||
*NextADBkeyevt = (KeyDown ? 0x00 : 0x80) | i;
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -186,7 +186,7 @@ LOCALPROC ADB_DoKeyboardTalk(void)
|
||||
|
||||
if (CheckForADBkeyEvt(&NextADBkeyevt)) {
|
||||
ADB_SzDatBuf = 2;
|
||||
ADB_TalkDatBuf = trueblnr;
|
||||
ADB_TalkDatBuf = true;
|
||||
ADB_DatBuf[0] = NextADBkeyevt;
|
||||
if (! CheckForADBkeyEvt(&NextADBkeyevt)) {
|
||||
ADB_DatBuf[1] = 0xFF;
|
||||
@ -198,7 +198,7 @@ LOCALPROC ADB_DoKeyboardTalk(void)
|
||||
break;
|
||||
case 3:
|
||||
ADB_SzDatBuf = 2;
|
||||
ADB_TalkDatBuf = trueblnr;
|
||||
ADB_TalkDatBuf = true;
|
||||
ADB_DatBuf[0] = 0x60 | (NotSoRandAddr & 0x0f);
|
||||
ADB_DatBuf[1] = 0x01;
|
||||
NotSoRandAddr += 1;
|
||||
@ -229,7 +229,7 @@ LOCALPROC ADB_DoKeyboardListen(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckForADBanyEvt(void)
|
||||
LOCALFUNC bool CheckForADBanyEvt(void)
|
||||
{
|
||||
EvtQEl *p = EvtQOutP();
|
||||
if (nullpr != p) {
|
||||
@ -237,7 +237,7 @@ LOCALFUNC blnr CheckForADBanyEvt(void)
|
||||
case EvtQElKindMouseButton:
|
||||
case EvtQElKindMouseDelta:
|
||||
case EvtQElKindKey:
|
||||
return trueblnr;
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -281,7 +281,7 @@ LOCALPROC ADB_Flush(void)
|
||||
|| (Address == MouseADBAddress))
|
||||
{
|
||||
ADB_SzDatBuf = 2;
|
||||
ADB_TalkDatBuf = trueblnr;
|
||||
ADB_TalkDatBuf = true;
|
||||
ADB_DatBuf[0] = 0x00;
|
||||
ADB_DatBuf[1] = 0x00;
|
||||
} else {
|
||||
|
@ -24,16 +24,16 @@
|
||||
#define ALTKEYSM_H
|
||||
#endif
|
||||
|
||||
LOCALVAR blnr AltKeysLockText = falseblnr;
|
||||
LOCALVAR blnr AltKeysTrueCmnd = falseblnr;
|
||||
LOCALVAR blnr AltKeysTrueOption = falseblnr;
|
||||
LOCALVAR blnr AltKeysTrueShift = falseblnr;
|
||||
LOCALVAR blnr AltKeysModOn = falseblnr;
|
||||
LOCALVAR blnr AltKeysTextOn = falseblnr;
|
||||
LOCALVAR bool AltKeysLockText = false;
|
||||
LOCALVAR bool AltKeysTrueCmnd = false;
|
||||
LOCALVAR bool AltKeysTrueOption = false;
|
||||
LOCALVAR bool AltKeysTrueShift = false;
|
||||
LOCALVAR bool AltKeysModOn = false;
|
||||
LOCALVAR bool AltKeysTextOn = false;
|
||||
|
||||
LOCALPROC CheckAltKeyUseMode(void)
|
||||
{
|
||||
blnr NewAltKeysTextOn;
|
||||
bool NewAltKeysTextOn;
|
||||
|
||||
AltKeysModOn = AltKeysTrueCmnd
|
||||
|| AltKeysTrueOption || AltKeysTrueShift;
|
||||
@ -47,7 +47,7 @@ LOCALPROC CheckAltKeyUseMode(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALPROC Keyboard_UpdateKeyMap1(uint8_t key, blnr down)
|
||||
LOCALPROC Keyboard_UpdateKeyMap1(uint8_t key, bool down)
|
||||
{
|
||||
if (MKC_Command == key) {
|
||||
AltKeysTrueCmnd = down;
|
||||
@ -64,8 +64,8 @@ LOCALPROC Keyboard_UpdateKeyMap1(uint8_t key, blnr down)
|
||||
} else if (MKC_SemiColon == key) {
|
||||
if (down && ! AltKeysModOn) {
|
||||
if (AltKeysLockText) {
|
||||
AltKeysLockText = falseblnr;
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
AltKeysLockText = false;
|
||||
NeedWholeScreenDraw = true;
|
||||
SpecialModeClr(SpclModeAltKeyText);
|
||||
|
||||
CheckAltKeyUseMode();
|
||||
@ -78,9 +78,9 @@ LOCALPROC Keyboard_UpdateKeyMap1(uint8_t key, blnr down)
|
||||
} else if (MKC_M == key) {
|
||||
if (down) {
|
||||
if (! AltKeysLockText) {
|
||||
AltKeysLockText = trueblnr;
|
||||
AltKeysLockText = true;
|
||||
SpecialModeSet(SpclModeAltKeyText);
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
NeedWholeScreenDraw = true;
|
||||
CheckAltKeyUseMode();
|
||||
}
|
||||
}
|
||||
@ -176,13 +176,13 @@ LOCALPROC DisconnectKeyCodes1(uint32_t KeepMask)
|
||||
DisconnectKeyCodes(KeepMask);
|
||||
|
||||
if (! (0 != (KeepMask & kKeepMaskCommand))) {
|
||||
AltKeysTrueCmnd = falseblnr;
|
||||
AltKeysTrueCmnd = false;
|
||||
}
|
||||
if (! (0 != (KeepMask & kKeepMaskOption))) {
|
||||
AltKeysTrueOption = falseblnr;
|
||||
AltKeysTrueOption = false;
|
||||
}
|
||||
if (! (0 != (KeepMask & kKeepMaskShift))) {
|
||||
AltKeysTrueShift = falseblnr;
|
||||
AltKeysTrueShift = false;
|
||||
}
|
||||
AltKeysModOn = AltKeysTrueCmnd
|
||||
|| AltKeysTrueOption || AltKeysTrueShift;
|
||||
|
@ -54,7 +54,7 @@ LOCALVAR ASC_ChanR ASC_ChanA[4];
|
||||
LOCALVAR uint16_t ASC_FIFO_Out = 0;
|
||||
LOCALVAR uint16_t ASC_FIFO_InA = 0;
|
||||
LOCALVAR uint16_t ASC_FIFO_InB = 0;
|
||||
LOCALVAR blnr ASC_Playing = falseblnr;
|
||||
LOCALVAR bool ASC_Playing = false;
|
||||
|
||||
#define ASC_dolog (dbglog_HAVE && 0)
|
||||
|
||||
@ -95,11 +95,11 @@ LOCALPROC ASC_ClearFIFO(void)
|
||||
ASC_FIFO_Out = 0;
|
||||
ASC_FIFO_InA = 0;
|
||||
ASC_FIFO_InB = 0;
|
||||
ASC_Playing = falseblnr;
|
||||
ASC_Playing = false;
|
||||
ASC_RecalcStatus();
|
||||
}
|
||||
|
||||
GLOBALFUNC uint32_t ASC_Access(uint32_t Data, blnr WriteMem, CPTR addr)
|
||||
GLOBALFUNC uint32_t ASC_Access(uint32_t Data, bool WriteMem, CPTR addr)
|
||||
{
|
||||
if (addr < 0x800) {
|
||||
if (WriteMem) {
|
||||
@ -558,7 +558,7 @@ label_retry:
|
||||
|
||||
if (1 == SoundReg801) {
|
||||
#if SoundEnabled
|
||||
ui3p addr;
|
||||
uint8_t * addr;
|
||||
#endif
|
||||
|
||||
if (0 != (SoundReg802 & 2)) {
|
||||
@ -569,7 +569,7 @@ label_retry:
|
||||
{
|
||||
SoundReg804 &= ~ 0x01;
|
||||
SoundReg804 &= ~ 0x04;
|
||||
ASC_Playing = trueblnr;
|
||||
ASC_Playing = true;
|
||||
#if ASC_dolog
|
||||
dbglog_WriteNote("ASC : start stereo playing");
|
||||
#endif
|
||||
@ -593,10 +593,10 @@ label_retry:
|
||||
|
||||
for (i = 0; i < actL; i++) {
|
||||
if (((uint16_t)(ASC_FIFO_InA - ASC_FIFO_Out)) == 0) {
|
||||
ASC_Playing = falseblnr;
|
||||
ASC_Playing = false;
|
||||
}
|
||||
if (((uint16_t)(ASC_FIFO_InB - ASC_FIFO_Out)) == 0) {
|
||||
ASC_Playing = falseblnr;
|
||||
ASC_Playing = false;
|
||||
}
|
||||
if (! ASC_Playing) {
|
||||
#if SoundEnabled
|
||||
@ -641,7 +641,7 @@ label_retry:
|
||||
if (((uint16_t)(ASC_FIFO_InA - ASC_FIFO_Out)) >= 0x200)
|
||||
{
|
||||
SoundReg804 &= ~ 0x01;
|
||||
ASC_Playing = trueblnr;
|
||||
ASC_Playing = true;
|
||||
#if ASC_dolog
|
||||
dbglog_WriteNote("ASC : start mono playing");
|
||||
#endif
|
||||
@ -650,7 +650,7 @@ label_retry:
|
||||
|
||||
for (i = 0; i < actL; i++) {
|
||||
if (((uint16_t)(ASC_FIFO_InA - ASC_FIFO_Out)) == 0) {
|
||||
ASC_Playing = falseblnr;
|
||||
ASC_Playing = false;
|
||||
}
|
||||
if (! ASC_Playing) {
|
||||
#if SoundEnabled
|
||||
|
@ -20,5 +20,5 @@
|
||||
#define ASCEMDEV_H
|
||||
#endif
|
||||
|
||||
EXPORTFUNC uint32_t ASC_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
EXPORTFUNC uint32_t ASC_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
EXPORTPROC ASC_SubTick(int SubTick);
|
||||
|
@ -35,7 +35,7 @@ static struct bpf_insn insns[] =
|
||||
BPF_STMT(BPF_RET + BPF_K, 0),
|
||||
};
|
||||
|
||||
GLOBALVAR ui3p LT_TxBuffer = NULL;
|
||||
GLOBALVAR uint8_t * LT_TxBuffer = NULL;
|
||||
|
||||
/* Transmit state */
|
||||
GLOBALVAR uint16_t LT_TxBuffSz = 0;
|
||||
@ -59,7 +59,7 @@ static unsigned char tx_buffer[20 + LT_TxBfMxSz] =
|
||||
"\xFF\xFF\xFF\xFF\xFF\xFFssssss\x80\x9BppppSS";
|
||||
|
||||
/* Receive state */
|
||||
GLOBALVAR ui3p LT_RxBuffer = NULL;
|
||||
GLOBALVAR uint8_t * LT_RxBuffer = NULL;
|
||||
/* When data pending, this is used */
|
||||
GLOBALVAR uint32_t LT_RxBuffSz = 0;
|
||||
/* When data pending, this is used */
|
||||
@ -123,7 +123,7 @@ LOCALFUNC int get_ethernet(void)
|
||||
/* Get a socket to routed for IPv4 */
|
||||
fd = socket(PF_ROUTE, SOCK_RAW, AF_INET);
|
||||
if (fd == -1) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Allocate a message */
|
||||
@ -131,7 +131,7 @@ LOCALFUNC int get_ethernet(void)
|
||||
message = (struct rt_msghdr*)malloc(size);
|
||||
if (! message) {
|
||||
close(fd);
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
memset(message, 0, size);
|
||||
addrs = (struct sockaddr_in*)(message + 1);
|
||||
@ -151,7 +151,7 @@ LOCALFUNC int get_ethernet(void)
|
||||
if (result < 0) {
|
||||
close(fd);
|
||||
free(message);
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Read the result from the kernel */
|
||||
@ -159,7 +159,7 @@ LOCALFUNC int get_ethernet(void)
|
||||
if (result < 0) {
|
||||
close(fd);
|
||||
free(message);
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Close the route socket */
|
||||
@ -174,7 +174,7 @@ LOCALFUNC int get_ethernet(void)
|
||||
if ((! sa_list[RTAX_IFP])
|
||||
|| (sa_list[RTAX_IFP]->sa_family != AF_LINK))
|
||||
{
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
int namelen = ((struct sockaddr_dl*)sa_list[RTAX_IFP])->sdl_nlen;
|
||||
@ -195,7 +195,7 @@ LOCALFUNC int get_ethernet(void)
|
||||
|
||||
result = sysctlbyname("debug.bpf_maxdevices", &kp, &len, NULL, 0);
|
||||
if (result == -1) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
max = *((int *)&kp);
|
||||
|
||||
@ -209,44 +209,44 @@ LOCALFUNC int get_ethernet(void)
|
||||
}
|
||||
|
||||
if (fd <= 0) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
memset(&ifreq, 0, sizeof(struct ifreq));
|
||||
strncpy(ifreq.ifr_name, device, IFNAMSIZ);
|
||||
result = ioctl(fd, BIOCSETIF, &ifreq);
|
||||
if (result) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
result = ioctl(fd, BIOCGBLEN, &device_buffer_size);
|
||||
if (result) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
result = ioctl(fd, BIOCPROMISC, &enable);
|
||||
if (result) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
result = ioctl(fd, BIOCSSEESENT, &enable);
|
||||
if (result) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
result = ioctl(fd, BIOCSHDRCMPLT, &enable);
|
||||
if (result) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
result = ioctl(fd, BIOCIMMEDIATE, &enable);
|
||||
if (result) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
result = ioctl(fd, BIOCVERSION, &bpf_version);
|
||||
if (result) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
bpf_program.bf_len = 4;
|
||||
@ -254,10 +254,10 @@ LOCALFUNC int get_ethernet(void)
|
||||
|
||||
result = ioctl(fd, BIOCSETF, &bpf_program);
|
||||
if (result) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
LOCALVAR unsigned char *RxBuffer = NULL;
|
||||
@ -278,15 +278,15 @@ LOCALFUNC int InitLocalTalk(void)
|
||||
*/
|
||||
*((uint32_t*)(&tx_buffer[14])) = htonl(getpid());
|
||||
|
||||
LT_TxBuffer = (ui3p)&tx_buffer[20];
|
||||
LT_TxBuffer = (uint8_t *)&tx_buffer[20];
|
||||
|
||||
RxBuffer = malloc(device_buffer_size);
|
||||
if (NULL == RxBuffer) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Initialized properly */
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
GLOBALOSGLUPROC LT_TransmitPacket(void)
|
||||
@ -356,7 +356,7 @@ label_retry:
|
||||
|
||||
if (llap_length <= ethernet_length) {
|
||||
/* Start the receiver */
|
||||
LT_RxBuffer = (ui3p)start;
|
||||
LT_RxBuffer = (uint8_t *)start;
|
||||
LT_RxBuffSz = llap_length;
|
||||
} else {
|
||||
goto label_retry;
|
||||
|
108
src/COMOSGLU.h
108
src/COMOSGLU.h
@ -36,18 +36,18 @@
|
||||
#define EnableMoveMouse 0
|
||||
#endif
|
||||
|
||||
GLOBALVAR ui3p ROM = nullpr;
|
||||
LOCALVAR blnr ROM_loaded = falseblnr;
|
||||
GLOBALVAR uint8_t * ROM = nullpr;
|
||||
LOCALVAR bool ROM_loaded = false;
|
||||
|
||||
GLOBALVAR uint32_t vSonyWritableMask = 0;
|
||||
GLOBALVAR uint32_t vSonyInsertedMask = 0;
|
||||
|
||||
#if IncludeSonyRawMode
|
||||
GLOBALVAR blnr vSonyRawMode = falseblnr;
|
||||
GLOBALVAR bool vSonyRawMode = false;
|
||||
#endif
|
||||
|
||||
#if IncludeSonyNew
|
||||
GLOBALVAR blnr vSonyNewDiskWanted = falseblnr;
|
||||
GLOBALVAR bool vSonyNewDiskWanted = false;
|
||||
GLOBALVAR uint32_t vSonyNewDiskSize;
|
||||
#endif
|
||||
|
||||
@ -65,12 +65,12 @@ GLOBALVAR uint32_t CurMacDelta = 0;
|
||||
#endif
|
||||
|
||||
#if 0 != vMacScreenDepth
|
||||
GLOBALVAR blnr UseColorMode = falseblnr;
|
||||
GLOBALVAR blnr ColorModeWorks = falseblnr;
|
||||
GLOBALVAR bool UseColorMode = false;
|
||||
GLOBALVAR bool ColorModeWorks = false;
|
||||
#endif
|
||||
|
||||
#if 0 != vMacScreenDepth
|
||||
GLOBALVAR blnr ColorMappingChanged = falseblnr;
|
||||
GLOBALVAR bool ColorMappingChanged = false;
|
||||
#endif
|
||||
|
||||
#if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
|
||||
@ -79,25 +79,25 @@ GLOBALVAR uint16_t CLUT_greens[CLUT_size];
|
||||
GLOBALVAR uint16_t CLUT_blues[CLUT_size];
|
||||
#endif
|
||||
|
||||
LOCALVAR blnr RequestMacOff = falseblnr;
|
||||
LOCALVAR bool RequestMacOff = false;
|
||||
|
||||
GLOBALVAR blnr ForceMacOff = falseblnr;
|
||||
GLOBALVAR bool ForceMacOff = false;
|
||||
|
||||
GLOBALVAR blnr WantMacInterrupt = falseblnr;
|
||||
GLOBALVAR bool WantMacInterrupt = false;
|
||||
|
||||
GLOBALVAR blnr WantMacReset = falseblnr;
|
||||
GLOBALVAR bool WantMacReset = false;
|
||||
|
||||
GLOBALVAR uint8_t SpeedValue = WantInitSpeedValue;
|
||||
|
||||
#if EnableAutoSlow
|
||||
GLOBALVAR blnr WantNotAutoSlow = (WantInitNotAutoSlow != 0);
|
||||
GLOBALVAR bool WantNotAutoSlow = (WantInitNotAutoSlow != 0);
|
||||
#endif
|
||||
|
||||
GLOBALVAR uint16_t CurMouseV = 0;
|
||||
GLOBALVAR uint16_t CurMouseH = 0;
|
||||
|
||||
#if EnableFSMouseMotion
|
||||
LOCALVAR blnr HaveMouseMotion = falseblnr;
|
||||
LOCALVAR bool HaveMouseMotion = false;
|
||||
#endif
|
||||
|
||||
#if EnableAutoSlow
|
||||
@ -123,17 +123,17 @@ LOCALVAR uint32_t PbufSize[NumPbufs];
|
||||
#endif
|
||||
|
||||
#if IncludePbufs
|
||||
LOCALFUNC blnr FirstFreePbuf(tPbuf *r)
|
||||
LOCALFUNC bool FirstFreePbuf(tPbuf *r)
|
||||
{
|
||||
tPbuf i;
|
||||
|
||||
for (i = 0; i < NumPbufs; ++i) {
|
||||
if (! PbufIsAllocated(i)) {
|
||||
*r = i;
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -182,7 +182,7 @@ GLOBALOSGLUFUNC tMacErr PbufGetSize(tPbuf Pbuf_No, uint32_t *Count)
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr FirstFreeDisk(tDrive *Drive_No)
|
||||
LOCALFUNC bool FirstFreeDisk(tDrive *Drive_No)
|
||||
{
|
||||
tDrive i;
|
||||
|
||||
@ -191,23 +191,23 @@ LOCALFUNC blnr FirstFreeDisk(tDrive *Drive_No)
|
||||
if (nullpr != Drive_No) {
|
||||
*Drive_No = i;
|
||||
}
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
GLOBALOSGLUFUNC blnr AnyDiskInserted(void)
|
||||
GLOBALOSGLUFUNC bool AnyDiskInserted(void)
|
||||
{
|
||||
#if 0
|
||||
tDrive i;
|
||||
|
||||
for (i = 0; i < NumDrives; ++i) {
|
||||
if (vSonyIsInserted(i)) {
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
#endif
|
||||
return 0 != vSonyInsertedMask;
|
||||
}
|
||||
@ -217,7 +217,7 @@ GLOBALOSGLUPROC DiskRevokeWritable(tDrive Drive_No)
|
||||
vSonyWritableMask &= ~ ((uint32_t)1 << Drive_No);
|
||||
}
|
||||
|
||||
LOCALPROC DiskInsertNotify(tDrive Drive_No, blnr locked)
|
||||
LOCALPROC DiskInsertNotify(tDrive Drive_No, bool locked)
|
||||
{
|
||||
vSonyInsertedMask |= ((uint32_t)1 << Drive_No);
|
||||
if (! locked) {
|
||||
@ -262,7 +262,7 @@ LOCALPROC DiskEjectedNotify(tDrive Drive_No)
|
||||
#define ln2uiblockbitsn (3 + ln2uiblockn)
|
||||
#define uiblockbitsn (8 * uiblockn)
|
||||
|
||||
LOCALFUNC blnr FindFirstChangeInLVecs(uibb *ptr1, uibb *ptr2,
|
||||
LOCALFUNC bool FindFirstChangeInLVecs(uibb *ptr1, uibb *ptr2,
|
||||
uimr L, uimr *j)
|
||||
{
|
||||
/*
|
||||
@ -276,10 +276,10 @@ LOCALFUNC blnr FindFirstChangeInLVecs(uibb *ptr1, uibb *ptr2,
|
||||
if (*p1++ != *p2++) {
|
||||
--p1;
|
||||
*j = p1 - ptr1;
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOCALPROC FindLastChangeInLVecs(uibb *ptr1, uibb *ptr2,
|
||||
@ -346,7 +346,7 @@ Label_3:
|
||||
*RightMask0 = RightMask;
|
||||
}
|
||||
|
||||
LOCALVAR ui3p screencomparebuff = nullpr;
|
||||
LOCALVAR uint8_t * screencomparebuff = nullpr;
|
||||
|
||||
LOCALVAR uimr NextDrawRow = 0;
|
||||
|
||||
@ -368,10 +368,10 @@ LOCALVAR uimr NextDrawRow = 0;
|
||||
#endif
|
||||
|
||||
#if WantColorTransValid
|
||||
LOCALVAR blnr ColorTransValid = falseblnr;
|
||||
LOCALVAR bool ColorTransValid = false;
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr ScreenFindChanges(ui3p screencurrentbuff,
|
||||
LOCALFUNC bool ScreenFindChanges(uint8_t * screencurrentbuff,
|
||||
int8_t TimeAdjust, int16_t *top, int16_t *left, int16_t *bottom, int16_t *right)
|
||||
{
|
||||
uimr j0;
|
||||
@ -402,13 +402,13 @@ LOCALFUNC blnr ScreenFindChanges(ui3p screencurrentbuff,
|
||||
#if 0 != vMacScreenDepth
|
||||
if (UseColorMode) {
|
||||
if (ColorMappingChanged) {
|
||||
ColorMappingChanged = falseblnr;
|
||||
ColorMappingChanged = false;
|
||||
j0h = 0;
|
||||
j1h = vMacScreenWidth;
|
||||
j0v = 0;
|
||||
j1v = vMacScreenHeight;
|
||||
#if WantColorTransValid
|
||||
ColorTransValid = falseblnr;
|
||||
ColorTransValid = false;
|
||||
#endif
|
||||
} else {
|
||||
if (! FindFirstChangeInLVecs(
|
||||
@ -421,7 +421,7 @@ LOCALFUNC blnr ScreenFindChanges(ui3p screencurrentbuff,
|
||||
&j0))
|
||||
{
|
||||
NextDrawRow = 0;
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
j0v = j0 / (vMacScreenBitWidth / uiblockbitsn);
|
||||
j0h = j0 - j0v * (vMacScreenBitWidth / uiblockbitsn);
|
||||
@ -501,13 +501,13 @@ Label_2c:
|
||||
{
|
||||
#if 0 != vMacScreenDepth
|
||||
if (ColorMappingChanged) {
|
||||
ColorMappingChanged = falseblnr;
|
||||
ColorMappingChanged = false;
|
||||
j0h = 0;
|
||||
j1h = vMacScreenWidth;
|
||||
j0v = 0;
|
||||
j1v = vMacScreenHeight;
|
||||
#if WantColorTransValid
|
||||
ColorTransValid = falseblnr;
|
||||
ColorTransValid = false;
|
||||
#endif
|
||||
} else
|
||||
#endif
|
||||
@ -522,7 +522,7 @@ Label_2c:
|
||||
&j0))
|
||||
{
|
||||
NextDrawRow = 0;
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
j0v = j0 / (vMacScreenWidth / uiblockbitsn);
|
||||
j0h = j0 - j0v * (vMacScreenWidth / uiblockbitsn);
|
||||
@ -591,10 +591,10 @@ Label_2:
|
||||
*bottom = j1v;
|
||||
*right = j1h;
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
GLOBALVAR blnr EmVideoDisable = falseblnr;
|
||||
GLOBALVAR bool EmVideoDisable = false;
|
||||
GLOBALVAR int8_t EmLagTime = 0;
|
||||
|
||||
GLOBALVAR uint32_t OnTrueTime = 0;
|
||||
@ -631,7 +631,7 @@ LOCALVAR int16_t ScreenChangedQuietBottom = 0;
|
||||
LOCALVAR int16_t ScreenChangedQuietRight = 0;
|
||||
#endif
|
||||
|
||||
GLOBALOSGLUPROC Screen_OutputFrame(ui3p screencurrentbuff)
|
||||
GLOBALOSGLUPROC Screen_OutputFrame(uint8_t * screencurrentbuff)
|
||||
{
|
||||
int16_t top;
|
||||
int16_t left;
|
||||
@ -803,7 +803,7 @@ LOCALPROC SetLongs(uint32_t *p, long n)
|
||||
}
|
||||
|
||||
LOCALVAR uimr ReserveAllocOffset;
|
||||
LOCALVAR ui3p ReserveAllocBigBlock = nullpr;
|
||||
LOCALVAR uint8_t * ReserveAllocBigBlock = nullpr;
|
||||
|
||||
#define PowOf2(p) ((uimr)1 << (p))
|
||||
#define Pow2Mask(p) (PowOf2(p) - 1)
|
||||
@ -813,8 +813,8 @@ LOCALVAR ui3p ReserveAllocBigBlock = nullpr;
|
||||
#define CeilPow2Mult(i, p) FloorPow2Mult((i) + Pow2Mask(p), (p))
|
||||
/* warning - CeilPow2Mult evaluates p twice */
|
||||
|
||||
GLOBALOSGLUPROC ReserveAllocOneBlock(ui3p *p, uimr n,
|
||||
uint8_t align, blnr FillOnes)
|
||||
GLOBALOSGLUPROC ReserveAllocOneBlock(uint8_t * *p, uimr n,
|
||||
uint8_t align, bool FillOnes)
|
||||
{
|
||||
ReserveAllocOffset = CeilPow2Mult(ReserveAllocOffset, align);
|
||||
if (nullpr == ReserveAllocBigBlock) {
|
||||
@ -839,8 +839,8 @@ LOCALVAR char *dbglog_bufp = nullpr;
|
||||
|
||||
LOCALPROC dbglog_ReserveAlloc(void)
|
||||
{
|
||||
ReserveAllocOneBlock((ui3p *)&dbglog_bufp, dbglog_bufsz,
|
||||
5, falseblnr);
|
||||
ReserveAllocOneBlock((uint8_t * *)&dbglog_bufp, dbglog_bufsz,
|
||||
5, false);
|
||||
}
|
||||
|
||||
#define dbglog_open dbglog_open0
|
||||
@ -998,7 +998,7 @@ GLOBALOSGLUPROC EvtQOutDone(void)
|
||||
++EvtQOut;
|
||||
}
|
||||
|
||||
LOCALVAR blnr EvtQNeedRecover = falseblnr;
|
||||
LOCALVAR bool EvtQNeedRecover = false;
|
||||
/* events lost because of full queue */
|
||||
|
||||
LOCALFUNC EvtQEl * EvtQElPreviousIn(void)
|
||||
@ -1015,7 +1015,7 @@ LOCALFUNC EvtQEl * EvtQElAlloc(void)
|
||||
{
|
||||
EvtQEl *p = NULL;
|
||||
if (EvtQIn - EvtQOut >= EvtQSz) {
|
||||
EvtQNeedRecover = trueblnr;
|
||||
EvtQNeedRecover = true;
|
||||
} else {
|
||||
p = &EvtQA[EvtQIn & EvtQIMask];
|
||||
|
||||
@ -1027,13 +1027,13 @@ LOCALFUNC EvtQEl * EvtQElAlloc(void)
|
||||
|
||||
LOCALVAR uint32_t theKeys[4];
|
||||
|
||||
LOCALPROC Keyboard_UpdateKeyMap(uint8_t key, blnr down)
|
||||
LOCALPROC Keyboard_UpdateKeyMap(uint8_t key, bool down)
|
||||
{
|
||||
uint8_t k = key & 127; /* just for safety */
|
||||
uint8_t bit = 1 << (k & 7);
|
||||
uint8_t *kp = (uint8_t *)theKeys;
|
||||
uint8_t *kpi = &kp[k / 8];
|
||||
blnr CurDown = ((*kpi & bit) != 0);
|
||||
bool CurDown = ((*kpi & bit) != 0);
|
||||
if (CurDown != down) {
|
||||
EvtQEl *p = EvtQElAlloc();
|
||||
if (NULL != p) {
|
||||
@ -1052,9 +1052,9 @@ LOCALPROC Keyboard_UpdateKeyMap(uint8_t key, blnr down)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALVAR blnr MouseButtonState = falseblnr;
|
||||
LOCALVAR bool MouseButtonState = false;
|
||||
|
||||
LOCALPROC MouseButtonSet(blnr down)
|
||||
LOCALPROC MouseButtonSet(bool down)
|
||||
{
|
||||
if (MouseButtonState != down) {
|
||||
EvtQEl *p = EvtQElAlloc();
|
||||
@ -1163,7 +1163,7 @@ LOCALPROC DisconnectKeyCodes(uint32_t KeepMask)
|
||||
default: m = 0; break;
|
||||
}
|
||||
if (0 == (KeepMask & m)) {
|
||||
Keyboard_UpdateKeyMap(key, falseblnr);
|
||||
Keyboard_UpdateKeyMap(key, false);
|
||||
}
|
||||
}
|
||||
bit <<= 1;
|
||||
@ -1174,7 +1174,7 @@ LOCALPROC DisconnectKeyCodes(uint32_t KeepMask)
|
||||
|
||||
LOCALPROC EvtQTryRecoverFromFull(void)
|
||||
{
|
||||
MouseButtonSet(falseblnr);
|
||||
MouseButtonSet(false);
|
||||
DisconnectKeyCodes(0);
|
||||
}
|
||||
|
||||
@ -1185,9 +1185,9 @@ LOCALVAR char *SavedLongMsg;
|
||||
#if WantAbnormalReports
|
||||
LOCALVAR uint16_t SavedIDMsg = 0;
|
||||
#endif
|
||||
LOCALVAR blnr SavedFatalMsg;
|
||||
LOCALVAR bool SavedFatalMsg;
|
||||
|
||||
LOCALPROC MacMsg(char *briefMsg, char *longMsg, blnr fatal)
|
||||
LOCALPROC MacMsg(char *briefMsg, char *longMsg, bool fatal)
|
||||
{
|
||||
if (nullpr != SavedBriefMsg) {
|
||||
/*
|
||||
@ -1205,7 +1205,7 @@ LOCALPROC MacMsg(char *briefMsg, char *longMsg, blnr fatal)
|
||||
GLOBALOSGLUPROC WarnMsgAbnormalID(uint16_t id)
|
||||
{
|
||||
MacMsg(kStrReportAbnormalTitle,
|
||||
kStrReportAbnormalMessage, falseblnr);
|
||||
kStrReportAbnormalMessage, false);
|
||||
|
||||
if (0 != SavedIDMsg) {
|
||||
/*
|
||||
|
@ -38,7 +38,7 @@ enum {
|
||||
|
||||
LOCALVAR uimr SpecialModes = 0;
|
||||
|
||||
LOCALVAR blnr NeedWholeScreenDraw = falseblnr;
|
||||
LOCALVAR bool NeedWholeScreenDraw = false;
|
||||
|
||||
#define SpecialModeSet(i) SpecialModes |= (1 << (i))
|
||||
#define SpecialModeClr(i) SpecialModes &= ~ (1 << (i))
|
||||
@ -46,7 +46,7 @@ LOCALVAR blnr NeedWholeScreenDraw = falseblnr;
|
||||
|
||||
#define MacMsgDisplayed SpecialModeTst(SpclModeMessage)
|
||||
|
||||
LOCALVAR ui3p CntrlDisplayBuff = nullpr;
|
||||
LOCALVAR uint8_t * CntrlDisplayBuff = nullpr;
|
||||
|
||||
LOCALPROC DrawCell(unsigned int h, unsigned int v, int x)
|
||||
{
|
||||
@ -57,11 +57,11 @@ LOCALPROC DrawCell(unsigned int h, unsigned int v, int x)
|
||||
#endif
|
||||
{
|
||||
int i;
|
||||
ui3p p0 = ((ui3p)CellData) + 16 * x;
|
||||
uint8_t * p0 = ((uint8_t *)CellData) + 16 * x;
|
||||
|
||||
#if 0 != vMacScreenDepth
|
||||
if (UseColorMode) {
|
||||
ui3p p = CntrlDisplayBuff
|
||||
uint8_t * p = CntrlDisplayBuff
|
||||
+ ((h + 1) << vMacScreenDepth)
|
||||
+ (v * 16 + 11) * vMacScreenByteWidth;
|
||||
|
||||
@ -69,7 +69,7 @@ LOCALPROC DrawCell(unsigned int h, unsigned int v, int x)
|
||||
#if 1 == vMacScreenDepth
|
||||
int k;
|
||||
uint8_t t0 = *p0;
|
||||
ui3p p2 = p;
|
||||
uint8_t * p2 = p;
|
||||
for (k = 2; --k >= 0; ) {
|
||||
*p2++ = (((t0) & 0x80) ? 0xC0 : 0x00)
|
||||
| (((t0) & 0x40) ? 0x30 : 0x00)
|
||||
@ -81,7 +81,7 @@ LOCALPROC DrawCell(unsigned int h, unsigned int v, int x)
|
||||
#elif 2 == vMacScreenDepth
|
||||
int k;
|
||||
uint8_t t0 = *p0;
|
||||
ui3p p2 = p;
|
||||
uint8_t * p2 = p;
|
||||
for (k = 4; --k >= 0; ) {
|
||||
*p2++ = (((t0) & 0x40) ? 0x0F : 0x00)
|
||||
| (((t0) & 0x80) ? 0xF0 : 0x00);
|
||||
@ -91,7 +91,7 @@ LOCALPROC DrawCell(unsigned int h, unsigned int v, int x)
|
||||
#elif 3 == vMacScreenDepth
|
||||
int k;
|
||||
uint8_t t0 = *p0;
|
||||
ui3p p2 = p;
|
||||
uint8_t * p2 = p;
|
||||
for (k = 8; --k >= 0; ) {
|
||||
*p2++ = ((t0 >> k) & 0x01) ? 0xFF : 0x00;
|
||||
/* black RRGGBBAA, white RRGGBBAA */
|
||||
@ -100,7 +100,7 @@ LOCALPROC DrawCell(unsigned int h, unsigned int v, int x)
|
||||
int k;
|
||||
uint16_t v;
|
||||
uint8_t t0 = *p0;
|
||||
ui3p p2 = p;
|
||||
uint8_t * p2 = p;
|
||||
for (k = 8; --k >= 0; ) {
|
||||
v = ((t0 >> k) & 0x01) ? 0x0000 : 0x7FFF;
|
||||
/* black RRGGBBAA, white RRGGBBAA */
|
||||
@ -112,7 +112,7 @@ LOCALPROC DrawCell(unsigned int h, unsigned int v, int x)
|
||||
int k;
|
||||
uint32_t v;
|
||||
uint8_t t0 = *p0;
|
||||
ui3p p2 = p;
|
||||
uint8_t * p2 = p;
|
||||
for (k = 8; --k >= 0; ) {
|
||||
v = ((t0 >> k) & 0x01) ? 0x00000000 : 0x00FFFFFF;
|
||||
/* black RRGGBBAA, white RRGGBBAA */
|
||||
@ -129,7 +129,7 @@ LOCALPROC DrawCell(unsigned int h, unsigned int v, int x)
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
ui3p p = CntrlDisplayBuff + (h + 1)
|
||||
uint8_t * p = CntrlDisplayBuff + (h + 1)
|
||||
+ (v * 16 + 11) * vMacScreenMonoByteWidth;
|
||||
|
||||
for (i = 16; --i >= 0; ) {
|
||||
@ -387,12 +387,12 @@ LOCALPROC MacMsgDisplayOff(void)
|
||||
#if WantAbnormalReports
|
||||
SavedIDMsg = 0;
|
||||
#endif
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
NeedWholeScreenDraw = true;
|
||||
}
|
||||
|
||||
LOCALPROC MacMsgDisplayOn(void)
|
||||
{
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
NeedWholeScreenDraw = true;
|
||||
DisconnectKeyCodes1(kKeepMaskControl | kKeepMaskCapsLock);
|
||||
/* command */
|
||||
SpecialModeSet(SpclModeMessage);
|
||||
@ -410,7 +410,7 @@ LOCALPROC MacMsgOverride(char *briefMsg, char *longMsg)
|
||||
if (MacMsgDisplayed) {
|
||||
MacMsgDisplayOff();
|
||||
}
|
||||
MacMsg(briefMsg, longMsg, falseblnr);
|
||||
MacMsg(briefMsg, longMsg, false);
|
||||
}
|
||||
|
||||
#if NeedDoMoreCommandsMsg
|
||||
@ -432,12 +432,12 @@ LOCALPROC DoAboutMsg(void)
|
||||
LOCALPROC NoRomMsgDisplayOff(void)
|
||||
{
|
||||
SpecialModeClr(SpclModeNoRom);
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
NeedWholeScreenDraw = true;
|
||||
}
|
||||
|
||||
LOCALPROC NoRomMsgDisplayOn(void)
|
||||
{
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
NeedWholeScreenDraw = true;
|
||||
SpecialModeSet(SpclModeNoRom);
|
||||
}
|
||||
|
||||
@ -453,7 +453,7 @@ LOCALPROC DrawNoRomMode(void)
|
||||
|
||||
#if UseControlKeys
|
||||
|
||||
LOCALVAR blnr LastControlKey = falseblnr;
|
||||
LOCALVAR bool LastControlKey = false;
|
||||
LOCALVAR int CurControlMode = 0;
|
||||
LOCALVAR int ControlMessage = 0;
|
||||
|
||||
@ -514,7 +514,7 @@ LOCALPROC DoEnterControlMode(void)
|
||||
{
|
||||
CurControlMode = kCntrlModeBase;
|
||||
ControlMessage = kCntrlMsgBaseStart;
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
NeedWholeScreenDraw = true;
|
||||
DisconnectKeyCodes1(kKeepMaskControl | kKeepMaskCapsLock);
|
||||
SpecialModeSet(SpclModeControl);
|
||||
}
|
||||
@ -523,10 +523,10 @@ LOCALPROC DoLeaveControlMode(void)
|
||||
{
|
||||
SpecialModeClr(SpclModeControl);
|
||||
CurControlMode = kCntrlModeOff;
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
NeedWholeScreenDraw = true;
|
||||
}
|
||||
|
||||
LOCALPROC Keyboard_UpdateControlKey(blnr down)
|
||||
LOCALPROC Keyboard_UpdateControlKey(bool down)
|
||||
{
|
||||
if (down != LastControlKey) {
|
||||
LastControlKey = down;
|
||||
@ -559,8 +559,8 @@ LOCALPROC HTCEexportSubstCStr(char *s)
|
||||
int n = ClStrSizeSubstCStr(s);
|
||||
|
||||
if (mnvm_noErr == PbufNew(n, &j)) {
|
||||
blnr IsOk = falseblnr;
|
||||
ui3p p = PbufLock(j);
|
||||
bool IsOk = false;
|
||||
uint8_t * p = PbufLock(j);
|
||||
|
||||
if (nullpr != p) {
|
||||
L = 0;
|
||||
@ -570,7 +570,7 @@ LOCALPROC HTCEexportSubstCStr(char *s)
|
||||
for (i = 0; i < n; ++i) {
|
||||
p[i] = Cell2MacAsciiMap[p[i]];
|
||||
}
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
}
|
||||
|
||||
PbufUnlock(j);
|
||||
@ -592,7 +592,7 @@ LOCALPROC HTCEexportSubstCStr(char *s)
|
||||
}
|
||||
|
||||
if (mnvm_noErr == PbufNew(L, &j)) {
|
||||
PbufTransfer(ps, j, 0, L, trueblnr);
|
||||
PbufTransfer(ps, j, 0, L, true);
|
||||
HTCEexport(j);
|
||||
}
|
||||
#endif
|
||||
@ -632,7 +632,7 @@ LOCALPROC DoControlModeKey(uint8_t key)
|
||||
#if WantEnblCtrlRst
|
||||
case MKC_R:
|
||||
if (! AnyDiskInserted()) {
|
||||
WantMacReset = trueblnr;
|
||||
WantMacReset = true;
|
||||
ControlMessage = kCntrlMsgHaveReset;
|
||||
} else {
|
||||
CurControlMode = kCntrlModeConfirmReset;
|
||||
@ -642,7 +642,7 @@ LOCALPROC DoControlModeKey(uint8_t key)
|
||||
#endif
|
||||
case MKC_Q:
|
||||
if (! AnyDiskInserted()) {
|
||||
ForceMacOff = trueblnr;
|
||||
ForceMacOff = true;
|
||||
} else {
|
||||
CurControlMode = kCntrlModeConfirmQuit;
|
||||
ControlMessage = kCntrlMsgConfirmQuitStart;
|
||||
@ -656,7 +656,7 @@ LOCALPROC DoControlModeKey(uint8_t key)
|
||||
break;
|
||||
#if NeedRequestInsertDisk
|
||||
case MKC_O:
|
||||
RequestInsertDisk = trueblnr;
|
||||
RequestInsertDisk = true;
|
||||
break;
|
||||
#endif
|
||||
#if EnableMagnify
|
||||
@ -712,7 +712,7 @@ LOCALPROC DoControlModeKey(uint8_t key)
|
||||
case kCntrlModeConfirmReset:
|
||||
switch (key) {
|
||||
case MKC_Y:
|
||||
WantMacReset = trueblnr;
|
||||
WantMacReset = true;
|
||||
CurControlMode = kCntrlModeBase;
|
||||
ControlMessage = kCntrlMsgHaveReset;
|
||||
break;
|
||||
@ -731,7 +731,7 @@ LOCALPROC DoControlModeKey(uint8_t key)
|
||||
case kCntrlModeConfirmInterrupt:
|
||||
switch (key) {
|
||||
case MKC_Y:
|
||||
WantMacInterrupt = trueblnr;
|
||||
WantMacInterrupt = true;
|
||||
CurControlMode = kCntrlModeBase;
|
||||
ControlMessage = kCntrlMsgHaveInterrupted;
|
||||
break;
|
||||
@ -749,7 +749,7 @@ LOCALPROC DoControlModeKey(uint8_t key)
|
||||
case kCntrlModeConfirmQuit:
|
||||
switch (key) {
|
||||
case MKC_Y:
|
||||
ForceMacOff = trueblnr;
|
||||
ForceMacOff = true;
|
||||
CurControlMode = kCntrlModeBase;
|
||||
ControlMessage = kCntrlMsgBaseStart;
|
||||
/* shouldn't see this message since quitting */
|
||||
@ -813,7 +813,7 @@ LOCALPROC DoControlModeKey(uint8_t key)
|
||||
}
|
||||
break;
|
||||
}
|
||||
NeedWholeScreenDraw = trueblnr;
|
||||
NeedWholeScreenDraw = true;
|
||||
}
|
||||
|
||||
LOCALFUNC char * ControlMode2TitleStr(void)
|
||||
@ -1026,9 +1026,9 @@ LOCALPROC DrawSpclMode(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC ui3p GetCurDrawBuff(void)
|
||||
LOCALFUNC uint8_t * GetCurDrawBuff(void)
|
||||
{
|
||||
ui3p p = screencomparebuff;
|
||||
uint8_t * p = screencomparebuff;
|
||||
|
||||
if (0 != SpecialModes) {
|
||||
MoveBytes((anyp)p, (anyp)CntrlDisplayBuff,
|
||||
@ -1162,7 +1162,7 @@ LOCALFUNC uint8_t Keyboard_RemapMac(uint8_t key)
|
||||
}
|
||||
#endif /* WantKeyboard_RemapMac */
|
||||
|
||||
LOCALPROC Keyboard_UpdateKeyMap2(uint8_t key, blnr down)
|
||||
LOCALPROC Keyboard_UpdateKeyMap2(uint8_t key, bool down)
|
||||
{
|
||||
#if UseControlKeys
|
||||
if (MKC_CM == key) {
|
||||
@ -1200,7 +1200,7 @@ LOCALPROC DisconnectKeyCodes2(void)
|
||||
{
|
||||
DisconnectKeyCodes1(kKeepMaskControl | kKeepMaskCapsLock);
|
||||
#if UseControlKeys
|
||||
Keyboard_UpdateControlKey(falseblnr);
|
||||
Keyboard_UpdateControlKey(false);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -1213,7 +1213,7 @@ LOCALFUNC uint32_t Calc_Checksum(void)
|
||||
{
|
||||
long int i;
|
||||
uint32_t CheckSum = 0;
|
||||
ui3p p = 4 + ROM;
|
||||
uint8_t * p = 4 + ROM;
|
||||
|
||||
for (i = (kCheckSumRom_Size - 4) >> 1; --i >= 0; ) {
|
||||
CheckSum += do_get_mem_word(p);
|
||||
@ -1274,28 +1274,28 @@ LOCALFUNC tMacErr ROM_IsValid(void)
|
||||
|
||||
#endif /* CheckRomCheckSum */
|
||||
|
||||
ROM_loaded = trueblnr;
|
||||
SpeedStopped = falseblnr;
|
||||
ROM_loaded = true;
|
||||
SpeedStopped = false;
|
||||
|
||||
return mnvm_noErr;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr WaitForRom(void)
|
||||
LOCALFUNC bool WaitForRom(void)
|
||||
{
|
||||
if (! ROM_loaded) {
|
||||
NoRomMsgDisplayOn();
|
||||
|
||||
SpeedStopped = trueblnr;
|
||||
SpeedStopped = true;
|
||||
do {
|
||||
WaitForNextTick();
|
||||
|
||||
if (ForceMacOff) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
} while (SpeedStopped);
|
||||
|
||||
NoRomMsgDisplayOff();
|
||||
}
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
@ -37,7 +37,7 @@
|
||||
#if BigEndianUnaligned
|
||||
#define do_get_mem_word(a) ((uint16_t)*((uint16_t *)(a)))
|
||||
#else
|
||||
LOCALINLINEFUNC uint16_t do_get_mem_word(ui3p a)
|
||||
LOCALINLINEFUNC uint16_t do_get_mem_word(uint8_t * a)
|
||||
{
|
||||
#if LittleEndianUnaligned
|
||||
uint16_t b = (*((uint16_t *)(a)));
|
||||
@ -54,7 +54,7 @@ LOCALINLINEFUNC uint16_t do_get_mem_word(ui3p a)
|
||||
#elif HaveSwapUi5r && LittleEndianUnaligned
|
||||
#define do_get_mem_long(a) (SwapUi5r((uint32_t)*((uint32_t *)(a))))
|
||||
#else
|
||||
LOCALINLINEFUNC uint32_t do_get_mem_long(ui3p a)
|
||||
LOCALINLINEFUNC uint32_t do_get_mem_long(uint8_t * a)
|
||||
{
|
||||
#if LittleEndianUnaligned
|
||||
#if 0
|
||||
@ -98,7 +98,7 @@ LOCALINLINEFUNC uint32_t do_get_mem_long(ui3p a)
|
||||
#if BigEndianUnaligned
|
||||
#define do_put_mem_word(a, v) ((*((uint16_t *)(a))) = (v))
|
||||
#else
|
||||
LOCALINLINEFUNC void do_put_mem_word(ui3p a, uint16_t v)
|
||||
LOCALINLINEFUNC void do_put_mem_word(uint8_t * a, uint16_t v)
|
||||
{
|
||||
#if LittleEndianUnaligned
|
||||
uint16_t b = ((v & 0x00FF) << 8) | ((v >> 8) & 0x00FF);
|
||||
@ -116,7 +116,7 @@ LOCALINLINEFUNC void do_put_mem_word(ui3p a, uint16_t v)
|
||||
#elif HaveSwapUi5r && LittleEndianUnaligned
|
||||
#define do_put_mem_long(a, v) ((*((uint32_t *)(a))) = SwapUi5r(v))
|
||||
#else
|
||||
LOCALINLINEFUNC void do_put_mem_long(ui3p a, uint32_t v)
|
||||
LOCALINLINEFUNC void do_put_mem_long(uint8_t * a, uint32_t v)
|
||||
{
|
||||
#if LittleEndianUnaligned
|
||||
uint16_t b1 = v;
|
||||
|
@ -40,7 +40,7 @@ LOCALFUNC uint32_t myfp_GetFPIAR(void)
|
||||
return fpu_dat.FPIAR;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr DecodeAddrModeRegister(uint32_t sz)
|
||||
LOCALFUNC bool DecodeAddrModeRegister(uint32_t sz)
|
||||
{
|
||||
uint16_t Dat = V_regs.CurDecOpY.v[0].ArgDat;
|
||||
uint16_t themode = (Dat >> 3) & 7;
|
||||
@ -64,12 +64,12 @@ LOCALFUNC blnr DecodeAddrModeRegister(uint32_t sz)
|
||||
return DecodeModeRegister(sz);
|
||||
break;
|
||||
default :
|
||||
return falseblnr;
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default :
|
||||
return falseblnr;
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -5688,22 +5688,22 @@ LOCALFUNC uint32_t myfp_ToLong(myfpr *x)
|
||||
return floatx80_to_int32( *x );
|
||||
}
|
||||
|
||||
LOCALFUNC blnr myfp_IsNan(myfpr *x)
|
||||
LOCALFUNC bool myfp_IsNan(myfpr *x)
|
||||
{
|
||||
return floatx80_is_nan(*x);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr myfp_IsInf(myfpr *x)
|
||||
LOCALFUNC bool myfp_IsInf(myfpr *x)
|
||||
{
|
||||
return ( ( x->high & 0x7FFF ) == 0x7FFF ) && (0 == ((uint64_t) ( x->low<<1 )));
|
||||
}
|
||||
|
||||
LOCALFUNC blnr myfp_IsZero(myfpr *x)
|
||||
LOCALFUNC bool myfp_IsZero(myfpr *x)
|
||||
{
|
||||
return ( ( x->high & 0x7FFF ) == 0x0000 ) && (0 == ((uint64_t) ( x->low<<1 )));
|
||||
}
|
||||
|
||||
LOCALFUNC blnr myfp_IsNeg(myfpr *x)
|
||||
LOCALFUNC bool myfp_IsNeg(myfpr *x)
|
||||
{
|
||||
return ( ( x->high & 0x8000 ) != 0x0000 );
|
||||
}
|
||||
@ -6002,7 +6002,7 @@ LOCALPROC myfp_SinCos(myfpr *r_sin, myfpr *r_cos, myfpr *source)
|
||||
(void) fsincos(*source, r_sin, r_cos);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr myfp_getCR(myfpr *r, uint16_t opmode)
|
||||
LOCALFUNC bool myfp_getCR(myfpr *r, uint16_t opmode)
|
||||
{
|
||||
switch (opmode) {
|
||||
case 0x00:
|
||||
@ -6144,9 +6144,9 @@ LOCALFUNC blnr myfp_getCR(myfpr *r, uint16_t opmode)
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Floating point control register */
|
||||
|
@ -70,15 +70,15 @@ IMPORTPROC SetCyclesRemaining(uint32_t n);
|
||||
IMPORTPROC SetHeadATTel(ATTep p);
|
||||
IMPORTFUNC ATTep FindATTel(CPTR addr);
|
||||
|
||||
IMPORTFUNC uint32_t SCSI_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t SCC_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t IWM_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t VIA1_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t SCSI_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t SCC_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t IWM_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t VIA1_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
#if EmVIA2
|
||||
IMPORTFUNC uint32_t VIA2_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t VIA2_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
#endif
|
||||
#if EmASC
|
||||
IMPORTFUNC uint32_t ASC_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
IMPORTFUNC uint32_t ASC_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
#endif
|
||||
|
||||
IMPORTFUNC uint8_t get_vm_byte(CPTR addr);
|
||||
@ -89,7 +89,7 @@ IMPORTPROC put_vm_byte(CPTR addr, uint8_t b);
|
||||
IMPORTPROC put_vm_word(CPTR addr, uint16_t w);
|
||||
IMPORTPROC put_vm_long(CPTR addr, uint32_t l);
|
||||
|
||||
GLOBALVAR uint32_t my_disk_icon_addr;
|
||||
GLOBALVAR uint32_t disk_icon_addr;
|
||||
|
||||
GLOBALPROC customreset(void)
|
||||
{
|
||||
@ -103,7 +103,7 @@ GLOBALPROC customreset(void)
|
||||
Sony_Reset();
|
||||
Extn_Reset();
|
||||
#if CurEmMd <= kEmMd_Plus
|
||||
WantMacReset = trueblnr;
|
||||
WantMacReset = true;
|
||||
/*
|
||||
kludge, code in Finder appears
|
||||
to do RESET and not expect
|
||||
@ -115,14 +115,14 @@ GLOBALPROC customreset(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
GLOBALVAR ui3p RAM = nullpr;
|
||||
GLOBALVAR uint8_t * RAM = nullpr;
|
||||
|
||||
#if EmVidCard
|
||||
GLOBALVAR ui3p VidROM = nullpr;
|
||||
GLOBALVAR uint8_t * VidROM = nullpr;
|
||||
#endif
|
||||
|
||||
#if IncludeVidMem
|
||||
GLOBALVAR ui3p VidMem = nullpr;
|
||||
GLOBALVAR uint8_t * VidMem = nullpr;
|
||||
#endif
|
||||
|
||||
GLOBALVAR uint8_t Wires[kNumWires];
|
||||
@ -141,7 +141,7 @@ GLOBALPROC dbglog_StartLine(void)
|
||||
#endif
|
||||
|
||||
#if dbglog_HAVE
|
||||
GLOBALPROC dbglog_WriteMemArrow(blnr WriteMem)
|
||||
GLOBALPROC dbglog_WriteMemArrow(bool WriteMem)
|
||||
{
|
||||
if (WriteMem) {
|
||||
dbglog_writeCStr(" <- ");
|
||||
@ -153,7 +153,7 @@ GLOBALPROC dbglog_WriteMemArrow(blnr WriteMem)
|
||||
|
||||
#if dbglog_HAVE
|
||||
GLOBALPROC dbglog_AddrAccess(char *s, uint32_t Data,
|
||||
blnr WriteMem, uint32_t addr)
|
||||
bool WriteMem, uint32_t addr)
|
||||
{
|
||||
dbglog_StartLine();
|
||||
dbglog_writeCStr(s);
|
||||
@ -167,7 +167,7 @@ GLOBALPROC dbglog_AddrAccess(char *s, uint32_t Data,
|
||||
#endif
|
||||
|
||||
#if dbglog_HAVE
|
||||
GLOBALPROC dbglog_Access(char *s, uint32_t Data, blnr WriteMem)
|
||||
GLOBALPROC dbglog_Access(char *s, uint32_t Data, bool WriteMem)
|
||||
{
|
||||
dbglog_StartLine();
|
||||
dbglog_writeCStr(s);
|
||||
@ -187,7 +187,7 @@ GLOBALPROC dbglog_WriteNote(char *s)
|
||||
#endif
|
||||
|
||||
#if dbglog_HAVE
|
||||
GLOBALPROC dbglog_WriteSetBool(char *s, blnr v)
|
||||
GLOBALPROC dbglog_WriteSetBool(char *s, bool v)
|
||||
{
|
||||
dbglog_StartLine();
|
||||
dbglog_writeCStr(s);
|
||||
@ -202,7 +202,7 @@ GLOBALPROC dbglog_WriteSetBool(char *s, blnr v)
|
||||
#endif
|
||||
|
||||
#if WantAbnormalReports
|
||||
LOCALVAR blnr GotOneAbnormal = falseblnr;
|
||||
LOCALVAR bool GotOneAbnormal = false;
|
||||
#endif
|
||||
|
||||
#ifndef ReportAbnormalInterrupt
|
||||
@ -226,9 +226,9 @@ GLOBALPROC DoReportAbnormalID(uint16_t id
|
||||
if (! GotOneAbnormal) {
|
||||
WarnMsgAbnormalID(id);
|
||||
#if ReportAbnormalInterrupt
|
||||
SetInterruptButton(trueblnr);
|
||||
SetInterruptButton(true);
|
||||
#endif
|
||||
GotOneAbnormal = trueblnr;
|
||||
GotOneAbnormal = true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -303,11 +303,11 @@ GLOBALPROC DoReportAbnormalID(uint16_t id
|
||||
|
||||
#if IncludeExtnPbufs
|
||||
LOCALFUNC tMacErr PbufTransferVM(CPTR Buffera,
|
||||
tPbuf i, uint32_t offset, uint32_t count, blnr IsWrite)
|
||||
tPbuf i, uint32_t offset, uint32_t count, bool IsWrite)
|
||||
{
|
||||
tMacErr result;
|
||||
uint32_t contig;
|
||||
ui3p Buffer;
|
||||
uint8_t * Buffer;
|
||||
|
||||
label_1:
|
||||
if (0 == count) {
|
||||
@ -392,7 +392,7 @@ LOCALPROC ExtnParamBuffers_Access(CPTR p)
|
||||
uint32_t offset = get_vm_long(p + ExtnDat_params + 4);
|
||||
uint32_t count = get_vm_long(p + ExtnDat_params + 8);
|
||||
CPTR Buffera = get_vm_long(p + ExtnDat_params + 12);
|
||||
blnr IsWrite =
|
||||
bool IsWrite =
|
||||
(get_vm_word(p + ExtnDat_params + 16) != 0);
|
||||
result = PbufGetSize(Pbuf_No, &PbufCount);
|
||||
if (mnvm_noErr == result) {
|
||||
@ -1300,7 +1300,7 @@ LOCALPROC get_fail_realblock(ATTep p)
|
||||
#endif
|
||||
|
||||
GLOBALFUNC uint32_t MMDV_Access(ATTep p, uint32_t Data,
|
||||
blnr WriteMem, blnr ByteSize, CPTR addr)
|
||||
bool WriteMem, bool ByteSize, CPTR addr)
|
||||
{
|
||||
switch (p->MMDV) {
|
||||
case kMMDV_VIA1:
|
||||
@ -1529,9 +1529,9 @@ GLOBALFUNC uint32_t MMDV_Access(ATTep p, uint32_t Data,
|
||||
return Data;
|
||||
}
|
||||
|
||||
GLOBALFUNC blnr MemAccessNtfy(ATTep pT)
|
||||
GLOBALFUNC bool MemAccessNtfy(ATTep pT)
|
||||
{
|
||||
blnr v = falseblnr;
|
||||
bool v = false;
|
||||
|
||||
switch (pT->Ntfy) {
|
||||
#if CurEmMd >= kEmMd_SE
|
||||
@ -1541,7 +1541,7 @@ GLOBALFUNC blnr MemAccessNtfy(ATTep pT)
|
||||
MemOverlay = 0;
|
||||
SetUpMemBanks();
|
||||
|
||||
v = trueblnr;
|
||||
v = true;
|
||||
|
||||
break;
|
||||
#endif
|
||||
@ -1566,7 +1566,7 @@ GLOBALPROC Addr32_ChangeNtfy(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALFUNC ATTep get_address_realblock1(blnr WriteMem, CPTR addr)
|
||||
LOCALFUNC ATTep get_address_realblock1(bool WriteMem, CPTR addr)
|
||||
{
|
||||
ATTep p;
|
||||
|
||||
@ -1588,11 +1588,11 @@ Label_Retry:
|
||||
return p;
|
||||
}
|
||||
|
||||
GLOBALFUNC ui3p get_real_address0(uint32_t L, blnr WritableMem, CPTR addr,
|
||||
GLOBALFUNC uint8_t * get_real_address0(uint32_t L, bool WritableMem, CPTR addr,
|
||||
uint32_t *actL)
|
||||
{
|
||||
uint32_t bankleft;
|
||||
ui3p p;
|
||||
uint8_t * p;
|
||||
ATTep q;
|
||||
|
||||
q = get_address_realblock1(WritableMem, addr);
|
||||
@ -1615,9 +1615,9 @@ GLOBALFUNC ui3p get_real_address0(uint32_t L, blnr WritableMem, CPTR addr,
|
||||
return p;
|
||||
}
|
||||
|
||||
GLOBALVAR blnr InterruptButton = falseblnr;
|
||||
GLOBALVAR bool InterruptButton = false;
|
||||
|
||||
GLOBALPROC SetInterruptButton(blnr v)
|
||||
GLOBALPROC SetInterruptButton(bool v)
|
||||
{
|
||||
if (InterruptButton != v) {
|
||||
InterruptButton = v;
|
||||
@ -1656,7 +1656,7 @@ GLOBALPROC VIAorSCCinterruptChngNtfy(void)
|
||||
}
|
||||
}
|
||||
|
||||
GLOBALFUNC blnr AddrSpac_Init(void)
|
||||
GLOBALFUNC bool AddrSpac_Init(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -1666,7 +1666,7 @@ GLOBALFUNC blnr AddrSpac_Init(void)
|
||||
|
||||
MINEM68K_Init(
|
||||
&CurIPL);
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
GLOBALPROC Memory_Reset(void)
|
||||
@ -1680,7 +1680,7 @@ EXPORTPROC PowerOff_ChangeNtfy(void);
|
||||
GLOBALPROC PowerOff_ChangeNtfy(void)
|
||||
{
|
||||
if (! VIA2_iB2) {
|
||||
ForceMacOff = trueblnr;
|
||||
ForceMacOff = true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -1696,7 +1696,7 @@ GLOBALVAR uint16_t MasterEvtQLock = 0;
|
||||
*/
|
||||
#endif
|
||||
|
||||
GLOBALFUNC blnr FindKeyEvent(int *VirtualKey, blnr *KeyDown)
|
||||
GLOBALFUNC bool FindKeyEvent(int *VirtualKey, bool *KeyDown)
|
||||
{
|
||||
EvtQEl *p;
|
||||
|
||||
@ -1710,11 +1710,11 @@ GLOBALFUNC blnr FindKeyEvent(int *VirtualKey, blnr *KeyDown)
|
||||
*VirtualKey = p->u.press.key;
|
||||
*KeyDown = p->u.press.down;
|
||||
EvtQOutDone();
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* task management */
|
||||
|
@ -36,7 +36,7 @@
|
||||
#define RAMSafetyMarginFudge 4
|
||||
|
||||
#define kRAM_Size (kRAMa_Size + kRAMb_Size)
|
||||
EXPORTVAR(ui3p, RAM)
|
||||
EXPORTVAR(uint8_t *, RAM)
|
||||
/*
|
||||
allocated by MYOSGLUE to be at least
|
||||
kRAM_Size + RAMSafetyMarginFudge
|
||||
@ -45,11 +45,11 @@ EXPORTVAR(ui3p, RAM)
|
||||
*/
|
||||
|
||||
#if EmVidCard
|
||||
EXPORTVAR(ui3p, VidROM)
|
||||
EXPORTVAR(uint8_t *, VidROM)
|
||||
#endif
|
||||
|
||||
#if IncludeVidMem
|
||||
EXPORTVAR(ui3p, VidMem)
|
||||
EXPORTVAR(uint8_t *, VidMem)
|
||||
#endif
|
||||
|
||||
EXPORTPROC MemOverlay_ChangeNtfy(void);
|
||||
@ -67,7 +67,7 @@ typedef uint32_t CPTR;
|
||||
mapping of address space to real memory
|
||||
*/
|
||||
|
||||
EXPORTFUNC ui3p get_real_address0(uint32_t L, blnr WritableMem, CPTR addr,
|
||||
EXPORTFUNC uint8_t * get_real_address0(uint32_t L, bool WritableMem, CPTR addr,
|
||||
uint32_t *actL);
|
||||
|
||||
/*
|
||||
@ -105,7 +105,7 @@ EXPORTFUNC ui3p get_real_address0(uint32_t L, blnr WritableMem, CPTR addr,
|
||||
real memory, i.e. memory mapped devices
|
||||
*/
|
||||
|
||||
EXPORTFUNC blnr AddrSpac_Init(void);
|
||||
EXPORTFUNC bool AddrSpac_Init(void);
|
||||
|
||||
|
||||
#define uint32_t_FromSByte(x) ((uint32_t)(int32_t)(int8_t)(uint8_t)(x))
|
||||
@ -124,13 +124,13 @@ EXPORTPROC dbglog_StartLine(void);
|
||||
#endif
|
||||
|
||||
#if dbglog_HAVE
|
||||
EXPORTPROC dbglog_WriteMemArrow(blnr WriteMem);
|
||||
EXPORTPROC dbglog_WriteMemArrow(bool WriteMem);
|
||||
|
||||
EXPORTPROC dbglog_WriteNote(char *s);
|
||||
EXPORTPROC dbglog_WriteSetBool(char *s, blnr v);
|
||||
EXPORTPROC dbglog_WriteSetBool(char *s, bool v);
|
||||
EXPORTPROC dbglog_AddrAccess(char *s,
|
||||
uint32_t Data, blnr WriteMem, uint32_t addr);
|
||||
EXPORTPROC dbglog_Access(char *s, uint32_t Data, blnr WriteMem);
|
||||
uint32_t Data, bool WriteMem, uint32_t addr);
|
||||
EXPORTPROC dbglog_Access(char *s, uint32_t Data, bool WriteMem);
|
||||
#endif
|
||||
|
||||
#if ! WantAbnormalReports
|
||||
@ -150,8 +150,8 @@ EXPORTPROC DoReportAbnormalID(uint16_t id
|
||||
|
||||
EXPORTPROC VIAorSCCinterruptChngNtfy(void);
|
||||
|
||||
EXPORTVAR(blnr, InterruptButton)
|
||||
EXPORTPROC SetInterruptButton(blnr v);
|
||||
EXPORTVAR(bool, InterruptButton)
|
||||
EXPORTPROC SetInterruptButton(bool v);
|
||||
|
||||
enum {
|
||||
kICT_SubTick,
|
||||
@ -202,7 +202,7 @@ EXPORTVAR(uint8_t, Wires[kNumWires])
|
||||
#if HaveMasterEvtQLock
|
||||
EXPORTVAR(uint16_t, MasterEvtQLock)
|
||||
#endif
|
||||
EXPORTFUNC blnr FindKeyEvent(int *VirtualKey, blnr *KeyDown);
|
||||
EXPORTFUNC bool FindKeyEvent(int *VirtualKey, bool *KeyDown);
|
||||
|
||||
|
||||
/* minivmac extensions */
|
||||
@ -236,7 +236,7 @@ enum {
|
||||
|
||||
#define kcom_callcheck 0x5B17
|
||||
|
||||
EXPORTVAR(uint32_t, my_disk_icon_addr)
|
||||
EXPORTVAR(uint32_t, disk_icon_addr)
|
||||
|
||||
EXPORTPROC Memory_Reset(void);
|
||||
|
||||
@ -250,7 +250,7 @@ struct ATTer {
|
||||
uint32_t cmpvalu;
|
||||
uint32_t Access;
|
||||
uint32_t usemask; /* Should be one less than a power of two. */
|
||||
ui3p usebase;
|
||||
uint8_t * usebase;
|
||||
uint8_t MMDV;
|
||||
uint8_t Ntfy;
|
||||
uint16_t Pad0;
|
||||
@ -272,5 +272,5 @@ typedef ATTer *ATTep;
|
||||
#define kATTA_ntfymask (1 << kATTA_ntfybit)
|
||||
|
||||
EXPORTFUNC uint32_t MMDV_Access(ATTep p, uint32_t Data,
|
||||
blnr WriteMem, blnr ByteSize, CPTR addr);
|
||||
EXPORTFUNC blnr MemAccessNtfy(ATTep pT);
|
||||
bool WriteMem, bool ByteSize, CPTR addr);
|
||||
EXPORTFUNC bool MemAccessNtfy(ATTep pT);
|
||||
|
@ -1643,20 +1643,20 @@ LOCALVAR const uint16_t Cell2UnicodeMap[] = {
|
||||
};
|
||||
#endif
|
||||
|
||||
LOCALVAR blnr SpeedStopped = falseblnr;
|
||||
LOCALVAR bool SpeedStopped = false;
|
||||
|
||||
LOCALVAR blnr RunInBackground = (WantInitRunInBackground != 0);
|
||||
LOCALVAR bool RunInBackground = (WantInitRunInBackground != 0);
|
||||
|
||||
#if VarFullScreen
|
||||
LOCALVAR blnr WantFullScreen = (WantInitFullScreen != 0);
|
||||
LOCALVAR bool WantFullScreen = (WantInitFullScreen != 0);
|
||||
#endif
|
||||
|
||||
#if EnableMagnify
|
||||
LOCALVAR blnr WantMagnify = (WantInitMagnify != 0);
|
||||
LOCALVAR bool WantMagnify = (WantInitMagnify != 0);
|
||||
#endif
|
||||
|
||||
#if NeedRequestInsertDisk
|
||||
LOCALVAR blnr RequestInsertDisk = falseblnr;
|
||||
LOCALVAR bool RequestInsertDisk = false;
|
||||
#endif
|
||||
|
||||
#ifndef NeedRequestIthDisk
|
||||
@ -1668,7 +1668,7 @@ LOCALVAR uint8_t RequestIthDisk = 0;
|
||||
#endif
|
||||
|
||||
#if UseControlKeys
|
||||
LOCALVAR blnr ControlKeyPressed = falseblnr;
|
||||
LOCALVAR bool ControlKeyPressed = false;
|
||||
#endif
|
||||
|
||||
#ifndef kStrCntrlKyName
|
||||
|
@ -149,7 +149,7 @@ LOCALPROC IWM_Write_Reg(uint8_t in)
|
||||
}
|
||||
}
|
||||
|
||||
GLOBALFUNC uint32_t IWM_Access(uint32_t Data, blnr WriteMem, CPTR addr)
|
||||
GLOBALFUNC uint32_t IWM_Access(uint32_t Data, bool WriteMem, CPTR addr)
|
||||
{
|
||||
switch (addr) {
|
||||
case kph0L :
|
||||
|
@ -22,4 +22,4 @@
|
||||
|
||||
EXPORTPROC IWM_Reset(void);
|
||||
|
||||
EXPORTFUNC uint32_t IWM_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
EXPORTFUNC uint32_t IWM_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
|
@ -53,13 +53,13 @@ enum {
|
||||
|
||||
LOCALVAR int KybdState = kKybdStateIdle;
|
||||
|
||||
LOCALVAR blnr HaveKeyBoardResult = falseblnr;
|
||||
LOCALVAR bool HaveKeyBoardResult = false;
|
||||
LOCALVAR uint8_t KeyBoardResult;
|
||||
|
||||
LOCALPROC GotKeyBoardData(uint8_t v)
|
||||
{
|
||||
if (KybdState != kKybdStateIdle) {
|
||||
HaveKeyBoardResult = trueblnr;
|
||||
HaveKeyBoardResult = true;
|
||||
KeyBoardResult = v;
|
||||
} else {
|
||||
KYBD_ShiftOutData(v);
|
||||
@ -69,10 +69,10 @@ LOCALPROC GotKeyBoardData(uint8_t v)
|
||||
|
||||
LOCALVAR uint8_t InstantCommandData = 0x7B;
|
||||
|
||||
LOCALFUNC blnr AttemptToFinishInquiry(void)
|
||||
LOCALFUNC bool AttemptToFinishInquiry(void)
|
||||
{
|
||||
int i;
|
||||
blnr KeyDown;
|
||||
bool KeyDown;
|
||||
uint8_t Keyboard_Data;
|
||||
|
||||
if (FindKeyEvent(&i, &KeyDown)) {
|
||||
@ -89,9 +89,9 @@ LOCALFUNC blnr AttemptToFinishInquiry(void)
|
||||
}
|
||||
}
|
||||
GotKeyBoardData(Keyboard_Data);
|
||||
return trueblnr;
|
||||
return true;
|
||||
} else {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -161,7 +161,7 @@ GLOBALPROC DoKybd_ReceiveEndCommand(void)
|
||||
#ifdef _VIA_Debug
|
||||
fprintf(stderr, "HaveKeyBoardResult: %d\n", KeyBoardResult);
|
||||
#endif
|
||||
HaveKeyBoardResult = falseblnr;
|
||||
HaveKeyBoardResult = false;
|
||||
KYBD_ShiftOutData(KeyBoardResult);
|
||||
VIA1_iCB2 = 1;
|
||||
}
|
||||
|
@ -39,7 +39,7 @@ LOCALVAR uint32_t Disasm_pc;
|
||||
(if pc points to memory mapped device)
|
||||
*/
|
||||
|
||||
LOCALVAR ui3p Disasm_pcp;
|
||||
LOCALVAR uint8_t * Disasm_pcp;
|
||||
LOCALVAR uint32_t Disasm_pc_blockmask;
|
||||
LOCALVAR uint8_t Disasm_pcp_dummy[2] = {
|
||||
0, 0
|
||||
@ -1692,24 +1692,24 @@ LOCALPROCUSEDONCE DisasmBitField(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr IsValidAddrMode(void)
|
||||
LOCALFUNC bool IsValidAddrMode(void)
|
||||
{
|
||||
return (Disasm_mode != 7) || (Disasm_reg < 5);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr IsValidDstAddrMode(void)
|
||||
LOCALFUNC bool IsValidDstAddrMode(void)
|
||||
{
|
||||
return (Disasm_md6 != 7) || (Disasm_rg9 < 2);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr IsValidDataAltAddrMode(void)
|
||||
LOCALFUNC bool IsValidDataAltAddrMode(void)
|
||||
{
|
||||
blnr IsOk;
|
||||
bool IsOk;
|
||||
|
||||
switch (Disasm_mode) {
|
||||
case 1:
|
||||
default: /* keep compiler happy */
|
||||
IsOk = falseblnr;
|
||||
IsOk = false;
|
||||
break;
|
||||
case 0:
|
||||
case 2:
|
||||
@ -1717,7 +1717,7 @@ LOCALFUNC blnr IsValidDataAltAddrMode(void)
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
break;
|
||||
case 7:
|
||||
IsOk = Disasm_reg < 2;
|
||||
@ -1727,14 +1727,14 @@ LOCALFUNC blnr IsValidDataAltAddrMode(void)
|
||||
return IsOk;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr IsValidDataAddrMode(void)
|
||||
LOCALFUNC bool IsValidDataAddrMode(void)
|
||||
{
|
||||
blnr IsOk;
|
||||
bool IsOk;
|
||||
|
||||
switch (Disasm_mode) {
|
||||
case 1:
|
||||
default: /* keep compiler happy */
|
||||
IsOk = falseblnr;
|
||||
IsOk = false;
|
||||
break;
|
||||
case 0:
|
||||
case 2:
|
||||
@ -1742,7 +1742,7 @@ LOCALFUNC blnr IsValidDataAddrMode(void)
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
break;
|
||||
case 7:
|
||||
IsOk = Disasm_reg < 5;
|
||||
@ -1752,9 +1752,9 @@ LOCALFUNC blnr IsValidDataAddrMode(void)
|
||||
return IsOk;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr IsValidControlAddrMode(void)
|
||||
LOCALFUNC bool IsValidControlAddrMode(void)
|
||||
{
|
||||
blnr IsOk;
|
||||
bool IsOk;
|
||||
|
||||
switch (Disasm_mode) {
|
||||
case 0:
|
||||
@ -1762,12 +1762,12 @@ LOCALFUNC blnr IsValidControlAddrMode(void)
|
||||
case 3:
|
||||
case 4:
|
||||
default: /* keep compiler happy */
|
||||
IsOk = falseblnr;
|
||||
IsOk = false;
|
||||
break;
|
||||
case 2:
|
||||
case 5:
|
||||
case 6:
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
break;
|
||||
case 7:
|
||||
IsOk = Disasm_reg < 4;
|
||||
@ -1777,9 +1777,9 @@ LOCALFUNC blnr IsValidControlAddrMode(void)
|
||||
return IsOk;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr IsValidControlAltAddrMode(void)
|
||||
LOCALFUNC bool IsValidControlAltAddrMode(void)
|
||||
{
|
||||
blnr IsOk;
|
||||
bool IsOk;
|
||||
|
||||
switch (Disasm_mode) {
|
||||
case 0:
|
||||
@ -1787,12 +1787,12 @@ LOCALFUNC blnr IsValidControlAltAddrMode(void)
|
||||
case 3:
|
||||
case 4:
|
||||
default: /* keep compiler happy */
|
||||
IsOk = falseblnr;
|
||||
IsOk = false;
|
||||
break;
|
||||
case 2:
|
||||
case 5:
|
||||
case 6:
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
break;
|
||||
case 7:
|
||||
IsOk = Disasm_reg < 2;
|
||||
@ -1802,22 +1802,22 @@ LOCALFUNC blnr IsValidControlAltAddrMode(void)
|
||||
return IsOk;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr IsValidAltMemAddrMode(void)
|
||||
LOCALFUNC bool IsValidAltMemAddrMode(void)
|
||||
{
|
||||
blnr IsOk;
|
||||
bool IsOk;
|
||||
|
||||
switch (Disasm_mode) {
|
||||
case 0:
|
||||
case 1:
|
||||
default: /* keep compiler happy */
|
||||
IsOk = falseblnr;
|
||||
IsOk = false;
|
||||
break;
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
case 6:
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
break;
|
||||
case 7:
|
||||
IsOk = Disasm_reg < 2;
|
||||
@ -2861,7 +2861,7 @@ LOCALPROCUSEDONCE DisasmSavedPCs(void)
|
||||
uint32_t i;
|
||||
#endif
|
||||
#if 0
|
||||
blnr Skipped = falseblnr;
|
||||
bool Skipped = false;
|
||||
#endif
|
||||
uint32_t j = SavedPCsOut;
|
||||
|
||||
@ -2881,7 +2881,7 @@ LOCALPROCUSEDONCE DisasmSavedPCs(void)
|
||||
j = SavedPCsIn - NumSavedPCs;
|
||||
dbglog_writeReturn();
|
||||
#if 0
|
||||
Skipped = trueblnr;
|
||||
Skipped = true;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -252,7 +252,7 @@ LOCALFUNC uint16_t OpEADestCalcCyc(WorkR *p, uint8_t m, uint8_t r)
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALPROC SetDcoArgFields(WorkR *p, blnr src,
|
||||
LOCALPROC SetDcoArgFields(WorkR *p, bool src,
|
||||
uint8_t CurAMd, uint8_t CurArgDat)
|
||||
{
|
||||
if (src) {
|
||||
@ -264,12 +264,12 @@ LOCALPROC SetDcoArgFields(WorkR *p, blnr src,
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckValidAddrMode(WorkR *p,
|
||||
uint8_t m, uint8_t r, uint8_t v, blnr src)
|
||||
LOCALFUNC bool CheckValidAddrMode(WorkR *p,
|
||||
uint8_t m, uint8_t r, uint8_t v, bool src)
|
||||
{
|
||||
uint8_t CurAMd = 0; /* init to keep compiler happy */
|
||||
uint8_t CurArgDat = 0;
|
||||
blnr IsOk;
|
||||
bool IsOk;
|
||||
|
||||
switch (m) {
|
||||
case 0:
|
||||
@ -476,12 +476,12 @@ LOCALFUNC blnr CheckValidAddrMode(WorkR *p,
|
||||
kAddrValidMaskAny | kAddrValidMaskData);
|
||||
break;
|
||||
default:
|
||||
IsOk = falseblnr;
|
||||
IsOk = false;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default: /* keep compiler happy */
|
||||
IsOk = falseblnr;
|
||||
IsOk = false;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -493,7 +493,7 @@ LOCALFUNC blnr CheckValidAddrMode(WorkR *p,
|
||||
}
|
||||
|
||||
#if WantCycByPriOp
|
||||
LOCALFUNC blnr LeaPeaEACalcCyc(WorkR *p, uint8_t m, uint8_t r)
|
||||
LOCALFUNC bool LeaPeaEACalcCyc(WorkR *p, uint8_t m, uint8_t r)
|
||||
{
|
||||
uint16_t v;
|
||||
|
||||
@ -536,40 +536,40 @@ LOCALFUNC blnr LeaPeaEACalcCyc(WorkR *p, uint8_t m, uint8_t r)
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr IsValidAddrMode(WorkR *p)
|
||||
LOCALFUNC bool IsValidAddrMode(WorkR *p)
|
||||
{
|
||||
return CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidAny, falseblnr);
|
||||
mode(p), reg(p), kAddrValidAny, false);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckDataAltAddrMode(WorkR *p)
|
||||
LOCALFUNC bool CheckDataAltAddrMode(WorkR *p)
|
||||
{
|
||||
return CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidDataAlt, falseblnr);
|
||||
mode(p), reg(p), kAddrValidDataAlt, false);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckDataAddrMode(WorkR *p)
|
||||
LOCALFUNC bool CheckDataAddrMode(WorkR *p)
|
||||
{
|
||||
return CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidData, falseblnr);
|
||||
mode(p), reg(p), kAddrValidData, false);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckControlAddrMode(WorkR *p)
|
||||
LOCALFUNC bool CheckControlAddrMode(WorkR *p)
|
||||
{
|
||||
return CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidControl, falseblnr);
|
||||
mode(p), reg(p), kAddrValidControl, false);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckControlAltAddrMode(WorkR *p)
|
||||
LOCALFUNC bool CheckControlAltAddrMode(WorkR *p)
|
||||
{
|
||||
return CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidControlAlt, falseblnr);
|
||||
mode(p), reg(p), kAddrValidControlAlt, false);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckAltMemAddrMode(WorkR *p)
|
||||
LOCALFUNC bool CheckAltMemAddrMode(WorkR *p)
|
||||
{
|
||||
return CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidAltMem, falseblnr);
|
||||
mode(p), reg(p), kAddrValidAltMem, false);
|
||||
}
|
||||
|
||||
LOCALPROC FindOpSizeFromb76(WorkR *p)
|
||||
@ -645,9 +645,9 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
}
|
||||
#endif
|
||||
if (CheckValidAddrMode(p, 1, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindMoveP0 + b76(p);
|
||||
}
|
||||
@ -672,12 +672,12 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
}
|
||||
#endif
|
||||
p->MainClass = kIKindBTstL + b76(p);
|
||||
SetDcoArgFields(p, trueblnr, kAMdRegL, rg9(p));
|
||||
SetDcoArgFields(p, falseblnr, kAMdRegL, reg(p));
|
||||
SetDcoArgFields(p, true, kAMdRegL, rg9(p));
|
||||
SetDcoArgFields(p, false, kAMdRegL, reg(p));
|
||||
} else {
|
||||
p->opsize = 1;
|
||||
p->MainClass = kIKindBTstB + b76(p);
|
||||
SetDcoArgFields(p, trueblnr, kAMdRegB, rg9(p));
|
||||
SetDcoArgFields(p, true, kAMdRegB, rg9(p));
|
||||
if (b76(p) == 0) { /* BTst */
|
||||
if (CheckDataAddrMode(p)) {
|
||||
#if WantCycByPriOp
|
||||
@ -721,16 +721,16 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
SetDcoArgFields(p, trueblnr, kAMdImmedB, 0);
|
||||
SetDcoArgFields(p, falseblnr, kAMdRegL, reg(p));
|
||||
SetDcoArgFields(p, true, kAMdImmedB, 0);
|
||||
SetDcoArgFields(p, false, kAMdRegL, reg(p));
|
||||
p->MainClass = kIKindBTstL + b76(p);
|
||||
} else {
|
||||
p->opsize = 1;
|
||||
SetDcoArgFields(p, trueblnr, kAMdImmedB, 0);
|
||||
SetDcoArgFields(p, true, kAMdImmedB, 0);
|
||||
p->MainClass = kIKindBTstB + b76(p);
|
||||
if (b76(p) == 0) { /* BTst */
|
||||
if (CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidDataNoCn, falseblnr))
|
||||
mode(p), reg(p), kAddrValidDataNoCn, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles =
|
||||
@ -814,9 +814,9 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
}
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 7, 4, kAddrValidAny, trueblnr))
|
||||
if (CheckValidAddrMode(p, 7, 4, kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidDataNoCn, falseblnr))
|
||||
mode(p), reg(p), kAddrValidDataNoCn, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (0 == mode(p)) {
|
||||
@ -887,9 +887,9 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 7, 4,
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (0 != mode(p)) {
|
||||
@ -921,9 +921,9 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 7, 4,
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (0 != mode(p)) {
|
||||
@ -955,9 +955,9 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 7, 4,
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (0 != mode(p)) {
|
||||
@ -989,9 +989,9 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 7, 4,
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (0 != mode(p)) {
|
||||
@ -1023,9 +1023,9 @@ LOCALPROCUSEDONCE DeCode0(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 7, 4,
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (0 != mode(p)) {
|
||||
@ -1069,9 +1069,9 @@ LOCALPROCUSEDONCE DeCode1(WorkR *p)
|
||||
p->MainClass = kIKindIllegal;
|
||||
} else {
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, md6(p), rg9(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 * kCycleScale + RdAvgXtraCyc);
|
||||
@ -1088,9 +1088,9 @@ LOCALPROCUSEDONCE DeCode2(WorkR *p)
|
||||
p->opsize = 4;
|
||||
if (md6(p) == 1) { /* MOVEA */
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 1, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 * kCycleScale + RdAvgXtraCyc);
|
||||
@ -1101,9 +1101,9 @@ LOCALPROCUSEDONCE DeCode2(WorkR *p)
|
||||
}
|
||||
} else {
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, md6(p), rg9(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 * kCycleScale + RdAvgXtraCyc);
|
||||
@ -1120,9 +1120,9 @@ LOCALPROCUSEDONCE DeCode3(WorkR *p)
|
||||
p->opsize = 2;
|
||||
if (md6(p) == 1) { /* MOVEA */
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 1, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 * kCycleScale + RdAvgXtraCyc);
|
||||
@ -1133,9 +1133,9 @@ LOCALPROCUSEDONCE DeCode3(WorkR *p)
|
||||
}
|
||||
} else {
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, md6(p), rg9(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 * kCycleScale + RdAvgXtraCyc);
|
||||
@ -1204,9 +1204,9 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
/* Chk.L 0100ddd100mmmrrr */
|
||||
p->opsize = 4;
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidData, falseblnr))
|
||||
kAddrValidData, false))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles += OpEACalcCyc(p, mode(p), reg(p));
|
||||
@ -1224,9 +1224,9 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
/* Chk.W 0100ddd110mmmrrr */
|
||||
p->opsize = 2;
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidData, falseblnr))
|
||||
kAddrValidData, false))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (10 * kCycleScale + RdAvgXtraCyc);
|
||||
@ -1240,7 +1240,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
#if Use68020
|
||||
if ((0 == mode(p)) && (4 == rg9(p))) {
|
||||
/* EXTB.L */
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegL, reg(p));
|
||||
p->MainClass = kIKindEXTBL;
|
||||
} else
|
||||
@ -1412,7 +1412,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
#if Use68020
|
||||
if (mode(p) == 1) {
|
||||
/* Link.L 0100100000001rrr */
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegL, reg(p) + 8);
|
||||
p->MainClass = kIKindLinkL;
|
||||
} else
|
||||
@ -1444,7 +1444,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
(4 * kCycleScale + RdAvgXtraCyc);
|
||||
#endif
|
||||
p->MainClass = kIKindSwap;
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegL, reg(p));
|
||||
} else
|
||||
#if Use68020
|
||||
@ -1473,7 +1473,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
p->Cycles =
|
||||
(4 * kCycleScale + RdAvgXtraCyc);
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegW, reg(p));
|
||||
p->MainClass = kIKindEXTW;
|
||||
} else {
|
||||
@ -1486,7 +1486,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
p->Cycles += MoveAvgN * 4 * kCycleScale
|
||||
+ MoveAvgN * WrAvgXtraCyc;
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdAPreDecL, reg(p) + 8);
|
||||
p->MainClass = kIKindMOVEMRmMW;
|
||||
} else {
|
||||
@ -1511,7 +1511,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
p->Cycles =
|
||||
(4 * kCycleScale + RdAvgXtraCyc);
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegL, reg(p));
|
||||
p->MainClass = kIKindEXTL;
|
||||
} else {
|
||||
@ -1524,7 +1524,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
#endif
|
||||
p->opsize = 4;
|
||||
if (mode(p) == 4) {
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdAPreDecL, reg(p) + 8);
|
||||
p->MainClass = kIKindMOVEMRmML;
|
||||
} else {
|
||||
@ -1601,7 +1601,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
+ MoveAvgN * RdAvgXtraCyc;
|
||||
}
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdAPosIncL, reg(p) + 8);
|
||||
if (b76(p) == 2) {
|
||||
p->MainClass = kIKindMOVEMApRW;
|
||||
@ -1665,7 +1665,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
+ 4 * RdAvgXtraCyc
|
||||
+ 3 * WrAvgXtraCyc);
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdDat4, (p->opcode & 15) + 32);
|
||||
p->MainClass = kIKindTrap;
|
||||
break;
|
||||
@ -1676,7 +1676,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
+ 2 * RdAvgXtraCyc
|
||||
+ 2 * WrAvgXtraCyc);
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegL, reg(p) + 8);
|
||||
if (reg(p) == 6) {
|
||||
p->MainClass = kIKindLinkA6;
|
||||
@ -1690,7 +1690,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
p->Cycles = (12 * kCycleScale
|
||||
+ 3 * RdAvgXtraCyc);
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegL, reg(p) + 8);
|
||||
if (reg(p) == 6) {
|
||||
p->MainClass = kIKindUnlkA6;
|
||||
@ -1704,7 +1704,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
p->Cycles =
|
||||
(4 * kCycleScale + RdAvgXtraCyc);
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegL, reg(p) + 8);
|
||||
p->MainClass = kIKindMoveRUSP;
|
||||
break;
|
||||
@ -1714,7 +1714,7 @@ LOCALPROCUSEDONCE DeCode4(WorkR *p)
|
||||
p->Cycles =
|
||||
(4 * kCycleScale + RdAvgXtraCyc);
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr,
|
||||
SetDcoArgFields(p, false,
|
||||
kAMdRegL, reg(p) + 8);
|
||||
p->MainClass = kIKindMoveUSPR;
|
||||
break;
|
||||
@ -1937,7 +1937,7 @@ LOCALPROCUSEDONCE DeCode5(WorkR *p)
|
||||
*/
|
||||
#endif
|
||||
#endif
|
||||
SetDcoArgFields(p, falseblnr, kAMdRegW, reg(p));
|
||||
SetDcoArgFields(p, false, kAMdRegW, reg(p));
|
||||
if (1 == ((p->opcode >> 8) & 15)) {
|
||||
p->MainClass = kIKindDBF;
|
||||
} else {
|
||||
@ -1976,9 +1976,9 @@ LOCALPROCUSEDONCE DeCode5(WorkR *p)
|
||||
} else {
|
||||
if (mode(p) == 1) {
|
||||
p->opsize = b8(p) * 2 + 2;
|
||||
SetDcoArgFields(p, trueblnr, kAMdDat4,
|
||||
SetDcoArgFields(p, true, kAMdDat4,
|
||||
octdat(rg9(p)));
|
||||
SetDcoArgFields(p, falseblnr, kAMdRegL,
|
||||
SetDcoArgFields(p, false, kAMdRegL,
|
||||
reg(p) + 8);
|
||||
/* always long, regardless of opsize */
|
||||
if (b8(p) == 0) {
|
||||
@ -1996,10 +1996,10 @@ LOCALPROCUSEDONCE DeCode5(WorkR *p)
|
||||
}
|
||||
} else {
|
||||
FindOpSizeFromb76(p);
|
||||
SetDcoArgFields(p, trueblnr, kAMdDat4,
|
||||
SetDcoArgFields(p, true, kAMdDat4,
|
||||
octdat(rg9(p)));
|
||||
if (CheckValidAddrMode(p,
|
||||
mode(p), reg(p), kAddrValidDataAlt, falseblnr))
|
||||
mode(p), reg(p), kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (0 != mode(p)) {
|
||||
@ -2131,9 +2131,9 @@ LOCALPROCUSEDONCE DeCode8(WorkR *p)
|
||||
if (b76(p) == 3) {
|
||||
p->opsize = 2;
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidData, trueblnr))
|
||||
kAddrValidData, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
if (b8(p) == 0) {
|
||||
/* DivU 1000ddd011mmmrrr */
|
||||
@ -2175,9 +2175,9 @@ LOCALPROCUSEDONCE DeCode8(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidData, trueblnr))
|
||||
kAddrValidData, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (4 == p->opsize) {
|
||||
@ -2212,17 +2212,17 @@ LOCALPROCUSEDONCE DeCode8(WorkR *p)
|
||||
p->opsize = 1;
|
||||
if (mode(p) == 0) {
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindSbcd;
|
||||
}
|
||||
} else {
|
||||
if (CheckValidAddrMode(p, 4, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 4, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindSbcd;
|
||||
}
|
||||
@ -2234,11 +2234,11 @@ LOCALPROCUSEDONCE DeCode8(WorkR *p)
|
||||
if (mode(p) == 0) {
|
||||
p->opsize = 2;
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
p->opsize = 1;
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindPack;
|
||||
}
|
||||
@ -2246,11 +2246,11 @@ LOCALPROCUSEDONCE DeCode8(WorkR *p)
|
||||
} else {
|
||||
p->opsize = 2;
|
||||
if (CheckValidAddrMode(p, 4, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
p->opsize = 1;
|
||||
if (CheckValidAddrMode(p, 4, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindPack;
|
||||
}
|
||||
@ -2262,11 +2262,11 @@ LOCALPROCUSEDONCE DeCode8(WorkR *p)
|
||||
if (mode(p) == 0) {
|
||||
p->opsize = 1;
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
p->opsize = 2;
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindUnpk;
|
||||
}
|
||||
@ -2274,11 +2274,11 @@ LOCALPROCUSEDONCE DeCode8(WorkR *p)
|
||||
} else {
|
||||
p->opsize = 1;
|
||||
if (CheckValidAddrMode(p, 4, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
p->opsize = 2;
|
||||
if (CheckValidAddrMode(p, 4, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindUnpk;
|
||||
}
|
||||
@ -2299,9 +2299,9 @@ LOCALPROCUSEDONCE DeCode8(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAltMem, falseblnr))
|
||||
kAddrValidAltMem, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2328,10 +2328,10 @@ LOCALPROCUSEDONCE DeCode9(WorkR *p)
|
||||
}
|
||||
#endif
|
||||
p->opsize = b8(p) * 2 + 2;
|
||||
SetDcoArgFields(p, falseblnr, kAMdRegL, rg9(p) + 8);
|
||||
SetDcoArgFields(p, false, kAMdRegL, rg9(p) + 8);
|
||||
/* always long, regardless of opsize */
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (4 == p->opsize) {
|
||||
@ -2358,9 +2358,9 @@ LOCALPROCUSEDONCE DeCode9(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (4 == p->opsize) {
|
||||
@ -2384,9 +2384,9 @@ LOCALPROCUSEDONCE DeCode9(WorkR *p)
|
||||
/* p->MainClass = kIKindSubXd; */
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2400,9 +2400,9 @@ LOCALPROCUSEDONCE DeCode9(WorkR *p)
|
||||
/* p->MainClass = kIKindSubXm; */
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 4, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 4, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2422,9 +2422,9 @@ LOCALPROCUSEDONCE DeCode9(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p),
|
||||
reg(p), kAddrValidAltMem, falseblnr))
|
||||
reg(p), kAddrValidAltMem, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2460,10 +2460,10 @@ LOCALPROCUSEDONCE DeCodeB(WorkR *p)
|
||||
}
|
||||
#endif
|
||||
p->opsize = b8(p) * 2 + 2;
|
||||
SetDcoArgFields(p, falseblnr, kAMdRegL, rg9(p) + 8);
|
||||
SetDcoArgFields(p, false, kAMdRegL, rg9(p) + 8);
|
||||
/* always long, regardless of opsize */
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (6 * kCycleScale + RdAvgXtraCyc);
|
||||
@ -2479,9 +2479,9 @@ LOCALPROCUSEDONCE DeCodeB(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 3, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 3, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2499,9 +2499,9 @@ LOCALPROCUSEDONCE DeCodeB(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidDataAlt, falseblnr))
|
||||
kAddrValidDataAlt, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (0 != mode(p)) {
|
||||
@ -2529,9 +2529,9 @@ LOCALPROCUSEDONCE DeCodeB(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2549,9 +2549,9 @@ LOCALPROCUSEDONCE DeCodeC(WorkR *p)
|
||||
if (b76(p) == 3) {
|
||||
p->opsize = 2;
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidData, trueblnr))
|
||||
kAddrValidData, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
#if WantCloserCyc
|
||||
@ -2580,9 +2580,9 @@ LOCALPROCUSEDONCE DeCodeC(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidData, trueblnr))
|
||||
kAddrValidData, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (4 == p->opsize) {
|
||||
@ -2617,17 +2617,17 @@ LOCALPROCUSEDONCE DeCodeC(WorkR *p)
|
||||
p->opsize = 1;
|
||||
if (mode(p) == 0) {
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindAbcd;
|
||||
}
|
||||
} else {
|
||||
if (CheckValidAddrMode(p, 4, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 4, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindAbcd;
|
||||
}
|
||||
@ -2641,17 +2641,17 @@ LOCALPROCUSEDONCE DeCodeC(WorkR *p)
|
||||
p->opsize = 4;
|
||||
if (mode(p) == 0) {
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindExg;
|
||||
}
|
||||
} else {
|
||||
if (CheckValidAddrMode(p, 1, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 1, reg(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindExg;
|
||||
}
|
||||
@ -2668,9 +2668,9 @@ LOCALPROCUSEDONCE DeCodeC(WorkR *p)
|
||||
+ RdAvgXtraCyc);
|
||||
#endif
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 1, reg(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
p->MainClass = kIKindExg;
|
||||
}
|
||||
@ -2686,9 +2686,9 @@ LOCALPROCUSEDONCE DeCodeC(WorkR *p)
|
||||
#endif
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAltMem, falseblnr))
|
||||
kAddrValidAltMem, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2710,10 +2710,10 @@ LOCALPROCUSEDONCE DeCodeD(WorkR *p)
|
||||
if (b76(p) == 3) {
|
||||
/* ADDA 1101dddm11mmmrrr */
|
||||
p->opsize = b8(p) * 2 + 2;
|
||||
SetDcoArgFields(p, falseblnr, kAMdRegL, rg9(p) + 8);
|
||||
SetDcoArgFields(p, false, kAMdRegL, rg9(p) + 8);
|
||||
/* always long, regardless of opsize */
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (4 == p->opsize) {
|
||||
@ -2735,9 +2735,9 @@ LOCALPROCUSEDONCE DeCodeD(WorkR *p)
|
||||
/* ADD 1101ddd0ssmmmrrr */
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
if (4 == p->opsize) {
|
||||
@ -2761,9 +2761,9 @@ LOCALPROCUSEDONCE DeCodeD(WorkR *p)
|
||||
/* p->MainClass = kIKindAddXd; */
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2776,9 +2776,9 @@ LOCALPROCUSEDONCE DeCodeD(WorkR *p)
|
||||
/* p->MainClass = kIKindAddXm; */
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 4, reg(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 4, rg9(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2793,9 +2793,9 @@ LOCALPROCUSEDONCE DeCodeD(WorkR *p)
|
||||
/* ADD 1101ddd1ssmmmrrr */
|
||||
FindOpSizeFromb76(p);
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, mode(p), reg(p),
|
||||
kAddrValidAltMem, falseblnr))
|
||||
kAddrValidAltMem, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = (4 == p->opsize)
|
||||
@ -2833,7 +2833,7 @@ LOCALPROCUSEDONCE DeCodeE(WorkR *p)
|
||||
p->DecOp.y.v[0].AMd = mode(p);
|
||||
p->DecOp.y.v[0].ArgDat = (p->opcode >> 8) & 7;
|
||||
if (0 == mode(p)) {
|
||||
SetDcoArgFields(p, falseblnr, kAMdRegL, reg(p));
|
||||
SetDcoArgFields(p, false, kAMdRegL, reg(p));
|
||||
p->MainClass = kIKindBitField;
|
||||
} else {
|
||||
switch ((p->opcode >> 8) & 7) {
|
||||
@ -2868,7 +2868,7 @@ LOCALPROCUSEDONCE DeCodeE(WorkR *p)
|
||||
p->Cycles += OpEACalcCyc(p, mode(p), reg(p));
|
||||
#endif
|
||||
p->MainClass = rolops(p, rg9(p));
|
||||
SetDcoArgFields(p, trueblnr, kAMdDat4, 1);
|
||||
SetDcoArgFields(p, true, kAMdDat4, 1);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -2876,7 +2876,7 @@ LOCALPROCUSEDONCE DeCodeE(WorkR *p)
|
||||
if (mode(p) < 4) {
|
||||
/* 1110cccdss0ttddd */
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
p->Cycles = ((4 == p->opsize)
|
||||
@ -2888,14 +2888,14 @@ LOCALPROCUSEDONCE DeCodeE(WorkR *p)
|
||||
;
|
||||
#endif
|
||||
p->MainClass = rolops(p, mode(p) & 3);
|
||||
SetDcoArgFields(p, trueblnr, kAMdDat4, octdat(rg9(p)));
|
||||
SetDcoArgFields(p, true, kAMdDat4, octdat(rg9(p)));
|
||||
}
|
||||
} else {
|
||||
/* 1110rrrdss1ttddd */
|
||||
if (CheckValidAddrMode(p, 0, rg9(p),
|
||||
kAddrValidAny, trueblnr))
|
||||
kAddrValidAny, true))
|
||||
if (CheckValidAddrMode(p, 0, reg(p),
|
||||
kAddrValidAny, falseblnr))
|
||||
kAddrValidAny, false))
|
||||
{
|
||||
#if WantCycByPriOp
|
||||
#if WantCloserCyc
|
||||
|
@ -268,7 +268,7 @@ struct DecOpR {
|
||||
/* expected size : 8 bytes */
|
||||
DecOpXR x;
|
||||
DecOpYR y;
|
||||
} my_align_8;
|
||||
} align_8;
|
||||
typedef struct DecOpR DecOpR;
|
||||
|
||||
#define GetDcoCycles(p) ((p)->x.Cycles)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -97,9 +97,9 @@ LOCALPROC UnInitPbufs(void)
|
||||
#endif
|
||||
|
||||
#if IncludePbufs
|
||||
LOCALFUNC ui3p PbufLock(tPbuf i)
|
||||
LOCALFUNC uint8_t * PbufLock(tPbuf i)
|
||||
{
|
||||
return (ui3p)PbufDat[i];
|
||||
return (uint8_t *)PbufDat[i];
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -108,10 +108,10 @@ LOCALFUNC ui3p PbufLock(tPbuf i)
|
||||
#endif
|
||||
|
||||
#if IncludePbufs
|
||||
GLOBALOSGLUPROC PbufTransfer(ui3p Buffer,
|
||||
tPbuf i, uint32_t offset, uint32_t count, blnr IsWrite)
|
||||
GLOBALOSGLUPROC PbufTransfer(uint8_t * Buffer,
|
||||
tPbuf i, uint32_t offset, uint32_t count, bool IsWrite)
|
||||
{
|
||||
void *p = ((ui3p)PbufDat[i]) + offset;
|
||||
void *p = ((uint8_t *)PbufDat[i]) + offset;
|
||||
if (IsWrite) {
|
||||
(void) memcpy(p, Buffer, count);
|
||||
} else {
|
||||
|
@ -45,7 +45,7 @@ enum {
|
||||
|
||||
#define PMU_BuffSz 8
|
||||
LOCALVAR uint8_t PMU_BuffA[PMU_BuffSz];
|
||||
LOCALVAR ui3p PMU_p;
|
||||
LOCALVAR uint8_t * PMU_p;
|
||||
LOCALVAR uint8_t PMU_rem;
|
||||
LOCALVAR uint8_t PMU_i;
|
||||
|
||||
@ -313,7 +313,7 @@ LOCALPROC SetPMUbus(uint8_t v)
|
||||
VIA1_iA7 = v & 0x01;
|
||||
}
|
||||
|
||||
LOCALVAR blnr PMU_Sending = falseblnr;
|
||||
LOCALVAR bool PMU_Sending = false;
|
||||
|
||||
LOCALPROC PmuCheckCommandCompletion(void)
|
||||
{
|
||||
@ -329,7 +329,7 @@ LOCALPROC PmuCheckCommandCompletion(void)
|
||||
PMUState = kPMUStateSendLength;
|
||||
}
|
||||
PMU_i = 0;
|
||||
PMU_Sending = trueblnr;
|
||||
PMU_Sending = true;
|
||||
ICT_add(kICT_PMU_Task,
|
||||
20400UL * kCycleScale / 64 * ClockMult);
|
||||
}
|
||||
@ -339,7 +339,7 @@ LOCALPROC PmuCheckCommandCompletion(void)
|
||||
GLOBALPROC PmuToReady_ChangeNtfy(void)
|
||||
{
|
||||
if (PMU_Sending) {
|
||||
PMU_Sending = falseblnr;
|
||||
PMU_Sending = false;
|
||||
ReportAbnormalID(0x0E0C,
|
||||
"PmuToReady_ChangeNtfy while PMU_Sending");
|
||||
PmuFromReady = 0;
|
||||
@ -398,7 +398,7 @@ GLOBALPROC PmuToReady_ChangeNtfy(void)
|
||||
} else {
|
||||
PMU_SendNext = PMU_BuffL;
|
||||
PMUState = kPMUStateSendBuffer;
|
||||
PMU_Sending = trueblnr;
|
||||
PMU_Sending = true;
|
||||
ICT_add(kICT_PMU_Task,
|
||||
20400UL * kCycleScale / 64 * ClockMult);
|
||||
}
|
||||
@ -423,7 +423,7 @@ GLOBALPROC PmuToReady_ChangeNtfy(void)
|
||||
PMU_SendNext = *PMU_p++;
|
||||
--PMU_rem;
|
||||
++PMU_i;
|
||||
PMU_Sending = trueblnr;
|
||||
PMU_Sending = true;
|
||||
ICT_add(kICT_PMU_Task,
|
||||
20400UL * kCycleScale / 64 * ClockMult);
|
||||
}
|
||||
@ -435,7 +435,7 @@ GLOBALPROC PmuToReady_ChangeNtfy(void)
|
||||
GLOBALPROC PMU_DoTask(void)
|
||||
{
|
||||
if (PMU_Sending) {
|
||||
PMU_Sending = falseblnr;
|
||||
PMU_Sending = false;
|
||||
SetPMUbus(PMU_SendNext);
|
||||
PmuFromReady = 0;
|
||||
}
|
||||
|
@ -90,19 +90,19 @@ LOCALPROC DoMacReset(void)
|
||||
|
||||
LOCALPROC InterruptReset_Update(void)
|
||||
{
|
||||
SetInterruptButton(falseblnr);
|
||||
SetInterruptButton(false);
|
||||
/*
|
||||
in case has been set. so only stays set
|
||||
for 60th of a second.
|
||||
*/
|
||||
|
||||
if (WantMacInterrupt) {
|
||||
SetInterruptButton(trueblnr);
|
||||
WantMacInterrupt = falseblnr;
|
||||
SetInterruptButton(true);
|
||||
WantMacInterrupt = false;
|
||||
}
|
||||
if (WantMacReset) {
|
||||
DoMacReset();
|
||||
WantMacReset = falseblnr;
|
||||
WantMacReset = false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -222,20 +222,20 @@ LOCALPROC ExtraTimeEndNotify(void)
|
||||
GLOBALPROC EmulationReserveAlloc(void)
|
||||
{
|
||||
ReserveAllocOneBlock(&RAM,
|
||||
kRAM_Size + RAMSafetyMarginFudge, 5, falseblnr);
|
||||
kRAM_Size + RAMSafetyMarginFudge, 5, false);
|
||||
#if EmVidCard
|
||||
ReserveAllocOneBlock(&VidROM, kVidROM_Size, 5, falseblnr);
|
||||
ReserveAllocOneBlock(&VidROM, kVidROM_Size, 5, false);
|
||||
#endif
|
||||
#if IncludeVidMem
|
||||
ReserveAllocOneBlock(&VidMem,
|
||||
kVidMemRAM_Size + RAMSafetyMarginFudge, 5, trueblnr);
|
||||
kVidMemRAM_Size + RAMSafetyMarginFudge, 5, true);
|
||||
#endif
|
||||
#if SmallGlobals
|
||||
MINEM68K_ReserveAlloc();
|
||||
#endif
|
||||
}
|
||||
|
||||
LOCALFUNC blnr InitEmulation(void)
|
||||
LOCALFUNC bool InitEmulation(void)
|
||||
{
|
||||
#if EmRTC
|
||||
if (RTC_Init())
|
||||
@ -247,9 +247,9 @@ LOCALFUNC blnr InitEmulation(void)
|
||||
if (AddrSpac_Init())
|
||||
{
|
||||
EmulatedHardwareZap();
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOCALPROC ICT_DoTask(int taskid)
|
||||
@ -425,9 +425,9 @@ LOCALPROC DoEmulateOneTick(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr MoreSubTicksToDo(void)
|
||||
LOCALFUNC bool MoreSubTicksToDo(void)
|
||||
{
|
||||
blnr v = falseblnr;
|
||||
bool v = false;
|
||||
|
||||
if (ExtraTimeNotOver() && (ExtraSubTicksToDo > 0)) {
|
||||
#if EnableAutoSlow
|
||||
@ -439,7 +439,7 @@ LOCALFUNC blnr MoreSubTicksToDo(void)
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
v = trueblnr;
|
||||
v = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -524,7 +524,7 @@ LOCALPROC RunEmulatedTicksToTrueTime(void)
|
||||
if (ExtraTimeNotOver() && (--n > 0)) {
|
||||
/* lagging, catch up */
|
||||
|
||||
EmVideoDisable = trueblnr;
|
||||
EmVideoDisable = true;
|
||||
|
||||
do {
|
||||
DoEmulateOneTick();
|
||||
@ -532,7 +532,7 @@ LOCALPROC RunEmulatedTicksToTrueTime(void)
|
||||
} while (ExtraTimeNotOver()
|
||||
&& (--n > 0));
|
||||
|
||||
EmVideoDisable = falseblnr;
|
||||
EmVideoDisable = false;
|
||||
}
|
||||
|
||||
EmLagTime = n;
|
||||
|
@ -53,7 +53,7 @@ INCBIN(SonyDriver, "PATCHES/SONY.bin");
|
||||
#endif
|
||||
|
||||
#if UseSonyPatch
|
||||
LOCALVAR const uint8_t my_disk_icon[] = {
|
||||
LOCALVAR const uint8_t disk_icon[] = {
|
||||
0x7F, 0xFF, 0xFF, 0xF0,
|
||||
0x81, 0x00, 0x01, 0x08,
|
||||
0x81, 0x00, 0x71, 0x04,
|
||||
@ -146,7 +146,7 @@ LOCALVAR const uint8_t my_disk_icon[] = {
|
||||
#if UseSonyPatch
|
||||
LOCALPROC Sony_Install(void)
|
||||
{
|
||||
ui3p pto = Sony_DriverBase + ROM;
|
||||
uint8_t * pto = Sony_DriverBase + ROM;
|
||||
|
||||
MoveBytes((anyp)gSonyDriverData, (anyp)pto, gSonyDriverSize);
|
||||
#if CurEmMd <= kEmMd_Twiggy
|
||||
@ -168,13 +168,13 @@ LOCALPROC Sony_Install(void)
|
||||
do_put_mem_long(pto, kExtn_Block_Base); /* pokeaddr */
|
||||
pto += 4;
|
||||
|
||||
my_disk_icon_addr = (pto - ROM) + kROM_Base;
|
||||
MoveBytes((anyp)my_disk_icon, (anyp)pto, sizeof(my_disk_icon));
|
||||
pto += sizeof(my_disk_icon);
|
||||
disk_icon_addr = (pto - ROM) + kROM_Base;
|
||||
MoveBytes((anyp)disk_icon, (anyp)pto, sizeof(disk_icon));
|
||||
pto += sizeof(disk_icon);
|
||||
|
||||
#if UseLargeScreenHack
|
||||
{
|
||||
ui3p patchp = pto;
|
||||
uint8_t * patchp = pto;
|
||||
|
||||
#include "SCRNHACK.h"
|
||||
}
|
||||
@ -200,8 +200,8 @@ LOCALPROC Sony_Install(void)
|
||||
LOCALPROC ROMscrambleForMTB(void)
|
||||
{
|
||||
int32_t j;
|
||||
ui3p p = ROM;
|
||||
ui3p p2 = ROM + (1 << ln2mtb);
|
||||
uint8_t * p = ROM;
|
||||
uint8_t * p2 = ROM + (1 << ln2mtb);
|
||||
|
||||
for (j = kROM_Size / (1 << ln2mtb) / 2; --j >= 0; ) {
|
||||
int32_t i;
|
||||
@ -219,7 +219,7 @@ LOCALPROC ROMscrambleForMTB(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
GLOBALFUNC blnr ROM_Init(void)
|
||||
GLOBALFUNC bool ROM_Init(void)
|
||||
{
|
||||
#if DisableRomCheck
|
||||
|
||||
@ -273,5 +273,5 @@ GLOBALFUNC blnr ROM_Init(void)
|
||||
ROMscrambleForMTB();
|
||||
#endif
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
@ -20,4 +20,4 @@
|
||||
#define ROMEMDEV_H
|
||||
#endif
|
||||
|
||||
EXPORTFUNC blnr ROM_Init(void);
|
||||
EXPORTFUNC bool ROM_Init(void);
|
||||
|
@ -145,14 +145,14 @@ GLOBALPROC DumpRTC(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
GLOBALFUNC blnr RTC_Init(void)
|
||||
GLOBALFUNC bool RTC_Init(void)
|
||||
{
|
||||
int Counter;
|
||||
uint32_t secs;
|
||||
|
||||
RTC.Mode = RTC.ShiftData = RTC.Counter = 0;
|
||||
RTC.DataOut = RTC.DataNextOut = 0;
|
||||
RTC.WrProtect = falseblnr;
|
||||
RTC.WrProtect = false;
|
||||
|
||||
secs = CurMacDateInSeconds;
|
||||
LastRealDate = secs;
|
||||
@ -301,7 +301,7 @@ GLOBALFUNC blnr RTC_Init(void)
|
||||
|
||||
#endif /* RTCinitPRAM */
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifdef RTC_OneSecond_PulseNtfy
|
||||
@ -331,7 +331,7 @@ GLOBALPROC RTC_Interrupt(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC uint8_t RTC_Access_PRAM_Reg(uint8_t Data, blnr WriteReg, uint8_t t)
|
||||
LOCALFUNC uint8_t RTC_Access_PRAM_Reg(uint8_t Data, bool WriteReg, uint8_t t)
|
||||
{
|
||||
if (WriteReg) {
|
||||
if (! RTC.WrProtect) {
|
||||
@ -346,7 +346,7 @@ LOCALFUNC uint8_t RTC_Access_PRAM_Reg(uint8_t Data, blnr WriteReg, uint8_t t)
|
||||
return Data;
|
||||
}
|
||||
|
||||
LOCALFUNC uint8_t RTC_Access_Reg(uint8_t Data, blnr WriteReg, uint8_t TheCmd)
|
||||
LOCALFUNC uint8_t RTC_Access_Reg(uint8_t Data, bool WriteReg, uint8_t TheCmd)
|
||||
{
|
||||
uint8_t t = (TheCmd & 0x7C) >> 2;
|
||||
if (t < 8) {
|
||||
@ -398,7 +398,7 @@ LOCALPROC RTC_DoCmd(void)
|
||||
{
|
||||
if ((RTC.ShiftData & 0x80) != 0x00) { /* Read Command */
|
||||
RTC.ShiftData =
|
||||
RTC_Access_Reg(0, falseblnr, RTC.ShiftData);
|
||||
RTC_Access_Reg(0, false, RTC.ShiftData);
|
||||
RTC.DataNextOut = 1;
|
||||
} else { /* Write Command */
|
||||
RTC.SavedCmd = RTC.ShiftData;
|
||||
@ -408,7 +408,7 @@ LOCALPROC RTC_DoCmd(void)
|
||||
break;
|
||||
case 1: /* This Byte is data for RTC Write */
|
||||
(void) RTC_Access_Reg(RTC.ShiftData,
|
||||
trueblnr, RTC.SavedCmd);
|
||||
true, RTC.SavedCmd);
|
||||
RTC.Mode = 0;
|
||||
break;
|
||||
#if HaveXPRAM
|
||||
@ -435,7 +435,7 @@ LOCALPROC RTC_DoCmd(void)
|
||||
break;
|
||||
case 3: /* This Byte is data for an Extended RTC Write */
|
||||
(void) RTC_Access_PRAM_Reg(RTC.ShiftData,
|
||||
trueblnr, RTC.Sector);
|
||||
true, RTC.Sector);
|
||||
RTC.Mode = 0;
|
||||
break;
|
||||
#endif
|
||||
|
@ -20,7 +20,7 @@
|
||||
#define RTCEMDEV_H
|
||||
#endif
|
||||
|
||||
EXPORTFUNC blnr RTC_Init(void);
|
||||
EXPORTFUNC bool RTC_Init(void);
|
||||
EXPORTPROC RTC_Interrupt(void);
|
||||
|
||||
EXPORTPROC RTCunEnabled_ChangeNtfy(void);
|
||||
|
326
src/SCCEMDEV.c
326
src/SCCEMDEV.c
@ -76,12 +76,12 @@
|
||||
#define SCC_B_Ext 1 /* External/Status Change */
|
||||
|
||||
typedef struct {
|
||||
blnr TxEnable;
|
||||
blnr RxEnable;
|
||||
blnr TxIE; /* Transmit Interrupt Enable */
|
||||
blnr TxUnderrun;
|
||||
blnr SyncHunt;
|
||||
blnr TxIP; /* Transmit Interrupt Pending */
|
||||
bool TxEnable;
|
||||
bool RxEnable;
|
||||
bool TxIE; /* Transmit Interrupt Enable */
|
||||
bool TxUnderrun;
|
||||
bool SyncHunt;
|
||||
bool TxIP; /* Transmit Interrupt Pending */
|
||||
#if EmLocalTalk
|
||||
uint8_t RxBuff;
|
||||
#endif
|
||||
@ -91,49 +91,49 @@ typedef struct {
|
||||
though should behave as went false
|
||||
for an instant when write to transmit buffer
|
||||
*/
|
||||
blnr TxBufferEmpty;
|
||||
bool TxBufferEmpty;
|
||||
#endif
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
blnr ExtIE;
|
||||
bool ExtIE;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr WaitRqstEnbl;
|
||||
bool WaitRqstEnbl;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr WaitRqstSlct;
|
||||
bool WaitRqstSlct;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr WaitRqstRT;
|
||||
bool WaitRqstRT;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr PrtySpclCond;
|
||||
bool PrtySpclCond;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr PrtyEnable;
|
||||
bool PrtyEnable;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr PrtyEven;
|
||||
bool PrtyEven;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr RxCRCEnbl;
|
||||
bool RxCRCEnbl;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr TxCRCEnbl;
|
||||
bool TxCRCEnbl;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr RTSctrl;
|
||||
bool RTSctrl;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr SndBrkCtrl;
|
||||
bool SndBrkCtrl;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr DTRctrl;
|
||||
bool DTRctrl;
|
||||
#endif
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
blnr AddrSrchMd;
|
||||
bool AddrSrchMd;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr SyncChrLdInhb;
|
||||
bool SyncChrLdInhb;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
uint8_t ClockRate;
|
||||
@ -160,7 +160,7 @@ typedef struct {
|
||||
uint8_t RxIntMode;
|
||||
#endif
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
blnr FirstChar;
|
||||
bool FirstChar;
|
||||
#endif
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
uint8_t SyncMode;
|
||||
@ -169,13 +169,13 @@ typedef struct {
|
||||
uint8_t StopBits;
|
||||
#endif
|
||||
#if 0 /* AllSent always true */
|
||||
blnr AllSent;
|
||||
bool AllSent;
|
||||
#endif
|
||||
#if 0 /* CTS always false */
|
||||
blnr CTS; /* input pin, unattached, so false? */
|
||||
bool CTS; /* input pin, unattached, so false? */
|
||||
#endif
|
||||
#if 0 /* DCD always false */
|
||||
blnr DCD; /* Data Carrier Detect */
|
||||
bool DCD; /* Data Carrier Detect */
|
||||
/*
|
||||
input pin for mouse interrupts. but since
|
||||
not emulating mouse this way, leave false.
|
||||
@ -183,44 +183,44 @@ typedef struct {
|
||||
#endif
|
||||
#if EmLocalTalk
|
||||
/* otherwise RxChrAvail always false */
|
||||
blnr RxChrAvail;
|
||||
bool RxChrAvail;
|
||||
#endif
|
||||
#if 0 /* RxOverrun always false */
|
||||
blnr RxOverrun;
|
||||
bool RxOverrun;
|
||||
#endif
|
||||
#if 0 /* CRCFramingErr always false */
|
||||
blnr CRCFramingErr;
|
||||
bool CRCFramingErr;
|
||||
#endif
|
||||
#if EmLocalTalk
|
||||
/* otherwise EndOfFrame always false */
|
||||
blnr EndOfFrame;
|
||||
bool EndOfFrame;
|
||||
#endif
|
||||
#if 0 /* ParityErr always false */
|
||||
blnr ParityErr;
|
||||
bool ParityErr;
|
||||
#endif
|
||||
#if 0 /* ZeroCount always false */
|
||||
blnr ZeroCount;
|
||||
bool ZeroCount;
|
||||
#endif
|
||||
#if 0 /* BreakAbort always false */
|
||||
blnr BreakAbort;
|
||||
bool BreakAbort;
|
||||
#endif
|
||||
#if 0 /* SyncHuntIE usually false */
|
||||
blnr SyncHuntIE;
|
||||
bool SyncHuntIE;
|
||||
#endif
|
||||
#if SCC_TrackMore /* don't care about CTS_IE */
|
||||
blnr CTS_IE;
|
||||
bool CTS_IE;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr CRCPreset;
|
||||
bool CRCPreset;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
blnr BRGEnbl;
|
||||
bool BRGEnbl;
|
||||
#endif
|
||||
#if 0 /* don't care about DCD_IE, always true */
|
||||
blnr DCD_IE;
|
||||
bool DCD_IE;
|
||||
#endif
|
||||
#if SCC_TrackMore /* don't care about BreakAbortIE */
|
||||
blnr BreakAbortIE;
|
||||
bool BreakAbortIE;
|
||||
#endif
|
||||
#if SCC_TrackMore /* don't care about Baud */
|
||||
uint8_t BaudLo;
|
||||
@ -233,12 +233,12 @@ typedef struct {
|
||||
int SCC_Interrupt_Type;
|
||||
int PointerBits;
|
||||
uint8_t InterruptVector;
|
||||
blnr MIE; /* master interrupt enable */
|
||||
bool MIE; /* master interrupt enable */
|
||||
#if SCC_TrackMore
|
||||
blnr NoVectorSlct;
|
||||
bool NoVectorSlct;
|
||||
#endif
|
||||
#if 0 /* StatusHiLo always false */
|
||||
blnr StatusHiLo;
|
||||
bool StatusHiLo;
|
||||
#endif
|
||||
} SCC_Ty;
|
||||
|
||||
@ -254,7 +254,7 @@ static int rx_data_offset = 0;
|
||||
/* when data pending, this is used */
|
||||
#endif
|
||||
|
||||
EXPORTFUNC blnr SCC_InterruptsEnabled(void)
|
||||
EXPORTFUNC bool SCC_InterruptsEnabled(void)
|
||||
{
|
||||
return SCC.MIE;
|
||||
}
|
||||
@ -265,7 +265,7 @@ EXPORTFUNC blnr SCC_InterruptsEnabled(void)
|
||||
LOCALPROC CheckSCCInterruptFlag(void)
|
||||
{
|
||||
#if 0 /* ReceiveAInterrupt always false */
|
||||
blnr ReceiveAInterrupt = falseblnr
|
||||
bool ReceiveAInterrupt = false
|
||||
/*
|
||||
also dependeds on WR1, bits 3 and 4, but
|
||||
this doesn't change that it's all false
|
||||
@ -290,14 +290,14 @@ LOCALPROC CheckSCCInterruptFlag(void)
|
||||
;
|
||||
#endif
|
||||
#if 0
|
||||
blnr TransmitAInterrupt = SCC.a[0].TxBufferEmpty;
|
||||
bool TransmitAInterrupt = SCC.a[0].TxBufferEmpty;
|
||||
/*
|
||||
but probably looking for transitions not
|
||||
current value
|
||||
*/
|
||||
#endif
|
||||
#if 0
|
||||
blnr ExtStatusAInterrupt = 0
|
||||
bool ExtStatusAInterrupt = 0
|
||||
#if 0 /* ZeroCount always false */
|
||||
| SCC.a[0].ZeroCount
|
||||
#endif
|
||||
@ -318,8 +318,8 @@ LOCALPROC CheckSCCInterruptFlag(void)
|
||||
uint8_t NewSCCInterruptRequest;
|
||||
|
||||
#if EmLocalTalk
|
||||
blnr ReceiveBInterrupt = falseblnr;
|
||||
blnr RxSpclBInterrupt = falseblnr
|
||||
bool ReceiveBInterrupt = false;
|
||||
bool RxSpclBInterrupt = false
|
||||
/* otherwise EndOfFrame always false */
|
||||
| SCC.a[1].EndOfFrame
|
||||
;
|
||||
@ -329,18 +329,18 @@ LOCALPROC CheckSCCInterruptFlag(void)
|
||||
switch (SCC.a[1].RxIntMode) {
|
||||
case 0:
|
||||
/* disabled */
|
||||
RxSpclBInterrupt = falseblnr;
|
||||
RxSpclBInterrupt = false;
|
||||
break;
|
||||
case 1:
|
||||
/* Rx INT on 1st char or special condition */
|
||||
if (SCC.a[1].RxChrAvail && SCC.a[1].FirstChar) {
|
||||
ReceiveBInterrupt = trueblnr;
|
||||
ReceiveBInterrupt = true;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
/* INT on all Rx char or special condition */
|
||||
if (SCC.a[1].RxChrAvail) {
|
||||
ReceiveBInterrupt = trueblnr;
|
||||
ReceiveBInterrupt = true;
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
@ -402,25 +402,25 @@ LOCALPROC SCC_InitChannel(int chan)
|
||||
{
|
||||
/* anything not done by ResetChannel */
|
||||
|
||||
SCC.a[chan].SyncHunt = trueblnr;
|
||||
SCC.a[chan].SyncHunt = true;
|
||||
#if 0 /* DCD always false */
|
||||
SCC.a[chan].DCD = falseblnr; /* input pin, reset doesn't change */
|
||||
SCC.a[chan].DCD = false; /* input pin, reset doesn't change */
|
||||
#endif
|
||||
#if 0 /* CTS always false */
|
||||
SCC.a[chan].CTS = falseblnr; /* input pin, reset doesn't change */
|
||||
SCC.a[chan].CTS = false; /* input pin, reset doesn't change */
|
||||
#endif
|
||||
#if 0 /* AllSent always true */
|
||||
SCC.a[chan].AllSent = trueblnr;
|
||||
SCC.a[chan].AllSent = true;
|
||||
#endif
|
||||
#if SCC_TrackMore /* don't care about Baud */
|
||||
SCC.a[chan].BaudLo = 0;
|
||||
SCC.a[chan].BaudHi = 0;
|
||||
#endif
|
||||
#if 0 /* BreakAbort always false */
|
||||
SCC.a[chan].BreakAbort = falseblnr;
|
||||
SCC.a[chan].BreakAbort = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].BRGEnbl = falseblnr;
|
||||
SCC.a[chan].BRGEnbl = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].TRxCsrc = 0;
|
||||
@ -441,72 +441,72 @@ LOCALPROC SCC_ResetChannel(int chan)
|
||||
#endif
|
||||
#if EmLocalTalk
|
||||
/* otherwise RxChrAvail always false */
|
||||
SCC.a[chan].RxChrAvail = falseblnr;
|
||||
SCC.a[chan].RxChrAvail = false;
|
||||
#endif
|
||||
#if 0 /* ZeroCount always false */
|
||||
SCC.a[chan].ZeroCount = falseblnr;
|
||||
SCC.a[chan].ZeroCount = false;
|
||||
#endif
|
||||
#if EmLocalTalk
|
||||
/* otherwise TxBufferEmpty always true */
|
||||
SCC.a[chan].TxBufferEmpty = trueblnr;
|
||||
SCC.a[chan].TxBufferEmpty = true;
|
||||
#endif
|
||||
SCC.a[chan].TxUnderrun = trueblnr;
|
||||
SCC.a[chan].TxUnderrun = true;
|
||||
/* RR 1 */
|
||||
#if 0 /* ParityErr always false */
|
||||
SCC.a[chan].ParityErr = falseblnr;
|
||||
SCC.a[chan].ParityErr = false;
|
||||
#endif
|
||||
#if 0 /* RxOverrun always false */
|
||||
SCC.a[chan].RxOverrun = falseblnr;
|
||||
SCC.a[chan].RxOverrun = false;
|
||||
#endif
|
||||
#if 0 /* CRCFramingErr always false */
|
||||
SCC.a[chan].CRCFramingErr = falseblnr;
|
||||
SCC.a[chan].CRCFramingErr = false;
|
||||
#endif
|
||||
#if EmLocalTalk
|
||||
/* otherwise EndOfFrame always false */
|
||||
SCC.a[chan].EndOfFrame = falseblnr;
|
||||
SCC.a[chan].EndOfFrame = false;
|
||||
#endif
|
||||
/* RR 3 */
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
SCC.a[chan].ExtIE = falseblnr;
|
||||
SCC.a[chan].ExtIE = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].RxCRCEnbl = falseblnr;
|
||||
SCC.a[chan].RxCRCEnbl = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].TxCRCEnbl = falseblnr;
|
||||
SCC.a[chan].TxCRCEnbl = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].RTSctrl = falseblnr;
|
||||
SCC.a[chan].RTSctrl = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].SndBrkCtrl = falseblnr;
|
||||
SCC.a[chan].SndBrkCtrl = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].DTRctrl = falseblnr;
|
||||
SCC.a[chan].DTRctrl = false;
|
||||
#endif
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
SCC.a[chan].AddrSrchMd = falseblnr;
|
||||
SCC.a[chan].AddrSrchMd = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].SyncChrLdInhb = falseblnr;
|
||||
SCC.a[chan].SyncChrLdInhb = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].WaitRqstEnbl = falseblnr;
|
||||
SCC.a[chan].WaitRqstEnbl = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].WaitRqstSlct = falseblnr;
|
||||
SCC.a[chan].WaitRqstSlct = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].WaitRqstRT = falseblnr;
|
||||
SCC.a[chan].WaitRqstRT = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].PrtySpclCond = falseblnr;
|
||||
SCC.a[chan].PrtySpclCond = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].PrtyEnable = falseblnr;
|
||||
SCC.a[chan].PrtyEnable = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].PrtyEven = falseblnr;
|
||||
SCC.a[chan].PrtyEven = false;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].ClockRate = 0;
|
||||
@ -524,7 +524,7 @@ LOCALPROC SCC_ResetChannel(int chan)
|
||||
SCC.a[chan].RxIntMode = 0;
|
||||
#endif
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
SCC.a[chan].FirstChar = falseblnr;
|
||||
SCC.a[chan].FirstChar = false;
|
||||
#endif
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
SCC.a[chan].SyncMode = 0;
|
||||
@ -533,28 +533,28 @@ LOCALPROC SCC_ResetChannel(int chan)
|
||||
SCC.a[chan].StopBits = 0;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.NoVectorSlct = falseblnr;
|
||||
SCC.NoVectorSlct = false;
|
||||
#endif
|
||||
SCC.a[chan].TxIP = falseblnr;
|
||||
SCC.a[chan].TxIP = false;
|
||||
|
||||
SCC.a[chan].TxEnable = falseblnr;
|
||||
SCC.a[chan].RxEnable = falseblnr;
|
||||
SCC.a[chan].TxIE = falseblnr;
|
||||
SCC.a[chan].TxEnable = false;
|
||||
SCC.a[chan].RxEnable = false;
|
||||
SCC.a[chan].TxIE = false;
|
||||
|
||||
#if 0 /* don't care about DCD_IE, always true */
|
||||
SCC.a[chan].DCD_IE = trueblnr;
|
||||
SCC.a[chan].DCD_IE = true;
|
||||
#endif
|
||||
#if SCC_TrackMore /* don't care about CTS_IE */
|
||||
SCC.a[chan].CTS_IE = trueblnr;
|
||||
SCC.a[chan].CTS_IE = true;
|
||||
#endif
|
||||
#if SCC_TrackMore
|
||||
SCC.a[chan].CRCPreset = falseblnr;
|
||||
SCC.a[chan].CRCPreset = false;
|
||||
#endif
|
||||
#if 0 /* SyncHuntIE usually false */
|
||||
SCC.a[chan].SyncHuntIE = trueblnr;
|
||||
SCC.a[chan].SyncHuntIE = true;
|
||||
#endif
|
||||
#if SCC_TrackMore /* don't care about BreakAbortIE */
|
||||
SCC.a[chan].BreakAbortIE = trueblnr;
|
||||
SCC.a[chan].BreakAbortIE = true;
|
||||
#endif
|
||||
|
||||
SCC.PointerBits = 0;
|
||||
@ -576,10 +576,10 @@ GLOBALPROC SCC_Reset(void)
|
||||
|
||||
SCCInterruptRequest = 0;
|
||||
SCC.PointerBits = 0;
|
||||
SCC.MIE = falseblnr;
|
||||
SCC.MIE = false;
|
||||
SCC.InterruptVector = 0;
|
||||
#if 0 /* StatusHiLo always false */
|
||||
SCC.StatusHiLo = falseblnr;
|
||||
SCC.StatusHiLo = false;
|
||||
#endif
|
||||
|
||||
SCC_InitChannel(1);
|
||||
@ -592,7 +592,7 @@ GLOBALPROC SCC_Reset(void)
|
||||
|
||||
#if EmLocalTalk
|
||||
|
||||
LOCALVAR blnr CTSpacketPending = falseblnr;
|
||||
LOCALVAR bool CTSpacketPending = false;
|
||||
LOCALVAR uint8_t CTSpacketRxDA;
|
||||
LOCALVAR uint8_t CTSpacketRxSA;
|
||||
|
||||
@ -623,7 +623,7 @@ LOCALPROC process_transmit(void)
|
||||
} else {
|
||||
CTSpacketRxDA = LT_TxBuffer[1]; /* rx da = tx sa */
|
||||
CTSpacketRxSA = LT_TxBuffer[0]; /* rx sa = tx da */
|
||||
CTSpacketPending = trueblnr;
|
||||
CTSpacketPending = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -645,7 +645,7 @@ LOCALVAR uint8_t CTSBuffer[4];
|
||||
LOCALPROC GetCTSpacket(void)
|
||||
{
|
||||
/* Get a single buffer worth of packets at a time */
|
||||
ui3p device_buffer = CTSBuffer;
|
||||
uint8_t * device_buffer = CTSBuffer;
|
||||
|
||||
#if SCC_dolog
|
||||
dbglog_WriteNote("SCC receiving CTS packet");
|
||||
@ -659,7 +659,7 @@ LOCALPROC GetCTSpacket(void)
|
||||
LT_RxBuffer = device_buffer;
|
||||
LT_RxBuffSz = 3;
|
||||
|
||||
CTSpacketPending = falseblnr;
|
||||
CTSpacketPending = false;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -684,7 +684,7 @@ LOCALPROC rx_complete(void)
|
||||
*/
|
||||
LT_RxBuffer = nullpr;
|
||||
|
||||
SCC.a[1].EndOfFrame = trueblnr;
|
||||
SCC.a[1].EndOfFrame = true;
|
||||
}
|
||||
|
||||
LOCALPROC SCC_RxBuffAdvance(void)
|
||||
@ -700,7 +700,7 @@ LOCALPROC SCC_RxBuffAdvance(void)
|
||||
|
||||
if (nullpr == LT_RxBuffer) {
|
||||
value = 0x7E;
|
||||
SCC.a[1].RxChrAvail = falseblnr;
|
||||
SCC.a[1].RxChrAvail = false;
|
||||
} else {
|
||||
if (rx_data_offset < LT_RxBuffSz) {
|
||||
value = LT_RxBuffer[rx_data_offset];
|
||||
@ -721,7 +721,7 @@ LOCALPROC SCC_RxBuffAdvance(void)
|
||||
}
|
||||
|
||||
/* LLAP/SDLC address */
|
||||
LOCALVAR uint8_t my_node_address = 0;
|
||||
LOCALVAR uint8_t node_address = 0;
|
||||
|
||||
LOCALPROC GetNextPacketForMe(void)
|
||||
{
|
||||
@ -739,13 +739,13 @@ label_retry:
|
||||
/* Is this packet destined for me? */
|
||||
dst = LT_RxBuffer[0];
|
||||
src = LT_RxBuffer[1];
|
||||
if (src == my_node_address) {
|
||||
if (src == node_address) {
|
||||
#if SCC_dolog
|
||||
dbglog_WriteNote("SCC ignore packet from myself");
|
||||
#endif
|
||||
LT_RxBuffer = nullpr;
|
||||
goto label_retry;
|
||||
} else if ((dst == my_node_address)
|
||||
} else if ((dst == node_address)
|
||||
|| (dst == 0xFF)
|
||||
|| ! SCC.a[1].AddrSrchMd)
|
||||
{
|
||||
@ -783,9 +783,9 @@ GLOBALPROC LocalTalkTick(void)
|
||||
|
||||
if (nullpr != LT_RxBuffer) {
|
||||
rx_data_offset = 0;
|
||||
SCC.a[1].EndOfFrame = falseblnr;
|
||||
SCC.a[1].RxChrAvail = trueblnr;
|
||||
SCC.a[1].SyncHunt = falseblnr;
|
||||
SCC.a[1].EndOfFrame = false;
|
||||
SCC.a[1].RxChrAvail = true;
|
||||
SCC.a[1].SyncHunt = false;
|
||||
|
||||
SCC_RxBuffAdvance();
|
||||
/* We can update the rx interrupt if enabled */
|
||||
@ -818,7 +818,7 @@ LOCALPROC SCC_Int(void)
|
||||
|
||||
/* Turn off Sync/Hunt Mode */
|
||||
if (SCC.a[0].SyncHunt) {
|
||||
SCC.a[0].SyncHunt = falseblnr;
|
||||
SCC.a[0].SyncHunt = false;
|
||||
|
||||
#ifdef _SCC_Debug2
|
||||
vMac_Message("SCC_Int: Disable Sync/Hunt on A");
|
||||
@ -831,7 +831,7 @@ LOCALPROC SCC_Int(void)
|
||||
#endif
|
||||
}
|
||||
if (SCC.a[1].SyncHunt) {
|
||||
SCC.a[1].SyncHunt = falseblnr;
|
||||
SCC.a[1].SyncHunt = false;
|
||||
|
||||
#ifdef _SCC_Debug2
|
||||
vMac_Message("SCC_Int: Disable Sync/Hunt on B");
|
||||
@ -854,14 +854,14 @@ LOCALPROC SCC_Int(void)
|
||||
|
||||
if ((ModemBytes > 0) && (ModemCount > ModemBytes - 1))
|
||||
{
|
||||
SCC.a[0].RxChrAvail = falseblnr;
|
||||
SCC.a[0].RxChrAvail = false;
|
||||
ReadModem = ModemBytes = ModemCount = 0;
|
||||
}
|
||||
|
||||
if (ReadModem) {
|
||||
ReadModem = 2;
|
||||
|
||||
SCC.a[0].RxChrAvail = trueblnr;
|
||||
SCC.a[0].RxChrAvail = true;
|
||||
|
||||
if (SCC.a[0].WR[0] & Bit5
|
||||
&& ! (SCC.a[0].WR[0] & (Bit4 | Bit3)))
|
||||
@ -888,14 +888,14 @@ LOCALPROC SCC_Int(void)
|
||||
}
|
||||
|
||||
if ((PrintBytes > 0) && (PrintCount > PrintBytes - 1)) {
|
||||
SCC.a[1].RxChrAvail = falseblnr;
|
||||
SCC.a[1].RxChrAvail = false;
|
||||
ReadPrint = PrintBytes = PrintCount = 0;
|
||||
}
|
||||
|
||||
if (ReadPrint) {
|
||||
ReadPrint = 2;
|
||||
|
||||
SCC.a[1].RxChrAvail = trueblnr;
|
||||
SCC.a[1].RxChrAvail = true;
|
||||
|
||||
if (SCC.a[1].WR[0] & Bit5
|
||||
&& ! (SCC.a[1].WR[0] & (Bit4 | Bit3)))
|
||||
@ -1138,7 +1138,7 @@ LOCALFUNC uint8_t SCC_GetRR8(int chan)
|
||||
if necessary
|
||||
*/
|
||||
value = SCC.a[1].RxBuff;
|
||||
SCC.a[1].FirstChar = falseblnr;
|
||||
SCC.a[1].FirstChar = false;
|
||||
SCC_RxBuffAdvance();
|
||||
} else {
|
||||
value = 0x7E;
|
||||
@ -1246,7 +1246,7 @@ LOCALPROC SCC_DbgLogChanCmnd(int chan, char *s)
|
||||
#endif
|
||||
|
||||
#if SCC_dolog
|
||||
LOCALPROC SCC_DbgLogChanChngBit(int chan, char *s, blnr v)
|
||||
LOCALPROC SCC_DbgLogChanChngBit(int chan, char *s, bool v)
|
||||
{
|
||||
SCC_DbgLogChanStartLine(chan);
|
||||
dbglog_writeCStr(" ");
|
||||
@ -1293,14 +1293,14 @@ LOCALPROC SCC_PutWR0(uint8_t Data, int chan)
|
||||
#if 0 /* It seems to work better without this */
|
||||
if (SCC.a[chan].TxEnable) {
|
||||
/* Tx Enabled */
|
||||
SCC.a[chan].TxUnderrun = falseblnr;
|
||||
SCC.a[chan].TxUnderrun = false;
|
||||
|
||||
if (SCC.a[chan].WR[10] & Bit2) {
|
||||
/* Abort/Flag on Underrun */
|
||||
/* Send Abort */
|
||||
SCC.a[chan].TxUnderrun = trueblnr;
|
||||
SCC.a[chan].TxUnderrun = true;
|
||||
#if 0 /* TxBufferEmpty always true */
|
||||
SCC.a[chan].TxBufferEmpty = trueblnr;
|
||||
SCC.a[chan].TxBufferEmpty = true;
|
||||
#endif
|
||||
|
||||
/* Send Flag */
|
||||
@ -1323,26 +1323,26 @@ LOCALPROC SCC_PutWR0(uint8_t Data, int chan)
|
||||
SCC_DbgLogChanCmnd(chan, "Reset Ext/Status Ints");
|
||||
#endif
|
||||
/* happens on boot always */
|
||||
SCC.a[chan].SyncHunt = falseblnr;
|
||||
SCC.a[chan].SyncHunt = false;
|
||||
#if 0 /* only in sync mode */
|
||||
SCC.a[chan].TxUnderrun = falseblnr;
|
||||
SCC.a[chan].TxUnderrun = false;
|
||||
#endif
|
||||
#if 0 /* ZeroCount always false */
|
||||
SCC.a[chan].ZeroCount = falseblnr;
|
||||
SCC.a[chan].ZeroCount = false;
|
||||
#endif
|
||||
#if 0 /* BreakAbort always false */
|
||||
SCC.a[chan].BreakAbort = falseblnr;
|
||||
SCC.a[chan].BreakAbort = false;
|
||||
#endif
|
||||
break;
|
||||
case 3:
|
||||
ReportAbnormalID(0x070C, "Send Abort (SDLC)");
|
||||
#if EmLocalTalk
|
||||
SCC.a[chan].TxBufferEmpty = trueblnr;
|
||||
SCC.a[chan].TxBufferEmpty = true;
|
||||
#endif
|
||||
#if 0
|
||||
SCC.a[chan].TxUnderrun = trueblnr;
|
||||
SCC.a[chan].TxUnderrun = true;
|
||||
#if 0 /* TxBufferEmpty always true */
|
||||
SCC.a[chan].TxBufferEmpty = trueblnr;
|
||||
SCC.a[chan].TxBufferEmpty = true;
|
||||
#endif
|
||||
#endif
|
||||
break;
|
||||
@ -1352,7 +1352,7 @@ LOCALPROC SCC_PutWR0(uint8_t Data, int chan)
|
||||
"Enable Int on next Rx char");
|
||||
#endif
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
SCC.a[chan].FirstChar = trueblnr;
|
||||
SCC.a[chan].FirstChar = true;
|
||||
#endif
|
||||
/* happens in MacCheck */
|
||||
break;
|
||||
@ -1362,7 +1362,7 @@ LOCALPROC SCC_PutWR0(uint8_t Data, int chan)
|
||||
#endif
|
||||
/* happens in MacCheck */
|
||||
/* happens in Print to ImageWriter */
|
||||
SCC.a[chan].TxIP = falseblnr;
|
||||
SCC.a[chan].TxIP = false;
|
||||
CheckSCCInterruptFlag();
|
||||
break;
|
||||
case 6:
|
||||
@ -1371,16 +1371,16 @@ LOCALPROC SCC_PutWR0(uint8_t Data, int chan)
|
||||
#endif
|
||||
/* happens on boot with appletalk on */
|
||||
#if EmLocalTalk
|
||||
SCC.a[chan].EndOfFrame = falseblnr;
|
||||
SCC.a[chan].EndOfFrame = false;
|
||||
#endif
|
||||
#if 0 /* ParityErr always false */
|
||||
SCC.a[chan].ParityErr = falseblnr;
|
||||
SCC.a[chan].ParityErr = false;
|
||||
#endif
|
||||
#if 0 /* RxOverrun always false */
|
||||
SCC.a[chan].RxOverrun = falseblnr;
|
||||
SCC.a[chan].RxOverrun = false;
|
||||
#endif
|
||||
#if 0 /* CRCFramingErr always false */
|
||||
SCC.a[chan].CRCFramingErr = falseblnr;
|
||||
SCC.a[chan].CRCFramingErr = false;
|
||||
#endif
|
||||
break;
|
||||
case 7:
|
||||
@ -1403,7 +1403,7 @@ LOCALPROC SCC_PutWR1(uint8_t Data, int chan)
|
||||
{
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
{
|
||||
blnr NewExtIE = (Data & Bit0) != 0;
|
||||
bool NewExtIE = (Data & Bit0) != 0;
|
||||
if (SCC.a[chan].ExtIE != NewExtIE) {
|
||||
SCC.a[chan].ExtIE = NewExtIE;
|
||||
#if SCC_dolog
|
||||
@ -1419,7 +1419,7 @@ LOCALPROC SCC_PutWR1(uint8_t Data, int chan)
|
||||
#endif
|
||||
|
||||
{
|
||||
blnr NewTxIE = (Data & Bit1) != 0;
|
||||
bool NewTxIE = (Data & Bit1) != 0;
|
||||
if (SCC.a[chan].TxIE != NewTxIE) {
|
||||
#if SCC_dolog
|
||||
SCC_DbgLogChanChngBit(chan, "Tx Int Enable",
|
||||
@ -1434,7 +1434,7 @@ LOCALPROC SCC_PutWR1(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewPrtySpclCond = (Data & Bit2) != 0;
|
||||
bool NewPrtySpclCond = (Data & Bit2) != 0;
|
||||
if (SCC.a[chan].PrtySpclCond != NewPrtySpclCond) {
|
||||
SCC.a[chan].PrtySpclCond = NewPrtySpclCond;
|
||||
#if SCC_dolog
|
||||
@ -1468,7 +1468,7 @@ LOCALPROC SCC_PutWR1(uint8_t Data, int chan)
|
||||
"Rx INT on 1st char"
|
||||
" or special condition");
|
||||
#endif
|
||||
SCC.a[chan].FirstChar = trueblnr;
|
||||
SCC.a[chan].FirstChar = true;
|
||||
/* happens on boot with appletalk on */
|
||||
break;
|
||||
case 2:
|
||||
@ -1491,7 +1491,7 @@ LOCALPROC SCC_PutWR1(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewWaitRqstRT = (Data & Bit5) != 0;
|
||||
bool NewWaitRqstRT = (Data & Bit5) != 0;
|
||||
if (SCC.a[chan].WaitRqstRT != NewWaitRqstRT) {
|
||||
SCC.a[chan].WaitRqstRT = NewWaitRqstRT;
|
||||
#if SCC_dolog
|
||||
@ -1506,7 +1506,7 @@ LOCALPROC SCC_PutWR1(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewWaitRqstSlct = (Data & Bit6) != 0;
|
||||
bool NewWaitRqstSlct = (Data & Bit6) != 0;
|
||||
if (SCC.a[chan].WaitRqstSlct != NewWaitRqstSlct) {
|
||||
SCC.a[chan].WaitRqstSlct = NewWaitRqstSlct;
|
||||
#if SCC_dolog
|
||||
@ -1520,7 +1520,7 @@ LOCALPROC SCC_PutWR1(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewWaitRqstEnbl = (Data & Bit7) != 0;
|
||||
bool NewWaitRqstEnbl = (Data & Bit7) != 0;
|
||||
if (SCC.a[chan].WaitRqstEnbl != NewWaitRqstEnbl) {
|
||||
SCC.a[chan].WaitRqstEnbl = NewWaitRqstEnbl;
|
||||
#if SCC_dolog
|
||||
@ -1636,7 +1636,7 @@ LOCALPROC SCC_PutWR3(uint8_t Data, int chan)
|
||||
#endif
|
||||
/* happens on boot with appletalk on */
|
||||
if (! (SCC.a[chan].SyncHunt)) {
|
||||
SCC.a[chan].SyncHunt = trueblnr;
|
||||
SCC.a[chan].SyncHunt = true;
|
||||
|
||||
#if 0 /* SyncHuntIE usually false */
|
||||
if (SCC.a[chan].SyncHuntIE) {
|
||||
@ -1650,7 +1650,7 @@ LOCALPROC SCC_PutWR3(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewRxCRCEnbl = (Data & Bit3) != 0;
|
||||
bool NewRxCRCEnbl = (Data & Bit3) != 0;
|
||||
if (SCC.a[chan].RxCRCEnbl != NewRxCRCEnbl) {
|
||||
SCC.a[chan].RxCRCEnbl = NewRxCRCEnbl;
|
||||
#if SCC_dolog
|
||||
@ -1664,7 +1664,7 @@ LOCALPROC SCC_PutWR3(uint8_t Data, int chan)
|
||||
|
||||
#if EmLocalTalk || SCC_TrackMore
|
||||
{
|
||||
blnr NewAddrSrchMd = (Data & Bit2) != 0;
|
||||
bool NewAddrSrchMd = (Data & Bit2) != 0;
|
||||
if (SCC.a[chan].AddrSrchMd != NewAddrSrchMd) {
|
||||
SCC.a[chan].AddrSrchMd = NewAddrSrchMd;
|
||||
#if SCC_dolog
|
||||
@ -1678,7 +1678,7 @@ LOCALPROC SCC_PutWR3(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewSyncChrLdInhb = (Data & Bit1) != 0;
|
||||
bool NewSyncChrLdInhb = (Data & Bit1) != 0;
|
||||
if (SCC.a[chan].SyncChrLdInhb != NewSyncChrLdInhb) {
|
||||
SCC.a[chan].SyncChrLdInhb = NewSyncChrLdInhb;
|
||||
#if SCC_dolog
|
||||
@ -1691,7 +1691,7 @@ LOCALPROC SCC_PutWR3(uint8_t Data, int chan)
|
||||
#endif
|
||||
|
||||
{
|
||||
blnr NewRxEnable = (Data & Bit0) != 0;
|
||||
bool NewRxEnable = (Data & Bit0) != 0;
|
||||
if (SCC.a[chan].RxEnable != NewRxEnable) {
|
||||
SCC.a[chan].RxEnable = NewRxEnable;
|
||||
#if SCC_dolog
|
||||
@ -1713,9 +1713,9 @@ LOCALPROC SCC_PutWR3(uint8_t Data, int chan)
|
||||
Go back into the idle state if we were
|
||||
waiting for EOF
|
||||
*/
|
||||
SCC.a[chan].EndOfFrame = falseblnr;
|
||||
SCC.a[chan].RxChrAvail = falseblnr;
|
||||
SCC.a[chan].SyncHunt = trueblnr;
|
||||
SCC.a[chan].EndOfFrame = false;
|
||||
SCC.a[chan].RxChrAvail = false;
|
||||
SCC.a[chan].SyncHunt = true;
|
||||
} else {
|
||||
/* look for a packet */
|
||||
LocalTalkTick();
|
||||
@ -1735,7 +1735,7 @@ LOCALPROC SCC_PutWR4(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewPrtyEnable = (Data & Bit0) != 0;
|
||||
bool NewPrtyEnable = (Data & Bit0) != 0;
|
||||
if (SCC.a[chan].PrtyEnable != NewPrtyEnable) {
|
||||
SCC.a[chan].PrtyEnable = NewPrtyEnable;
|
||||
#if SCC_dolog
|
||||
@ -1748,7 +1748,7 @@ LOCALPROC SCC_PutWR4(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewPrtyEven = (Data & Bit1) != 0;
|
||||
bool NewPrtyEven = (Data & Bit1) != 0;
|
||||
if (SCC.a[chan].PrtyEven != NewPrtyEven) {
|
||||
SCC.a[chan].PrtyEven = NewPrtyEven;
|
||||
#if SCC_dolog
|
||||
@ -1815,7 +1815,7 @@ LOCALPROC SCC_PutWR4(uint8_t Data, int chan)
|
||||
#endif
|
||||
/* happens on boot with appletalk on */
|
||||
#if EmLocalTalk
|
||||
SCC.a[chan].TxBufferEmpty = trueblnr;
|
||||
SCC.a[chan].TxBufferEmpty = true;
|
||||
#endif
|
||||
break;
|
||||
case 3:
|
||||
@ -1867,7 +1867,7 @@ LOCALPROC SCC_PutWR5(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewTxCRCEnbl = (Data & Bit0) != 0;
|
||||
bool NewTxCRCEnbl = (Data & Bit0) != 0;
|
||||
if (SCC.a[chan].TxCRCEnbl != NewTxCRCEnbl) {
|
||||
SCC.a[chan].TxCRCEnbl = NewTxCRCEnbl;
|
||||
#if SCC_dolog
|
||||
@ -1881,7 +1881,7 @@ LOCALPROC SCC_PutWR5(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewRTSctrl = (Data & Bit1) != 0;
|
||||
bool NewRTSctrl = (Data & Bit1) != 0;
|
||||
if (SCC.a[chan].RTSctrl != NewRTSctrl) {
|
||||
SCC.a[chan].RTSctrl = NewRTSctrl;
|
||||
#if SCC_dolog
|
||||
@ -1902,7 +1902,7 @@ LOCALPROC SCC_PutWR5(uint8_t Data, int chan)
|
||||
}
|
||||
|
||||
{
|
||||
blnr NewTxEnable = (Data & Bit3) != 0;
|
||||
bool NewTxEnable = (Data & Bit3) != 0;
|
||||
if (SCC.a[chan].TxEnable != NewTxEnable) {
|
||||
SCC.a[chan].TxEnable = NewTxEnable;
|
||||
#if SCC_dolog
|
||||
@ -1918,7 +1918,7 @@ LOCALPROC SCC_PutWR5(uint8_t Data, int chan)
|
||||
#endif
|
||||
} else {
|
||||
#if EmLocalTalk
|
||||
SCC.a[chan].TxBufferEmpty = trueblnr;
|
||||
SCC.a[chan].TxBufferEmpty = true;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -1926,7 +1926,7 @@ LOCALPROC SCC_PutWR5(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewSndBrkCtrl = (Data & Bit4) != 0;
|
||||
bool NewSndBrkCtrl = (Data & Bit4) != 0;
|
||||
if (SCC.a[chan].SndBrkCtrl != NewSndBrkCtrl) {
|
||||
SCC.a[chan].SndBrkCtrl = NewSndBrkCtrl;
|
||||
#if SCC_dolog
|
||||
@ -1969,7 +1969,7 @@ LOCALPROC SCC_PutWR5(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewDTRctrl = (Data & Bit7) != 0;
|
||||
bool NewDTRctrl = (Data & Bit7) != 0;
|
||||
if (SCC.a[chan].DTRctrl != NewDTRctrl) {
|
||||
SCC.a[chan].DTRctrl = NewDTRctrl;
|
||||
#if SCC_dolog
|
||||
@ -2007,7 +2007,7 @@ LOCALPROC SCC_PutWR6(uint8_t Data, int chan)
|
||||
|
||||
#if EmLocalTalk
|
||||
if (0 != Data) {
|
||||
my_node_address = Data;
|
||||
node_address = Data;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -2065,18 +2065,18 @@ LOCALPROC SCC_PutWR8(uint8_t Data, int chan)
|
||||
}
|
||||
#else
|
||||
#if 0 /* TxBufferEmpty always true */
|
||||
SCC.a[chan].TxBufferEmpty = trueblnr;
|
||||
SCC.a[chan].TxBufferEmpty = true;
|
||||
#endif
|
||||
SCC.a[chan].TxUnderrun = trueblnr; /* underrun ? */
|
||||
SCC.a[chan].TxUnderrun = true; /* underrun ? */
|
||||
#endif
|
||||
|
||||
SCC.a[chan].TxIP = trueblnr;
|
||||
SCC.a[chan].TxIP = true;
|
||||
CheckSCCInterruptFlag();
|
||||
} else {
|
||||
ReportAbnormalID(0x071F,
|
||||
"write when Transmit Buffer not Enabled");
|
||||
#if 0 /* TxBufferEmpty always true */
|
||||
SCC.a[chan].TxBufferEmpty = falseblnr;
|
||||
SCC.a[chan].TxBufferEmpty = false;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -2097,7 +2097,7 @@ LOCALPROC SCC_PutWR9(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewNoVectorSlct = (Data & Bit1) != 0;
|
||||
bool NewNoVectorSlct = (Data & Bit1) != 0;
|
||||
if (SCC.NoVectorSlct != NewNoVectorSlct) {
|
||||
SCC.NoVectorSlct = NewNoVectorSlct;
|
||||
#if SCC_dolog
|
||||
@ -2114,7 +2114,7 @@ LOCALPROC SCC_PutWR9(uint8_t Data, int chan)
|
||||
}
|
||||
|
||||
{
|
||||
blnr NewMIE = (Data & Bit3) != 0;
|
||||
bool NewMIE = (Data & Bit3) != 0;
|
||||
/* has both values on boot always */
|
||||
if (SCC.MIE != NewMIE) {
|
||||
SCC.MIE = NewMIE;
|
||||
@ -2233,7 +2233,7 @@ LOCALPROC SCC_PutWR10(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewCRCPreset = (Data & Bit7) != 0;
|
||||
bool NewCRCPreset = (Data & Bit7) != 0;
|
||||
if (SCC.a[chan].CRCPreset != NewCRCPreset) {
|
||||
SCC.a[chan].CRCPreset = NewCRCPreset;
|
||||
#if SCC_dolog
|
||||
@ -2453,7 +2453,7 @@ LOCALPROC SCC_PutWR14(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewBRGEnbl = (Data & Bit0) != 0;
|
||||
bool NewBRGEnbl = (Data & Bit0) != 0;
|
||||
if (SCC.a[chan].BRGEnbl != NewBRGEnbl) {
|
||||
SCC.a[chan].BRGEnbl = NewBRGEnbl;
|
||||
#if SCC_dolog
|
||||
@ -2568,7 +2568,7 @@ LOCALPROC SCC_PutWR15(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore /* don't care about CTS_IE */
|
||||
{
|
||||
blnr NewCTS_IE = (Data & Bit5) != 0;
|
||||
bool NewCTS_IE = (Data & Bit5) != 0;
|
||||
if (SCC.a[chan].CTS_IE != NewCTS_IE) {
|
||||
SCC.a[chan].CTS_IE = NewCTS_IE;
|
||||
#if SCC_dolog
|
||||
@ -2587,7 +2587,7 @@ LOCALPROC SCC_PutWR15(uint8_t Data, int chan)
|
||||
|
||||
#if SCC_TrackMore
|
||||
{
|
||||
blnr NewBreakAbortIE = (Data & Bit7) != 0;
|
||||
bool NewBreakAbortIE = (Data & Bit7) != 0;
|
||||
if (SCC.a[chan].BreakAbortIE != NewBreakAbortIE) {
|
||||
SCC.a[chan].BreakAbortIE = NewBreakAbortIE;
|
||||
#if SCC_dolog
|
||||
@ -2763,7 +2763,7 @@ LOCALPROC SCC_PutReg(uint8_t Data, int chan, uint8_t SCC_Reg)
|
||||
#endif
|
||||
}
|
||||
|
||||
GLOBALFUNC uint32_t SCC_Access(uint32_t Data, blnr WriteMem, CPTR addr)
|
||||
GLOBALFUNC uint32_t SCC_Access(uint32_t Data, bool WriteMem, CPTR addr)
|
||||
{
|
||||
#if EmLocalTalk
|
||||
/*
|
||||
|
@ -22,9 +22,9 @@
|
||||
|
||||
EXPORTPROC SCC_Reset(void);
|
||||
|
||||
EXPORTFUNC uint32_t SCC_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
EXPORTFUNC uint32_t SCC_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
|
||||
EXPORTFUNC blnr SCC_InterruptsEnabled(void);
|
||||
EXPORTFUNC bool SCC_InterruptsEnabled(void);
|
||||
|
||||
#if EmLocalTalk
|
||||
EXPORTPROC LocalTalkTick(void);
|
||||
|
@ -43,7 +43,7 @@
|
||||
|
||||
GLOBALPROC Screen_EndTickNotify(void)
|
||||
{
|
||||
ui3p screencurrentbuff;
|
||||
uint8_t * screencurrentbuff;
|
||||
|
||||
#if IncludeVidMem
|
||||
screencurrentbuff = VidMem;
|
||||
|
@ -141,7 +141,7 @@ LOCALPROC SCSI_Check(void)
|
||||
}
|
||||
}
|
||||
|
||||
GLOBALFUNC uint32_t SCSI_Access(uint32_t Data, blnr WriteMem, CPTR addr)
|
||||
GLOBALFUNC uint32_t SCSI_Access(uint32_t Data, bool WriteMem, CPTR addr)
|
||||
{
|
||||
if (addr < (kSCSI_Size / 2)) {
|
||||
addr *= 2;
|
||||
|
@ -22,4 +22,4 @@
|
||||
|
||||
EXPORTPROC SCSI_Reset(void);
|
||||
|
||||
EXPORTFUNC uint32_t SCSI_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
EXPORTFUNC uint32_t SCSI_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
|
226
src/SGLUALSA.h
226
src/SGLUALSA.h
@ -237,16 +237,16 @@
|
||||
|
||||
static void *alsa_handle = NULL;
|
||||
|
||||
LOCALVAR blnr DidAlsaLib = falseblnr;
|
||||
LOCALVAR bool DidAlsaLib = false;
|
||||
|
||||
LOCALFUNC blnr HaveAlsaLib(void)
|
||||
LOCALFUNC bool HaveAlsaLib(void)
|
||||
{
|
||||
if (! DidAlsaLib) {
|
||||
alsa_handle = dlopen("libasound.so.2", RTLD_NOW);
|
||||
if (NULL == alsa_handle) {
|
||||
fprintf(stderr, "dlopen libasound failed\n");
|
||||
}
|
||||
DidAlsaLib = trueblnr;
|
||||
DidAlsaLib = true;
|
||||
}
|
||||
return (alsa_handle != NULL);
|
||||
}
|
||||
@ -466,9 +466,9 @@ typedef int (*snd_pcm_open_ProcPtr)
|
||||
(_snd_pcm_t **pcm, const char *name, _snd_pcm_stream_t stream,
|
||||
int mode);
|
||||
LOCALVAR snd_pcm_open_ProcPtr _snd_pcm_open = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_open = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_open = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_open(void)
|
||||
LOCALFUNC bool Have_snd_pcm_open(void)
|
||||
{
|
||||
if (! Did_snd_pcm_open) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -478,16 +478,16 @@ LOCALFUNC blnr Have_snd_pcm_open(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_open failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_open = trueblnr;
|
||||
Did_snd_pcm_open = true;
|
||||
}
|
||||
return (_snd_pcm_open != NULL);
|
||||
}
|
||||
|
||||
typedef int (*snd_pcm_close_ProcPtr)(_snd_pcm_t *pcm);
|
||||
LOCALVAR snd_pcm_close_ProcPtr _snd_pcm_close = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_close = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_close = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_close(void)
|
||||
LOCALFUNC bool Have_snd_pcm_close(void)
|
||||
{
|
||||
if (! Did_snd_pcm_close) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -497,7 +497,7 @@ LOCALFUNC blnr Have_snd_pcm_close(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_close failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_close = trueblnr;
|
||||
Did_snd_pcm_close = true;
|
||||
}
|
||||
return (_snd_pcm_close != NULL);
|
||||
}
|
||||
@ -506,9 +506,9 @@ typedef int (*snd_pcm_hw_params_malloc_ProcPtr)
|
||||
(_snd_pcm_hw_params_t **ptr);
|
||||
LOCALVAR snd_pcm_hw_params_malloc_ProcPtr _snd_pcm_hw_params_malloc
|
||||
= NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_malloc = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_malloc = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_malloc(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_malloc(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_malloc) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -520,7 +520,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_malloc(void)
|
||||
"dlsym snd_pcm_hw_params_malloc failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_malloc = trueblnr;
|
||||
Did_snd_pcm_hw_params_malloc = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_malloc != NULL);
|
||||
}
|
||||
@ -529,9 +529,9 @@ typedef void (*snd_pcm_hw_params_free_ProcPtr)
|
||||
(_snd_pcm_hw_params_t *obj);
|
||||
LOCALVAR snd_pcm_hw_params_free_ProcPtr
|
||||
_snd_pcm_hw_params_free = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_free = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_free = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_free(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_free(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_free) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -542,7 +542,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_free(void)
|
||||
"dlsym snd_pcm_hw_params_free failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_free = trueblnr;
|
||||
Did_snd_pcm_hw_params_free = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_free != NULL);
|
||||
}
|
||||
@ -550,9 +550,9 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_free(void)
|
||||
typedef int (*snd_pcm_hw_params_any_ProcPtr)
|
||||
(_snd_pcm_t *pcm, _snd_pcm_hw_params_t *params);
|
||||
LOCALVAR snd_pcm_hw_params_any_ProcPtr _snd_pcm_hw_params_any = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_any = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_any = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_any(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_any(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_any) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -562,7 +562,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_any(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_hw_params_any failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_any = trueblnr;
|
||||
Did_snd_pcm_hw_params_any = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_any != NULL);
|
||||
}
|
||||
@ -572,9 +572,9 @@ typedef int (*snd_pcm_hw_params_set_access_ProcPtr)
|
||||
_snd_pcm_access_t _access);
|
||||
LOCALVAR snd_pcm_hw_params_set_access_ProcPtr
|
||||
_snd_pcm_hw_params_set_access = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_set_access = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_set_access = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_set_access(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_set_access(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_set_access) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -586,7 +586,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_set_access(void)
|
||||
"dlsym snd_pcm_hw_params_set_access failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_set_access = trueblnr;
|
||||
Did_snd_pcm_hw_params_set_access = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_set_access != NULL);
|
||||
}
|
||||
@ -596,9 +596,9 @@ typedef int (*snd_pcm_hw_params_set_format_ProcPtr)
|
||||
_snd_pcm_format_t val);
|
||||
LOCALVAR snd_pcm_hw_params_set_format_ProcPtr
|
||||
_snd_pcm_hw_params_set_format = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_set_format = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_set_format = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_set_format(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_set_format(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_set_format) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -610,7 +610,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_set_format(void)
|
||||
"dlsym snd_pcm_hw_params_set_format failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_set_format = trueblnr;
|
||||
Did_snd_pcm_hw_params_set_format = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_set_format != NULL);
|
||||
}
|
||||
@ -620,9 +620,9 @@ typedef int (*snd_pcm_hw_params_set_rate_near_ProcPtr)
|
||||
unsigned int *val, int *dir);
|
||||
LOCALVAR snd_pcm_hw_params_set_rate_near_ProcPtr
|
||||
_snd_pcm_hw_params_set_rate_near = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_set_rate_near = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_set_rate_near = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_set_rate_near(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_set_rate_near(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_set_rate_near) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -634,7 +634,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_set_rate_near(void)
|
||||
"dlsym snd_pcm_hw_params_set_rate_near failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_set_rate_near = trueblnr;
|
||||
Did_snd_pcm_hw_params_set_rate_near = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_set_rate_near != NULL);
|
||||
}
|
||||
@ -644,9 +644,9 @@ typedef int (*snd_pcm_hw_params_set_channels_ProcPtr)
|
||||
unsigned int val);
|
||||
LOCALVAR snd_pcm_hw_params_set_channels_ProcPtr
|
||||
_snd_pcm_hw_params_set_channels = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_set_channels = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_set_channels = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_set_channels(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_set_channels(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_set_channels) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -658,7 +658,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_set_channels(void)
|
||||
"dlsym snd_pcm_hw_params_set_channels failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_set_channels = trueblnr;
|
||||
Did_snd_pcm_hw_params_set_channels = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_set_channels != NULL);
|
||||
}
|
||||
@ -668,9 +668,9 @@ typedef int (*snd_pcm_hw_params_set_buffer_size_near_ProcPtr)
|
||||
_snd_pcm_uframes_t *val);
|
||||
LOCALVAR snd_pcm_hw_params_set_buffer_size_near_ProcPtr
|
||||
_snd_pcm_hw_params_set_buffer_size_near = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_set_buffer_size_near = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_set_buffer_size_near = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_set_buffer_size_near(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_set_buffer_size_near(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_set_buffer_size_near) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -684,7 +684,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_set_buffer_size_near(void)
|
||||
" failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_set_buffer_size_near = trueblnr;
|
||||
Did_snd_pcm_hw_params_set_buffer_size_near = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_set_buffer_size_near != NULL);
|
||||
}
|
||||
@ -694,9 +694,9 @@ typedef int (*snd_pcm_hw_params_set_period_size_near_ProcPtr)
|
||||
_snd_pcm_uframes_t *val, int *dir);
|
||||
LOCALVAR snd_pcm_hw_params_set_period_size_near_ProcPtr
|
||||
_snd_pcm_hw_params_set_period_size_near = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params_set_period_size_near = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params_set_period_size_near = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params_set_period_size_near(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params_set_period_size_near(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params_set_period_size_near) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -710,7 +710,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_set_period_size_near(void)
|
||||
" failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params_set_period_size_near = trueblnr;
|
||||
Did_snd_pcm_hw_params_set_period_size_near = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params_set_period_size_near != NULL);
|
||||
}
|
||||
@ -718,9 +718,9 @@ LOCALFUNC blnr Have_snd_pcm_hw_params_set_period_size_near(void)
|
||||
typedef int (*snd_pcm_hw_params_ProcPtr)
|
||||
(_snd_pcm_t *pcm, _snd_pcm_hw_params_t *params);
|
||||
LOCALVAR snd_pcm_hw_params_ProcPtr _snd_pcm_hw_params = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_hw_params = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_hw_params = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_hw_params(void)
|
||||
LOCALFUNC bool Have_snd_pcm_hw_params(void)
|
||||
{
|
||||
if (! Did_snd_pcm_hw_params) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -730,7 +730,7 @@ LOCALFUNC blnr Have_snd_pcm_hw_params(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_hw_params failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_hw_params = trueblnr;
|
||||
Did_snd_pcm_hw_params = true;
|
||||
}
|
||||
return (_snd_pcm_hw_params != NULL);
|
||||
}
|
||||
@ -739,9 +739,9 @@ typedef int (*snd_pcm_sw_params_malloc_ProcPtr)
|
||||
(_snd_pcm_sw_params_t **ptr);
|
||||
LOCALVAR snd_pcm_sw_params_malloc_ProcPtr
|
||||
_snd_pcm_sw_params_malloc = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_sw_params_malloc = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_sw_params_malloc = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_sw_params_malloc(void)
|
||||
LOCALFUNC bool Have_snd_pcm_sw_params_malloc(void)
|
||||
{
|
||||
if (! Did_snd_pcm_sw_params_malloc) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -753,7 +753,7 @@ LOCALFUNC blnr Have_snd_pcm_sw_params_malloc(void)
|
||||
"dlsym snd_pcm_sw_params_malloc failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_sw_params_malloc = trueblnr;
|
||||
Did_snd_pcm_sw_params_malloc = true;
|
||||
}
|
||||
return (_snd_pcm_sw_params_malloc != NULL);
|
||||
}
|
||||
@ -762,9 +762,9 @@ typedef void (*snd_pcm_sw_params_free_ProcPtr)
|
||||
(_snd_pcm_sw_params_t *obj);
|
||||
LOCALVAR snd_pcm_sw_params_free_ProcPtr
|
||||
_snd_pcm_sw_params_free = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_sw_params_free = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_sw_params_free = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_sw_params_free(void)
|
||||
LOCALFUNC bool Have_snd_pcm_sw_params_free(void)
|
||||
{
|
||||
if (! Did_snd_pcm_sw_params_free) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -775,7 +775,7 @@ LOCALFUNC blnr Have_snd_pcm_sw_params_free(void)
|
||||
"dlsym snd_pcm_sw_params_free failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_sw_params_free = trueblnr;
|
||||
Did_snd_pcm_sw_params_free = true;
|
||||
}
|
||||
return (_snd_pcm_sw_params_free != NULL);
|
||||
}
|
||||
@ -784,9 +784,9 @@ typedef int (*snd_pcm_sw_params_current_ProcPtr)
|
||||
(_snd_pcm_t *pcm, _snd_pcm_sw_params_t *params);
|
||||
LOCALVAR snd_pcm_sw_params_current_ProcPtr
|
||||
_snd_pcm_sw_params_current = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_sw_params_current = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_sw_params_current = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_sw_params_current(void)
|
||||
LOCALFUNC bool Have_snd_pcm_sw_params_current(void)
|
||||
{
|
||||
if (! Did_snd_pcm_sw_params_current) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -798,7 +798,7 @@ LOCALFUNC blnr Have_snd_pcm_sw_params_current(void)
|
||||
"dlsym snd_pcm_sw_params_current failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_sw_params_current = trueblnr;
|
||||
Did_snd_pcm_sw_params_current = true;
|
||||
}
|
||||
return (_snd_pcm_sw_params_current != NULL);
|
||||
}
|
||||
@ -808,9 +808,9 @@ typedef int (*snd_pcm_sw_params_set_start_threshold_ProcPtr)
|
||||
_snd_pcm_uframes_t val);
|
||||
LOCALVAR snd_pcm_sw_params_set_start_threshold_ProcPtr
|
||||
_snd_pcm_sw_params_set_start_threshold = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_sw_params_set_start_threshold = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_sw_params_set_start_threshold = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_sw_params_set_start_threshold(void)
|
||||
LOCALFUNC bool Have_snd_pcm_sw_params_set_start_threshold(void)
|
||||
{
|
||||
if (! Did_snd_pcm_sw_params_set_start_threshold) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -824,7 +824,7 @@ LOCALFUNC blnr Have_snd_pcm_sw_params_set_start_threshold(void)
|
||||
" failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_sw_params_set_start_threshold = trueblnr;
|
||||
Did_snd_pcm_sw_params_set_start_threshold = true;
|
||||
}
|
||||
return (_snd_pcm_sw_params_set_start_threshold != NULL);
|
||||
}
|
||||
@ -834,9 +834,9 @@ typedef int (*snd_pcm_sw_params_set_avail_min_ProcPtr)
|
||||
_snd_pcm_uframes_t val);
|
||||
LOCALVAR snd_pcm_sw_params_set_avail_min_ProcPtr
|
||||
_snd_pcm_sw_params_set_avail_min = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_sw_params_set_avail_min = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_sw_params_set_avail_min = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_sw_params_set_avail_min(void)
|
||||
LOCALFUNC bool Have_snd_pcm_sw_params_set_avail_min(void)
|
||||
{
|
||||
if (! Did_snd_pcm_sw_params_set_avail_min) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -848,7 +848,7 @@ LOCALFUNC blnr Have_snd_pcm_sw_params_set_avail_min(void)
|
||||
"dlsym snd_pcm_sw_params_set_avail_min failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_sw_params_set_avail_min = trueblnr;
|
||||
Did_snd_pcm_sw_params_set_avail_min = true;
|
||||
}
|
||||
return (_snd_pcm_sw_params_set_avail_min != NULL);
|
||||
}
|
||||
@ -858,9 +858,9 @@ typedef int (*snd_pcm_sw_params_set_xfer_align_ProcPtr)
|
||||
_snd_pcm_uframes_t val);
|
||||
LOCALVAR snd_pcm_sw_params_set_xfer_align_ProcPtr
|
||||
_snd_pcm_sw_params_set_xfer_align = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_sw_params_set_xfer_align = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_sw_params_set_xfer_align = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_sw_params_set_xfer_align(void)
|
||||
LOCALFUNC bool Have_snd_pcm_sw_params_set_xfer_align(void)
|
||||
{
|
||||
if (! Did_snd_pcm_sw_params_set_xfer_align) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -872,7 +872,7 @@ LOCALFUNC blnr Have_snd_pcm_sw_params_set_xfer_align(void)
|
||||
"dlsym snd_pcm_sw_params_set_xfer_align failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_sw_params_set_xfer_align = trueblnr;
|
||||
Did_snd_pcm_sw_params_set_xfer_align = true;
|
||||
}
|
||||
return (_snd_pcm_sw_params_set_xfer_align != NULL);
|
||||
}
|
||||
@ -880,9 +880,9 @@ LOCALFUNC blnr Have_snd_pcm_sw_params_set_xfer_align(void)
|
||||
typedef int (*snd_pcm_sw_params_ProcPtr)
|
||||
(_snd_pcm_t *pcm, _snd_pcm_sw_params_t *params);
|
||||
LOCALVAR snd_pcm_sw_params_ProcPtr _snd_pcm_sw_params = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_sw_params = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_sw_params = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_sw_params(void)
|
||||
LOCALFUNC bool Have_snd_pcm_sw_params(void)
|
||||
{
|
||||
if (! Did_snd_pcm_sw_params) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -892,7 +892,7 @@ LOCALFUNC blnr Have_snd_pcm_sw_params(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_sw_params failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_sw_params = trueblnr;
|
||||
Did_snd_pcm_sw_params = true;
|
||||
}
|
||||
return (_snd_pcm_sw_params != NULL);
|
||||
}
|
||||
@ -900,9 +900,9 @@ LOCALFUNC blnr Have_snd_pcm_sw_params(void)
|
||||
typedef int (*snd_pcm_nonblock_ProcPtr)
|
||||
(_snd_pcm_t *pcm, int nonblock);
|
||||
LOCALVAR snd_pcm_nonblock_ProcPtr _snd_pcm_nonblock = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_nonblock = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_nonblock = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_nonblock(void)
|
||||
LOCALFUNC bool Have_snd_pcm_nonblock(void)
|
||||
{
|
||||
if (! Did_snd_pcm_nonblock) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -912,16 +912,16 @@ LOCALFUNC blnr Have_snd_pcm_nonblock(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_nonblock failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_nonblock = trueblnr;
|
||||
Did_snd_pcm_nonblock = true;
|
||||
}
|
||||
return (_snd_pcm_nonblock != NULL);
|
||||
}
|
||||
|
||||
typedef _snd_pcm_state_t (*snd_pcm_state_ProcPtr)(_snd_pcm_t *pcm);
|
||||
LOCALVAR snd_pcm_state_ProcPtr _snd_pcm_state = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_state = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_state = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_state(void)
|
||||
LOCALFUNC bool Have_snd_pcm_state(void)
|
||||
{
|
||||
if (! Did_snd_pcm_state) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -931,16 +931,16 @@ LOCALFUNC blnr Have_snd_pcm_state(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_state failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_state = trueblnr;
|
||||
Did_snd_pcm_state = true;
|
||||
}
|
||||
return (_snd_pcm_state != NULL);
|
||||
}
|
||||
|
||||
typedef int (*snd_pcm_prepare_ProcPtr)(_snd_pcm_t *pcm);
|
||||
LOCALVAR snd_pcm_prepare_ProcPtr _snd_pcm_prepare = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_prepare = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_prepare = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_prepare(void)
|
||||
LOCALFUNC bool Have_snd_pcm_prepare(void)
|
||||
{
|
||||
if (! Did_snd_pcm_prepare) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -950,16 +950,16 @@ LOCALFUNC blnr Have_snd_pcm_prepare(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_prepare failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_prepare = trueblnr;
|
||||
Did_snd_pcm_prepare = true;
|
||||
}
|
||||
return (_snd_pcm_prepare != NULL);
|
||||
}
|
||||
|
||||
typedef int (*snd_pcm_start_ProcPtr)(_snd_pcm_t *pcm);
|
||||
LOCALVAR snd_pcm_start_ProcPtr _snd_pcm_start = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_start = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_start = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_start(void)
|
||||
LOCALFUNC bool Have_snd_pcm_start(void)
|
||||
{
|
||||
if (! Did_snd_pcm_start) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -969,16 +969,16 @@ LOCALFUNC blnr Have_snd_pcm_start(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_start failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_start = trueblnr;
|
||||
Did_snd_pcm_start = true;
|
||||
}
|
||||
return (_snd_pcm_start != NULL);
|
||||
}
|
||||
|
||||
typedef int (*snd_pcm_resume_ProcPtr)(_snd_pcm_t *pcm);
|
||||
LOCALVAR snd_pcm_resume_ProcPtr _snd_pcm_resume = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_resume = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_resume = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_resume(void)
|
||||
LOCALFUNC bool Have_snd_pcm_resume(void)
|
||||
{
|
||||
if (! Did_snd_pcm_resume) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -988,7 +988,7 @@ LOCALFUNC blnr Have_snd_pcm_resume(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_resume failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_resume = trueblnr;
|
||||
Did_snd_pcm_resume = true;
|
||||
}
|
||||
return (_snd_pcm_resume != NULL);
|
||||
}
|
||||
@ -996,9 +996,9 @@ LOCALFUNC blnr Have_snd_pcm_resume(void)
|
||||
typedef _snd_pcm_sframes_t (*snd_pcm_avail_update_ProcPtr)
|
||||
(_snd_pcm_t *pcm);
|
||||
LOCALVAR snd_pcm_avail_update_ProcPtr _snd_pcm_avail_update = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_avail_update = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_avail_update = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_avail_update(void)
|
||||
LOCALFUNC bool Have_snd_pcm_avail_update(void)
|
||||
{
|
||||
if (! Did_snd_pcm_avail_update) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -1008,7 +1008,7 @@ LOCALFUNC blnr Have_snd_pcm_avail_update(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_avail_update failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_avail_update = trueblnr;
|
||||
Did_snd_pcm_avail_update = true;
|
||||
}
|
||||
return (_snd_pcm_avail_update != NULL);
|
||||
}
|
||||
@ -1016,9 +1016,9 @@ LOCALFUNC blnr Have_snd_pcm_avail_update(void)
|
||||
typedef _snd_pcm_sframes_t (*snd_pcm_writei_ProcPtr)
|
||||
(_snd_pcm_t *pcm, const void *buffer, _snd_pcm_uframes_t size);
|
||||
LOCALVAR snd_pcm_writei_ProcPtr _snd_pcm_writei = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_writei = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_writei = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_writei(void)
|
||||
LOCALFUNC bool Have_snd_pcm_writei(void)
|
||||
{
|
||||
if (! Did_snd_pcm_writei) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -1028,16 +1028,16 @@ LOCALFUNC blnr Have_snd_pcm_writei(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_writei failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_writei = trueblnr;
|
||||
Did_snd_pcm_writei = true;
|
||||
}
|
||||
return (_snd_pcm_writei != NULL);
|
||||
}
|
||||
|
||||
typedef int (*snd_pcm_drop_ProcPtr)(_snd_pcm_t *pcm);
|
||||
LOCALVAR snd_pcm_drop_ProcPtr _snd_pcm_drop = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_drop = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_drop = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_drop(void)
|
||||
LOCALFUNC bool Have_snd_pcm_drop(void)
|
||||
{
|
||||
if (! Did_snd_pcm_drop) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -1047,7 +1047,7 @@ LOCALFUNC blnr Have_snd_pcm_drop(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_drop failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_drop = trueblnr;
|
||||
Did_snd_pcm_drop = true;
|
||||
}
|
||||
return (_snd_pcm_drop != NULL);
|
||||
}
|
||||
@ -1056,9 +1056,9 @@ LOCALFUNC blnr Have_snd_pcm_drop(void)
|
||||
typedef int (*snd_pcm_status_malloc_ProcPtr)
|
||||
(_snd_pcm_status_t **ptr);
|
||||
LOCALVAR snd_pcm_status_malloc_ProcPtr _snd_pcm_status_malloc = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_status_malloc = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_status_malloc = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_status_malloc(void)
|
||||
LOCALFUNC bool Have_snd_pcm_status_malloc(void)
|
||||
{
|
||||
if (! Did_snd_pcm_status_malloc) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -1068,7 +1068,7 @@ LOCALFUNC blnr Have_snd_pcm_status_malloc(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_status_malloc failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_status_malloc = trueblnr;
|
||||
Did_snd_pcm_status_malloc = true;
|
||||
}
|
||||
return (_snd_pcm_status_malloc != NULL);
|
||||
}
|
||||
@ -1078,9 +1078,9 @@ LOCALFUNC blnr Have_snd_pcm_status_malloc(void)
|
||||
typedef int (*snd_pcm_status_ProcPtr)(_snd_pcm_t *pcm,
|
||||
_snd_pcm_status_t *status);
|
||||
LOCALVAR snd_pcm_status_ProcPtr _snd_pcm_status = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_status = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_status = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_status(void)
|
||||
LOCALFUNC bool Have_snd_pcm_status(void)
|
||||
{
|
||||
if (! Did_snd_pcm_status) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -1090,7 +1090,7 @@ LOCALFUNC blnr Have_snd_pcm_status(void)
|
||||
fprintf(stderr, "dlsym snd_pcm_status failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_status = trueblnr;
|
||||
Did_snd_pcm_status = true;
|
||||
}
|
||||
return (_snd_pcm_status != NULL);
|
||||
}
|
||||
@ -1101,9 +1101,9 @@ typedef _snd_pcm_uframes_t (*snd_pcm_status_get_avail_ProcPtr)
|
||||
(const _snd_pcm_status_t *obj);
|
||||
LOCALVAR snd_pcm_status_get_avail_ProcPtr
|
||||
_snd_pcm_status_get_avail = NULL;
|
||||
LOCALVAR blnr Did_snd_pcm_status_get_avail = falseblnr;
|
||||
LOCALVAR bool Did_snd_pcm_status_get_avail = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_pcm_status_get_avail(void)
|
||||
LOCALFUNC bool Have_snd_pcm_status_get_avail(void)
|
||||
{
|
||||
if (! Did_snd_pcm_status_get_avail) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -1115,7 +1115,7 @@ LOCALFUNC blnr Have_snd_pcm_status_get_avail(void)
|
||||
"dlsym snd_pcm_status_get_avail failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_pcm_status_get_avail = trueblnr;
|
||||
Did_snd_pcm_status_get_avail = true;
|
||||
}
|
||||
return (_snd_pcm_status_get_avail != NULL);
|
||||
}
|
||||
@ -1123,9 +1123,9 @@ LOCALFUNC blnr Have_snd_pcm_status_get_avail(void)
|
||||
|
||||
typedef const char * (*snd_strerror_ProcPtr)(int errnum);
|
||||
LOCALVAR snd_strerror_ProcPtr _snd_strerror = NULL;
|
||||
LOCALVAR blnr Did_snd_strerror = falseblnr;
|
||||
LOCALVAR bool Did_snd_strerror = false;
|
||||
|
||||
LOCALFUNC blnr Have_snd_strerror(void)
|
||||
LOCALFUNC bool Have_snd_strerror(void)
|
||||
{
|
||||
if (! Did_snd_strerror) {
|
||||
if (HaveAlsaLib()) {
|
||||
@ -1135,7 +1135,7 @@ LOCALFUNC blnr Have_snd_strerror(void)
|
||||
fprintf(stderr, "dlsym snd_strerror failed\n");
|
||||
}
|
||||
}
|
||||
Did_snd_strerror = trueblnr;
|
||||
Did_snd_strerror = true;
|
||||
}
|
||||
return (_snd_strerror != NULL);
|
||||
}
|
||||
@ -1176,27 +1176,27 @@ LOCALVAR _snd_pcm_uframes_t buffer_size;
|
||||
LOCALVAR _snd_pcm_uframes_t period_size;
|
||||
|
||||
|
||||
LOCALVAR blnr Sound_StartPend = falseblnr;
|
||||
LOCALVAR bool Sound_StartPend = false;
|
||||
|
||||
#if RaspbianWorkAround
|
||||
LOCALVAR _snd_pcm_status_t *my_status = NULL;
|
||||
LOCALVAR _snd_pcm_status_t *status = NULL;
|
||||
|
||||
LOCALFUNC blnr HaveStatusAlloc(void)
|
||||
LOCALFUNC bool HaveStatusAlloc(void)
|
||||
{
|
||||
if (NULL == my_status) {
|
||||
if (NULL == status) {
|
||||
if (Have_snd_pcm_status_malloc())
|
||||
if (Have_snd_pcm_status())
|
||||
if (Have_snd_pcm_status_get_avail())
|
||||
{
|
||||
if (_snd_pcm_status_malloc(&my_status) < 0) {
|
||||
my_status = NULL; /* just to make sure */
|
||||
if (_snd_pcm_status_malloc(&status) < 0) {
|
||||
status = NULL; /* just to make sure */
|
||||
} else {
|
||||
/* snd_pcm_status_free(my_status); */
|
||||
/* snd_pcm_status_free(status); */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return NULL != my_status;
|
||||
return NULL != status;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1213,7 +1213,7 @@ label_retry:
|
||||
if (_SND_PCM_STATE_PREPARED == cur_state) {
|
||||
if (! Sound_StartPend) {
|
||||
if (TheFillOffset - ThePlayOffset >= kAllBuffLen) {
|
||||
Sound_StartPend = trueblnr;
|
||||
Sound_StartPend = true;
|
||||
}
|
||||
}
|
||||
if (Sound_StartPend) {
|
||||
@ -1270,8 +1270,8 @@ label_retry:
|
||||
*/
|
||||
/* work around bug observed in Raspbian */
|
||||
if (HaveStatusAlloc()) {
|
||||
if (_snd_pcm_status(pcm_handle, my_status) >= 0) {
|
||||
avail = _snd_pcm_status_get_avail(my_status);
|
||||
if (_snd_pcm_status(pcm_handle, status) >= 0) {
|
||||
avail = _snd_pcm_status_get_avail(status);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1331,7 +1331,7 @@ label_retry:
|
||||
goto label_retry;
|
||||
}
|
||||
} else if (Sound_StartPend) {
|
||||
Sound_StartPend = falseblnr;
|
||||
Sound_StartPend = false;
|
||||
if ((err = _snd_pcm_start(pcm_handle)) < 0) {
|
||||
fprintf(stderr, "pcm start error: %s\n",
|
||||
_snd_strerror(err));
|
||||
@ -1355,9 +1355,9 @@ LOCALPROC Sound_Stop(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr HaveAlsaRoutines(void)
|
||||
LOCALFUNC bool HaveAlsaRoutines(void)
|
||||
{
|
||||
blnr IsOk = falseblnr;
|
||||
bool IsOk = false;
|
||||
|
||||
if (Have_snd_pcm_open())
|
||||
if (Have_snd_pcm_close())
|
||||
@ -1387,7 +1387,7 @@ LOCALFUNC blnr HaveAlsaRoutines(void)
|
||||
if (Have_snd_pcm_drop())
|
||||
if (Have_snd_strerror())
|
||||
{
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
}
|
||||
|
||||
return IsOk;
|
||||
@ -1577,13 +1577,13 @@ label_done:
|
||||
;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sound_Init(void)
|
||||
LOCALFUNC bool Sound_Init(void)
|
||||
{
|
||||
if (HaveAlsaRoutines()) {
|
||||
Sound_Init0();
|
||||
}
|
||||
|
||||
return trueblnr; /* keep going, even if no sound */
|
||||
return true; /* keep going, even if no sound */
|
||||
}
|
||||
|
||||
LOCALPROC Sound_UnInit(void)
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
LOCALVAR int audio_fd = -1;
|
||||
LOCALVAR blnr audio_started;
|
||||
LOCALVAR bool audio_started;
|
||||
|
||||
#if 4 == kLn2SoundSampSz
|
||||
LOCALPROC ConvertSoundBlockToNative(tpSoundSamp p)
|
||||
@ -62,7 +62,7 @@ label_retry:
|
||||
/* fprintf(stderr, "buffer used %d\n", (int)used); */
|
||||
} else {
|
||||
if (PrivateBuffUsed >= kAllBuffLen - kOneBuffLen) {
|
||||
audio_started = trueblnr;
|
||||
audio_started = true;
|
||||
} else {
|
||||
info.bytes = 0;
|
||||
}
|
||||
@ -123,7 +123,7 @@ LOCALPROC Sound_Start(void)
|
||||
{
|
||||
if (audio_fd >= 0) {
|
||||
Sound_Start0();
|
||||
audio_started = falseblnr;
|
||||
audio_started = false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -145,9 +145,9 @@ LOCALPROC Sound_Stop(void)
|
||||
#define DesiredFormat AFMT_U8
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr Sound_Init(void)
|
||||
LOCALFUNC bool Sound_Init(void)
|
||||
{
|
||||
blnr IsOk = falseblnr;
|
||||
bool IsOk = false;
|
||||
|
||||
audio_fd = open(AudioDevPath, O_WRONLY, 0);
|
||||
if (audio_fd < 0) {
|
||||
@ -187,7 +187,7 @@ LOCALFUNC blnr Sound_Init(void)
|
||||
fprintf(stderr, "SNDCTL_DSP_SPEED fails\n");
|
||||
} else
|
||||
{
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
}
|
||||
|
||||
if (! IsOk) {
|
||||
@ -196,7 +196,7 @@ LOCALFUNC blnr Sound_Init(void)
|
||||
}
|
||||
}
|
||||
|
||||
return trueblnr; /* keep going, even if no sound */
|
||||
return true; /* keep going, even if no sound */
|
||||
}
|
||||
|
||||
LOCALPROC Sound_UnInit(void)
|
||||
|
@ -117,7 +117,7 @@ GLOBALPROC MacSound_SubTick(int SubTick)
|
||||
#endif
|
||||
kSnd_Main_Buffer;
|
||||
#ifndef ln2mtb
|
||||
ui3p addr = addy + (2 * StartOffset) + RAM;
|
||||
uint8_t * addr = addy + (2 * StartOffset) + RAM;
|
||||
#else
|
||||
CPTR addr = addy + (2 * StartOffset);
|
||||
#endif
|
||||
|
@ -51,7 +51,7 @@ LOCALVAR uint32_t vSonyMountedMask = 0;
|
||||
#define vSonyIsMounted(Drive_No) \
|
||||
((vSonyMountedMask & ((uint32_t)1 << (Drive_No))) != 0)
|
||||
|
||||
LOCALFUNC blnr vSonyNextPendingInsert0(tDrive *Drive_No)
|
||||
LOCALFUNC bool vSonyNextPendingInsert0(tDrive *Drive_No)
|
||||
{
|
||||
/* find next drive to Mount */
|
||||
uint32_t MountPending = vSonyInsertedMask & (~ vSonyMountedMask);
|
||||
@ -60,12 +60,12 @@ LOCALFUNC blnr vSonyNextPendingInsert0(tDrive *Drive_No)
|
||||
for (i = 0; i < NumDrives; ++i) {
|
||||
if ((MountPending & ((uint32_t)1 << i)) != 0) {
|
||||
*Drive_No = i;
|
||||
return trueblnr; /* only one disk at a time */
|
||||
return true; /* only one disk at a time */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr CheckReadableDrive(tDrive Drive_No)
|
||||
@ -83,7 +83,7 @@ LOCALFUNC tMacErr CheckReadableDrive(tDrive Drive_No)
|
||||
return result;
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr vSonyTransferVM(blnr IsWrite,
|
||||
LOCALFUNC tMacErr vSonyTransferVM(bool IsWrite,
|
||||
CPTR Buffera, tDrive Drive_No,
|
||||
uint32_t Sony_Start, uint32_t Sony_Count, uint32_t *Sony_ActCount)
|
||||
{
|
||||
@ -95,7 +95,7 @@ LOCALFUNC tMacErr vSonyTransferVM(blnr IsWrite,
|
||||
tMacErr result;
|
||||
uint32_t contig;
|
||||
uint32_t actual;
|
||||
ui3p Buffer;
|
||||
uint8_t * Buffer;
|
||||
uint32_t offset = Sony_Start;
|
||||
uint32_t n = Sony_Count;
|
||||
|
||||
@ -126,17 +126,17 @@ label_1:
|
||||
|
||||
LOCALPROC MoveBytesVM(CPTR srcPtr, CPTR dstPtr, int32_t byteCount)
|
||||
{
|
||||
ui3p src;
|
||||
ui3p dst;
|
||||
uint8_t * src;
|
||||
uint8_t * dst;
|
||||
uint32_t contigSrc;
|
||||
uint32_t contigDst;
|
||||
uint32_t contig;
|
||||
|
||||
label_1:
|
||||
if (0 != byteCount) {
|
||||
src = get_real_address0(byteCount, falseblnr, srcPtr,
|
||||
src = get_real_address0(byteCount, false, srcPtr,
|
||||
&contigSrc);
|
||||
dst = get_real_address0(byteCount, trueblnr, dstPtr,
|
||||
dst = get_real_address0(byteCount, true, dstPtr,
|
||||
&contigDst);
|
||||
if ((0 == contigSrc) || (0 == contigDst)) {
|
||||
ReportAbnormalID(0x0901, "MoveBytesVM fails");
|
||||
@ -195,7 +195,7 @@ LOCALFUNC tMacErr DC42BlockChecksum(tDrive Drive_No,
|
||||
n = remaining;
|
||||
}
|
||||
|
||||
result = vSonyTransfer(falseblnr, Buffer, Drive_No, offset,
|
||||
result = vSonyTransfer(false, Buffer, Drive_No, offset,
|
||||
n, nullpr);
|
||||
if (mnvm_noErr != result) {
|
||||
return result;
|
||||
@ -278,7 +278,7 @@ LOCALPROC Drive_UpdateChecksums(tDrive Drive_No)
|
||||
#endif
|
||||
|
||||
/* write Checksums */
|
||||
vSonyTransfer(trueblnr, Buffer, Drive_No,
|
||||
vSonyTransfer(true, Buffer, Drive_No,
|
||||
kDC42offset_dataChecksum, Sony_Count, nullpr);
|
||||
}
|
||||
#endif
|
||||
@ -320,9 +320,9 @@ LOCALFUNC tMacErr vSonyNextPendingInsert(tDrive *Drive_No)
|
||||
uint32_t TagSize0;
|
||||
uint8_t Temp[checkheadersize];
|
||||
uint32_t Sony_Count = checkheadersize;
|
||||
blnr gotFormat = falseblnr;
|
||||
bool gotFormat = false;
|
||||
|
||||
result = vSonyTransfer(falseblnr, Temp, i,
|
||||
result = vSonyTransfer(false, Temp, i,
|
||||
checkheaderoffset, Sony_Count, nullpr);
|
||||
if (mnvm_noErr == result) {
|
||||
#if Sony_SupportDC42
|
||||
@ -345,12 +345,12 @@ LOCALFUNC tMacErr vSonyNextPendingInsert(tDrive *Drive_No)
|
||||
{
|
||||
if (0 == TagSize0) {
|
||||
/* no tags */
|
||||
gotFormat = trueblnr;
|
||||
gotFormat = true;
|
||||
} else if ((DataSize0 >> 9) * 12
|
||||
== TagSize0)
|
||||
{
|
||||
/* 12 byte tags */
|
||||
gotFormat = trueblnr;
|
||||
gotFormat = true;
|
||||
}
|
||||
if (gotFormat) {
|
||||
#if Sony_VerifyChecksums /* mostly useful to check the Checksum code */
|
||||
@ -469,7 +469,7 @@ GLOBALPROC Sony_Update (void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr Drive_Transfer(blnr IsWrite, CPTR Buffera,
|
||||
LOCALFUNC tMacErr Drive_Transfer(bool IsWrite, CPTR Buffera,
|
||||
tDrive Drive_No, uint32_t Sony_Start, uint32_t Sony_Count,
|
||||
uint32_t *Sony_ActCount)
|
||||
{
|
||||
@ -490,12 +490,12 @@ LOCALFUNC tMacErr Drive_Transfer(blnr IsWrite, CPTR Buffera,
|
||||
if (Sony_Start > DataSize) {
|
||||
result = mnvm_eofErr;
|
||||
} else {
|
||||
blnr hit_eof = falseblnr;
|
||||
bool hit_eof = false;
|
||||
uint32_t L = DataSize - Sony_Start;
|
||||
if (L >= Sony_Count) {
|
||||
L = Sony_Count;
|
||||
} else {
|
||||
hit_eof = trueblnr;
|
||||
hit_eof = true;
|
||||
}
|
||||
result = vSonyTransferVM(IsWrite, Buffera, Drive_No,
|
||||
ImageDataOffset[Drive_No] + Sony_Start, L,
|
||||
@ -510,11 +510,11 @@ LOCALFUNC tMacErr Drive_Transfer(blnr IsWrite, CPTR Buffera,
|
||||
return result;
|
||||
}
|
||||
|
||||
LOCALVAR blnr QuitOnEject = falseblnr;
|
||||
LOCALVAR bool QuitOnEject = false;
|
||||
|
||||
GLOBALPROC Sony_SetQuitOnEject(void)
|
||||
{
|
||||
QuitOnEject = trueblnr;
|
||||
QuitOnEject = true;
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr Drive_Eject(tDrive Drive_No)
|
||||
@ -530,7 +530,7 @@ LOCALFUNC tMacErr Drive_Eject(tDrive Drive_No)
|
||||
result = vSonyEject(Drive_No);
|
||||
if (QuitOnEject != 0) {
|
||||
if (! AnyDiskInserted()) {
|
||||
ForceMacOff = trueblnr;
|
||||
ForceMacOff = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -575,7 +575,7 @@ GLOBALPROC Sony_EjectAllDisks(void)
|
||||
GLOBALPROC Sony_Reset(void)
|
||||
{
|
||||
DelayUntilNextInsert = 0;
|
||||
QuitOnEject = falseblnr;
|
||||
QuitOnEject = false;
|
||||
MountCallBack = 0;
|
||||
}
|
||||
|
||||
@ -638,7 +638,7 @@ GLOBALPROC ExtnDisk_Access(CPTR p)
|
||||
uint32_t Sony_Start = get_vm_long(p + kParamDiskStart);
|
||||
uint32_t Sony_Count = get_vm_long(p + kParamDiskCount);
|
||||
|
||||
result = Drive_Transfer(falseblnr, Buffera, Drive_No,
|
||||
result = Drive_Transfer(false, Buffera, Drive_No,
|
||||
Sony_Start, Sony_Count, &Sony_ActCount);
|
||||
|
||||
put_vm_long(p + kParamDiskCount, Sony_ActCount);
|
||||
@ -652,7 +652,7 @@ GLOBALPROC ExtnDisk_Access(CPTR p)
|
||||
uint32_t Sony_Start = get_vm_long(p + kParamDiskStart);
|
||||
uint32_t Sony_Count = get_vm_long(p + kParamDiskCount);
|
||||
|
||||
result = Drive_Transfer(trueblnr, Buffera, Drive_No,
|
||||
result = Drive_Transfer(true, Buffera, Drive_No,
|
||||
Sony_Start, Sony_Count, &Sony_ActCount);
|
||||
|
||||
put_vm_long(p + kParamDiskCount, Sony_ActCount);
|
||||
@ -685,7 +685,7 @@ GLOBALPROC ExtnDisk_Access(CPTR p)
|
||||
result = mnvm_noErr;
|
||||
break;
|
||||
case kCmndDiskQuitOnEject:
|
||||
QuitOnEject = trueblnr;
|
||||
QuitOnEject = true;
|
||||
result = mnvm_noErr;
|
||||
break;
|
||||
case kCmndDiskFeatures:
|
||||
@ -742,7 +742,7 @@ GLOBALPROC ExtnDisk_Access(CPTR p)
|
||||
if (Pbuf_No != NotAPbuf) {
|
||||
result = CheckPbuf(Pbuf_No);
|
||||
if (mnvm_noErr == result) {
|
||||
vSonyNewDiskWanted = trueblnr;
|
||||
vSonyNewDiskWanted = true;
|
||||
vSonyNewDiskSize = count;
|
||||
#if IncludeSonyNameNew
|
||||
if (vSonyNewDiskName != NotAPbuf) {
|
||||
@ -756,7 +756,7 @@ GLOBALPROC ExtnDisk_Access(CPTR p)
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
vSonyNewDiskWanted = trueblnr;
|
||||
vSonyNewDiskWanted = true;
|
||||
vSonyNewDiskSize = count;
|
||||
}
|
||||
}
|
||||
@ -1036,7 +1036,7 @@ LOCALFUNC tMacErr Sony_Mount(CPTR p)
|
||||
|
||||
#if Sony_SupportTags
|
||||
LOCALFUNC tMacErr Sony_PrimeTags(tDrive Drive_No,
|
||||
uint32_t Sony_Start, uint32_t Sony_Count, blnr IsWrite)
|
||||
uint32_t Sony_Start, uint32_t Sony_Count, bool IsWrite)
|
||||
{
|
||||
tMacErr result = mnvm_noErr;
|
||||
uint32_t TagOffset = ImageTagOffset[Drive_No];
|
||||
@ -1059,14 +1059,14 @@ LOCALFUNC tMacErr Sony_PrimeTags(tDrive Drive_No,
|
||||
/* only need to read the last block tags */
|
||||
uint32_t count = 12;
|
||||
TagOffset += 12 * (n - 1);
|
||||
result = vSonyTransferVM(falseblnr, 0x02FC, Drive_No,
|
||||
result = vSonyTransferVM(false, 0x02FC, Drive_No,
|
||||
TagOffset, count, nullpr);
|
||||
} else {
|
||||
uint32_t count = 12;
|
||||
uint16_t BufTgFBkNum = get_vm_word(0x0302);
|
||||
do {
|
||||
put_vm_word(0x0302, BufTgFBkNum);
|
||||
result = vSonyTransferVM(trueblnr, 0x02FC, Drive_No,
|
||||
result = vSonyTransferVM(true, 0x02FC, Drive_No,
|
||||
TagOffset, count, nullpr);
|
||||
if (mnvm_noErr != result) {
|
||||
goto label_fail;
|
||||
@ -1114,7 +1114,7 @@ LOCALFUNC tMacErr Sony_Prime(CPTR p)
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
blnr IsWrite = (0 != (IOTrap & 0x0001));
|
||||
bool IsWrite = (0 != (IOTrap & 0x0001));
|
||||
uint8_t DiskInPlaceV = get_vm_byte(dvl + kDiskInPlace);
|
||||
|
||||
if (DiskInPlaceV != 0x02) {
|
||||
@ -1355,7 +1355,7 @@ LOCALFUNC tMacErr Sony_Control(CPTR p)
|
||||
|
||||
if (get_vm_word(dvl + kQType) != 0) {
|
||||
put_vm_long(ParamBlk + kcsParam,
|
||||
my_disk_icon_addr);
|
||||
disk_icon_addr);
|
||||
result = mnvm_noErr;
|
||||
} else {
|
||||
result = mnvm_controlErr;
|
||||
|
@ -24,13 +24,10 @@
|
||||
#define SYSDEPNS_H
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include "CNFGGLOB.h"
|
||||
|
||||
|
||||
typedef uint8_t *ui3p;
|
||||
typedef uint16_t *ui4p;
|
||||
typedef uint32_t *ui5p;
|
||||
|
||||
/*
|
||||
Largest efficiently supported
|
||||
representation types. uimr should be
|
||||
@ -40,27 +37,23 @@ typedef uint32_t *ui5p;
|
||||
typedef uint32_t uimr;
|
||||
typedef int32_t simr;
|
||||
|
||||
#define blnr uint8_t
|
||||
#define trueblnr 1
|
||||
#define falseblnr 0
|
||||
|
||||
#define nullpr ((void *) 0)
|
||||
|
||||
#define anyp ui3p
|
||||
#define anyp uint8_t *
|
||||
|
||||
/* pascal string, single byte characters */
|
||||
#define ps3p ui3p
|
||||
#define ps3p uint8_t *
|
||||
|
||||
#ifndef MayInline
|
||||
#define MayInline
|
||||
#endif
|
||||
|
||||
#ifndef my_reg_call
|
||||
#define my_reg_call
|
||||
#ifndef reg_call
|
||||
#define reg_call
|
||||
#endif
|
||||
|
||||
#ifndef my_osglu_call
|
||||
#define my_osglu_call
|
||||
#ifndef osglu_call
|
||||
#define osglu_call
|
||||
#endif
|
||||
|
||||
#define LOCALVAR static
|
||||
@ -97,10 +90,10 @@ typedef int32_t simr;
|
||||
#define LOCALFUNCUSEDONCE LOCALINLINEFUNC
|
||||
#define LOCALPROCUSEDONCE LOCALINLINEPROC
|
||||
|
||||
#define GLOBALOSGLUFUNC GLOBALFUNC my_osglu_call
|
||||
#define EXPORTOSGLUFUNC EXPORTFUNC my_osglu_call
|
||||
#define GLOBALOSGLUPROC GLOBALFUNC my_osglu_call void
|
||||
#define EXPORTOSGLUPROC EXPORTFUNC my_osglu_call void
|
||||
#define GLOBALOSGLUFUNC GLOBALFUNC osglu_call
|
||||
#define EXPORTOSGLUFUNC EXPORTFUNC osglu_call
|
||||
#define GLOBALOSGLUPROC GLOBALFUNC osglu_call void
|
||||
#define EXPORTOSGLUPROC EXPORTFUNC osglu_call void
|
||||
/*
|
||||
For functions in operating system glue that
|
||||
are called by rest of program.
|
||||
@ -119,24 +112,12 @@ typedef int32_t simr;
|
||||
#define LittleEndianUnaligned 0
|
||||
#endif
|
||||
|
||||
#ifndef uint8_tr
|
||||
#define uint8_tr uint8_t
|
||||
#ifndef align_8
|
||||
#define align_8
|
||||
#endif
|
||||
|
||||
#ifndef uint16_tr
|
||||
#define uint16_tr uint16_t
|
||||
#endif
|
||||
|
||||
#ifndef int32_tr
|
||||
#define int32_tr int32_t
|
||||
#endif
|
||||
|
||||
#ifndef my_align_8
|
||||
#define my_align_8
|
||||
#endif
|
||||
|
||||
#ifndef my_cond_rare
|
||||
#define my_cond_rare(x) (x)
|
||||
#ifndef cond_rare
|
||||
#define cond_rare(x) (x)
|
||||
#endif
|
||||
|
||||
#ifndef Have_ASR
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -48,13 +48,13 @@ EXPORTOSGLUPROC dbglog_writeln(char *s);
|
||||
EXPORTOSGLUPROC dbglog_writelnNum(char *s, simr v);
|
||||
#endif
|
||||
|
||||
EXPORTOSGLUPROC ReserveAllocOneBlock(ui3p *p, uimr n, uint8_t align,
|
||||
blnr FillOnes);
|
||||
EXPORTOSGLUPROC ReserveAllocOneBlock(uint8_t * *p, uimr n, uint8_t align,
|
||||
bool FillOnes);
|
||||
|
||||
EXPORTOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount);
|
||||
|
||||
|
||||
EXPORTVAR(ui3p, ROM)
|
||||
EXPORTVAR(uint8_t *, ROM)
|
||||
|
||||
/*
|
||||
error codes returned by Mini vMac extensions
|
||||
@ -113,8 +113,8 @@ EXPORTOSGLUFUNC tMacErr PbufGetSize(tPbuf Pbuf_No, uint32_t *Count);
|
||||
|
||||
EXPORTOSGLUFUNC tMacErr PbufNew(uint32_t count, tPbuf *r);
|
||||
EXPORTOSGLUPROC PbufDispose(tPbuf i);
|
||||
EXPORTOSGLUPROC PbufTransfer(ui3p Buffer,
|
||||
tPbuf i, uint32_t offset, uint32_t count, blnr IsWrite);
|
||||
EXPORTOSGLUPROC PbufTransfer(uint8_t * Buffer,
|
||||
tPbuf i, uint32_t offset, uint32_t count, bool IsWrite);
|
||||
|
||||
#endif
|
||||
|
||||
@ -126,21 +126,21 @@ EXPORTVAR(uint32_t, vSonyInsertedMask)
|
||||
#define vSonyIsInserted(Drive_No) \
|
||||
((vSonyInsertedMask & ((uint32_t)1 << (Drive_No))) != 0)
|
||||
|
||||
EXPORTOSGLUFUNC tMacErr vSonyTransfer(blnr IsWrite, ui3p Buffer,
|
||||
EXPORTOSGLUFUNC tMacErr vSonyTransfer(bool IsWrite, uint8_t * Buffer,
|
||||
tDrive Drive_No, uint32_t Sony_Start, uint32_t Sony_Count,
|
||||
uint32_t *Sony_ActCount);
|
||||
EXPORTOSGLUFUNC tMacErr vSonyEject(tDrive Drive_No);
|
||||
EXPORTOSGLUFUNC tMacErr vSonyGetSize(tDrive Drive_No, uint32_t *Sony_Count);
|
||||
|
||||
EXPORTOSGLUFUNC blnr AnyDiskInserted(void);
|
||||
EXPORTOSGLUFUNC bool AnyDiskInserted(void);
|
||||
EXPORTOSGLUPROC DiskRevokeWritable(tDrive Drive_No);
|
||||
|
||||
#if IncludeSonyRawMode
|
||||
EXPORTVAR(blnr, vSonyRawMode)
|
||||
EXPORTVAR(bool, vSonyRawMode)
|
||||
#endif
|
||||
|
||||
#if IncludeSonyNew
|
||||
EXPORTVAR(blnr, vSonyNewDiskWanted)
|
||||
EXPORTVAR(bool, vSonyNewDiskWanted)
|
||||
EXPORTVAR(uint32_t, vSonyNewDiskSize)
|
||||
EXPORTOSGLUFUNC tMacErr vSonyEjectDelete(tDrive Drive_No);
|
||||
#endif
|
||||
@ -182,12 +182,12 @@ EXPORTVAR(uint32_t, CurMacDelta)
|
||||
#define vMacScreenMonoByteWidth ((long)vMacScreenWidth / 8)
|
||||
|
||||
#if 0 != vMacScreenDepth
|
||||
EXPORTVAR(blnr, UseColorMode)
|
||||
EXPORTVAR(blnr, ColorModeWorks)
|
||||
EXPORTVAR(bool, UseColorMode)
|
||||
EXPORTVAR(bool, ColorModeWorks)
|
||||
#endif
|
||||
|
||||
#if 0 != vMacScreenDepth
|
||||
EXPORTVAR(blnr, ColorMappingChanged)
|
||||
EXPORTVAR(bool, ColorMappingChanged)
|
||||
#endif
|
||||
|
||||
#if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
|
||||
@ -198,24 +198,24 @@ EXPORTVAR(uint16_t, CLUT_greens[CLUT_size])
|
||||
EXPORTVAR(uint16_t, CLUT_blues[CLUT_size])
|
||||
#endif
|
||||
|
||||
EXPORTVAR(blnr, EmVideoDisable)
|
||||
EXPORTVAR(bool, EmVideoDisable)
|
||||
EXPORTVAR(int8_t, EmLagTime)
|
||||
|
||||
EXPORTOSGLUPROC Screen_OutputFrame(ui3p screencurrentbuff);
|
||||
EXPORTOSGLUPROC Screen_OutputFrame(uint8_t * screencurrentbuff);
|
||||
EXPORTOSGLUPROC DoneWithDrawingForTick(void);
|
||||
|
||||
EXPORTVAR(blnr, ForceMacOff)
|
||||
EXPORTVAR(bool, ForceMacOff)
|
||||
|
||||
EXPORTVAR(blnr, WantMacInterrupt)
|
||||
EXPORTVAR(bool, WantMacInterrupt)
|
||||
|
||||
EXPORTVAR(blnr, WantMacReset)
|
||||
EXPORTVAR(bool, WantMacReset)
|
||||
|
||||
EXPORTOSGLUFUNC blnr ExtraTimeNotOver(void);
|
||||
EXPORTOSGLUFUNC bool ExtraTimeNotOver(void);
|
||||
|
||||
EXPORTVAR(uint8_t, SpeedValue)
|
||||
|
||||
#if EnableAutoSlow
|
||||
EXPORTVAR(blnr, WantNotAutoSlow)
|
||||
EXPORTVAR(bool, WantNotAutoSlow)
|
||||
#endif
|
||||
|
||||
/* where emulated machine thinks mouse is */
|
||||
@ -238,12 +238,12 @@ EXPORTVAR(uint32_t, QuietSubTicks)
|
||||
#if 3 == kLn2SoundSampSz
|
||||
#define trSoundSamp uint8_t
|
||||
#define tbSoundSamp uint8_t
|
||||
#define tpSoundSamp ui3p
|
||||
#define tpSoundSamp uint8_t *
|
||||
#define kCenterSound 0x80
|
||||
#elif 4 == kLn2SoundSampSz
|
||||
#define trSoundSamp uint16_t
|
||||
#define tbSoundSamp uint16_t
|
||||
#define tpSoundSamp ui4p
|
||||
#define tpSoundSamp uint16_t *
|
||||
#define kCenterSound 0x8000
|
||||
#else
|
||||
#error "unsupported kLn2SoundSampSz"
|
||||
@ -260,12 +260,12 @@ EXPORTOSGLUPROC Sound_EndWrite(uint16_t actL);
|
||||
#if EmLocalTalk
|
||||
|
||||
#define LT_TxBfMxSz 1024
|
||||
EXPORTVAR(ui3p, LT_TxBuffer)
|
||||
EXPORTVAR(uint8_t *, LT_TxBuffer)
|
||||
EXPORTVAR(uint16_t, LT_TxBuffSz)
|
||||
|
||||
EXPORTOSGLUPROC LT_TransmitPacket(void);
|
||||
|
||||
EXPORTVAR(ui3p, LT_RxBuffer)
|
||||
EXPORTVAR(uint8_t *, LT_RxBuffer)
|
||||
EXPORTVAR(uint32_t, LT_RxBuffSz)
|
||||
|
||||
EXPORTOSGLUPROC LT_ReceivePacket(void);
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -71,10 +71,10 @@ LOCALVAR int Display_bg2_Main = 0;
|
||||
LOCALVAR FILE *dbglog_File = NULL;
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr dbglog_open0(void)
|
||||
LOCALFUNC bool dbglog_open0(void)
|
||||
{
|
||||
#if dbglog_ToStdErr
|
||||
return trueblnr;
|
||||
return true;
|
||||
#else
|
||||
dbglog_File = fopen("dbglog.txt", "w");
|
||||
return (NULL != dbglog_File);
|
||||
@ -164,7 +164,7 @@ LOCALPROC InitDrives(void)
|
||||
}
|
||||
}
|
||||
|
||||
GLOBALOSGLUFUNC tMacErr vSonyTransfer(blnr IsWrite, ui3p Buffer,
|
||||
GLOBALOSGLUFUNC tMacErr vSonyTransfer(bool IsWrite, uint8_t * Buffer,
|
||||
tDrive Drive_No, uint32_t Sony_Start, uint32_t Sony_Count,
|
||||
uint32_t *Sony_ActCount)
|
||||
{
|
||||
@ -208,7 +208,7 @@ GLOBALOSGLUFUNC tMacErr vSonyGetSize(tDrive Drive_No, uint32_t *Sony_Count)
|
||||
return err; /*& figure out what really to return &*/
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, blnr deleteit)
|
||||
LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, bool deleteit)
|
||||
{
|
||||
FILE *refnum = Drives[Drive_No];
|
||||
|
||||
@ -235,13 +235,13 @@ LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, blnr deleteit)
|
||||
|
||||
GLOBALOSGLUFUNC tMacErr vSonyEject(tDrive Drive_No)
|
||||
{
|
||||
return vSonyEject0(Drive_No, falseblnr);
|
||||
return vSonyEject0(Drive_No, false);
|
||||
}
|
||||
|
||||
#if IncludeSonyNew
|
||||
GLOBALOSGLUFUNC tMacErr vSonyEjectDelete(tDrive Drive_No)
|
||||
{
|
||||
return vSonyEject0(Drive_No, trueblnr);
|
||||
return vSonyEject0(Drive_No, true);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -274,15 +274,15 @@ GLOBALOSGLUFUNC tMacErr vSonyGetName(tDrive Drive_No, tPbuf *r)
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr Sony_Insert0(FILE *refnum, blnr locked,
|
||||
LOCALFUNC bool Sony_Insert0(FILE *refnum, bool locked,
|
||||
char *drivepath)
|
||||
{
|
||||
tDrive Drive_No;
|
||||
blnr IsOk = falseblnr;
|
||||
bool IsOk = false;
|
||||
|
||||
if (! FirstFreeDisk(&Drive_No)) {
|
||||
MacMsg(kStrTooManyImagesTitle, kStrTooManyImagesMessage,
|
||||
falseblnr);
|
||||
false);
|
||||
} else {
|
||||
/* printf("Sony_Insert0 %d\n", (int)Drive_No); */
|
||||
|
||||
@ -301,7 +301,7 @@ LOCALFUNC blnr Sony_Insert0(FILE *refnum, blnr locked,
|
||||
}
|
||||
#endif
|
||||
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -312,19 +312,19 @@ LOCALFUNC blnr Sony_Insert0(FILE *refnum, blnr locked,
|
||||
return IsOk;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sony_Insert1(char *drivepath, blnr silentfail)
|
||||
LOCALFUNC bool Sony_Insert1(char *drivepath, bool silentfail)
|
||||
{
|
||||
blnr locked = falseblnr;
|
||||
bool locked = false;
|
||||
/* printf("Sony_Insert1 %s\n", drivepath); */
|
||||
FILE *refnum = fopen(drivepath, "rb+");
|
||||
if (NULL == refnum) {
|
||||
locked = trueblnr;
|
||||
locked = true;
|
||||
refnum = fopen(drivepath, "rb");
|
||||
CONSOLE_TRACE();
|
||||
}
|
||||
if (NULL == refnum) {
|
||||
if (! silentfail) {
|
||||
MacMsg(kStrOpenFailTitle, kStrOpenFailMessage, falseblnr);
|
||||
MacMsg(kStrOpenFailTitle, kStrOpenFailMessage, false);
|
||||
CONSOLE_TRACE();
|
||||
}
|
||||
} else {
|
||||
@ -332,17 +332,17 @@ LOCALFUNC blnr Sony_Insert1(char *drivepath, blnr silentfail)
|
||||
return Sony_Insert0(refnum, locked, drivepath);
|
||||
}
|
||||
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
#define Sony_Insert2(s) Sony_Insert1(s, trueblnr)
|
||||
#define Sony_Insert2(s) Sony_Insert1(s, true)
|
||||
|
||||
LOCALFUNC blnr Sony_InsertIth(int i)
|
||||
LOCALFUNC bool Sony_InsertIth(int i)
|
||||
{
|
||||
blnr v;
|
||||
bool v;
|
||||
|
||||
if ((i > 9) || ! FirstFreeDisk(nullpr)) {
|
||||
v = falseblnr;
|
||||
v = false;
|
||||
} else {
|
||||
char s[] = "disk?.dsk";
|
||||
|
||||
@ -354,7 +354,7 @@ LOCALFUNC blnr Sony_InsertIth(int i)
|
||||
return v;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr LoadInitialImages(void)
|
||||
LOCALFUNC bool LoadInitialImages(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -364,11 +364,11 @@ LOCALFUNC blnr LoadInitialImages(void)
|
||||
/* stop on first error (including file not found) */
|
||||
}
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
#if IncludeSonyNew
|
||||
LOCALFUNC blnr WriteZero(FILE *refnum, uint32_t L)
|
||||
LOCALFUNC bool WriteZero(FILE *refnum, uint32_t L)
|
||||
{
|
||||
#define ZeroBufferSize 2048
|
||||
uint32_t i;
|
||||
@ -379,24 +379,24 @@ LOCALFUNC blnr WriteZero(FILE *refnum, uint32_t L)
|
||||
while (L > 0) {
|
||||
i = (L > ZeroBufferSize) ? ZeroBufferSize : L;
|
||||
if (fwrite(buffer, 1, i, refnum) != i) {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
L -= i;
|
||||
}
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if IncludeSonyNew
|
||||
LOCALPROC MakeNewDisk(uint32_t L, char *drivepath)
|
||||
{
|
||||
blnr IsOk = falseblnr;
|
||||
bool IsOk = false;
|
||||
FILE *refnum = fopen(drivepath, "wb+");
|
||||
if (NULL == refnum) {
|
||||
MacMsg(kStrOpenFailTitle, kStrOpenFailMessage, falseblnr);
|
||||
MacMsg(kStrOpenFailTitle, kStrOpenFailMessage, false);
|
||||
} else {
|
||||
if (WriteZero(refnum, L)) {
|
||||
IsOk = Sony_Insert0(refnum, falseblnr, drivepath);
|
||||
IsOk = Sony_Insert0(refnum, false, drivepath);
|
||||
refnum = NULL;
|
||||
}
|
||||
if (refnum != NULL) {
|
||||
@ -451,7 +451,7 @@ LOCALFUNC tMacErr LoadMacRomFrom(char *path)
|
||||
return err;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr LoadMacRom(void)
|
||||
LOCALFUNC bool LoadMacRom(void)
|
||||
{
|
||||
tMacErr err;
|
||||
|
||||
@ -459,7 +459,7 @@ LOCALFUNC blnr LoadMacRom(void)
|
||||
{
|
||||
}
|
||||
|
||||
return trueblnr; /* keep launching Mini vMac, regardless */
|
||||
return true; /* keep launching Mini vMac, regardless */
|
||||
}
|
||||
|
||||
/* --- video out --- */
|
||||
@ -470,14 +470,14 @@ LOCALVAR short vOffset;
|
||||
#endif
|
||||
|
||||
#if VarFullScreen
|
||||
LOCALVAR blnr UseFullScreen = (WantInitFullScreen != 0);
|
||||
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
|
||||
#endif
|
||||
|
||||
#if EnableMagnify
|
||||
LOCALVAR blnr UseMagnify = (WantInitMagnify != 0);
|
||||
LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
|
||||
#endif
|
||||
|
||||
LOCALVAR blnr CurSpeedStopped = trueblnr;
|
||||
LOCALVAR bool CurSpeedStopped = true;
|
||||
|
||||
#if EnableMagnify
|
||||
#define MaxScale WindowScale
|
||||
@ -554,7 +554,7 @@ LOCALPROC CheckMouseState(void)
|
||||
MotionY = 4;
|
||||
}
|
||||
|
||||
HaveMouseMotion = trueblnr;
|
||||
HaveMouseMotion = true;
|
||||
|
||||
MousePositionSetDelta(MotionX, MotionY);
|
||||
MouseButtonSet(0 != (KeysHeld & KEY_A));
|
||||
@ -580,7 +580,7 @@ LOCALPROC AssignKeyToMKC(int UKey, int LKey, uint8_t MKC)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr KC2MKCInit(void)
|
||||
LOCALFUNC bool KC2MKCInit(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -645,10 +645,10 @@ LOCALFUNC blnr KC2MKCInit(void)
|
||||
|
||||
InitKeyCodes();
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
LOCALPROC DoKeyCode0(int i, blnr down)
|
||||
LOCALPROC DoKeyCode0(int i, bool down)
|
||||
{
|
||||
uint8_t key = KC2MKC[i];
|
||||
if (MKC_None != key) {
|
||||
@ -658,7 +658,7 @@ LOCALPROC DoKeyCode0(int i, blnr down)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALPROC DoKeyCode(int i, blnr down)
|
||||
LOCALPROC DoKeyCode(int i, bool down)
|
||||
{
|
||||
if ((i >= 0) && (i < 256)) {
|
||||
DoKeyCode0(i, down);
|
||||
@ -673,10 +673,10 @@ LOCALPROC DoKeyCode(int i, blnr down)
|
||||
is weird about those.
|
||||
*/
|
||||
|
||||
LOCALVAR blnr DS_Keystate_Menu = falseblnr;
|
||||
LOCALVAR blnr DS_Keystate_Shift = falseblnr;
|
||||
LOCALVAR bool DS_Keystate_Menu = false;
|
||||
LOCALVAR bool DS_Keystate_Shift = false;
|
||||
|
||||
LOCALPROC DS_HandleKey(int32_t Key, blnr Down)
|
||||
LOCALPROC DS_HandleKey(int32_t Key, bool Down)
|
||||
{
|
||||
if (Key == NOKEY) {
|
||||
return;
|
||||
@ -700,13 +700,13 @@ LOCALPROC DS_HandleKey(int32_t Key, blnr Down)
|
||||
break;
|
||||
|
||||
case DVK_SHIFT:
|
||||
Keyboard_UpdateKeyMap2(MKC_formac_Shift, trueblnr);
|
||||
Keyboard_UpdateKeyMap2(MKC_formac_Shift, true);
|
||||
break;
|
||||
|
||||
default:
|
||||
if (Key > 0) {
|
||||
DoKeyCode(Key, Down);
|
||||
Keyboard_UpdateKeyMap2(MKC_formac_Shift, falseblnr);
|
||||
Keyboard_UpdateKeyMap2(MKC_formac_Shift, false);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -718,10 +718,10 @@ LOCALPROC DS_HandleKeyboard(void)
|
||||
KeyboardKey = keyboardUpdate();
|
||||
|
||||
if ((KeyboardKey == NOKEY) && (LastKeyboardKey != NOKEY)) {
|
||||
DS_HandleKey(LastKeyboardKey, falseblnr);
|
||||
DS_HandleKey(LastKeyboardKey, false);
|
||||
LastKeyboardKey = NOKEY;
|
||||
} else {
|
||||
DS_HandleKey(KeyboardKey, trueblnr);
|
||||
DS_HandleKey(KeyboardKey, true);
|
||||
LastKeyboardKey = KeyboardKey;
|
||||
}
|
||||
}
|
||||
@ -735,7 +735,7 @@ LOCALVAR uint32_t TrueEmulatedTime = 0;
|
||||
#define TicksPerSecond 1000000
|
||||
/* #define TicksPerSecond 1000 */
|
||||
|
||||
LOCALVAR blnr HaveTimeDelta = falseblnr;
|
||||
LOCALVAR bool HaveTimeDelta = false;
|
||||
LOCALVAR uint32_t TimeDelta;
|
||||
|
||||
LOCALVAR uint32_t NewMacDateInSeconds;
|
||||
@ -767,7 +767,7 @@ LOCALPROC GetCurrentTicks(void)
|
||||
CurMacDelta = ((uint32_t)(s->tm_gmtoff) & 0x00FFFFFF)
|
||||
| ((s->tm_isdst ? 0x80 : 0) << 24);
|
||||
#endif
|
||||
HaveTimeDelta = trueblnr;
|
||||
HaveTimeDelta = true;
|
||||
}
|
||||
|
||||
NewMacDateInSeconds = t.tv_sec + TimeDelta;
|
||||
@ -834,22 +834,22 @@ LOCALPROC UpdateTrueEmulatedTime(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckDateTime(void)
|
||||
LOCALFUNC bool CheckDateTime(void)
|
||||
{
|
||||
if (CurMacDateInSeconds != NewMacDateInSeconds) {
|
||||
CurMacDateInSeconds = NewMacDateInSeconds;
|
||||
return trueblnr;
|
||||
return true;
|
||||
} else {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr InitLocationDat(void)
|
||||
LOCALFUNC bool InitLocationDat(void)
|
||||
{
|
||||
GetCurrentTicks();
|
||||
CurMacDateInSeconds = NewMacDateInSeconds;
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --- basic dialogs --- */
|
||||
@ -883,7 +883,7 @@ LOCALPROC CheckSavedMacMsg(void)
|
||||
Also we need to map 2 banks of vram so we have enough space for
|
||||
our 512x512 surface.
|
||||
*/
|
||||
LOCALFUNC blnr Screen_Init(void)
|
||||
LOCALFUNC bool Screen_Init(void)
|
||||
{
|
||||
videoSetMode(MODE_5_2D);
|
||||
vramSetBankA(VRAM_A_MAIN_BG_0x06000000);
|
||||
@ -894,7 +894,7 @@ LOCALFUNC blnr Screen_Init(void)
|
||||
BG_PALETTE[0] = RGB15(31, 31, 31);
|
||||
BG_PALETTE[1] = RGB15(0, 0, 0);
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
#if VarFullScreen
|
||||
@ -925,19 +925,19 @@ LOCALPROC EnterSpeedStopped(void)
|
||||
LOCALPROC CheckForSavedTasks(void)
|
||||
{
|
||||
if (EvtQNeedRecover) {
|
||||
EvtQNeedRecover = falseblnr;
|
||||
EvtQNeedRecover = false;
|
||||
|
||||
/* attempt cleanup, EvtQNeedRecover may get set again */
|
||||
EvtQTryRecoverFromFull();
|
||||
}
|
||||
|
||||
if (RequestMacOff) {
|
||||
RequestMacOff = falseblnr;
|
||||
RequestMacOff = false;
|
||||
if (AnyDiskInserted()) {
|
||||
MacMsgOverride(kStrQuitWarningTitle,
|
||||
kStrQuitWarningMessage);
|
||||
} else {
|
||||
ForceMacOff = trueblnr;
|
||||
ForceMacOff = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -958,8 +958,8 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
if (vSonyNewDiskWanted) {
|
||||
#if IncludeSonyNameNew
|
||||
if (vSonyNewDiskName != NotAPbuf) {
|
||||
ui3p NewDiskNameDat;
|
||||
if (MacRomanTextToNativePtr(vSonyNewDiskName, trueblnr,
|
||||
uint8_t * NewDiskNameDat;
|
||||
if (MacRomanTextToNativePtr(vSonyNewDiskName, true,
|
||||
&NewDiskNameDat))
|
||||
{
|
||||
MakeNewDisk(vSonyNewDiskSize, (char *)NewDiskNameDat);
|
||||
@ -972,7 +972,7 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
{
|
||||
MakeNewDiskAtDefault(vSonyNewDiskSize);
|
||||
}
|
||||
vSonyNewDiskWanted = falseblnr;
|
||||
vSonyNewDiskWanted = false;
|
||||
/* must be done after may have gotten disk */
|
||||
}
|
||||
#endif
|
||||
@ -982,7 +982,7 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
}
|
||||
|
||||
if (NeedWholeScreenDraw) {
|
||||
NeedWholeScreenDraw = falseblnr;
|
||||
NeedWholeScreenDraw = false;
|
||||
ScreenChangedAll();
|
||||
}
|
||||
|
||||
@ -996,7 +996,7 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
|
||||
/* --- main program flow --- */
|
||||
|
||||
GLOBALOSGLUFUNC blnr ExtraTimeNotOver(void)
|
||||
GLOBALOSGLUFUNC bool ExtraTimeNotOver(void)
|
||||
{
|
||||
UpdateTrueEmulatedTime();
|
||||
return TrueEmulatedTime == OnTrueTime;
|
||||
@ -1254,42 +1254,42 @@ LOCALPROC ReserveAllocAll(void)
|
||||
#if dbglog_HAVE
|
||||
dbglog_ReserveAlloc();
|
||||
#endif
|
||||
ReserveAllocOneBlock(&ROM, kROM_Size, 5, falseblnr);
|
||||
ReserveAllocOneBlock(&ROM, kROM_Size, 5, false);
|
||||
|
||||
ReserveAllocOneBlock(&screencomparebuff,
|
||||
vMacScreenNumBytes, 5, trueblnr);
|
||||
vMacScreenNumBytes, 5, true);
|
||||
#if UseControlKeys
|
||||
ReserveAllocOneBlock(&CntrlDisplayBuff,
|
||||
vMacScreenNumBytes, 5, falseblnr);
|
||||
vMacScreenNumBytes, 5, false);
|
||||
#endif
|
||||
|
||||
#if SoundEnabled
|
||||
ReserveAllocOneBlock((ui3p *)&TheSoundBuffer,
|
||||
dbhBufferSize, 5, falseblnr);
|
||||
ReserveAllocOneBlock((uint8_t * *)&TheSoundBuffer,
|
||||
dbhBufferSize, 5, false);
|
||||
#endif
|
||||
|
||||
EmulationReserveAlloc();
|
||||
}
|
||||
|
||||
LOCALFUNC blnr AllocMemory(void)
|
||||
LOCALFUNC bool AllocMemory(void)
|
||||
{
|
||||
uimr n;
|
||||
blnr IsOk = falseblnr;
|
||||
bool IsOk = false;
|
||||
|
||||
ReserveAllocOffset = 0;
|
||||
ReserveAllocBigBlock = nullpr;
|
||||
ReserveAllocAll();
|
||||
n = ReserveAllocOffset;
|
||||
ReserveAllocBigBlock = (ui3p)calloc(1, n);
|
||||
ReserveAllocBigBlock = (uint8_t *)calloc(1, n);
|
||||
if (NULL == ReserveAllocBigBlock) {
|
||||
MacMsg(kStrOutOfMemTitle, kStrOutOfMemMessage, trueblnr);
|
||||
MacMsg(kStrOutOfMemTitle, kStrOutOfMemMessage, true);
|
||||
} else {
|
||||
ReserveAllocOffset = 0;
|
||||
ReserveAllocAll();
|
||||
if (n != ReserveAllocOffset) {
|
||||
/* oops, program error */
|
||||
} else {
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1309,7 +1309,7 @@ LOCALPROC ZapOSGLUVars(void)
|
||||
DS_ClearVRAM();
|
||||
}
|
||||
|
||||
LOCALFUNC blnr InitOSGLU(void)
|
||||
LOCALFUNC bool InitOSGLU(void)
|
||||
{
|
||||
DS_SysInit();
|
||||
|
||||
@ -1327,10 +1327,10 @@ LOCALFUNC blnr InitOSGLU(void)
|
||||
if (KC2MKCInit())
|
||||
if (WaitForRom())
|
||||
{
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOCALPROC UnInitOSGLU(void)
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -56,10 +56,10 @@ GLOBALOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount)
|
||||
LOCALVAR FILE *dbglog_File = NULL;
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr dbglog_open0(void)
|
||||
LOCALFUNC bool dbglog_open0(void)
|
||||
{
|
||||
#if dbglog_ToStdErr
|
||||
return trueblnr;
|
||||
return true;
|
||||
#else
|
||||
dbglog_File = fopen("dbglog.txt", "w");
|
||||
return (NULL != dbglog_File);
|
||||
@ -106,7 +106,7 @@ LOCALPROC WriteExtraErr(char *s)
|
||||
|
||||
/* --- text translation --- */
|
||||
|
||||
LOCALPROC NativeStrFromCStr(char *r, char *s, blnr AddEllipsis)
|
||||
LOCALPROC NativeStrFromCStr(char *r, char *s, bool AddEllipsis)
|
||||
{
|
||||
uint8_t ps[ClStrMaxLength];
|
||||
int i;
|
||||
@ -149,7 +149,7 @@ LOCALPROC InitDrives(void)
|
||||
}
|
||||
}
|
||||
|
||||
GLOBALOSGLUFUNC tMacErr vSonyTransfer(blnr IsWrite, ui3p Buffer,
|
||||
GLOBALOSGLUFUNC tMacErr vSonyTransfer(bool IsWrite, uint8_t * Buffer,
|
||||
tDrive Drive_No, uint32_t Sony_Start, uint32_t Sony_Count,
|
||||
uint32_t *Sony_ActCount)
|
||||
{
|
||||
@ -177,7 +177,7 @@ GLOBALOSGLUFUNC tMacErr vSonyGetSize(tDrive Drive_No, uint32_t *Sony_Count)
|
||||
return mnvm_noErr; /*& figure out what really to return &*/
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, blnr deleteit)
|
||||
LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, bool deleteit)
|
||||
{
|
||||
DiskEjectedNotify(Drive_No);
|
||||
|
||||
@ -190,7 +190,7 @@ LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, blnr deleteit)
|
||||
|
||||
GLOBALOSGLUFUNC tMacErr vSonyEject(tDrive Drive_No)
|
||||
{
|
||||
return vSonyEject0(Drive_No, falseblnr);
|
||||
return vSonyEject0(Drive_No, false);
|
||||
}
|
||||
|
||||
LOCALPROC UnInitDrives(void)
|
||||
@ -204,7 +204,7 @@ LOCALPROC UnInitDrives(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sony_Insert0(FILE *refnum, blnr locked,
|
||||
LOCALFUNC bool Sony_Insert0(FILE *refnum, bool locked,
|
||||
char *drivepath)
|
||||
{
|
||||
tDrive Drive_No;
|
||||
@ -212,34 +212,34 @@ LOCALFUNC blnr Sony_Insert0(FILE *refnum, blnr locked,
|
||||
if (! FirstFreeDisk(&Drive_No)) {
|
||||
fclose(refnum);
|
||||
MacMsg(kStrTooManyImagesTitle,
|
||||
kStrTooManyImagesMessage, falseblnr);
|
||||
return falseblnr;
|
||||
kStrTooManyImagesMessage, false);
|
||||
return false;
|
||||
} else {
|
||||
/* printf("Sony_Insert0 %d\n", (int)Drive_No); */
|
||||
Drives[Drive_No] = refnum;
|
||||
DiskInsertNotify(Drive_No, locked);
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sony_Insert1(char *drivepath, blnr silentfail)
|
||||
LOCALFUNC bool Sony_Insert1(char *drivepath, bool silentfail)
|
||||
{
|
||||
blnr locked = falseblnr;
|
||||
bool locked = false;
|
||||
/* printf("Sony_Insert1 %s\n", drivepath); */
|
||||
FILE *refnum = fopen(drivepath, "rb+");
|
||||
if (NULL == refnum) {
|
||||
locked = trueblnr;
|
||||
locked = true;
|
||||
refnum = fopen(drivepath, "rb");
|
||||
}
|
||||
if (NULL == refnum) {
|
||||
if (! silentfail) {
|
||||
MacMsg(kStrOpenFailTitle, kStrOpenFailMessage, falseblnr);
|
||||
MacMsg(kStrOpenFailTitle, kStrOpenFailMessage, false);
|
||||
}
|
||||
} else {
|
||||
return Sony_Insert0(refnum, locked, drivepath);
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr LoadMacRomFrom(char *path)
|
||||
@ -272,9 +272,9 @@ LOCALFUNC tMacErr LoadMacRomFrom(char *path)
|
||||
return err;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sony_Insert1a(char *drivepath, blnr silentfail)
|
||||
LOCALFUNC bool Sony_Insert1a(char *drivepath, bool silentfail)
|
||||
{
|
||||
blnr v;
|
||||
bool v;
|
||||
|
||||
if (! ROM_loaded) {
|
||||
v = (mnvm_noErr == LoadMacRomFrom(drivepath));
|
||||
@ -285,24 +285,24 @@ LOCALFUNC blnr Sony_Insert1a(char *drivepath, blnr silentfail)
|
||||
return v;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sony_InsertIth(int i)
|
||||
LOCALFUNC bool Sony_InsertIth(int i)
|
||||
{
|
||||
blnr v;
|
||||
bool v;
|
||||
|
||||
if ((i > 9) || ! FirstFreeDisk(nullpr)) {
|
||||
v = falseblnr;
|
||||
v = false;
|
||||
} else {
|
||||
char s[] = "disk?.dsk";
|
||||
|
||||
s[4] = '0' + i;
|
||||
|
||||
v = Sony_Insert1(s, trueblnr);
|
||||
v = Sony_Insert1(s, true);
|
||||
}
|
||||
|
||||
return v;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr LoadInitialImages(void)
|
||||
LOCALFUNC bool LoadInitialImages(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -310,14 +310,14 @@ LOCALFUNC blnr LoadInitialImages(void)
|
||||
/* stop on first error (including file not found) */
|
||||
}
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --- ROM --- */
|
||||
|
||||
LOCALVAR char *rom_path = NULL;
|
||||
|
||||
LOCALFUNC blnr LoadMacRom(void)
|
||||
LOCALFUNC bool LoadMacRom(void)
|
||||
{
|
||||
tMacErr err;
|
||||
|
||||
@ -327,16 +327,16 @@ LOCALFUNC blnr LoadMacRom(void)
|
||||
{
|
||||
}
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --- video out --- */
|
||||
|
||||
static GtkWidget *drawing_area;
|
||||
|
||||
LOCALVAR blnr gBackgroundFlag = falseblnr;
|
||||
LOCALVAR blnr gTrueBackgroundFlag = falseblnr;
|
||||
LOCALVAR blnr CurSpeedStopped = trueblnr;
|
||||
LOCALVAR bool gBackgroundFlag = false;
|
||||
LOCALVAR bool gTrueBackgroundFlag = false;
|
||||
LOCALVAR bool CurSpeedStopped = true;
|
||||
|
||||
LOCALPROC HaveChangedScreenBuff(int16_t top, int16_t left,
|
||||
int16_t bottom, int16_t right)
|
||||
@ -391,8 +391,8 @@ GLOBALOSGLUPROC DoneWithDrawingForTick(void)
|
||||
|
||||
/* --- mouse --- */
|
||||
|
||||
LOCALVAR blnr HaveCursorHidden = falseblnr;
|
||||
LOCALVAR blnr WantCursorHidden = falseblnr;
|
||||
LOCALVAR bool HaveCursorHidden = false;
|
||||
LOCALVAR bool WantCursorHidden = false;
|
||||
|
||||
static GdkCursor *blank_cursor;
|
||||
static GtkWidget *window = NULL;
|
||||
@ -400,7 +400,7 @@ static GtkWidget *window = NULL;
|
||||
LOCALPROC ForceShowCursor(void)
|
||||
{
|
||||
if (HaveCursorHidden) {
|
||||
HaveCursorHidden = falseblnr;
|
||||
HaveCursorHidden = false;
|
||||
|
||||
if (window) {
|
||||
gdk_window_set_cursor(window->window, NULL);
|
||||
@ -412,22 +412,22 @@ LOCALPROC ForceShowCursor(void)
|
||||
|
||||
LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
|
||||
{
|
||||
blnr ShouldHaveCursorHidden = trueblnr;
|
||||
bool ShouldHaveCursorHidden = true;
|
||||
|
||||
{
|
||||
if (NewMousePosh < 0) {
|
||||
NewMousePosh = 0;
|
||||
ShouldHaveCursorHidden = falseblnr;
|
||||
ShouldHaveCursorHidden = false;
|
||||
} else if (NewMousePosh >= vMacScreenWidth) {
|
||||
NewMousePosh = vMacScreenWidth - 1;
|
||||
ShouldHaveCursorHidden = falseblnr;
|
||||
ShouldHaveCursorHidden = false;
|
||||
}
|
||||
if (NewMousePosv < 0) {
|
||||
NewMousePosv = 0;
|
||||
ShouldHaveCursorHidden = falseblnr;
|
||||
ShouldHaveCursorHidden = false;
|
||||
} else if (NewMousePosv >= vMacScreenHeight) {
|
||||
NewMousePosv = vMacScreenHeight - 1;
|
||||
ShouldHaveCursorHidden = falseblnr;
|
||||
ShouldHaveCursorHidden = false;
|
||||
}
|
||||
|
||||
|
||||
@ -494,7 +494,7 @@ LOCALPROC KC2MKCAssignOne(guint keyval, uint8_t key)
|
||||
#endif
|
||||
}
|
||||
|
||||
LOCALFUNC blnr KC2MKCInit(void)
|
||||
LOCALFUNC bool KC2MKCInit(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -748,7 +748,7 @@ LOCALFUNC blnr KC2MKCInit(void)
|
||||
|
||||
InitKeyCodes();
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
LOCALPROC CheckTheCapsLock(void)
|
||||
@ -761,7 +761,7 @@ LOCALPROC CheckTheCapsLock(void)
|
||||
(mask & GDK_LOCK_MASK) != 0);
|
||||
}
|
||||
|
||||
LOCALPROC DoKeyCode(guint keycode, blnr down)
|
||||
LOCALPROC DoKeyCode(guint keycode, bool down)
|
||||
{
|
||||
if (GDK_Caps_Lock == keycode) {
|
||||
CheckTheCapsLock();
|
||||
@ -782,7 +782,7 @@ LOCALVAR uint32_t TrueEmulatedTime = 0;
|
||||
|
||||
#define TicksPerSecond 1000000
|
||||
|
||||
LOCALVAR blnr HaveTimeDelta = falseblnr;
|
||||
LOCALVAR bool HaveTimeDelta = false;
|
||||
LOCALVAR uint32_t TimeDelta;
|
||||
|
||||
LOCALVAR uint32_t NewMacDateInSeconds;
|
||||
@ -813,7 +813,7 @@ LOCALPROC GetCurrentTicks(void)
|
||||
CurMacDelta = ((uint32_t)(s->tm_gmtoff) & 0x00FFFFFF)
|
||||
| ((s->tm_isdst ? 0x80 : 0) << 24);
|
||||
#endif
|
||||
HaveTimeDelta = trueblnr;
|
||||
HaveTimeDelta = true;
|
||||
}
|
||||
|
||||
NewMacDateInSeconds = t.tv_sec + TimeDelta;
|
||||
@ -879,22 +879,22 @@ LOCALPROC UpdateTrueEmulatedTime(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr CheckDateTime(void)
|
||||
LOCALFUNC bool CheckDateTime(void)
|
||||
{
|
||||
if (CurMacDateInSeconds != NewMacDateInSeconds) {
|
||||
CurMacDateInSeconds = NewMacDateInSeconds;
|
||||
return trueblnr;
|
||||
return true;
|
||||
} else {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr InitLocationDat(void)
|
||||
LOCALFUNC bool InitLocationDat(void)
|
||||
{
|
||||
GetCurrentTicks();
|
||||
CurMacDateInSeconds = NewMacDateInSeconds;
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --- basic dialogs --- */
|
||||
@ -905,8 +905,8 @@ LOCALPROC CheckSavedMacMsg(void)
|
||||
char briefMsg0[ClStrMaxLength + 1];
|
||||
char longMsg0[ClStrMaxLength + 1];
|
||||
|
||||
NativeStrFromCStr(briefMsg0, SavedBriefMsg, falseblnr);
|
||||
NativeStrFromCStr(longMsg0, SavedLongMsg, falseblnr);
|
||||
NativeStrFromCStr(briefMsg0, SavedBriefMsg, false);
|
||||
NativeStrFromCStr(longMsg0, SavedLongMsg, false);
|
||||
|
||||
fprintf(stderr, "%s\n", briefMsg0);
|
||||
fprintf(stderr, "%s\n", longMsg0);
|
||||
@ -915,12 +915,12 @@ LOCALPROC CheckSavedMacMsg(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALVAR blnr CaughtMouse = falseblnr;
|
||||
LOCALVAR bool CaughtMouse = false;
|
||||
|
||||
/* --- main window creation and disposal --- */
|
||||
|
||||
LOCALVAR int my_argc;
|
||||
LOCALVAR char **my_argv;
|
||||
LOCALVAR int argc;
|
||||
LOCALVAR char **argv;
|
||||
|
||||
/* Create a new backing pixmap of the appropriate size */
|
||||
static gboolean configure_event(GtkWidget *widget,
|
||||
@ -967,7 +967,7 @@ static gboolean button_press_event(GtkWidget *widget,
|
||||
gpointer user_data)
|
||||
{
|
||||
MousePositionNotify(event->x, event->y);
|
||||
MouseButtonSet(trueblnr);
|
||||
MouseButtonSet(true);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@ -977,7 +977,7 @@ static gboolean button_release_event(GtkWidget *widget,
|
||||
gpointer user_data)
|
||||
{
|
||||
MousePositionNotify(event->x, event->y);
|
||||
MouseButtonSet(falseblnr);
|
||||
MouseButtonSet(false);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@ -1008,7 +1008,7 @@ static gboolean enter_notify_event(GtkWidget *widget,
|
||||
GdkEventCrossing *event,
|
||||
gpointer user_data)
|
||||
{
|
||||
CaughtMouse = trueblnr;
|
||||
CaughtMouse = true;
|
||||
|
||||
MousePositionNotify(event->x, event->y);
|
||||
MouseButtonSet((event->state & GDK_BUTTON1_MASK) != 0);
|
||||
@ -1023,7 +1023,7 @@ static gboolean leave_notify_event(GtkWidget *widget,
|
||||
MousePositionNotify(event->x, event->y);
|
||||
MouseButtonSet((event->state & GDK_BUTTON1_MASK) != 0);
|
||||
|
||||
CaughtMouse = falseblnr;
|
||||
CaughtMouse = false;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@ -1031,7 +1031,7 @@ static gboolean leave_notify_event(GtkWidget *widget,
|
||||
static gboolean delete_event(GtkWidget *widget,
|
||||
GdkEventMotion *event)
|
||||
{
|
||||
RequestMacOff = trueblnr;
|
||||
RequestMacOff = true;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@ -1042,7 +1042,7 @@ LOCALPROC ReconnectKeyCodes3(void)
|
||||
|
||||
#if 0
|
||||
if (WantCmdOptOnReconnect) {
|
||||
WantCmdOptOnReconnect = falseblnr;
|
||||
WantCmdOptOnReconnect = false;
|
||||
|
||||
GetTheDownKeys();
|
||||
}
|
||||
@ -1052,21 +1052,21 @@ LOCALPROC ReconnectKeyCodes3(void)
|
||||
LOCALPROC DisconnectKeyCodes3(void)
|
||||
{
|
||||
DisconnectKeyCodes2();
|
||||
MouseButtonSet(falseblnr);
|
||||
MouseButtonSet(false);
|
||||
}
|
||||
|
||||
LOCALVAR blnr ADialogIsUp = falseblnr;
|
||||
LOCALVAR bool ADialogIsUp = false;
|
||||
|
||||
LOCALPROC BeginDialog(void)
|
||||
{
|
||||
DisconnectKeyCodes3();
|
||||
ADialogIsUp = trueblnr;
|
||||
ADialogIsUp = true;
|
||||
ForceShowCursor();
|
||||
}
|
||||
|
||||
LOCALPROC EndDialog(void)
|
||||
{
|
||||
ADialogIsUp = falseblnr;
|
||||
ADialogIsUp = false;
|
||||
ReconnectKeyCodes3();
|
||||
}
|
||||
|
||||
@ -1104,7 +1104,7 @@ static void InsertADisk0(void)
|
||||
char ts[ClStrMaxLength + 1];
|
||||
GtkWidget *dialog;
|
||||
|
||||
NativeStrFromCStr(ts, kStrMenuItemOpen, falseblnr);
|
||||
NativeStrFromCStr(ts, kStrMenuItemOpen, false);
|
||||
|
||||
BeginDialog();
|
||||
dialog = gtk_file_chooser_dialog_new(ts,
|
||||
@ -1120,7 +1120,7 @@ static void InsertADisk0(void)
|
||||
|
||||
filename =
|
||||
gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
|
||||
(void) Sony_Insert1a(filename, falseblnr);
|
||||
(void) Sony_Insert1a(filename, false);
|
||||
g_free(filename);
|
||||
}
|
||||
|
||||
@ -1130,19 +1130,19 @@ static void InsertADisk0(void)
|
||||
LOCALPROC CheckForSavedTasks(void)
|
||||
{
|
||||
if (EvtQNeedRecover) {
|
||||
EvtQNeedRecover = falseblnr;
|
||||
EvtQNeedRecover = false;
|
||||
|
||||
/* attempt cleanup, EvtQNeedRecover may get set again */
|
||||
EvtQTryRecoverFromFull();
|
||||
}
|
||||
|
||||
if (RequestMacOff) {
|
||||
RequestMacOff = falseblnr;
|
||||
RequestMacOff = false;
|
||||
if (AnyDiskInserted()) {
|
||||
MacMsgOverride(kStrQuitWarningTitle,
|
||||
kStrQuitWarningMessage);
|
||||
} else {
|
||||
ForceMacOff = trueblnr;
|
||||
ForceMacOff = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1180,7 +1180,7 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
}
|
||||
|
||||
if (NeedWholeScreenDraw) {
|
||||
NeedWholeScreenDraw = falseblnr;
|
||||
NeedWholeScreenDraw = false;
|
||||
ScreenChangedAll();
|
||||
}
|
||||
|
||||
@ -1198,7 +1198,7 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
if (gTrueBackgroundFlag || ADialogIsUp) {
|
||||
} else {
|
||||
if (RequestInsertDisk) {
|
||||
RequestInsertDisk = falseblnr;
|
||||
RequestInsertDisk = false;
|
||||
InsertADisk0();
|
||||
}
|
||||
}
|
||||
@ -1213,48 +1213,48 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
|
||||
/* --- command line parsing --- */
|
||||
|
||||
LOCALFUNC blnr ScanCommandLine(void)
|
||||
LOCALFUNC bool ScanCommandLine(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 1; i < my_argc; ++i) {
|
||||
if ('-' == my_argv[i][0]) {
|
||||
for (i = 1; i < argc; ++i) {
|
||||
if ('-' == argv[i][0]) {
|
||||
#if 0
|
||||
if ((0 == strcmp(my_argv[i], "--display")) ||
|
||||
(0 == strcmp(my_argv[i], "-display")))
|
||||
if ((0 == strcmp(argv[i], "--display")) ||
|
||||
(0 == strcmp(argv[i], "-display")))
|
||||
{
|
||||
++i;
|
||||
if (i < my_argc) {
|
||||
display_name = my_argv[i];
|
||||
if (i < argc) {
|
||||
display_name = argv[i];
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
if ((0 == strcmp(my_argv[i], "--rom")) ||
|
||||
(0 == strcmp(my_argv[i], "-r")))
|
||||
if ((0 == strcmp(argv[i], "--rom")) ||
|
||||
(0 == strcmp(argv[i], "-r")))
|
||||
{
|
||||
++i;
|
||||
if (i < my_argc) {
|
||||
rom_path = my_argv[i];
|
||||
if (i < argc) {
|
||||
rom_path = argv[i];
|
||||
}
|
||||
} else
|
||||
#if 0
|
||||
if (0 == strcmp(my_argv[i], "-l")) {
|
||||
if (0 == strcmp(argv[i], "-l")) {
|
||||
SpeedValue = 0;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
MacMsg(kStrBadArgTitle, kStrBadArgMessage, falseblnr);
|
||||
MacMsg(kStrBadArgTitle, kStrBadArgMessage, false);
|
||||
}
|
||||
} else {
|
||||
(void) Sony_Insert1(my_argv[i], falseblnr);
|
||||
(void) Sony_Insert1(argv[i], false);
|
||||
}
|
||||
}
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --- main program flow --- */
|
||||
|
||||
GLOBALOSGLUFUNC blnr ExtraTimeNotOver(void)
|
||||
GLOBALOSGLUFUNC bool ExtraTimeNotOver(void)
|
||||
{
|
||||
UpdateTrueEmulatedTime();
|
||||
return TrueEmulatedTime == OnTrueTime;
|
||||
@ -1344,7 +1344,7 @@ static gboolean
|
||||
focus_in_event(GtkWidget *widget, GdkEvent *event,
|
||||
gpointer data)
|
||||
{
|
||||
gTrueBackgroundFlag = falseblnr;
|
||||
gTrueBackgroundFlag = false;
|
||||
|
||||
CheckMouseState();
|
||||
|
||||
@ -1355,7 +1355,7 @@ static gboolean
|
||||
focus_out_event(GtkWidget *widget, GdkEvent *event,
|
||||
gpointer data)
|
||||
{
|
||||
gTrueBackgroundFlag = trueblnr;
|
||||
gTrueBackgroundFlag = true;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -1384,7 +1384,7 @@ static gboolean key_press_event(GtkWidget *widget,
|
||||
}
|
||||
}
|
||||
#endif
|
||||
DoKeyCode(event->hardware_keycode, trueblnr);
|
||||
DoKeyCode(event->hardware_keycode, true);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@ -1398,7 +1398,7 @@ static gboolean key_release_event(GtkWidget *widget,
|
||||
fprintf(stderr, "keyval %d\n", event->keyval);
|
||||
fprintf(stderr, "hardware_keycode %d\n", event->hardware_keycode);
|
||||
#endif
|
||||
DoKeyCode(event->hardware_keycode, falseblnr);
|
||||
DoKeyCode(event->hardware_keycode, false);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@ -1423,7 +1423,7 @@ static void drag_data_received(GtkWidget *widget,
|
||||
file = g_filename_from_uri(uris[i], NULL, NULL);
|
||||
/* file = gnome_vfs_get_local_path_from_uri(uris[i]); */
|
||||
if (file != NULL) {
|
||||
(void) Sony_Insert1a(file, falseblnr);
|
||||
(void) Sony_Insert1a(file, false);
|
||||
handled = TRUE;
|
||||
g_free(file);
|
||||
}
|
||||
@ -1448,16 +1448,16 @@ static void do_about_item(GtkAction *action, gpointer user_data)
|
||||
|
||||
static void do_quit_item(GtkAction *action, gpointer user_data)
|
||||
{
|
||||
RequestMacOff = trueblnr;
|
||||
RequestMacOff = true;
|
||||
}
|
||||
|
||||
static void do_open_item(GtkAction *action, gpointer user_data)
|
||||
{
|
||||
RequestInsertDisk = trueblnr;
|
||||
RequestInsertDisk = true;
|
||||
}
|
||||
|
||||
LOCALPROC AppendConvertMenuItem(GtkWidget *the_menu,
|
||||
GCallback c_handler, gpointer gobject, char *s, blnr AddEllipsis)
|
||||
GCallback c_handler, gpointer gobject, char *s, bool AddEllipsis)
|
||||
{
|
||||
char ts[ClStrMaxLength + 1];
|
||||
GtkWidget *the_item;
|
||||
@ -1475,7 +1475,7 @@ LOCALPROC AppendSubmenuConvertName(GtkWidget *menubar,
|
||||
char ts[ClStrMaxLength + 1];
|
||||
GtkWidget *the_item;
|
||||
|
||||
NativeStrFromCStr(ts, s, falseblnr);
|
||||
NativeStrFromCStr(ts, s, false);
|
||||
the_item = gtk_menu_item_new_with_label(ts);
|
||||
gtk_menu_item_set_submenu(GTK_MENU_ITEM(the_item), the_menu);
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(menubar), the_item);
|
||||
@ -1506,7 +1506,7 @@ LOCALPROC ZapOSGLUVars(void)
|
||||
int i;
|
||||
|
||||
for (i = 0; i < kNumMagStates; ++i) {
|
||||
HavePositionWins[i] = falseblnr;
|
||||
HavePositionWins[i] = false;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -1517,36 +1517,36 @@ LOCALPROC ReserveAllocAll(void)
|
||||
#if dbglog_HAVE
|
||||
dbglog_ReserveAlloc();
|
||||
#endif
|
||||
ReserveAllocOneBlock(&ROM, kROM_Size, 5, falseblnr);
|
||||
ReserveAllocOneBlock(&ROM, kROM_Size, 5, false);
|
||||
ReserveAllocOneBlock(&screencomparebuff,
|
||||
vMacScreenNumBytes, 5, trueblnr);
|
||||
vMacScreenNumBytes, 5, true);
|
||||
#if UseControlKeys
|
||||
ReserveAllocOneBlock(&CntrlDisplayBuff,
|
||||
vMacScreenNumBytes, 5, falseblnr);
|
||||
vMacScreenNumBytes, 5, false);
|
||||
#endif
|
||||
|
||||
EmulationReserveAlloc();
|
||||
}
|
||||
|
||||
LOCALFUNC blnr AllocMemory(void)
|
||||
LOCALFUNC bool AllocMemory(void)
|
||||
{
|
||||
uimr n;
|
||||
blnr IsOk = falseblnr;
|
||||
bool IsOk = false;
|
||||
|
||||
ReserveAllocOffset = 0;
|
||||
ReserveAllocBigBlock = nullpr;
|
||||
ReserveAllocAll();
|
||||
n = ReserveAllocOffset;
|
||||
ReserveAllocBigBlock = (ui3p)calloc(1, n);
|
||||
ReserveAllocBigBlock = (uint8_t *)calloc(1, n);
|
||||
if (NULL == ReserveAllocBigBlock) {
|
||||
MacMsg(kStrOutOfMemTitle, kStrOutOfMemMessage, trueblnr);
|
||||
MacMsg(kStrOutOfMemTitle, kStrOutOfMemMessage, true);
|
||||
} else {
|
||||
ReserveAllocOffset = 0;
|
||||
ReserveAllocAll();
|
||||
if (n != ReserveAllocOffset) {
|
||||
/* oops, program error */
|
||||
} else {
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1560,7 +1560,7 @@ LOCALPROC UnallocMemory(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr InitOSGLU(void)
|
||||
LOCALFUNC bool InitOSGLU(void)
|
||||
{
|
||||
if (AllocMemory())
|
||||
#if dbglog_HAVE
|
||||
@ -1574,9 +1574,9 @@ LOCALFUNC blnr InitOSGLU(void)
|
||||
if (KC2MKCInit())
|
||||
if (WaitForRom())
|
||||
{
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOCALPROC UnInitOSGLU(void)
|
||||
@ -1638,27 +1638,27 @@ int main(int argc, char *argv[])
|
||||
the_menu = gtk_menu_new();
|
||||
|
||||
AppendConvertMenuItem(the_menu,
|
||||
G_CALLBACK(do_open_item), NULL, kStrMenuItemOpen, trueblnr);
|
||||
G_CALLBACK(do_open_item), NULL, kStrMenuItemOpen, true);
|
||||
|
||||
the_item = gtk_separator_menu_item_new();
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(the_menu), the_item);
|
||||
|
||||
AppendConvertMenuItem(the_menu,
|
||||
G_CALLBACK(do_quit_item), NULL, kStrMenuItemQuit, falseblnr);
|
||||
G_CALLBACK(do_quit_item), NULL, kStrMenuItemQuit, false);
|
||||
|
||||
AppendSubmenuConvertName(menubar, the_menu, kStrMenuFile);
|
||||
|
||||
the_menu = gtk_menu_new();
|
||||
|
||||
AppendConvertMenuItem(the_menu, G_CALLBACK(do_more_commands_item),
|
||||
NULL, kStrMenuItemMore, trueblnr);
|
||||
NULL, kStrMenuItemMore, true);
|
||||
|
||||
AppendSubmenuConvertName(menubar, the_menu, kStrMenuSpecial);
|
||||
|
||||
the_menu = gtk_menu_new();
|
||||
|
||||
AppendConvertMenuItem(the_menu,
|
||||
G_CALLBACK(do_about_item), NULL, kStrMenuItemAbout, trueblnr);
|
||||
G_CALLBACK(do_about_item), NULL, kStrMenuItemAbout, true);
|
||||
|
||||
AppendSubmenuConvertName(menubar, the_menu, kStrMenuHelp);
|
||||
|
||||
@ -1748,8 +1748,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
g_idle_add(MainEventLoop0, NULL);
|
||||
|
||||
my_argc = argc;
|
||||
my_argv = argv;
|
||||
argc = argc;
|
||||
argv = argv;
|
||||
|
||||
ZapOSGLUVars();
|
||||
if (InitOSGLU()) {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -52,10 +52,10 @@ GLOBALOSGLUPROC MoveBytes(anyp srcPtr, anyp destPtr, int32_t byteCount)
|
||||
LOCALVAR FILE *dbglog_File = NULL;
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr dbglog_open0(void)
|
||||
LOCALFUNC bool dbglog_open0(void)
|
||||
{
|
||||
#if dbglog_ToStdErr
|
||||
return trueblnr;
|
||||
return true;
|
||||
#else
|
||||
dbglog_File = fopen("dbglog.txt", "w");
|
||||
return (NULL != dbglog_File);
|
||||
@ -131,7 +131,7 @@ LOCALPROC InitDrives(void)
|
||||
}
|
||||
}
|
||||
|
||||
GLOBALOSGLUFUNC tMacErr vSonyTransfer(blnr IsWrite, ui3p Buffer,
|
||||
GLOBALOSGLUFUNC tMacErr vSonyTransfer(bool IsWrite, uint8_t * Buffer,
|
||||
tDrive Drive_No, uint32_t Sony_Start, uint32_t Sony_Count,
|
||||
uint32_t *Sony_ActCount)
|
||||
{
|
||||
@ -175,7 +175,7 @@ GLOBALOSGLUFUNC tMacErr vSonyGetSize(tDrive Drive_No, uint32_t *Sony_Count)
|
||||
return err; /*& figure out what really to return &*/
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, blnr deleteit)
|
||||
LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, bool deleteit)
|
||||
{
|
||||
FILE *refnum = Drives[Drive_No];
|
||||
|
||||
@ -189,7 +189,7 @@ LOCALFUNC tMacErr vSonyEject0(tDrive Drive_No, blnr deleteit)
|
||||
|
||||
GLOBALOSGLUFUNC tMacErr vSonyEject(tDrive Drive_No)
|
||||
{
|
||||
return vSonyEject0(Drive_No, falseblnr);
|
||||
return vSonyEject0(Drive_No, false);
|
||||
}
|
||||
|
||||
LOCALPROC UnInitDrives(void)
|
||||
@ -203,15 +203,15 @@ LOCALPROC UnInitDrives(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sony_Insert0(FILE *refnum, blnr locked,
|
||||
LOCALFUNC bool Sony_Insert0(FILE *refnum, bool locked,
|
||||
char *drivepath)
|
||||
{
|
||||
tDrive Drive_No;
|
||||
blnr IsOk = falseblnr;
|
||||
bool IsOk = false;
|
||||
|
||||
if (! FirstFreeDisk(&Drive_No)) {
|
||||
MacMsg(kStrTooManyImagesTitle, kStrTooManyImagesMessage,
|
||||
falseblnr);
|
||||
false);
|
||||
} else {
|
||||
/* printf("Sony_Insert0 %d\n", (int)Drive_No); */
|
||||
|
||||
@ -219,7 +219,7 @@ LOCALFUNC blnr Sony_Insert0(FILE *refnum, blnr locked,
|
||||
Drives[Drive_No] = refnum;
|
||||
DiskInsertNotify(Drive_No, locked);
|
||||
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -230,23 +230,23 @@ LOCALFUNC blnr Sony_Insert0(FILE *refnum, blnr locked,
|
||||
return IsOk;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sony_Insert1(char *drivepath, blnr silentfail)
|
||||
LOCALFUNC bool Sony_Insert1(char *drivepath, bool silentfail)
|
||||
{
|
||||
blnr locked = falseblnr;
|
||||
bool locked = false;
|
||||
/* printf("Sony_Insert1 %s\n", drivepath); */
|
||||
FILE *refnum = fopen(drivepath, "rb+");
|
||||
if (NULL == refnum) {
|
||||
locked = trueblnr;
|
||||
locked = true;
|
||||
refnum = fopen(drivepath, "rb");
|
||||
}
|
||||
if (NULL == refnum) {
|
||||
if (! silentfail) {
|
||||
MacMsg(kStrOpenFailTitle, kStrOpenFailMessage, falseblnr);
|
||||
MacMsg(kStrOpenFailTitle, kStrOpenFailMessage, false);
|
||||
}
|
||||
} else {
|
||||
return Sony_Insert0(refnum, locked, drivepath);
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOCALFUNC tMacErr LoadMacRomFrom(char *path)
|
||||
@ -280,9 +280,9 @@ LOCALFUNC tMacErr LoadMacRomFrom(char *path)
|
||||
}
|
||||
|
||||
#if 0 /* no drag and drop to make use of this */
|
||||
LOCALFUNC blnr Sony_Insert1a(char *drivepath, blnr silentfail)
|
||||
LOCALFUNC bool Sony_Insert1a(char *drivepath, bool silentfail)
|
||||
{
|
||||
blnr v;
|
||||
bool v;
|
||||
|
||||
if (! ROM_loaded) {
|
||||
v = (mnvm_noErr == LoadMacRomFrom(drivepath));
|
||||
@ -294,17 +294,17 @@ LOCALFUNC blnr Sony_Insert1a(char *drivepath, blnr silentfail)
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr Sony_Insert2(char *s)
|
||||
LOCALFUNC bool Sony_Insert2(char *s)
|
||||
{
|
||||
return Sony_Insert1(s, trueblnr);
|
||||
return Sony_Insert1(s, true);
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sony_InsertIth(int i)
|
||||
LOCALFUNC bool Sony_InsertIth(int i)
|
||||
{
|
||||
blnr v;
|
||||
bool v;
|
||||
|
||||
if ((i > 9) || ! FirstFreeDisk(nullpr)) {
|
||||
v = falseblnr;
|
||||
v = false;
|
||||
} else {
|
||||
char s[] = "disk?.dsk";
|
||||
|
||||
@ -316,7 +316,7 @@ LOCALFUNC blnr Sony_InsertIth(int i)
|
||||
return v;
|
||||
}
|
||||
|
||||
LOCALFUNC blnr LoadInitialImages(void)
|
||||
LOCALFUNC bool LoadInitialImages(void)
|
||||
{
|
||||
if (! AnyDiskInserted()) {
|
||||
int i;
|
||||
@ -326,14 +326,14 @@ LOCALFUNC blnr LoadInitialImages(void)
|
||||
}
|
||||
}
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --- ROM --- */
|
||||
|
||||
LOCALVAR char *rom_path = NULL;
|
||||
|
||||
LOCALFUNC blnr LoadMacRom(void)
|
||||
LOCALFUNC bool LoadMacRom(void)
|
||||
{
|
||||
tMacErr err;
|
||||
|
||||
@ -343,22 +343,22 @@ LOCALFUNC blnr LoadMacRom(void)
|
||||
{
|
||||
}
|
||||
|
||||
return trueblnr; /* keep launching Mini vMac, regardless */
|
||||
return true; /* keep launching Mini vMac, regardless */
|
||||
}
|
||||
|
||||
/* --- video out --- */
|
||||
|
||||
#if VarFullScreen
|
||||
LOCALVAR blnr UseFullScreen = (WantInitFullScreen != 0);
|
||||
LOCALVAR bool UseFullScreen = (WantInitFullScreen != 0);
|
||||
#endif
|
||||
|
||||
#if EnableMagnify
|
||||
LOCALVAR blnr UseMagnify = (WantInitMagnify != 0);
|
||||
LOCALVAR bool UseMagnify = (WantInitMagnify != 0);
|
||||
#endif
|
||||
|
||||
LOCALVAR blnr gBackgroundFlag = falseblnr;
|
||||
LOCALVAR blnr gTrueBackgroundFlag = falseblnr;
|
||||
LOCALVAR blnr CurSpeedStopped = trueblnr;
|
||||
LOCALVAR bool gBackgroundFlag = false;
|
||||
LOCALVAR bool gTrueBackgroundFlag = false;
|
||||
LOCALVAR bool CurSpeedStopped = true;
|
||||
|
||||
#if EnableMagnify
|
||||
#define MaxScale WindowScale
|
||||
@ -367,11 +367,11 @@ LOCALVAR blnr CurSpeedStopped = trueblnr;
|
||||
#endif
|
||||
|
||||
|
||||
LOCALVAR SDL_Surface *my_surface = nullpr;
|
||||
LOCALVAR SDL_Surface *surface = nullpr;
|
||||
|
||||
LOCALVAR ui3p ScalingBuff = nullpr;
|
||||
LOCALVAR uint8_t * ScalingBuff = nullpr;
|
||||
|
||||
LOCALVAR ui3p CLUT_final;
|
||||
LOCALVAR uint8_t * CLUT_final;
|
||||
|
||||
#define CLUT_finalsz (256 * 8 * 4 * MaxScale)
|
||||
/*
|
||||
@ -526,15 +526,15 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
|
||||
}
|
||||
#endif
|
||||
|
||||
if (SDL_MUSTLOCK(my_surface)) {
|
||||
if (SDL_LockSurface(my_surface) < 0) {
|
||||
if (SDL_MUSTLOCK(surface)) {
|
||||
if (SDL_LockSurface(surface) < 0) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
int bpp = my_surface->format->BytesPerPixel;
|
||||
int bpp = surface->format->BytesPerPixel;
|
||||
uint32_t ExpectedPitch = vMacScreenWidth * bpp;
|
||||
|
||||
#if EnableMagnify
|
||||
@ -547,7 +547,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
|
||||
if (UseColorMode) {
|
||||
#if vMacScreenDepth < 4
|
||||
for (i = 0; i < CLUT_size; ++i) {
|
||||
CLUT_pixel[i] = SDL_MapRGB(my_surface->format,
|
||||
CLUT_pixel[i] = SDL_MapRGB(surface->format,
|
||||
CLUT_reds[i] >> 8,
|
||||
CLUT_greens[i] >> 8,
|
||||
CLUT_blues[i] >> 8);
|
||||
@ -556,14 +556,14 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
BWLUT_pixel[1] = SDL_MapRGB(my_surface->format, 0, 0, 0);
|
||||
BWLUT_pixel[1] = SDL_MapRGB(surface->format, 0, 0, 0);
|
||||
/* black */
|
||||
BWLUT_pixel[0] = SDL_MapRGB(my_surface->format, 255, 255, 255);
|
||||
BWLUT_pixel[0] = SDL_MapRGB(surface->format, 255, 255, 255);
|
||||
/* white */
|
||||
}
|
||||
|
||||
if ((0 == ((bpp - 1) & bpp)) /* a power of 2 */
|
||||
&& (my_surface->pitch == ExpectedPitch)
|
||||
&& (surface->pitch == ExpectedPitch)
|
||||
#if (vMacScreenDepth > 3)
|
||||
&& ! UseColorMode
|
||||
#endif
|
||||
@ -621,7 +621,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
|
||||
}
|
||||
}
|
||||
|
||||
ScalingBuff = (ui3p)my_surface->pixels;
|
||||
ScalingBuff = (uint8_t *)surface->pixels;
|
||||
|
||||
#if (0 != vMacScreenDepth) && (vMacScreenDepth < 4)
|
||||
if (UseColorMode) {
|
||||
@ -701,8 +701,8 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
|
||||
for (j = left2; j < right2; ++j) {
|
||||
int i0 = i;
|
||||
int j0 = j;
|
||||
Uint8 *bufp = (Uint8 *)my_surface->pixels
|
||||
+ i * my_surface->pitch + j * bpp;
|
||||
Uint8 *bufp = (Uint8 *)surface->pixels
|
||||
+ i * surface->pitch + j * bpp;
|
||||
|
||||
#if EnableMagnify
|
||||
if (UseMagnify) {
|
||||
@ -727,7 +727,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
|
||||
p = the_data + ((i0 * vMacScreenWidth + j0) << 1);
|
||||
{
|
||||
uint16_t t0 = do_get_mem_word(p);
|
||||
pixel = SDL_MapRGB(my_surface->format,
|
||||
pixel = SDL_MapRGB(surface->format,
|
||||
((t0 & 0x7C00) >> 7)
|
||||
| ((t0 & 0x7000) >> 12),
|
||||
((t0 & 0x03E0) >> 2)
|
||||
@ -737,7 +737,7 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
|
||||
}
|
||||
#elif 5 == vMacScreenDepth
|
||||
p = the_data + ((i0 * vMacScreenWidth + j0) << 2);
|
||||
pixel = SDL_MapRGB(my_surface->format,
|
||||
pixel = SDL_MapRGB(surface->format,
|
||||
p[1],
|
||||
p[2],
|
||||
p[3]);
|
||||
@ -778,11 +778,11 @@ LOCALPROC HaveChangedScreenBuff(uint16_t top, uint16_t left,
|
||||
|
||||
}
|
||||
|
||||
if (SDL_MUSTLOCK(my_surface)) {
|
||||
SDL_UnlockSurface(my_surface);
|
||||
if (SDL_MUSTLOCK(surface)) {
|
||||
SDL_UnlockSurface(surface);
|
||||
}
|
||||
|
||||
SDL_UpdateRect(my_surface, left2, top2,
|
||||
SDL_UpdateRect(surface, left2, top2,
|
||||
right2 - left2, bottom2 - top2);
|
||||
}
|
||||
|
||||
@ -809,20 +809,20 @@ GLOBALOSGLUPROC DoneWithDrawingForTick(void)
|
||||
|
||||
/* cursor hiding */
|
||||
|
||||
LOCALVAR blnr HaveCursorHidden = falseblnr;
|
||||
LOCALVAR blnr WantCursorHidden = falseblnr;
|
||||
LOCALVAR bool HaveCursorHidden = false;
|
||||
LOCALVAR bool WantCursorHidden = false;
|
||||
|
||||
LOCALPROC ForceShowCursor(void)
|
||||
{
|
||||
if (HaveCursorHidden) {
|
||||
HaveCursorHidden = falseblnr;
|
||||
HaveCursorHidden = false;
|
||||
(void) SDL_ShowCursor(SDL_ENABLE);
|
||||
}
|
||||
}
|
||||
|
||||
/* cursor moving */
|
||||
|
||||
LOCALFUNC blnr MoveMouse(int16_t h, int16_t v)
|
||||
LOCALFUNC bool MoveMouse(int16_t h, int16_t v)
|
||||
{
|
||||
#if EnableMagnify
|
||||
if (UseMagnify) {
|
||||
@ -833,14 +833,14 @@ LOCALFUNC blnr MoveMouse(int16_t h, int16_t v)
|
||||
|
||||
SDL_WarpMouse(h, v);
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* cursor state */
|
||||
|
||||
LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
|
||||
{
|
||||
blnr ShouldHaveCursorHidden = trueblnr;
|
||||
bool ShouldHaveCursorHidden = true;
|
||||
|
||||
#if EnableMagnify
|
||||
if (UseMagnify) {
|
||||
@ -860,17 +860,17 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
|
||||
{
|
||||
if (NewMousePosh < 0) {
|
||||
NewMousePosh = 0;
|
||||
ShouldHaveCursorHidden = falseblnr;
|
||||
ShouldHaveCursorHidden = false;
|
||||
} else if (NewMousePosh >= vMacScreenWidth) {
|
||||
NewMousePosh = vMacScreenWidth - 1;
|
||||
ShouldHaveCursorHidden = falseblnr;
|
||||
ShouldHaveCursorHidden = false;
|
||||
}
|
||||
if (NewMousePosv < 0) {
|
||||
NewMousePosv = 0;
|
||||
ShouldHaveCursorHidden = falseblnr;
|
||||
ShouldHaveCursorHidden = false;
|
||||
} else if (NewMousePosv >= vMacScreenHeight) {
|
||||
NewMousePosv = vMacScreenHeight - 1;
|
||||
ShouldHaveCursorHidden = falseblnr;
|
||||
ShouldHaveCursorHidden = false;
|
||||
}
|
||||
|
||||
#if VarFullScreen
|
||||
@ -878,7 +878,7 @@ LOCALPROC MousePositionNotify(int NewMousePosh, int NewMousePosv)
|
||||
#endif
|
||||
#if MayFullScreen
|
||||
{
|
||||
ShouldHaveCursorHidden = trueblnr;
|
||||
ShouldHaveCursorHidden = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1066,7 +1066,7 @@ LOCALFUNC uint8_t SDLKey2MacKeyCode(SDLKey i)
|
||||
return v;
|
||||
}
|
||||
|
||||
LOCALPROC DoKeyCode(SDL_keysym *r, blnr down)
|
||||
LOCALPROC DoKeyCode(SDL_keysym *r, bool down)
|
||||
{
|
||||
uint8_t v = SDLKey2MacKeyCode(r->sym);
|
||||
if (MKC_None != v) {
|
||||
@ -1089,7 +1089,7 @@ LOCALPROC ReconnectKeyCodes3(void)
|
||||
LOCALPROC DisconnectKeyCodes3(void)
|
||||
{
|
||||
DisconnectKeyCodes2();
|
||||
MouseButtonSet(falseblnr);
|
||||
MouseButtonSet(false);
|
||||
}
|
||||
|
||||
/* --- time, date, location --- */
|
||||
@ -1124,7 +1124,7 @@ LOCALPROC InitNextTime(void)
|
||||
|
||||
LOCALVAR uint32_t NewMacDateInSeconds;
|
||||
|
||||
LOCALFUNC blnr UpdateTrueEmulatedTime(void)
|
||||
LOCALFUNC bool UpdateTrueEmulatedTime(void)
|
||||
{
|
||||
Uint32 LatestTime;
|
||||
int32_t TimeDiff;
|
||||
@ -1155,7 +1155,7 @@ LOCALFUNC blnr UpdateTrueEmulatedTime(void)
|
||||
TimeDiff = (LatestTime - NextIntTime);
|
||||
} while (TimeDiff >= 0);
|
||||
}
|
||||
return trueblnr;
|
||||
return true;
|
||||
} else {
|
||||
if (TimeDiff < -256) {
|
||||
#if dbglog_TimeStuff
|
||||
@ -1166,17 +1166,17 @@ LOCALFUNC blnr UpdateTrueEmulatedTime(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
LOCALFUNC blnr CheckDateTime(void)
|
||||
LOCALFUNC bool CheckDateTime(void)
|
||||
{
|
||||
if (CurMacDateInSeconds != NewMacDateInSeconds) {
|
||||
CurMacDateInSeconds = NewMacDateInSeconds;
|
||||
return trueblnr;
|
||||
return true;
|
||||
} else {
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1186,14 +1186,14 @@ LOCALPROC StartUpTimeAdjust(void)
|
||||
InitNextTime();
|
||||
}
|
||||
|
||||
LOCALFUNC blnr InitLocationDat(void)
|
||||
LOCALFUNC bool InitLocationDat(void)
|
||||
{
|
||||
LastTime = SDL_GetTicks();
|
||||
InitNextTime();
|
||||
NewMacDateInSeconds = LastTime / 1000;
|
||||
CurMacDateInSeconds = NewMacDateInSeconds;
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --- sound --- */
|
||||
@ -1312,20 +1312,20 @@ LOCALPROC Sound_WroteABlock(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
LOCALFUNC blnr Sound_EndWrite0(uint16_t actL)
|
||||
LOCALFUNC bool Sound_EndWrite0(uint16_t actL)
|
||||
{
|
||||
blnr v;
|
||||
bool v;
|
||||
|
||||
TheWriteOffset += actL;
|
||||
|
||||
if (0 != (TheWriteOffset & kOneBuffMask)) {
|
||||
v = falseblnr;
|
||||
v = false;
|
||||
} else {
|
||||
/* just finished a block */
|
||||
|
||||
Sound_WroteABlock();
|
||||
|
||||
v = trueblnr;
|
||||
v = true;
|
||||
}
|
||||
|
||||
return v;
|
||||
@ -1420,12 +1420,12 @@ struct SoundR {
|
||||
|
||||
volatile trSoundTemp lastv;
|
||||
|
||||
blnr wantplaying;
|
||||
blnr HaveStartedPlaying;
|
||||
bool wantplaying;
|
||||
bool HaveStartedPlaying;
|
||||
};
|
||||
typedef struct SoundR SoundR;
|
||||
|
||||
static void my_audio_callback(void *udata, Uint8 *stream, int len)
|
||||
static void audio_callback(void *udata, Uint8 *stream, int len)
|
||||
{
|
||||
uint16_t ToPlayLen;
|
||||
uint16_t FilledSoundBuffs;
|
||||
@ -1442,7 +1442,7 @@ static void my_audio_callback(void *udata, Uint8 *stream, int len)
|
||||
#endif
|
||||
|
||||
#if dbglog_SoundStuff
|
||||
dbglog_writeln("Enter my_audio_callback");
|
||||
dbglog_writeln("Enter audio_callback");
|
||||
dbglog_writelnNum("len", len);
|
||||
#endif
|
||||
|
||||
@ -1481,7 +1481,7 @@ label_retry:
|
||||
dbglog_writeln("finished start transition");
|
||||
#endif
|
||||
|
||||
datp->HaveStartedPlaying = trueblnr;
|
||||
datp->HaveStartedPlaying = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1533,7 +1533,7 @@ label_retry:
|
||||
|
||||
LOCALVAR SoundR cur_audio;
|
||||
|
||||
LOCALVAR blnr HaveSoundOut = falseblnr;
|
||||
LOCALVAR bool HaveSoundOut = false;
|
||||
|
||||
LOCALPROC Sound_Stop(void)
|
||||
{
|
||||
@ -1544,7 +1544,7 @@ LOCALPROC Sound_Stop(void)
|
||||
if (cur_audio.wantplaying && HaveSoundOut) {
|
||||
uint16_t retry_limit = 50; /* half of a second */
|
||||
|
||||
cur_audio.wantplaying = falseblnr;
|
||||
cur_audio.wantplaying = false;
|
||||
|
||||
label_retry:
|
||||
if (kCenterTempSound == cur_audio.lastv) {
|
||||
@ -1587,8 +1587,8 @@ LOCALPROC Sound_Start(void)
|
||||
if ((! cur_audio.wantplaying) && HaveSoundOut) {
|
||||
Sound_Start0();
|
||||
cur_audio.lastv = kCenterTempSound;
|
||||
cur_audio.HaveStartedPlaying = falseblnr;
|
||||
cur_audio.wantplaying = trueblnr;
|
||||
cur_audio.HaveStartedPlaying = false;
|
||||
cur_audio.wantplaying = true;
|
||||
|
||||
SDL_PauseAudio(0);
|
||||
}
|
||||
@ -1603,7 +1603,7 @@ LOCALPROC Sound_UnInit(void)
|
||||
|
||||
#define SOUND_SAMPLERATE 22255 /* = round(7833600 * 2 / 704) */
|
||||
|
||||
LOCALFUNC blnr Sound_Init(void)
|
||||
LOCALFUNC bool Sound_Init(void)
|
||||
{
|
||||
SDL_AudioSpec desired;
|
||||
|
||||
@ -1613,7 +1613,7 @@ LOCALFUNC blnr Sound_Init(void)
|
||||
cur_audio.fPlayOffset = &ThePlayOffset;
|
||||
cur_audio.fFillOffset = &TheFillOffset;
|
||||
cur_audio.fMinFilledSoundBuffs = &MinFilledSoundBuffs;
|
||||
cur_audio.wantplaying = falseblnr;
|
||||
cur_audio.wantplaying = false;
|
||||
|
||||
desired.freq = SOUND_SAMPLERATE;
|
||||
|
||||
@ -1627,14 +1627,14 @@ LOCALFUNC blnr Sound_Init(void)
|
||||
|
||||
desired.channels = 1;
|
||||
desired.samples = 1024;
|
||||
desired.callback = my_audio_callback;
|
||||
desired.callback = audio_callback;
|
||||
desired.userdata = (void *)&cur_audio;
|
||||
|
||||
/* Open the audio device */
|
||||
if (SDL_OpenAudio(&desired, NULL) < 0) {
|
||||
fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
|
||||
} else {
|
||||
HaveSoundOut = trueblnr;
|
||||
HaveSoundOut = true;
|
||||
|
||||
Sound_Start();
|
||||
/*
|
||||
@ -1644,7 +1644,7 @@ LOCALFUNC blnr Sound_Init(void)
|
||||
*/
|
||||
}
|
||||
|
||||
return trueblnr; /* keep going, even if no sound */
|
||||
return true; /* keep going, even if no sound */
|
||||
}
|
||||
|
||||
GLOBALOSGLUPROC Sound_EndWrite(uint16_t actL)
|
||||
@ -1687,7 +1687,7 @@ LOCALPROC CheckSavedMacMsg(void)
|
||||
#define UseMotionEvents 1
|
||||
|
||||
#if UseMotionEvents
|
||||
LOCALVAR blnr CaughtMouse = falseblnr;
|
||||
LOCALVAR bool CaughtMouse = false;
|
||||
#endif
|
||||
|
||||
/* --- event handling for main window --- */
|
||||
@ -1696,7 +1696,7 @@ LOCALPROC HandleTheEvent(SDL_Event *event)
|
||||
{
|
||||
switch (event->type) {
|
||||
case SDL_QUIT:
|
||||
RequestMacOff = trueblnr;
|
||||
RequestMacOff = true;
|
||||
break;
|
||||
case SDL_ACTIVEEVENT:
|
||||
switch (event->active.state) {
|
||||
@ -1721,18 +1721,18 @@ LOCALPROC HandleTheEvent(SDL_Event *event)
|
||||
/* any mouse button, we don't care which */
|
||||
MousePositionNotify(
|
||||
event->button.x, event->button.y);
|
||||
MouseButtonSet(trueblnr);
|
||||
MouseButtonSet(true);
|
||||
break;
|
||||
case SDL_MOUSEBUTTONUP:
|
||||
MousePositionNotify(
|
||||
event->button.x, event->button.y);
|
||||
MouseButtonSet(falseblnr);
|
||||
MouseButtonSet(false);
|
||||
break;
|
||||
case SDL_KEYDOWN:
|
||||
DoKeyCode(&event->key.keysym, trueblnr);
|
||||
DoKeyCode(&event->key.keysym, true);
|
||||
break;
|
||||
case SDL_KEYUP:
|
||||
DoKeyCode(&event->key.keysym, falseblnr);
|
||||
DoKeyCode(&event->key.keysym, false);
|
||||
break;
|
||||
#if 0
|
||||
case Expose: /* SDL doesn't have an expose event */
|
||||
@ -1763,12 +1763,12 @@ LOCALPROC HandleTheEvent(SDL_Event *event)
|
||||
|
||||
/* --- main window creation and disposal --- */
|
||||
|
||||
LOCALVAR int my_argc;
|
||||
LOCALVAR char **my_argv;
|
||||
LOCALVAR int argc;
|
||||
LOCALVAR char **argv;
|
||||
|
||||
LOCALFUNC blnr Screen_Init(void)
|
||||
LOCALFUNC bool Screen_Init(void)
|
||||
{
|
||||
blnr v = falseblnr;
|
||||
bool v = false;
|
||||
|
||||
InitKeyCodes();
|
||||
|
||||
@ -1777,14 +1777,14 @@ LOCALFUNC blnr Screen_Init(void)
|
||||
fprintf(stderr, "Unable to init SDL: %s\n", SDL_GetError());
|
||||
} else {
|
||||
SDL_WM_SetCaption(kStrAppName, NULL);
|
||||
v = trueblnr;
|
||||
v = true;
|
||||
}
|
||||
|
||||
return v;
|
||||
}
|
||||
|
||||
#if MayFullScreen
|
||||
LOCALVAR blnr GrabMachine = falseblnr;
|
||||
LOCALVAR bool GrabMachine = false;
|
||||
#endif
|
||||
|
||||
#if MayFullScreen
|
||||
@ -1804,7 +1804,7 @@ LOCALPROC GrabTheMachine(void)
|
||||
{
|
||||
SavedMouseH = ViewHStart + (ViewHSize / 2);
|
||||
SavedMouseV = ViewVStart + (ViewVSize / 2);
|
||||
HaveMouseMotion = trueblnr;
|
||||
HaveMouseMotion = true;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -1816,7 +1816,7 @@ LOCALPROC UngrabMachine(void)
|
||||
#if EnableFSMouseMotion
|
||||
if (HaveMouseMotion) {
|
||||
(void) MoveMouse(CurMouseH, CurMouseV);
|
||||
HaveMouseMotion = falseblnr;
|
||||
HaveMouseMotion = false;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1850,18 +1850,18 @@ LOCALPROC MouseConstrain(void)
|
||||
SavedMouseH += shiftdh;
|
||||
SavedMouseV += shiftdv;
|
||||
if (! MoveMouse(SavedMouseH, SavedMouseV)) {
|
||||
HaveMouseMotion = falseblnr;
|
||||
HaveMouseMotion = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALFUNC blnr CreateMainWindow(void)
|
||||
LOCALFUNC bool CreateMainWindow(void)
|
||||
{
|
||||
int NewWindowHeight = vMacScreenHeight;
|
||||
int NewWindowWidth = vMacScreenWidth;
|
||||
Uint32 flags = SDL_SWSURFACE;
|
||||
blnr v = falseblnr;
|
||||
bool v = false;
|
||||
|
||||
#if EnableMagnify && 1
|
||||
if (UseMagnify) {
|
||||
@ -1884,34 +1884,34 @@ LOCALFUNC blnr CreateMainWindow(void)
|
||||
ViewHSize = vMacScreenWidth;
|
||||
ViewVSize = vMacScreenHeight;
|
||||
|
||||
my_surface = SDL_SetVideoMode(NewWindowWidth, NewWindowHeight,
|
||||
surface = SDL_SetVideoMode(NewWindowWidth, NewWindowHeight,
|
||||
#if 0 != vMacScreenDepth
|
||||
32,
|
||||
#else
|
||||
/* 32 */ /* 24 */ /* 16 */ 8,
|
||||
#endif
|
||||
flags);
|
||||
if (NULL == my_surface) {
|
||||
if (NULL == surface) {
|
||||
fprintf(stderr, "SDL_SetVideoMode fails: %s\n",
|
||||
SDL_GetError());
|
||||
} else {
|
||||
#if 0 != vMacScreenDepth
|
||||
ColorModeWorks = trueblnr;
|
||||
ColorModeWorks = true;
|
||||
#endif
|
||||
v = trueblnr;
|
||||
v = true;
|
||||
}
|
||||
|
||||
return v;
|
||||
}
|
||||
|
||||
#if EnableRecreateW
|
||||
LOCALFUNC blnr ReCreateMainWindow(void)
|
||||
LOCALFUNC bool ReCreateMainWindow(void)
|
||||
{
|
||||
ForceShowCursor(); /* hide/show cursor api is per window */
|
||||
|
||||
#if MayFullScreen
|
||||
if (GrabMachine) {
|
||||
GrabMachine = falseblnr;
|
||||
GrabMachine = false;
|
||||
UngrabMachine();
|
||||
}
|
||||
#endif
|
||||
@ -1929,7 +1929,7 @@ LOCALFUNC blnr ReCreateMainWindow(void)
|
||||
(void) MoveMouse(CurMouseH, CurMouseV);
|
||||
}
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1979,7 +1979,7 @@ LOCALPROC EnterSpeedStopped(void)
|
||||
LOCALPROC CheckForSavedTasks(void)
|
||||
{
|
||||
if (EvtQNeedRecover) {
|
||||
EvtQNeedRecover = falseblnr;
|
||||
EvtQNeedRecover = false;
|
||||
|
||||
/* attempt cleanup, EvtQNeedRecover may get set again */
|
||||
EvtQTryRecoverFromFull();
|
||||
@ -1992,12 +1992,12 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
#endif
|
||||
|
||||
if (RequestMacOff) {
|
||||
RequestMacOff = falseblnr;
|
||||
RequestMacOff = false;
|
||||
if (AnyDiskInserted()) {
|
||||
MacMsgOverride(kStrQuitWarningTitle,
|
||||
kStrQuitWarningMessage);
|
||||
} else {
|
||||
ForceMacOff = trueblnr;
|
||||
ForceMacOff = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2064,7 +2064,7 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
#endif
|
||||
|
||||
if (NeedWholeScreenDraw) {
|
||||
NeedWholeScreenDraw = falseblnr;
|
||||
NeedWholeScreenDraw = false;
|
||||
ScreenChangedAll();
|
||||
}
|
||||
|
||||
@ -2086,38 +2086,38 @@ LOCALPROC CheckForSavedTasks(void)
|
||||
|
||||
/* --- command line parsing --- */
|
||||
|
||||
LOCALFUNC blnr ScanCommandLine(void)
|
||||
LOCALFUNC bool ScanCommandLine(void)
|
||||
{
|
||||
char *pa;
|
||||
int i = 1;
|
||||
|
||||
label_retry:
|
||||
if (i < my_argc) {
|
||||
pa = my_argv[i++];
|
||||
if (i < argc) {
|
||||
pa = argv[i++];
|
||||
if ('-' == pa[0]) {
|
||||
if ((0 == strcmp(pa, "--rom"))
|
||||
|| (0 == strcmp(pa, "-r")))
|
||||
{
|
||||
if (i < my_argc) {
|
||||
rom_path = my_argv[i++];
|
||||
if (i < argc) {
|
||||
rom_path = argv[i++];
|
||||
goto label_retry;
|
||||
}
|
||||
} else
|
||||
{
|
||||
MacMsg(kStrBadArgTitle, kStrBadArgMessage, falseblnr);
|
||||
MacMsg(kStrBadArgTitle, kStrBadArgMessage, false);
|
||||
}
|
||||
} else {
|
||||
(void) Sony_Insert1(pa, falseblnr);
|
||||
(void) Sony_Insert1(pa, false);
|
||||
goto label_retry;
|
||||
}
|
||||
}
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* --- main program flow --- */
|
||||
|
||||
GLOBALOSGLUFUNC blnr ExtraTimeNotOver(void)
|
||||
GLOBALOSGLUFUNC bool ExtraTimeNotOver(void)
|
||||
{
|
||||
UpdateTrueEmulatedTime();
|
||||
return TrueEmulatedTime == OnTrueTime;
|
||||
@ -2200,43 +2200,43 @@ LOCALPROC ReserveAllocAll(void)
|
||||
#if dbglog_HAVE
|
||||
dbglog_ReserveAlloc();
|
||||
#endif
|
||||
ReserveAllocOneBlock(&ROM, kROM_Size, 5, falseblnr);
|
||||
ReserveAllocOneBlock(&ROM, kROM_Size, 5, false);
|
||||
|
||||
ReserveAllocOneBlock(&screencomparebuff,
|
||||
vMacScreenNumBytes, 5, trueblnr);
|
||||
vMacScreenNumBytes, 5, true);
|
||||
#if UseControlKeys
|
||||
ReserveAllocOneBlock(&CntrlDisplayBuff,
|
||||
vMacScreenNumBytes, 5, falseblnr);
|
||||
vMacScreenNumBytes, 5, false);
|
||||
#endif
|
||||
|
||||
ReserveAllocOneBlock(&CLUT_final, CLUT_finalsz, 5, falseblnr);
|
||||
ReserveAllocOneBlock(&CLUT_final, CLUT_finalsz, 5, false);
|
||||
#if SoundEnabled
|
||||
ReserveAllocOneBlock((ui3p *)&TheSoundBuffer,
|
||||
dbhBufferSize, 5, falseblnr);
|
||||
ReserveAllocOneBlock((uint8_t * *)&TheSoundBuffer,
|
||||
dbhBufferSize, 5, false);
|
||||
#endif
|
||||
|
||||
EmulationReserveAlloc();
|
||||
}
|
||||
|
||||
LOCALFUNC blnr AllocMemory(void)
|
||||
LOCALFUNC bool AllocMemory(void)
|
||||
{
|
||||
uimr n;
|
||||
blnr IsOk = falseblnr;
|
||||
bool IsOk = false;
|
||||
|
||||
ReserveAllocOffset = 0;
|
||||
ReserveAllocBigBlock = nullpr;
|
||||
ReserveAllocAll();
|
||||
n = ReserveAllocOffset;
|
||||
ReserveAllocBigBlock = (ui3p)calloc(1, n);
|
||||
ReserveAllocBigBlock = (uint8_t *)calloc(1, n);
|
||||
if (NULL == ReserveAllocBigBlock) {
|
||||
MacMsg(kStrOutOfMemTitle, kStrOutOfMemMessage, trueblnr);
|
||||
MacMsg(kStrOutOfMemTitle, kStrOutOfMemMessage, true);
|
||||
} else {
|
||||
ReserveAllocOffset = 0;
|
||||
ReserveAllocAll();
|
||||
if (n != ReserveAllocOffset) {
|
||||
/* oops, program error */
|
||||
} else {
|
||||
IsOk = trueblnr;
|
||||
IsOk = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2250,7 +2250,7 @@ LOCALPROC UnallocMemory(void)
|
||||
}
|
||||
}
|
||||
|
||||
LOCALFUNC blnr InitOSGLU(void)
|
||||
LOCALFUNC bool InitOSGLU(void)
|
||||
{
|
||||
if (AllocMemory())
|
||||
#if dbglog_HAVE
|
||||
@ -2267,9 +2267,9 @@ LOCALFUNC blnr InitOSGLU(void)
|
||||
if (CreateMainWindow())
|
||||
if (WaitForRom())
|
||||
{
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOCALPROC UnInitOSGLU(void)
|
||||
@ -2308,8 +2308,8 @@ LOCALPROC UnInitOSGLU(void)
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
my_argc = argc;
|
||||
my_argv = argv;
|
||||
argc = argc;
|
||||
argv = argv;
|
||||
|
||||
ZapOSGLUVars();
|
||||
if (InitOSGLU()) {
|
||||
|
@ -575,7 +575,7 @@ LOCALPROC VIA2_CheckInterruptFlag(void)
|
||||
LOCALVAR uint8_t VIA2_T1_Active = 0;
|
||||
LOCALVAR uint8_t VIA2_T2_Active = 0;
|
||||
|
||||
LOCALVAR blnr VIA2_T1IntReady = falseblnr;
|
||||
LOCALVAR bool VIA2_T1IntReady = false;
|
||||
|
||||
LOCALPROC VIA2_Clear(void)
|
||||
{
|
||||
@ -588,7 +588,7 @@ LOCALPROC VIA2_Clear(void)
|
||||
VIA2_D.SR = VIA2_D.ACR = 0x00;
|
||||
VIA2_D.PCR = VIA2_D.IFR = VIA2_D.IER = 0x00;
|
||||
VIA2_T1_Active = VIA2_T2_Active = 0x00;
|
||||
VIA2_T1IntReady = falseblnr;
|
||||
VIA2_T1IntReady = false;
|
||||
}
|
||||
|
||||
GLOBALPROC VIA2_Zap(void)
|
||||
@ -670,7 +670,7 @@ GLOBALFUNC uint8_t VIA2_ShiftOutData(void)
|
||||
#define CyclesPerViaTime (10 * ClockMult)
|
||||
#define CyclesScaledPerViaTime (kCycleScale * CyclesPerViaTime)
|
||||
|
||||
LOCALVAR blnr VIA2_T1Running = trueblnr;
|
||||
LOCALVAR bool VIA2_T1Running = true;
|
||||
LOCALVAR iCountt VIA2_T1LastTime = 0;
|
||||
|
||||
GLOBALPROC VIA2_DoTimer1Check(void)
|
||||
@ -722,7 +722,7 @@ GLOBALPROC VIA2_DoTimer1Check(void)
|
||||
VIA2_T1LastTime = NewTime;
|
||||
}
|
||||
|
||||
VIA2_T1IntReady = falseblnr;
|
||||
VIA2_T1IntReady = false;
|
||||
if ((VIA2_D.IFR & (1 << kIntT1)) == 0) {
|
||||
if (((VIA2_D.ACR & 0x40) != 0) || (VIA2_T1_Active == 1)) {
|
||||
uint32_t NewTemp = VIA2_D.T1C_F; /* Get Timer 1 Counter */
|
||||
@ -739,7 +739,7 @@ GLOBALPROC VIA2_DoTimer1Check(void)
|
||||
* CyclesPerViaTime;
|
||||
}
|
||||
ICT_add(kICT_VIA2_Timer1Check, NewTimer);
|
||||
VIA2_T1IntReady = trueblnr;
|
||||
VIA2_T1IntReady = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -748,11 +748,11 @@ GLOBALPROC VIA2_DoTimer1Check(void)
|
||||
LOCALPROC CheckT1IntReady(void)
|
||||
{
|
||||
if (VIA2_T1Running) {
|
||||
blnr NewT1IntReady = falseblnr;
|
||||
bool NewT1IntReady = false;
|
||||
|
||||
if ((VIA2_D.IFR & (1 << kIntT1)) == 0) {
|
||||
if (((VIA2_D.ACR & 0x40) != 0) || (VIA2_T1_Active == 1)) {
|
||||
NewT1IntReady = trueblnr;
|
||||
NewT1IntReady = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -777,8 +777,8 @@ GLOBALFUNC uint16_t VIA2_GetT1InvertTime(void)
|
||||
return v;
|
||||
}
|
||||
|
||||
LOCALVAR blnr VIA2_T2Running = trueblnr;
|
||||
LOCALVAR blnr VIA2_T2C_ShortTime = falseblnr;
|
||||
LOCALVAR bool VIA2_T2Running = true;
|
||||
LOCALVAR bool VIA2_T2C_ShortTime = false;
|
||||
LOCALVAR iCountt VIA2_T2LastTime = 0;
|
||||
|
||||
GLOBALPROC VIA2_DoTimer2Check(void)
|
||||
@ -794,7 +794,7 @@ GLOBALPROC VIA2_DoTimer2Check(void)
|
||||
if ((deltaTime > (0x00010000UL * CyclesScaledPerViaTime))
|
||||
|| ((Temp <= deltaTemp) && (Temp != 0)))
|
||||
{
|
||||
VIA2_T2C_ShortTime = falseblnr;
|
||||
VIA2_T2C_ShortTime = false;
|
||||
VIA2_T2_Active = 0;
|
||||
VIA2_SetInterruptFlag(kIntT2);
|
||||
#if VIA2_dolog && 1
|
||||
@ -837,7 +837,7 @@ GLOBALPROC VIA2_DoTimer2Check(void)
|
||||
#define kIER 0x0E
|
||||
#define kORA 0x0F
|
||||
|
||||
GLOBALFUNC uint32_t VIA2_Access(uint32_t Data, blnr WriteMem, CPTR addr)
|
||||
GLOBALFUNC uint32_t VIA2_Access(uint32_t Data, bool WriteMem, CPTR addr)
|
||||
{
|
||||
switch (addr) {
|
||||
case kORB :
|
||||
@ -950,8 +950,8 @@ GLOBALFUNC uint32_t VIA2_Access(uint32_t Data, blnr WriteMem, CPTR addr)
|
||||
if ((VIA2_D.T2C_F < (128UL << 16))
|
||||
&& (VIA2_D.T2C_F != 0))
|
||||
{
|
||||
VIA2_T2C_ShortTime = trueblnr;
|
||||
VIA2_T2Running = trueblnr;
|
||||
VIA2_T2C_ShortTime = true;
|
||||
VIA2_T2Running = true;
|
||||
/*
|
||||
Running too many instructions during
|
||||
a short timer interval can crash when
|
||||
@ -1171,23 +1171,23 @@ GLOBALPROC VIA2_ExtraTimeBegin(void)
|
||||
{
|
||||
if (VIA2_T1Running) {
|
||||
VIA2_DoTimer1Check(); /* run up to this moment */
|
||||
VIA2_T1Running = falseblnr;
|
||||
VIA2_T1Running = false;
|
||||
}
|
||||
if (VIA2_T2Running & (! VIA2_T2C_ShortTime)) {
|
||||
VIA2_DoTimer2Check(); /* run up to this moment */
|
||||
VIA2_T2Running = falseblnr;
|
||||
VIA2_T2Running = false;
|
||||
}
|
||||
}
|
||||
|
||||
GLOBALPROC VIA2_ExtraTimeEnd(void)
|
||||
{
|
||||
if (! VIA2_T1Running) {
|
||||
VIA2_T1Running = trueblnr;
|
||||
VIA2_T1Running = true;
|
||||
VIA2_T1LastTime = GetCuriCount();
|
||||
VIA2_DoTimer1Check();
|
||||
}
|
||||
if (! VIA2_T2Running) {
|
||||
VIA2_T2Running = trueblnr;
|
||||
VIA2_T2Running = true;
|
||||
VIA2_T2LastTime = GetCuriCount();
|
||||
VIA2_DoTimer2Check();
|
||||
}
|
||||
|
@ -23,7 +23,7 @@
|
||||
EXPORTPROC VIA2_Zap(void);
|
||||
EXPORTPROC VIA2_Reset(void);
|
||||
|
||||
EXPORTFUNC uint32_t VIA2_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
EXPORTFUNC uint32_t VIA2_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
|
||||
EXPORTPROC VIA2_ExtraTimeBegin(void);
|
||||
EXPORTPROC VIA2_ExtraTimeEnd(void);
|
||||
|
@ -575,7 +575,7 @@ LOCALPROC VIA1_CheckInterruptFlag(void)
|
||||
LOCALVAR uint8_t VIA1_T1_Active = 0;
|
||||
LOCALVAR uint8_t VIA1_T2_Active = 0;
|
||||
|
||||
LOCALVAR blnr VIA1_T1IntReady = falseblnr;
|
||||
LOCALVAR bool VIA1_T1IntReady = false;
|
||||
|
||||
LOCALPROC VIA1_Clear(void)
|
||||
{
|
||||
@ -588,7 +588,7 @@ LOCALPROC VIA1_Clear(void)
|
||||
VIA1_D.SR = VIA1_D.ACR = 0x00;
|
||||
VIA1_D.PCR = VIA1_D.IFR = VIA1_D.IER = 0x00;
|
||||
VIA1_T1_Active = VIA1_T2_Active = 0x00;
|
||||
VIA1_T1IntReady = falseblnr;
|
||||
VIA1_T1IntReady = false;
|
||||
}
|
||||
|
||||
GLOBALPROC VIA1_Zap(void)
|
||||
@ -670,7 +670,7 @@ GLOBALFUNC uint8_t VIA1_ShiftOutData(void)
|
||||
#define CyclesPerViaTime (10 * ClockMult)
|
||||
#define CyclesScaledPerViaTime (kCycleScale * CyclesPerViaTime)
|
||||
|
||||
LOCALVAR blnr VIA1_T1Running = trueblnr;
|
||||
LOCALVAR bool VIA1_T1Running = true;
|
||||
LOCALVAR iCountt VIA1_T1LastTime = 0;
|
||||
|
||||
GLOBALPROC VIA1_DoTimer1Check(void)
|
||||
@ -722,7 +722,7 @@ GLOBALPROC VIA1_DoTimer1Check(void)
|
||||
VIA1_T1LastTime = NewTime;
|
||||
}
|
||||
|
||||
VIA1_T1IntReady = falseblnr;
|
||||
VIA1_T1IntReady = false;
|
||||
if ((VIA1_D.IFR & (1 << kIntT1)) == 0) {
|
||||
if (((VIA1_D.ACR & 0x40) != 0) || (VIA1_T1_Active == 1)) {
|
||||
uint32_t NewTemp = VIA1_D.T1C_F; /* Get Timer 1 Counter */
|
||||
@ -739,7 +739,7 @@ GLOBALPROC VIA1_DoTimer1Check(void)
|
||||
* CyclesPerViaTime;
|
||||
}
|
||||
ICT_add(kICT_VIA1_Timer1Check, NewTimer);
|
||||
VIA1_T1IntReady = trueblnr;
|
||||
VIA1_T1IntReady = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -748,11 +748,11 @@ GLOBALPROC VIA1_DoTimer1Check(void)
|
||||
LOCALPROC CheckT1IntReady(void)
|
||||
{
|
||||
if (VIA1_T1Running) {
|
||||
blnr NewT1IntReady = falseblnr;
|
||||
bool NewT1IntReady = false;
|
||||
|
||||
if ((VIA1_D.IFR & (1 << kIntT1)) == 0) {
|
||||
if (((VIA1_D.ACR & 0x40) != 0) || (VIA1_T1_Active == 1)) {
|
||||
NewT1IntReady = trueblnr;
|
||||
NewT1IntReady = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -777,8 +777,8 @@ GLOBALFUNC uint16_t VIA1_GetT1InvertTime(void)
|
||||
return v;
|
||||
}
|
||||
|
||||
LOCALVAR blnr VIA1_T2Running = trueblnr;
|
||||
LOCALVAR blnr VIA1_T2C_ShortTime = falseblnr;
|
||||
LOCALVAR bool VIA1_T2Running = true;
|
||||
LOCALVAR bool VIA1_T2C_ShortTime = false;
|
||||
LOCALVAR iCountt VIA1_T2LastTime = 0;
|
||||
|
||||
GLOBALPROC VIA1_DoTimer2Check(void)
|
||||
@ -794,7 +794,7 @@ GLOBALPROC VIA1_DoTimer2Check(void)
|
||||
if ((deltaTime > (0x00010000UL * CyclesScaledPerViaTime))
|
||||
|| ((Temp <= deltaTemp) && (Temp != 0)))
|
||||
{
|
||||
VIA1_T2C_ShortTime = falseblnr;
|
||||
VIA1_T2C_ShortTime = false;
|
||||
VIA1_T2_Active = 0;
|
||||
VIA1_SetInterruptFlag(kIntT2);
|
||||
#if VIA1_dolog && 1
|
||||
@ -837,7 +837,7 @@ GLOBALPROC VIA1_DoTimer2Check(void)
|
||||
#define kIER 0x0E
|
||||
#define kORA 0x0F
|
||||
|
||||
GLOBALFUNC uint32_t VIA1_Access(uint32_t Data, blnr WriteMem, CPTR addr)
|
||||
GLOBALFUNC uint32_t VIA1_Access(uint32_t Data, bool WriteMem, CPTR addr)
|
||||
{
|
||||
switch (addr) {
|
||||
case kORB :
|
||||
@ -950,8 +950,8 @@ GLOBALFUNC uint32_t VIA1_Access(uint32_t Data, blnr WriteMem, CPTR addr)
|
||||
if ((VIA1_D.T2C_F < (128UL << 16))
|
||||
&& (VIA1_D.T2C_F != 0))
|
||||
{
|
||||
VIA1_T2C_ShortTime = trueblnr;
|
||||
VIA1_T2Running = trueblnr;
|
||||
VIA1_T2C_ShortTime = true;
|
||||
VIA1_T2Running = true;
|
||||
/*
|
||||
Running too many instructions during
|
||||
a short timer interval can crash when
|
||||
@ -1171,23 +1171,23 @@ GLOBALPROC VIA1_ExtraTimeBegin(void)
|
||||
{
|
||||
if (VIA1_T1Running) {
|
||||
VIA1_DoTimer1Check(); /* run up to this moment */
|
||||
VIA1_T1Running = falseblnr;
|
||||
VIA1_T1Running = false;
|
||||
}
|
||||
if (VIA1_T2Running & (! VIA1_T2C_ShortTime)) {
|
||||
VIA1_DoTimer2Check(); /* run up to this moment */
|
||||
VIA1_T2Running = falseblnr;
|
||||
VIA1_T2Running = false;
|
||||
}
|
||||
}
|
||||
|
||||
GLOBALPROC VIA1_ExtraTimeEnd(void)
|
||||
{
|
||||
if (! VIA1_T1Running) {
|
||||
VIA1_T1Running = trueblnr;
|
||||
VIA1_T1Running = true;
|
||||
VIA1_T1LastTime = GetCuriCount();
|
||||
VIA1_DoTimer1Check();
|
||||
}
|
||||
if (! VIA1_T2Running) {
|
||||
VIA1_T2Running = trueblnr;
|
||||
VIA1_T2Running = true;
|
||||
VIA1_T2LastTime = GetCuriCount();
|
||||
VIA1_DoTimer2Check();
|
||||
}
|
||||
|
@ -23,7 +23,7 @@
|
||||
EXPORTPROC VIA1_Zap(void);
|
||||
EXPORTPROC VIA1_Reset(void);
|
||||
|
||||
EXPORTFUNC uint32_t VIA1_Access(uint32_t Data, blnr WriteMem, CPTR addr);
|
||||
EXPORTFUNC uint32_t VIA1_Access(uint32_t Data, bool WriteMem, CPTR addr);
|
||||
|
||||
EXPORTPROC VIA1_ExtraTimeBegin(void);
|
||||
EXPORTPROC VIA1_ExtraTimeEnd(void);
|
||||
|
@ -88,7 +88,7 @@ LOCALPROC ChecksumSlotROM(void)
|
||||
/* Calculate CRC */
|
||||
/* assuming check sum field initialized to zero */
|
||||
int i;
|
||||
ui3p p = VidROM;
|
||||
uint8_t * p = VidROM;
|
||||
uint32_t crc = 0;
|
||||
|
||||
for (i = kVidROM_Size; --i >= 0; ) {
|
||||
@ -97,7 +97,7 @@ LOCALPROC ChecksumSlotROM(void)
|
||||
do_put_mem_long(p - 12, crc);
|
||||
}
|
||||
|
||||
LOCALVAR ui3p pPatch;
|
||||
LOCALVAR uint8_t * pPatch;
|
||||
|
||||
LOCALPROC PatchAByte(uint8_t v)
|
||||
{
|
||||
@ -123,21 +123,21 @@ LOCALPROC PatchAOSLstEntry0(uint8_t Id, uint32_t Offset)
|
||||
}
|
||||
#endif
|
||||
|
||||
LOCALPROC PatchAOSLstEntry(uint8_t Id, ui3p Offset)
|
||||
LOCALPROC PatchAOSLstEntry(uint8_t Id, uint8_t * Offset)
|
||||
{
|
||||
PatchALong((Id << 24) | ((Offset - pPatch) & 0x00FFFFFF));
|
||||
}
|
||||
|
||||
LOCALFUNC ui3p ReservePatchOSLstEntry(void)
|
||||
LOCALFUNC uint8_t * ReservePatchOSLstEntry(void)
|
||||
{
|
||||
ui3p v = pPatch;
|
||||
uint8_t * v = pPatch;
|
||||
pPatch += 4;
|
||||
return v;
|
||||
}
|
||||
|
||||
LOCALPROC PatchAReservedOSLstEntry(ui3p p, uint8_t Id)
|
||||
LOCALPROC PatchAReservedOSLstEntry(uint8_t * p, uint8_t Id)
|
||||
{
|
||||
ui3p pPatchSave = pPatch;
|
||||
uint8_t * pPatchSave = pPatch;
|
||||
pPatch = p;
|
||||
PatchAOSLstEntry(Id, pPatchSave);
|
||||
pPatch = pPatchSave;
|
||||
@ -153,35 +153,35 @@ LOCALPROC PatchAnEndOfLst(void)
|
||||
PatchADatLstEntry(0xFF /* endOfList */, 0x00000000);
|
||||
}
|
||||
|
||||
GLOBALFUNC blnr Vid_Init(void)
|
||||
GLOBALFUNC bool Vid_Init(void)
|
||||
{
|
||||
int i;
|
||||
uint32_t UsedSoFar;
|
||||
|
||||
ui3p pAt_sRsrcDir;
|
||||
ui3p pTo_sRsrc_Board;
|
||||
ui3p pTo_BoardType;
|
||||
ui3p pTo_BoardName;
|
||||
ui3p pTo_VenderInfo;
|
||||
ui3p pTo_VendorID;
|
||||
ui3p pTo_RevLevel;
|
||||
ui3p pTo_PartNum;
|
||||
ui3p pTo_sRsrc_Video;
|
||||
ui3p pTo_VideoType;
|
||||
ui3p pTo_VideoName;
|
||||
ui3p pTo_MinorBase;
|
||||
ui3p pTo_MinorLength;
|
||||
uint8_t * pAt_sRsrcDir;
|
||||
uint8_t * pTo_sRsrc_Board;
|
||||
uint8_t * pTo_BoardType;
|
||||
uint8_t * pTo_BoardName;
|
||||
uint8_t * pTo_VenderInfo;
|
||||
uint8_t * pTo_VendorID;
|
||||
uint8_t * pTo_RevLevel;
|
||||
uint8_t * pTo_PartNum;
|
||||
uint8_t * pTo_sRsrc_Video;
|
||||
uint8_t * pTo_VideoType;
|
||||
uint8_t * pTo_VideoName;
|
||||
uint8_t * pTo_MinorBase;
|
||||
uint8_t * pTo_MinorLength;
|
||||
#if 0
|
||||
ui3p pTo_MajorBase;
|
||||
ui3p pTo_MajorLength;
|
||||
uint8_t * pTo_MajorBase;
|
||||
uint8_t * pTo_MajorLength;
|
||||
#endif
|
||||
ui3p pTo_VidDrvrDir;
|
||||
ui3p pTo_sMacOS68020;
|
||||
ui3p pTo_OneBitMode;
|
||||
ui3p pTo_OneVidParams;
|
||||
uint8_t * pTo_VidDrvrDir;
|
||||
uint8_t * pTo_sMacOS68020;
|
||||
uint8_t * pTo_OneBitMode;
|
||||
uint8_t * pTo_OneVidParams;
|
||||
#if 0 != vMacScreenDepth
|
||||
ui3p pTo_ColorBitMode = nullpr;
|
||||
ui3p pTo_ColorVidParams;
|
||||
uint8_t * pTo_ColorBitMode = nullpr;
|
||||
uint8_t * pTo_ColorVidParams;
|
||||
#endif
|
||||
|
||||
pPatch = VidROM;
|
||||
@ -314,7 +314,7 @@ GLOBALFUNC blnr Vid_Init(void)
|
||||
PatchAReservedOSLstEntry(pTo_sMacOS68020, 0x02 /* sMacOS68020 */);
|
||||
|
||||
PatchALong(4 + sizeof(VidDrvr_contents) + 8);
|
||||
MoveBytes((ui3p)VidDrvr_contents,
|
||||
MoveBytes((uint8_t *)VidDrvr_contents,
|
||||
pPatch, sizeof(VidDrvr_contents));
|
||||
pPatch += sizeof(VidDrvr_contents);
|
||||
PatchAWord(kcom_callcheck);
|
||||
@ -391,7 +391,7 @@ GLOBALFUNC blnr Vid_Init(void)
|
||||
UsedSoFar = (pPatch - VidROM) + 20;
|
||||
if (UsedSoFar > kVidROM_Size) {
|
||||
ReportAbnormalID(0x0A01, "kVidROM_Size to small");
|
||||
return falseblnr;
|
||||
return false;
|
||||
}
|
||||
|
||||
for (i = kVidROM_Size - UsedSoFar; --i >= 0; ) {
|
||||
@ -419,7 +419,7 @@ GLOBALFUNC blnr Vid_Init(void)
|
||||
CLUT_blues[CLUT_size - 1] = 0;
|
||||
#endif
|
||||
|
||||
return trueblnr;
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPORTPROC Vid_VBLinterrupt_PulseNotify(void);
|
||||
@ -448,7 +448,7 @@ LOCALFUNC tMacErr Vid_SetMode(uint16_t v)
|
||||
#else
|
||||
if (UseColorMode != ((v != 128) && ColorModeWorks)) {
|
||||
UseColorMode = ! UseColorMode;
|
||||
ColorMappingChanged = trueblnr;
|
||||
ColorMappingChanged = true;
|
||||
}
|
||||
#endif
|
||||
return mnvm_noErr;
|
||||
@ -457,7 +457,7 @@ LOCALFUNC tMacErr Vid_SetMode(uint16_t v)
|
||||
GLOBALFUNC uint16_t Vid_Reset(void)
|
||||
{
|
||||
#if 0 != vMacScreenDepth
|
||||
UseColorMode = falseblnr;
|
||||
UseColorMode = false;
|
||||
#endif
|
||||
return 128;
|
||||
}
|
||||
@ -486,7 +486,7 @@ GLOBALFUNC uint16_t Vid_Reset(void)
|
||||
#define VidBaseAddr 0xF9900000
|
||||
/* appears to be completely ignored */
|
||||
|
||||
LOCALVAR blnr UseGrayTones = falseblnr;
|
||||
LOCALVAR bool UseGrayTones = false;
|
||||
|
||||
LOCALPROC FillScreenWithGrayPattern(void)
|
||||
{
|
||||
@ -665,7 +665,7 @@ GLOBALPROC ExtnVideo_Access(CPTR p)
|
||||
}
|
||||
csTable += 8;
|
||||
}
|
||||
ColorMappingChanged = trueblnr;
|
||||
ColorMappingChanged = true;
|
||||
} else
|
||||
if (csStart + csCount < csStart) {
|
||||
/* overflow */
|
||||
@ -699,7 +699,7 @@ GLOBALPROC ExtnVideo_Access(CPTR p)
|
||||
}
|
||||
csTable += 8;
|
||||
}
|
||||
ColorMappingChanged = trueblnr;
|
||||
ColorMappingChanged = true;
|
||||
result = mnvm_noErr;
|
||||
}
|
||||
} else
|
||||
|
@ -20,7 +20,7 @@
|
||||
#define VIDEMDEV_H
|
||||
#endif
|
||||
|
||||
EXPORTFUNC blnr Vid_Init(void);
|
||||
EXPORTFUNC bool Vid_Init(void);
|
||||
EXPORTFUNC uint16_t Vid_Reset(void);
|
||||
EXPORTPROC Vid_Update(void);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user