Menu
▾
▴
[vba-commit] VisualBoyAdvance/src EEprom.h, 1.3, 1.4 Flash.h, 1.4, 1.5 GBA.cpp, 1.66, 1.67 Sound.cpp, 1.16, 1.17 Sound.h, 1.4, 1.5 elf.cpp, 1.20, 1.21 memgzio.c, 1.4, 1.5 remote.cpp, 1.8, 1.9
|
From: Spacy <sp...@us...> - 2006-06-06 21:04:32
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29806/src Modified Files: EEprom.h Flash.h GBA.cpp Sound.cpp Sound.h elf.cpp memgzio.c remote.cpp Log Message: make compilable for Windows x64 Index: Flash.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Flash.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Flash.h 14 Nov 2004 18:54:14 -0000 1.4 --- Flash.h 6 Jun 2006 21:04:20 -0000 1.5 *************** *** 21,26 **** #define VBA_FLASH_H ! extern void flashSaveGame(gzFile gzFile); ! extern void flashReadGame(gzFile gzFile, int version); extern u8 flashRead(u32 address); extern void flashWrite(u32 address, u8 byte); --- 21,26 ---- #define VBA_FLASH_H ! extern void flashSaveGame(gzFile _gzFile); ! extern void flashReadGame(gzFile _gzFile, int version); extern u8 flashRead(u32 address); extern void flashWrite(u32 address, u8 byte); Index: memgzio.c =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/memgzio.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** memgzio.c 27 May 2006 14:47:32 -0000 1.4 --- memgzio.c 6 Jun 2006 21:04:20 -0000 1.5 *************** *** 332,336 **** if (s->stream.avail_in == 0) { errno = 0; ! s->stream.avail_in = memRead(s->inbuf, 1, Z_BUFSIZE, s->file); if (s->stream.avail_in == 0) { s->z_eof = 1; --- 332,336 ---- if (s->stream.avail_in == 0) { errno = 0; ! s->stream.avail_in = (uInt)memRead(s->inbuf, 1, Z_BUFSIZE, s->file); if (s->stream.avail_in == 0) { s->z_eof = 1; *************** *** 477,482 **** } if (s->stream.avail_out > 0) { ! s->stream.avail_out -= memRead(next_out, 1, s->stream.avail_out, ! s->file); } len -= s->stream.avail_out; --- 477,481 ---- } if (s->stream.avail_out > 0) { ! s->stream.avail_out -= (uInt)memRead(next_out, 1, s->stream.avail_out, s->file); } len -= s->stream.avail_out; *************** *** 489,493 **** errno = 0; ! s->stream.avail_in = memRead(s->inbuf, 1, Z_BUFSIZE, s->file); if (s->stream.avail_in == 0) { s->z_eof = 1; --- 488,492 ---- errno = 0; ! s->stream.avail_in = (uInt)memRead(s->inbuf, 1, Z_BUFSIZE, s->file); if (s->stream.avail_in == 0) { s->z_eof = 1; Index: Sound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sound.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Sound.cpp 25 Jun 2005 06:16:05 -0000 1.16 --- Sound.cpp 6 Jun 2006 21:04:20 -0000 1.17 *************** *** 1,5 **** // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten ! // Copyright (C) 2005 Forgotten and the VBA development team // This program is free software; you can redistribute it and/or modify --- 1,6 ---- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten ! // Copyright (C) 2004 Forgotten and the VBA development team ! // Copyright (C) 2004-2006 VBA development team // This program is free software; you can redistribute it and/or modify *************** *** 19,25 **** #include <memory.h> #include "GBA.h" #include "Globals.h" - #include "Sound.h" #include "Util.h" --- 20,27 ---- #include <memory.h> + #include "Sound.h" + #include "GBA.h" #include "Globals.h" #include "Util.h" *************** *** 27,31 **** #define SOUND_MAGIC 0x60000000 #define SOUND_MAGIC_2 0x30000000 ! #define NOISE_MAGIC 5 extern bool stopState; --- 29,33 ---- #define SOUND_MAGIC 0x60000000 #define SOUND_MAGIC_2 0x30000000 ! #define NOISE_MAGIC 5 extern bool stopState; Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** GBA.cpp 13 May 2006 16:32:15 -0000 1.66 --- GBA.cpp 6 Jun 2006 21:04:20 -0000 1.67 *************** *** 1231,1241 **** utilPutDword(buffer, 0x000f0000); fwrite(buffer, 1, 4, file); // save type 0x000f0000 = GBA save ! utilPutDword(buffer, strlen(title)); fwrite(buffer, 1, 4, file); // title length fwrite(title, 1, strlen(title), file); ! utilPutDword(buffer, strlen(desc)); fwrite(buffer, 1, 4, file); // desc length fwrite(desc, 1, strlen(desc), file); ! utilPutDword(buffer, strlen(notes)); fwrite(buffer, 1, 4, file); // notes length fwrite(notes, 1, strlen(notes), file); --- 1231,1241 ---- utilPutDword(buffer, 0x000f0000); fwrite(buffer, 1, 4, file); // save type 0x000f0000 = GBA save ! utilPutDword(buffer, (u32)strlen(title)); fwrite(buffer, 1, 4, file); // title length fwrite(title, 1, strlen(title), file); ! utilPutDword(buffer, (u32)strlen(desc)); fwrite(buffer, 1, 4, file); // desc length fwrite(desc, 1, strlen(desc), file); ! utilPutDword(buffer, (u32)strlen(notes)); fwrite(buffer, 1, 4, file); // notes length fwrite(notes, 1, strlen(notes), file); Index: Sound.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sound.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Sound.h 13 May 2004 15:06:44 -0000 1.4 --- Sound.h 6 Jun 2006 21:04:20 -0000 1.5 *************** *** 3,6 **** --- 3,7 ---- // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team + // Copyright (C) 2004-2006 VBA development team // This program is free software; you can redistribute it and/or modify *************** *** 21,24 **** --- 22,27 ---- #define VBA_SOUND_H + #include "System.h" + #define NR10 0x60 #define NR11 0x62 *************** *** 48,68 **** #define FIFOB_H 0xa6 ! extern void soundTick(); ! extern void soundShutdown(); ! extern bool soundInit(); ! extern void soundPause(); ! extern void soundResume(); ! extern void soundEnable(int); ! extern void soundDisable(int); ! extern int soundGetEnable(); ! extern void soundReset(); ! extern void soundSaveGame(gzFile); ! extern void soundReadGame(gzFile, int); ! extern void soundEvent(u32, u8); ! extern void soundEvent(u32, u16); ! extern void soundTimerOverflow(int); ! extern void soundSetQuality(int); - //extern int SOUND_TICKS; extern int SOUND_CLOCK_TICKS; extern int soundTicks; --- 51,70 ---- #define FIFOB_H 0xa6 ! void soundTick(); ! void soundShutdown(); ! bool soundInit(); ! void soundPause(); ! void soundResume(); ! void soundEnable(int); ! void soundDisable(int); ! int soundGetEnable(); ! void soundReset(); ! void soundSaveGame(gzFile); ! void soundReadGame(gzFile, int); ! void soundEvent(u32, u8); ! void soundEvent(u32, u16); ! void soundTimerOverflow(int); ! void soundSetQuality(int); extern int SOUND_CLOCK_TICKS; extern int soundTicks; Index: EEprom.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/EEprom.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EEprom.h 25 Jun 2005 06:15:34 -0000 1.3 --- EEprom.h 6 Jun 2006 21:04:20 -0000 1.4 *************** *** 21,26 **** #define VBA_EEPROM_H ! extern void eepromSaveGame(gzFile gzFile); ! extern void eepromReadGame(gzFile gzFile, int version); extern int eepromRead(u32 address); extern void eepromWrite(u32 address, u8 value); --- 21,26 ---- #define VBA_EEPROM_H ! extern void eepromSaveGame(gzFile _gzFile); ! extern void eepromReadGame(gzFile _gzFile, int version); extern int eepromRead(u32 address); extern void eepromWrite(u32 address, u8 value); Index: remote.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/remote.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** remote.cpp 20 May 2004 21:01:29 -0000 1.8 --- remote.cpp 6 Jun 2006 21:04:20 -0000 1.9 *************** *** 21,25 **** #include <string.h> ! #ifndef WIN32 # include <unistd.h> # include <sys/socket.h> --- 21,25 ---- #include <string.h> ! #ifndef _WIN32 # include <unistd.h> # include <sys/socket.h> *************** *** 33,37 **** # define socklen_t int # endif // ! HAVE_ARPA_INET_H ! #else // WIN32 # include <winsock.h> # include <io.h> --- 33,37 ---- # define socklen_t int # endif // ! HAVE_ARPA_INET_H ! #else // _WIN32 # include <winsock.h> # include <io.h> *************** *** 40,44 **** # define read _read # define write _write ! #endif // WIN32 #include "GBA.h" --- 40,44 ---- # define read _read # define write _write ! #endif // _WIN32 #include "GBA.h" *************** *** 55,60 **** int remotePort = 55555; int remoteSignal = 5; ! int remoteSocket = -1; ! int remoteListenSocket = -1; bool remoteConnected = false; bool remoteResumed = false; --- 55,60 ---- int remotePort = 55555; int remoteSignal = 5; ! SOCKET remoteSocket = -1; ! SOCKET remoteListenSocket = -1; bool remoteConnected = false; bool remoteResumed = false; *************** *** 86,94 **** { if(remoteSocket == -1) { ! #ifdef WIN32 WSADATA wsaData; int error = WSAStartup(MAKEWORD(1,1),&wsaData); ! #endif // WIN32 ! int s = socket(PF_INET, SOCK_STREAM, 0); remoteListenSocket = s; --- 86,94 ---- { if(remoteSocket == -1) { ! #ifdef _WIN32 WSADATA wsaData; int error = WSAStartup(MAKEWORD(1,1),&wsaData); ! #endif // _WIN32 ! SOCKET s = socket(PF_INET, SOCK_STREAM, 0); remoteListenSocket = s; *************** *** 132,140 **** socklen_t len = sizeof(addr); ! #ifdef WIN32 int flag = 0; ioctlsocket(s, FIONBIO, (unsigned long *)&flag); ! #endif // WIN32 ! int s2 = accept(s, (sockaddr *)&addr, &len); if(s2 > 0) { fprintf(stderr, "Got a connection from %s %d\n", --- 132,140 ---- socklen_t len = sizeof(addr); ! #ifdef _WIN32 int flag = 0; ioctlsocket(s, FIONBIO, (unsigned long *)&flag); ! #endif // _WIN32 ! SOCKET s2 = accept(s, (sockaddr *)&addr, &len); if(s2 > 0) { fprintf(stderr, "Got a connection from %s %d\n", *************** *** 142,148 **** ntohs(addr.sin_port)); } else { ! #ifdef WIN32 int error = WSAGetLastError(); ! #endif // WIN32 } char dummy; --- 142,148 ---- ntohs(addr.sin_port)); } else { ! #ifdef _WIN32 int error = WSAGetLastError(); ! #endif // _WIN32 } char dummy; *************** *** 231,235 **** char buffer[1024]; ! int count = strlen(packet); unsigned char csum = 0; --- 231,235 ---- char buffer[1024]; ! size_t count = strlen(packet); unsigned char csum = 0; *************** *** 247,251 **** *p++ = 0; // printf("Sending %s\n", buffer); ! remoteSendFnc(buffer, count + 4); char c = 0; --- 247,251 ---- *p++ = 0; // printf("Sending %s\n", buffer); ! remoteSendFnc(buffer, (int)count + 4); char c = 0; Index: elf.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/elf.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** elf.cpp 27 May 2006 14:47:32 -0000 1.20 --- elf.cpp 6 Jun 2006 21:04:20 -0000 1.21 *************** *** 962,967 **** break; case DW_FORM_ref_addr: ! attr->value = (elfDebugInfo->infodata + elfRead4Bytes(data)) - ! elfGetCompileUnitForData(data)->top; data += 4; break; --- 962,966 ---- break; case DW_FORM_ref_addr: ! attr->value = (elfDebugInfo->infodata + elfRead4Bytes(data)) - elfGetCompileUnitForData(data)->top; data += 4; break; *************** *** 971,979 **** break; case DW_FORM_ref_udata: ! attr->value = (elfDebugInfo->infodata + ! (elfGetCompileUnitForData(data)->top - ! elfDebugInfo->infodata) + ! elfReadLEB128(data, &bytes)) - ! elfCurrentUnit->top; data += bytes; break; --- 970,974 ---- break; case DW_FORM_ref_udata: ! attr->value = (elfDebugInfo->infodata + (elfGetCompileUnitForData(data)->top - elfDebugInfo->infodata) + elfReadLEB128(data, &bytes)) - elfCurrentUnit->top; data += bytes; break; |
