diff --git a/glide2x/h3/minihwc/minihwc.c b/glide2x/h3/minihwc/minihwc.c index 343c589..2590621 100644 --- a/glide2x/h3/minihwc/minihwc.c +++ b/glide2x/h3/minihwc/minihwc.c @@ -987,25 +987,25 @@ hwcMapBoard(hwcBoardInfo *bInfo, FxU32 bAddrMask) 0x1000000, &bInfo->deviceNum, bInfo->boardNum, 3); } } -#endif +#endif return FXTRUE; #undef FN_NAME } /* hwcMapBoard */ FxBool -hwcInitRegisters(hwcBoardInfo *bInfo) +hwcInitRegisters(hwcBoardInfo *bInfo) { -#define FN_NAME hwcInitRegisters +#define FN_NAME "hwcInitRegisters" FxU32 grxSpeedInMHz, memSpeedInMHz, sgramMode, sgramMask, sgramColor; - + if (bInfo->linearInfo.initialized == FXFALSE) { - printf(errorString, "%s: Called before hwcMapBoard\n", FN_NAME); + sprintf(errorString, "%s: Called before hwcMapBoard\n", FN_NAME); return FXFALSE; } - + bInfo->regInfo.initialized = FXTRUE; bInfo->regInfo.ioMemBase = diff --git a/glide3x/h3/minihwc/minihwc.c b/glide3x/h3/minihwc/minihwc.c index 4380a84..1c2295c 100644 --- a/glide3x/h3/minihwc/minihwc.c +++ b/glide3x/h3/minihwc/minihwc.c @@ -1135,12 +1135,12 @@ hwcMapBoard(hwcBoardInfo *bInfo, FxU32 bAddrMask) bInfo->linearInfo.linearAddress[3] = 0; /* Kludge. Pass boardInfo to acceleration stuff. */ -#if GLIDE3 +#if GLIDE3 { extern hwcBoardInfo *acceleratorBoardInfo; acceleratorBoardInfo = bInfo; } -#endif +#endif } #else { @@ -1170,25 +1170,25 @@ hwcMapBoard(hwcBoardInfo *bInfo, FxU32 bAddrMask) 0x1000000, &bInfo->deviceNum, bInfo->boardNum, 3); } } -#endif +#endif return FXTRUE; #undef FN_NAME } /* hwcMapBoard */ FxBool -hwcInitRegisters(hwcBoardInfo *bInfo) +hwcInitRegisters(hwcBoardInfo *bInfo) { -#define FN_NAME hwcInitRegisters +#define FN_NAME "hwcInitRegisters" FxU32 grxSpeedInMHz, memSpeedInMHz, sgramMode, sgramMask, sgramColor; - + if (bInfo->linearInfo.initialized == FXFALSE) { - printf(errorString, "%s: Called before hwcMapBoard\n", FN_NAME); + sprintf(errorString, "%s: Called before hwcMapBoard\n", FN_NAME); return FXFALSE; } - + bInfo->regInfo.initialized = FXTRUE; bInfo->regInfo.ioMemBase = @@ -1203,7 +1203,7 @@ hwcInitRegisters(hwcBoardInfo *bInfo) bInfo->linearInfo.linearAddress[0] + SST_LFB_OFFSET; bInfo->regInfo.rawLfbBase = bInfo->linearInfo.linearAddress[1]; -#if __POWERPC__ +#if __POWERPC__ bInfo->regInfo.ioPortBase = bInfo->pciInfo.pciBaseAddr[2] & ~0x1; #else bInfo->regInfo.ioPortBase = (FxU16) bInfo->pciInfo.pciBaseAddr[2] & ~0x1; diff --git a/glide3x/h5/minihwc/minihwc.c b/glide3x/h5/minihwc/minihwc.c index 1a8d6a2..022c6b1 100644 --- a/glide3x/h5/minihwc/minihwc.c +++ b/glide3x/h5/minihwc/minihwc.c @@ -1979,25 +1979,25 @@ hwcMapBoard(hwcBoardInfo *bInfo, FxU32 bAddrMask) } } } -#endif +#endif return FXTRUE; #undef FN_NAME } /* hwcMapBoard */ FxBool -hwcInitRegisters(hwcBoardInfo *bInfo) +hwcInitRegisters(hwcBoardInfo *bInfo) { #define FN_NAME "hwcInitRegisters" FxU32 grxSpeedInMHz, memSpeedInMHz, sgramMode, sgramMask, sgramColor; - + if (bInfo->linearInfo.initialized == FXFALSE) { sprintf(errorString, "%s: Called before hwcMapBoard\n", FN_NAME); return FXFALSE; } - + bInfo->regInfo.initialized = FXTRUE; bInfo->regInfo.ioMemBase = @@ -2034,7 +2034,7 @@ hwcInitRegisters(hwcBoardInfo *bInfo) bInfo->regInfo.slaveIOBase[chip - 1] = bInfo->linearInfo.linearAddress[(chip << 2) + 0] ; } } -#else +#else /* DOS is a bit weirder. In this case we have both memBase0 and memBase1's linear * addresses stored in linearAddress[0] and linearAddress[1], which is not what * the Windows and Mac code expect. However, the important thing is really just @@ -2059,7 +2059,7 @@ hwcInitRegisters(hwcBoardInfo *bInfo) bInfo->regInfo.rawLfbBase = bInfo->linearInfo.linearAddress[1]; -#if __POWERPC__ +#if __POWERPC__ bInfo->regInfo.ioPortBase = bInfo->pciInfo.pciBaseAddr[2] & ~0x1; #else bInfo->regInfo.ioPortBase = (FxU16) bInfo->pciInfo.pciBaseAddr[2] & ~0x1;