[Scummvm-cvs-logs] CVS: scummvm/backends/gp32 debug-gdbstub-usb.cpp,1.2,1.3 gfx_splash.h,1.1,1.2 gp-fs.cpp,1.6,1.7 gp32.cpp,1.26,1.27 gp32.h,1.25,1.26 graphics.h,1.1,1.2 portdefs.h,1.5,1.6 setup.h,1.1,1.2 startup.h,1.1,1.2
Eugene Sandulenko
sev at users.sourceforge.net
Sat Jul 30 14:14:09 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm PNOMain.cpp,1.6,1.7 blit.cpp,1.2,1.3 copyrectangle.cpp,1.3,1.4 decompressrle0.cpp,1.1,1.2 decompressrle7.cpp,1.1,1.2 drawsprite.cpp,1.1,1.2 drawstrip.cpp,1.2,1.3 fastshrink.cpp,1.1,1.2 macros.h,1.4,1.5 native.h,1.6,1.7 proc3.cpp,1.5,1.6 renderparallax.cpp,1.1,1.2 screendraw.cpp,1.1,1.2 widelandscape.cpp,1.3,1.4 wideportrait.cpp,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.19,1.20 adlibmusic.cpp,1.25,1.26 gmchannel.cpp,1.21,1.22 musicbase.cpp,1.24,1.25 musicbase.h,1.20,1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/gp32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/backends/gp32
Modified Files:
debug-gdbstub-usb.cpp gfx_splash.h gp-fs.cpp gp32.cpp gp32.h
graphics.h portdefs.h setup.h startup.h
Log Message:
Remove trailing whitespaces.
Index: debug-gdbstub-usb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/debug-gdbstub-usb.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debug-gdbstub-usb.cpp 9 Apr 2005 01:52:41 -0000 1.2
+++ debug-gdbstub-usb.cpp 30 Jul 2005 21:10:52 -0000 1.3
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
@@ -120,7 +120,7 @@
// Global stuff
// Register array.
-int g_Registers[50] = {1, 2, 3, 4 ,5, 6, 7, 8, 9, 10,
+int g_Registers[50] = {1, 2, 3, 4 ,5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19,
21, 22, 23, 24, 25, 26, 27, 28, 29,
31, 32, 33, 34, 35, 36, 37, 38, 39,
@@ -173,13 +173,13 @@
int OpenUSB()
{
int iResult;
-
+
g_CommDesc.port_kind = COMM_USB_D;
g_CommDesc.tr_mode = 1;
g_CommDesc.tr_buf_size = PACKET_SIZE;
g_CommDesc.sz_pkt = PACKET_SIZE;
g_CommDesc.isr_comm_ram = 0;
-
+
iResult = GpCommCreate(&g_CommDesc, &g_Comm);
return iResult;
@@ -222,7 +222,7 @@
}
}
///////////////////////////////////////////////////////////////
-// Formats and sends a command to the server,
+// Formats and sends a command to the server,
// it also calculates checksum
void SendCommand(unsigned char *pCommand)
{
@@ -329,7 +329,7 @@
pString[3] = HexDigits[(iNumber >> 8) & 0x0f];
pString[0] = HexDigits[(iNumber >> 4) & 0x0f];
pString[1] = HexDigits[(iNumber) & 0x0f];
-
+
pString[8] = 0;
}
@@ -402,7 +402,7 @@
case 'f':
ucValue |= (0x0f);
break;
-
+
}
}
@@ -418,7 +418,7 @@
int a = 0;//(int)&__text_start;
int b = 0;//(int)&__data_start;
int c = 0;//(int)&__bss_start;
-
+
PrintToString(String, "Text=");
HexToString(&String[5], a);
PrintToString(&String[5+8], ";Data=");
@@ -449,23 +449,23 @@
HexToStringBW(&Buffer[i * 8], g_Registers[21 + i]);
}
Buffer[21*8] = 0;
-
+
SendCommandSize((unsigned char *)Buffer, (21 * 8) + 4);
}
///////////////////////////////////////////////////////////////
-// This function extracts an address from a string.
+// This function extracts an address from a string.
void *GetAddr(char *pBuffer)
{
int iAddr;
int i = 0;
iAddr = 0;
-
+
while (pBuffer[i] != ',') {
iAddr = iAddr << 4;
switch(pBuffer[i]) {
case '0':
- //iAddr |=
+ //iAddr |=
break;
case '1':
iAddr |= (0x01);
@@ -531,7 +531,7 @@
iBytes = iBytes << 4;
switch(pBuffer[i]) {
case '0':
- //iAddr |=
+ //iAddr |=
break;
case '1':
iBytes |= 0x01;
@@ -580,7 +580,7 @@
break;
}
-
+
i++;
}
return iBytes;
@@ -613,7 +613,7 @@
iData = *pData++;
g_TempBuffer[iBufferPos++] = HexDigits[(iData & 0xf0) >> 4];
g_TempBuffer[iBufferPos++] = HexDigits[(iData & 0x0f)];
-
+
}
if (iBytes > 0) {
// This mean that we have not yet sent our last command.
@@ -711,7 +711,7 @@
void ISR()
{
// Lets snatch the registers!
-
+
asm volatile(" \n"
" str r4, [%0, #0x10] \n"
" str r5, [%0, #0x14] \n"
@@ -724,7 +724,7 @@
" str r12, [%0, #0x30] \n"
" str r14, [%0, #0x3C] \n"
-
+
" @// skip 8 * 12byte(96bit) = 0x60 \n"
" mov r4, %0 \n"
@@ -738,10 +738,10 @@
" str r1, [r4, #0x48] \n"
" str r1, [r4,#0xA0] \n"
" str r1, [r4,#0xA4] \n"
-
+
" mrs r1, CPSR \n"
" mov r2, r1 \n"
-
+
" @// Let us set the mode to supervisor so we can get r13 and r14 \n"
" bic r1, r1, #0x1f \n"
@@ -755,15 +755,15 @@
" bic r2, r2, #0x80 \n"
" msr CPSR_fsxc, r2 \n"
-
-
+
+
" \n"
:
: "r" (g_Registers)
: "%0", "r1", "r2", "r4");
-
+
// Get Current CSPR and save LR
asm volatile(" \n"
" mrs r0, CPSR \n"
@@ -806,7 +806,7 @@
default:
g_iTrap = -1;
}
-
+
#ifdef USE_PRINTF
Printf("Trap at 0x%x:%d", g_Registers[15], g_iTrap);
@@ -834,11 +834,11 @@
*/
SendBreakPoint();
BreakPoint();
-
+
//Printf("0x%x 0x%x", g_Registers[15], g_Registers[16]);
// Okay, it's time to continue.
-
-
+
+
switch (g_iTrap) {
case MODE_USER:
//Printf("Dunno!!\n");
@@ -877,7 +877,7 @@
" ldr r0,[%0, #0x00] \n"
" ldr r3,[%0, #0x0C] \n"
-
+
" subs pc, lr, #0x04 \n"
" \n"
@@ -918,7 +918,7 @@
:
:"r" (g_Registers)
:"r0");
-
+
break;
case MODE_SYSTEM:
@@ -931,7 +931,7 @@
}
-
+
}
@@ -992,7 +992,7 @@
unsigned char MyChar;
if (!g_GDBConnected) return;
-
+
va_start(VaList , pFormat);
vsnprintf(Temp, 0x100, pFormat , VaList);
va_end(VaList);
@@ -1026,7 +1026,7 @@
void *pAddr;
int iOffset;
int iBytes;
-
+
// Find out if we got here through a STEP command
if (g_LastWasStep) {
@@ -1050,7 +1050,7 @@
while(!bBreakLoop) {
iResult = RecvUSB(g_ReadBuffer, 0x100);
//Printf("%d\n", iResult);
-
+
if (iResult > 0) {
// If we recieve a package we can assume that GDB is connected.. or smth..:D
g_GDBConnected = true;
@@ -1064,7 +1064,7 @@
g_SendBuffer[4] = '+';
SendUSB((const void *)g_SendBuffer, 0x100);
WaitACK();
-
+
// I can see that i get a bunch of '+' and '-' in the messages.. lets remove them.
iOffsetAdd = 4;
while((g_ReadBuffer[iOffsetAdd] == '+') || (g_ReadBuffer[iOffsetAdd] == '-')) iOffsetAdd++;
@@ -1118,16 +1118,16 @@
iOffset = FindChar(&g_ReadBuffer[iOffsetAdd + 2], ':');
WriteMemory(pAddr, iBytes, &g_ReadBuffer[iOffsetAdd + 2 + iOffset + 1]);
SendCommand((unsigned char *)"OK");
-
+
}
break;
case 'c': // continue
{
return;
-
+
}
break;
-
+
case 's': // Stepping.
{
// Get the address of the next instruction.
@@ -1164,7 +1164,7 @@
}
}
break;
-
+
default:
UnSupportedCommand();
break;
@@ -1195,8 +1195,8 @@
unsigned int uiNewPC = DecodeInstruction(uiInstruction, (unsigned int)pAddr);
return (unsigned int *)uiNewPC;
-
-
+
+
// Set new PC to pAddr + 4, because we really hope that is the case...:D
iNewPC = (unsigned int)pAddr;
iNewPC += 4; // Next instruction (atleast in ARM mode, we don't support thumb yet)
@@ -1227,9 +1227,9 @@
iNewAddr *= 4; // Instruction size.
iNewPC = ((int)pAddr + iNewAddr + 8);
}
-
+
// Well, it might be a ldm(ea)?
-
+
if ((uiInstruction & 0xE000000) == 0x8000000) {
#ifdef USE_PRINTF
Printf("LDM");
@@ -1261,28 +1261,28 @@
uiRegVal = ((unsigned int *)g_Registers)[uiBaseRegister];
// First, have a look at the U bit.
if ((uiInstruction & (1 << 23)) != 0) {
-
+
// Transfer is made descending
// Which also means that the PC is closest to the base register i just found out.
// Lets check the P bit (If i'm supposed to increment before or after.
-
+
iPCOffset = iRegsbeforePC * 4;
if (((uiInstruction) & (1 << 24)) != 0) iPCOffset += 4;
-
+
} else {
// Transfer is done ascending
// Lets check the P bit (If i'm supposed to decrement before or after.
if (((uiInstruction) & (1 << 24)) != 0) iPCOffset = -4;
}
-
-
+
+
iNewPC = *(unsigned int *)((((int)uiRegVal) + iPCOffset) & ~0x03);
}
}
}
-
+
// Check if it's a mov pc, Rn
-
+
}
return (unsigned int *)iNewPC;
@@ -1298,7 +1298,7 @@
// This is true if Z is set in CSPR
if ((CSPR & (1 << 30)) != 0) return true;
else return false;
-
+
break;
case 1: // NE
// This should be true if Z is not set.
@@ -1370,7 +1370,7 @@
default:
break;
}
-
+
}
// I got the idea for this layout from the singlestep.c (found in eCos)
@@ -1395,7 +1395,7 @@
#define DPISR_R1 0
#define DPISR_R2 0
// Example <opcode> Rd, Rm, <shift> amount
-typedef struct
+typedef struct
{
unsigned Rm : 4; // Rm
unsigned resv3 : 1; // Reserved 3 (1)
@@ -1475,7 +1475,7 @@
unsigned S : 1; // B-bit
unsigned U : 1; // U-bit
unsigned p : 1; // P-bit
-
+
unsigned resv1 : 3; // Reserved 1 (100)
unsigned cond : 4; // Condition
} lsm; // Load store multiple
@@ -1563,7 +1563,7 @@
///////////////////////////////////////////////////////////////
-//
+//
unsigned int DecodeInstruction(unsigned int uiInstruction, unsigned int PC)
{
Instruction myInstruction;
@@ -1585,7 +1585,7 @@
(myInstruction.DPRRS.resv3 == DPRRS_R3)) return DecodeDPRRS(myInstruction.DPRRS, PC);
else if ((myInstruction.DPI.resv1 == DPI_R1)) return DecodeDPI(myInstruction.DPI, PC);
else if ((myInstruction.LSIO.resv1 == LSIO_R1)) return DecodeLSIO(myInstruction.LSIO, PC);
-
+
else if ((myInstruction.LSRO.resv1 == LSRO_R1) &&
(myInstruction.LSRO.resv2 == LSRO_R2)) return DecodeLSRO(myInstruction.LSRO, PC);
else if (myInstruction.LSM.resv1 == LSM_R1) return DecodeLSM(myInstruction.LSM, PC);
@@ -1595,21 +1595,21 @@
}
///////////////////////////////////////////////////////////////
-//
+//
unsigned int LSL(unsigned int uiValue, unsigned int uiSteps)
{
return uiValue << uiSteps;
}
///////////////////////////////////////////////////////////////
-//
+//
unsigned int LSR(unsigned int uiValue, unsigned int uiSteps)
{
return uiValue >> uiSteps;
}
///////////////////////////////////////////////////////////////
-//
+//
// This one could be trickier since, i'm nor sure if a signed shift really is a signed shift.
unsigned int ASR(unsigned int uiValue, unsigned int uiSteps)
{
@@ -1625,7 +1625,7 @@
}
///////////////////////////////////////////////////////////////
-//
+//
unsigned int ROR(unsigned int uiValue, unsigned int uiSteps)
{
unsigned int uiRetval;
@@ -1642,14 +1642,14 @@
///////////////////////////////////////////////////////////////
-//
+//
unsigned int Shift_Operand(unsigned int Rm, unsigned int amount, unsigned int shift)
{
unsigned int uiRegisterValue;
-
-
-
+
+
+
uiRegisterValue = g_Registers[Rm];
if (Rm == 0x0f) {
// Rm is PC, and PC is offseted by 8.
@@ -1671,7 +1671,7 @@
case 3: // ROR
return ROR(uiRegisterValue, amount);
break;
-
+
default:
break;
@@ -1680,7 +1680,7 @@
}
///////////////////////////////////////////////////////////////
-//
+//
// Example <opcode> Rd, Rm, <shift> amount
unsigned int DecodeDPISR(dpisr Instr, unsigned int uiPC)
{
@@ -1688,10 +1688,10 @@
unsigned int uiRnVal = g_Registers[Instr.Rn];
-
+
// Only do this i Pc is Rd
if (Instr.Rd != 0x0f) return uiPC + 4;
-
+
// The actual value that PC contains when executing this instruction is the instruction address+8
if (Instr.Rn == 0x0f) uiRnVal += 8;
@@ -1702,11 +1702,11 @@
case OPCODE_MVN:
return ~uiOperand;
case OPCODE_ADD:
- return uiRnVal + uiOperand;
+ return uiRnVal + uiOperand;
case OPCODE_ADC:
return uiRnVal + uiOperand + (((g_Registers[18] & (1 << 29))) == 0?0:1);
case OPCODE_SUB:
- return uiRnVal - uiOperand;
+ return uiRnVal - uiOperand;
case OPCODE_SBC:
return uiRnVal - uiOperand - (((g_Registers[18] & (1 << 29))) == 0?1:0);
case OPCODE_RSB:
@@ -1728,7 +1728,7 @@
///////////////////////////////////////////////////////////////
-//
+//
//dprrs; // Data Processing Register Register Shift
// Example <opcode> Rd, Rn, Rm <shift> Rs
unsigned int DecodeDPRRS(dprrs Instr, unsigned int uiPC)
@@ -1752,11 +1752,11 @@
case OPCODE_MVN:
return ~uiOperand;
case OPCODE_ADD:
- return uiRnVal + uiOperand;
+ return uiRnVal + uiOperand;
case OPCODE_ADC:
return uiRnVal + uiOperand + (((g_Registers[18] & (1 << 29))) == 0?0:1);
case OPCODE_SUB:
- return uiRnVal - uiOperand;
+ return uiRnVal - uiOperand;
case OPCODE_SBC:
return uiRnVal - uiOperand - (((g_Registers[18] & (1 << 29))) == 0?1:0);
case OPCODE_RSB:
@@ -1778,7 +1778,7 @@
}
///////////////////////////////////////////////////////////////
-//
+//
// dpi; // Data processing immediate
// example add r0, r1, (ror <immed>, <rotate * 2>)
unsigned int DecodeDPI(dpi Instr, unsigned int uiPC)
@@ -1797,11 +1797,11 @@
case OPCODE_MVN:
return ~uiOperand;
case OPCODE_ADD:
- return uiRnVal + uiOperand;
+ return uiRnVal + uiOperand;
case OPCODE_ADC:
return uiRnVal + uiOperand + (((g_Registers[18] & (1 << 29))) == 0?0:1);
case OPCODE_SUB:
- return uiRnVal - uiOperand;
+ return uiRnVal - uiOperand;
case OPCODE_SBC:
return uiRnVal - uiOperand - (((g_Registers[18] & (1 << 29))) == 0?1:0);
case OPCODE_RSB:
@@ -1823,7 +1823,7 @@
}
///////////////////////////////////////////////////////////////
-//
+//
// lsio; // Load/store immediate offset
// Example ldr Rd, [Rn, #<immed>]
unsigned int DecodeLSIO(lsio Instr, unsigned int uiPC)
@@ -1840,7 +1840,7 @@
// Check if it's pre-indexed
if (Instr.p == 1){
-
+
if (Instr.U == 1) {
// Add offset
uiRnValue += Instr.immed;
@@ -1857,7 +1857,7 @@
}
///////////////////////////////////////////////////////////////
-//
+//
// lsro; // Load/Store register offset
// Example ldr Rd, [Rn + Rm lsl 5]
unsigned int DecodeLSRO(lsro Instr, unsigned int uiPC)
@@ -1876,7 +1876,7 @@
uiIndex = Shift_Operand(Instr.Rm, Instr.amount, Instr.shift);
if (Instr.p == 1){
-
+
if (Instr.U == 1) {
// Add offset
uiRnValue += uiIndex;
@@ -1893,7 +1893,7 @@
}
///////////////////////////////////////////////////////////////
-//
+//
// lsm; // Load store multiple
// Example: ldm r0, {r1, r2, r3}
unsigned int DecodeLSM(lsm Instr, unsigned int uiPC)
@@ -1922,7 +1922,7 @@
for (int i = 0; i < 15; i++) {
if ((Instr.regs & (1 << i)) != 0) uiOffsetToPC += 4;
}
-
+
// If the P bit is set, it uses pre increment
if (Instr.p == 1) uiOffsetToPC += 4;
}
@@ -1935,7 +1935,7 @@
}
///////////////////////////////////////////////////////////////
-//
+//
// bl; // Branch with link(optional)
unsigned int DecodeBL(bl Instr, unsigned int uiPC)
{
Index: gfx_splash.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gfx_splash.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gfx_splash.h 9 Mar 2005 22:21:54 -0000 1.1
+++ gfx_splash.h 30 Jul 2005 21:10:52 -0000 1.2
@@ -21,4825 +21,4825 @@
#include "gpgraphic.h"
GP_PALETTEENTRY gfx_splash_Pal[256] = {
- 0x843, 0x88B, 0x1941, 0x110D, 0x2883, 0x30C9, 0x2945, 0x2109, 0x214D, 0x2989, 0x218F, 0x3149, 0x394D, 0x3989, 0x318D, 0x8D1,
- 0x1153, 0x9D9, 0x2993, 0x29DB, 0x1A01, 0x3243, 0x3A4B, 0x3B01, 0x1A15, 0x125B, 0x3255, 0x329B, 0x3B17, 0x331D, 0x40C3, 0x4145,
- 0x498B, 0x6987, 0x61C9, 0x49D1, 0x4285, 0x524D, 0x4B43, 0x530D, 0x6207, 0x624D, 0x6307, 0x6B4B, 0x4211, 0x4A55, 0x4A93, 0x4297,
- 0x5251, 0x5255, 0x5293, 0x5295, 0x4ADB, 0x5313, 0x535D, 0x6AD3, 0x62D9, 0x7355, 0x6319, 0x6B5D, 0x6B9B, 0x639F, 0x7359, 0x735D,
- 0x739B, 0x7B9F, 0x32E1, 0x3B63, 0x4AA3, 0x52E9, 0x4BA3, 0x53A9, 0x6BE3, 0x6BA9, 0x7BF1, 0x7C4D, 0x5C1F, 0x7417, 0x741B, 0x5C25,
- 0x54AB, 0x552F, 0x6C65, 0x6CAB, 0x7D27, 0x752D, 0x54F1, 0x5D35, 0x5D79, 0x6CF1, 0x6D75, 0x6DB9, 0x7E35, 0x763B, 0x89CF, 0xB085,
- 0xA909, 0xA98D, 0xB14B, 0xB1CF, 0x8207, 0x834F, 0x8A53, 0x8AD3, 0x8A95, 0x9253, 0x9295, 0x8395, 0x8359, 0x835D, 0x83D9, 0x83DD,
- 0x9359, 0x93D9, 0x93DD, 0xAA11, 0xA2D7, 0xB253, 0xBA95, 0xA393, 0xAB19, 0xABDB, 0xA3DF, 0xB319, 0xB3DF, 0xC001, 0xC8C7, 0xD843,
[...9610 lines suppressed...]
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
+ 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD,
0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD
-
+
};
Index: gp-fs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp-fs.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gp-fs.cpp 24 Jun 2005 15:22:29 -0000 1.6
+++ gp-fs.cpp 30 Jul 2005 21:10:53 -0000 1.7
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
@@ -41,7 +41,7 @@
bool _isDirectory;
bool _isValid;
Common::String _path;
-
+
public:
GP32FilesystemNode();
GP32FilesystemNode(const Common::String &path);
@@ -105,17 +105,17 @@
ulong read;
FSList myList;
-
+
int start=0; // current file
// ... loop over dir entries using readdir
- while (GpDirEnumList(_path.c_str(), start++, 1, &dp, &read) == SM_OK) {
+ while (GpDirEnumList(_path.c_str(), start++, 1, &dp, &read) == SM_OK) {
if (strcmp(dp.name,".")==0|| strcmp(dp.name,"..")==0) continue;
GP32FilesystemNode entry;
entry._displayName = dp.name;
entry._path = _path;
entry._path += dp.name;
-
+
GPFILEATTR attr;
char s[256];
sprintf(s, "%s%s", _path.c_str(), dp.name);
@@ -130,23 +130,23 @@
if (entry._isDirectory)
entry._path += "\\"; //ph0x
myList.push_back(entry);
- }
+ }
return myList;
}
const char *lastPathComponent(const Common::String &str) {
const char *start = str.c_str();
const char *cur = start + str.size() - 2;
-
+
while (cur > start && *cur != '\\') { //ph0x
--cur;
}
-
+
return cur+1;
}
FilesystemNode *GP32FilesystemNode::parent() const {
-
+
GP32FilesystemNode *p = new GP32FilesystemNode();
// OLD - REMOVE ON CLEAN COMPILE
Index: gp32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gp32.cpp 9 Apr 2005 01:52:41 -0000 1.26
+++ gp32.cpp 30 Jul 2005 21:10:53 -0000 1.27
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
@@ -69,7 +69,7 @@
// FIXME!!
// crashes if here and not buildgammatab() not called as very first line! check
// check if sav file handling overwrites something!
-// float gammatab[256];
+// float gammatab[256];
FILE *fstderr, *fstdout, *fstdin;
@@ -124,7 +124,7 @@
GP32 ScummVM OSystem Implementation.
****************************************************************/
-//OSystem *OSystem_GP32::create()
+//OSystem *OSystem_GP32::create()
//{
// //OSystem_GP32 *syst = new OSystem_GP32();
// //return syst;
@@ -135,10 +135,10 @@
{
//
// OSystem_GP32 *syst = new OSystem_GP32();
-////
+////
//// //syst->_mode = gfx_mode;
//// //syst->_full_screen = full_screen;
-//
+//
// // allocate palette storage
// syst->_currentPalette = (gpColor*)calloc(sizeof(gpColor), 256);
//
@@ -157,8 +157,8 @@
//#endif
_hwscreen(0), _screen(0), _screenWidth(0), _screenHeight(0),
_tmpscreen(0), _overlayVisible(false),
-// _cdrom(0),
-// _scaler_proc(0),
+// _cdrom(0),
+// _scaler_proc(0),
_modeChanged(false), _dirty_checksums(0),
_mouseVisible(false), _mouseDrawn(false), _mouseData(0),
_mouseHotspotX(0), _mouseHotspotY(0),
@@ -589,8 +589,8 @@
// Moves the screen content around by the given amount of pixels
// but only the top height pixel rows, the rest stays untouched
-//void OSystem_GP32::move_screen(int dx, int dy, int height)
-//{
+//void OSystem_GP32::move_screen(int dx, int dy, int height)
+//{
// if ((dx == 0) && (dy == 0))
// return;
//
@@ -634,12 +634,12 @@
return _screenWidth;
}
-//void OSystem_GP32::warpMouse(int, int)
-//{
+//void OSystem_GP32::warpMouse(int, int)
+//{
//}
void OSystem_GP32::warpMouse(int x, int y) {
-// set_mouse_pos(x, y);
+// set_mouse_pos(x, y);
}
void OSystem_GP32::load_gfx_mode() {
@@ -978,7 +978,7 @@
// // If the shake position changed, fill the dirty area with blackness
// if (_currentShakePos != _newShakePos) {
// gpRect blackrect = {0, 0, _screenWidth*_scaleFactor, _newShakePos*_scaleFactor};
-//
+//
// if (_adjustAspectRatio)
// blackrect.h = real2Aspect(blackrect.h - 1) + 1;
//
@@ -991,14 +991,14 @@
//
// // Make sure the mouse is drawn, if it should be drawn.
// draw_mouse();
-//
+//
// // Check whether the palette was changed in the meantime and update the
-// // screen surface accordingly.
+// // screen surface accordingly.
// if (_paletteDirtyEnd != 0) {
-// gpSetColors(_screen, _currentPalette + _paletteDirtyStart,
+// gpSetColors(_screen, _currentPalette + _paletteDirtyStart,
// _paletteDirtyStart,
// _paletteDirtyEnd - _paletteDirtyStart);
-//
+//
// _paletteDirtyEnd = 0;
//
// _forceFull = true;
@@ -1016,24 +1016,24 @@
//
// // Only draw anything if necessary
// if (_num_dirty_rects > 0) {
-//
-// gpRect *r;
+//
+// gpRect *r;
// uint32 srcPitch, dstPitch;
// gpRect *last_rect = _dirty_rect_list + _num_dirty_rects;
-//
+//
// // Convert appropriate parts of the 8bpp image into 16bpp
// if (!_overlayVisible) {
// gpRect dst;
// for(r = _dirty_rect_list; r != last_rect; ++r) {
// dst = *r;
// dst.x++; // FIXME? Shift rect by one since 2xSai needs to acces the data around
-// dst.y++; // FIXME? any pixel to scale it, and we want to avoid mem access crashes.
+// dst.y++; // FIXME? any pixel to scale it, and we want to avoid mem access crashes.
//
// if (gpBlitSurface(_screen, r, _hwscreen, &dst) != 0) //ph0x! _tmpscreen
-// error("gpBlitSurface failed: %s", gpGetError());
+// error("gpBlitSurface failed: %s", gpGetError());
// }
// }
-//
+//
//// ph0x! (no scaling) cannot skip intro if commented?
//
// srcPitch = _tmpscreen->pitch;
@@ -1045,13 +1045,13 @@
// dst_h = r->h;
// if (dst_h > _screenHeight - dst_y)
// dst_h = _screenHeight - dst_y;
-//
+//
// dst_y *= _scaleFactor;
//
// if (_overlayVisible) //ph0x fixme?
-// _scaler_proc((byte*)_tmpscreen->pixels + (r->x*2+2) + (r->y+1)*srcPitch, srcPitch,
-// (byte*)_hwscreen->pixels + r->x*2*_scaleFactor + dst_y*dstPitch, dstPitch, r->w, dst_h);
-// }
+// _scaler_proc((byte*)_tmpscreen->pixels + (r->x*2+2) + (r->y+1)*srcPitch, srcPitch,
+// (byte*)_hwscreen->pixels + r->x*2*_scaleFactor + dst_y*dstPitch, dstPitch, r->w, dst_h);
+// }
// r->x *= _scaleFactor;
// r->y = dst_y;
// r->w *= _scaleFactor;
@@ -1152,7 +1152,7 @@
}
// Get the next event.
-// Returns true if an event was retrieved.
+// Returns true if an event was retrieved.
const signed char abc[] = "0123456789abcdefghijklmnopqrstuvwxyz";
signed int abcindex = -1;
@@ -1238,7 +1238,7 @@
gindex++;
buildgammatab(gindex);
_paletteDirtyStart = 0;
- _paletteDirtyEnd = 255; //fixme?
+ _paletteDirtyEnd = 255; //fixme?
lastevent = event.type;
lastkey = key;
return true;
@@ -1251,7 +1251,7 @@
gindex--;
buildgammatab(gindex);
_paletteDirtyStart = 0;
- _paletteDirtyEnd = 255; //fixme?
+ _paletteDirtyEnd = 255; //fixme?
lastevent = event.type;
lastkey = key;
return true;
@@ -1269,7 +1269,7 @@
lastkey = key;
- if (key & GPC_VK_FR) { // R
+ if (key & GPC_VK_FR) { // R
if (key & GPC_VK_UP) {
if (getMillis() < t)
return false;
@@ -1297,7 +1297,7 @@
if (getMillis() < t)
return false;
//do key=GpKeyGet(); while (key & GPC_VK_DOWN);
- //fixme -2/-1
+ //fixme -2/-1
t = getMillis() + 200;
if (abcindex == -1)
abcindex = abcindex = sizeof(abc) - 2;
@@ -1357,7 +1357,7 @@
while (key != GPC_VK_NONE); // prevent 2xESC
buildgammatab(gindex);
_paletteDirtyStart = 0;
- _paletteDirtyEnd = 255; //fixme?
+ _paletteDirtyEnd = 255; //fixme?
}
event.kbd.keycode = event.kbd.ascii = 27;
lastevent = event.type;
@@ -1426,7 +1426,7 @@
/////////////////////////////////////////////////////////////////////////////
//
-// GP32 Graphics Stuff -
+// GP32 Graphics Stuff -
//
/////////////////////////////////////////////////////////////////////////////
@@ -1504,7 +1504,7 @@
/////////////////////////////////////////////////////////////////////////////
//
-// GP32 Sound Stuff -
+// GP32 Sound Stuff -
//
/////////////////////////////////////////////////////////////////////////////
@@ -1623,7 +1623,7 @@
//gpsndbuf.userdata=g_scumm; //param; //fixme? // Userdata which gets passed to the callback function
gpsndbuf.callback = proc; //mycallback; // Callback function (just like in SDL)
//2*((float)22025/(float)s.samples);
- gpsndbuf.pollfreq = 8 * (SAMPLES_PER_SEC / gpsndbuf.samples); //fixme
+ gpsndbuf.pollfreq = 8 * (SAMPLES_PER_SEC / gpsndbuf.samples); //fixme
// Frequency of the timer interrupt which polls the playing position
// recommended value: 2*(playingfreq in Hz/GPSOUNDBUF.samples)
//s.samplesize; // Size of one sample (8bit mono->1, 16bit stereo->4) - don't touch this
@@ -1716,7 +1716,7 @@
int (*_timercallback)(int);
void voidcallback() {
- //printf("timer running");
+ //printf("timer running");
_timercallback(_timerinterval); //FIXME ?? (*_timercallback)(_timerinterval);
}
@@ -1911,7 +1911,7 @@
draw_mouse();
// Check whether the palette was changed in the meantime and update the
- // screen surface accordingly.
+ // screen surface accordingly.
if (_paletteDirtyEnd != 0) {
gpSetColors(_screen, _currentPalette + _paletteDirtyStart,
@@ -2078,14 +2078,14 @@
//
// // Make sure the mouse is drawn, if it should be drawn.
// draw_mouse(); //ph0x
-//
+//
// // Check whether the palette was changed in the meantime and update the
-// // screen surface accordingly.
+// // screen surface accordingly.
// if (_paletteDirtyEnd != 0) {
-// gpSetColors(_screen, _currentPalette + _paletteDirtyStart,
+// gpSetColors(_screen, _currentPalette + _paletteDirtyStart,
// _paletteDirtyStart,
// _paletteDirtyEnd - _paletteDirtyStart);
-//
+//
// _paletteDirtyEnd = 0;
//
// _forceFull = true;
@@ -2103,27 +2103,27 @@
//
// // Only draw anything if necessary
// if (_num_dirty_rects > 0) {
-//
-// gpRect *r;
+//
+// gpRect *r;
// uint32 srcPitch, dstPitch;
// gpRect *last_rect = _dirty_rect_list + _num_dirty_rects;
-//
+//
// // Convert appropriate parts of the 8bpp image into 16bpp
// if (!_overlayVisible) {
// gpRect dst;
// for(r = _dirty_rect_list; r != last_rect; ++r) {
// dst = *r;
// dst.x++; // FIXME? Shift rect by one since 2xSai needs to acces the data around
-// dst.y++; // FIXME? any pixel to scale it, and we want to avoid mem access crashes.
+// dst.y++; // FIXME? any pixel to scale it, and we want to avoid mem access crashes.
//
// if (gpBlitSurface(_screen, r, _hwscreen, &dst) != 0) //ph0x! gp_tmpscreen
-// error("gpBlitSurface failed: %s", gpGetError());
+// error("gpBlitSurface failed: %s", gpGetError());
// }
// }
-//
+//
// ///gp_LockSurface(gp_tmpscreen);
// ///gp_LockSurface(gp_hwscreen);
-//
+//
//// ph0x! (no scaling) cannot skip intro if commented?
//
// srcPitch = _tmpscreen->pitch;
@@ -2135,13 +2135,13 @@
// dst_h = r->h;
// if (dst_h > _screenHeight - dst_y)
// dst_h = _screenHeight - dst_y;
-//
+//
// dst_y *= _scaleFactor;
//
// if (_overlayVisible) //ph0x fixme?
-// _scaler_proc((byte*)_tmpscreen->pixels + (r->x*2+2) + (r->y+1)*srcPitch, srcPitch,
-// (byte*)_hwscreen->pixels + r->x*2*_scaleFactor + dst_y*dstPitch, dstPitch, r->w, dst_h);
-// }
+// _scaler_proc((byte*)_tmpscreen->pixels + (r->x*2+2) + (r->y+1)*srcPitch, srcPitch,
+// (byte*)_hwscreen->pixels + r->x*2*_scaleFactor + dst_y*dstPitch, dstPitch, r->w, dst_h);
+// }
// r->x *= _scaleFactor;
// r->y = dst_y;
// r->w *= _scaleFactor;
@@ -2388,11 +2388,11 @@
return _mode;
}
-////OSystem *OSystem_GP32::create(int gfx_mode, bool full_screen)
-//OSystem *OSystem_GP32::create()
+////OSystem *OSystem_GP32::create(int gfx_mode, bool full_screen)
+//OSystem *OSystem_GP32::create()
//{
// //OSystem_GP32 *syst = new OSystem_GP32();
-//
+//
// //syst->_mode = gfx_mode;
// //syst->_full_screen = full_screen;
// //
@@ -2414,7 +2414,7 @@
return 0;
}
-// Converts 8bit rgb values to a GP32 palette value
+// Converts 8bit rgb values to a GP32 palette value
void GpSetPaletteEntry(u8 i, u8 r, u8 g, u8 b) {
GP_PALETTEENTRY entry = gpRGB16(r, g, b);
GpPaletteEntryChange(i, 1, &entry, 0);
@@ -2486,7 +2486,7 @@
sprintf(s, "%s.", filename);
filename = s;
}
- //printf(">open %s as %s", filename, mode);
+ //printf(">open %s as %s", filename, mode);
// FIXME add binary/text support
if (tolower(mode[0]) == 'r') {
@@ -2651,7 +2651,7 @@
memset(p, 0, nitems * size);
if (*(u8 *) p)
warning("%s: calloc doesn't clear!", __FUNCTION__); //fixme: was error
- //printf("callocing");
+ //printf("callocing");
return p;
}
@@ -2811,10 +2811,10 @@
if (menu[choice].submenu[menu[choice].index + 1])
menu[choice].index++;
}
- //if (key & GPC_VK_START || key & GPC_VK_FA) return 1;
+ //if (key & GPC_VK_START || key & GPC_VK_FA) return 1;
if (key & GPC_VK_FA)
return 1;
- //if (key & GPC_VK_SELECT) return 0;
+ //if (key & GPC_VK_SELECT) return 0;
do
key = gpTrapKey();
@@ -3021,7 +3021,7 @@
Prepare GP32
****************************************************************/
void InitLCD() {
- // Initialize graphics
+ // Initialize graphics
GpGraphicModeSet(COLOUR_8BIT_MODE, NULL);
// Set the current buffer
@@ -3053,7 +3053,7 @@
//stderr = fstdout = fopen("gp:\\data\\scummvm\\config\\debug.out", "w");
//stdin = NULL; //fixme?
- ////fstdin = fopen("stdin", "w");
+ ////fstdin = fopen("stdin", "w");
////fstderr = fopen("stderr", "w");
//printf(" ScummVM for the GP32");
@@ -3073,7 +3073,7 @@
//err = GpFormat("gp:", FORMAT_RESCUE, &bad);
//char s[256];
//GpRelativePathGet(s);
- //*/
+ //*/
}
//void *gpmemset (void *s, int c, size_t n) {
@@ -3164,7 +3164,7 @@
//" \n"
//:
//:
- //:"r0", "r1");
+ //:"r0", "r1");
// FIXME: causes crash?! (if not at first line of gpmain())
buildgammatab(gindex);
@@ -3174,7 +3174,7 @@
// ConfigRead();
- //if ()
+ //if ()
//{
// ConfigWrite();
//}
Index: gp32.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gp32.h 9 Mar 2005 23:07:25 -0000 1.25
+++ gp32.h 30 Jul 2005 21:10:53 -0000 1.26
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
@@ -46,7 +46,7 @@
//#include "backends/gp32/config.h"
#define LCD_WIDTH 320
-#define LCD_HEIGHT 240
+#define LCD_HEIGHT 240
#define LCD_WIDTH_CENTER LCD_WIDTH / 2
#define LCD_HEIGHT_CENTER LCD_HEIGHT / 2
#define LCD_SIZE (LCD_WIDTH * LCD_HEIGHT)
@@ -77,20 +77,20 @@
//int main_scummvm(int argc, char *argv[]);
//Prototypes
-class OSystem_GP32 : public OSystem
+class OSystem_GP32 : public OSystem
{
public:
OSystem_GP32();
virtual ~OSystem_GP32();
-
+
// Set colors of the palette
void setPalette(const byte *colors, uint start, uint num);
// Set the size of the video bitmap.
// Typically, 320x200
void initSize(uint w, uint h, int overlayScale);
- int16 getHeight() { return _screenHeight; }
- int16 getWidth() { return _screenWidth; }
+ int16 getHeight() { return _screenHeight; }
+ int16 getWidth() { return _screenWidth; }
// Draw a bitmap to screen.
// The screen will not be updated to reflect the new bitmap
@@ -101,23 +101,23 @@
// Either show or hide the mouse cursor
bool showMouse(bool visible);
-
+
void warpMouse(int x, int y);
// Set the bitmap that's used when drawing the cursor.
void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor = 255, int cursorTargetScale = 1);
-
+
// Shaking is used in SCUMM. Set current shake position.
void setShakePos(int shake_pos);
-
+
// Get the number of milliseconds since the program was started.
uint32 getMillis();
-
+
// Delay for a specified amount of milliseconds
void delayMillis(uint msecs);
// Get the next event.
- // Returns true if an event was retrieved.
+ // Returns true if an event was retrieved.
bool pollEvent(Event &event);
// Set the function to be invoked whenever samples need to be generated
@@ -126,13 +126,13 @@
bool setSoundCallback(SoundProc proc, void *param);
// Clear Sound Sample
- void clearSoundCallback();
-
+ void clearSoundCallback();
+
// OLD - Delete when sure not needed.
// Get or set a property
//uint32 property(int param, Property *value);
//virtual uint32 property(int param, Property *value);
-
+
// Poll cdrom status
// Returns true if cd audio is playing
bool pollCD();
@@ -149,20 +149,20 @@
// Add a new callback timer
void setTimerCallback(TimerProc callback, int timer);
- // Mutex handling
+ // Mutex handling
OSystem::MutexRef createMutex();
void lockMutex(MutexRef mutex);
void unlockMutex(MutexRef mutex);
void deleteMutex(MutexRef mutex);
// DJWillis
-
+
//helper
int16 get_height();
int16 get_width();
-
+
// Quit
void quit();
-
+
// Overlay
void showOverlay();
void hideOverlay();
@@ -171,7 +171,7 @@
void copyRectToOverlay(const int16 *buf, int pitch, int x, int y, int w, int h);
//static OSystem *create(int gfx_mode, bool full_screen);
-
+
int16 RBGToColor(uint8 r, uint8 g, uint8 b);
void colorToRBG(int16 color, uint8 &r, uint8 &g, uint8 &b);
@@ -183,7 +183,7 @@
int getDefaultGraphicsMode() const;
bool setGraphicsMode(int mode);
int getGraphicsMode() const;
-
+
void setWindowCaption(const char *caption);
bool openCD(int drive);
@@ -252,7 +252,7 @@
int CKSUM_NUM;
// Keyboard mouse emulation
- struct KbdMouse {
+ struct KbdMouse {
int16 x, y, x_vel, y_vel, x_max, y_max, x_down_count, y_down_count;
uint32 last_time, delay_time, x_down_time, y_down_time;
} km;
@@ -284,12 +284,12 @@
* when accessing the screen.
*/
MutexRef _graphicsMutex;
-
+
void add_dirty_rgn_auto(const byte *buf);
void mk_checksums(const byte *buf);
static void fill_sound(void *userdata, Uint8 * stream, int len);
-
+
void add_dirty_rect(int x, int y, int w, int h);
void draw_mouse();
@@ -303,7 +303,7 @@
void setFullscreenMode(bool enable);
- void get_screen_image(byte *buf);
+ void get_screen_image(byte *buf);
void setup_icon();
void kbd_mouse();
Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/graphics.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- graphics.h 9 Mar 2005 22:21:56 -0000 1.1
+++ graphics.h 30 Jul 2005 21:10:53 -0000 1.2
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
Index: portdefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/portdefs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- portdefs.h 9 Mar 2005 22:21:56 -0000 1.5
+++ portdefs.h 30 Jul 2005 21:10:53 -0000 1.6
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
@@ -48,7 +48,7 @@
#include <gpfont_port.h>
#include <gpgraphic.h>
#include <gpgraphic16.h>
-#include <gpmm.h>
+#include <gpmm.h>
#include <gpmem.h>
#include <gpos_def.h>
#include <gpstdio.h>
@@ -85,10 +85,10 @@
extern void gpfree(void *block);
extern char *gpstrdup(const char *s);
-#define malloc gpmalloc
+#define malloc gpmalloc
#define calloc gpcalloc //gm_calloc
//#define calloc gm_calloc
-#define free gpfree
+#define free gpfree
// #define memset gm_memset
// #define memcopy gm_memcopy
@@ -105,7 +105,7 @@
#define ENDLESSLOOP while (1)
-#define FILE F_HANDLE
+#define FILE F_HANDLE
extern FILE *fstderr;
extern FILE *fstdout;
extern FILE *fstdin;
@@ -133,10 +133,10 @@
#define fwrite gpfwrite
#define ftell gpftell
-#undef clearerr
+#undef clearerr
#define clearerr gpclearerr
-#undef feof
+#undef feof
#define feof gpfeof
#define fgets gpfgets
#define fgetc gpfgetc
Index: setup.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/setup.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.h 9 Mar 2005 22:21:57 -0000 1.1
+++ setup.h 30 Jul 2005 21:10:53 -0000 1.2
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
@@ -25,8 +25,8 @@
#ifndef SETUP_H
#define SETUP_H
-#ifndef NULL
- #define NULL 0
+#ifndef NULL
+ #define NULL 0
#endif
/////////////////////////////////////////////////////////////////////////////
Index: startup.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/startup.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- startup.h 9 Mar 2005 22:21:57 -0000 1.1
+++ startup.h 30 Jul 2005 21:10:53 -0000 1.2
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header$
*
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm PNOMain.cpp,1.6,1.7 blit.cpp,1.2,1.3 copyrectangle.cpp,1.3,1.4 decompressrle0.cpp,1.1,1.2 decompressrle7.cpp,1.1,1.2 drawsprite.cpp,1.1,1.2 drawstrip.cpp,1.2,1.3 fastshrink.cpp,1.1,1.2 macros.h,1.4,1.5 native.h,1.6,1.7 proc3.cpp,1.5,1.6 renderparallax.cpp,1.1,1.2 screendraw.cpp,1.1,1.2 widelandscape.cpp,1.3,1.4 wideportrait.cpp,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.19,1.20 adlibmusic.cpp,1.25,1.26 gmchannel.cpp,1.21,1.22 musicbase.cpp,1.24,1.25 musicbase.h,1.20,1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list