diff --git a/src/hookcrc32/hookcrc32.c b/src/hookcrc32/hookcrc32.c index 9f7e5fc..4181782 100644 --- a/src/hookcrc32/hookcrc32.c +++ b/src/hookcrc32/hookcrc32.c @@ -74,7 +74,7 @@ __attribute__((__constructor__)) static void setup(void) { dl_iterate_phdr(callback, NULL); //real_main = dlsym(RTLD_NEXT, "main"); - //exit(0); + exit(0); } __attribute__((__destructor__)) diff --git a/src/hookcrc32/hookcrc32.so b/src/hookcrc32/hookcrc32.so index ff67e24..1744282 100755 Binary files a/src/hookcrc32/hookcrc32.so and b/src/hookcrc32/hookcrc32.so differ diff --git a/src/lindbergh/config.c b/src/lindbergh/config.c index ab5c00e..6af9b06 100644 --- a/src/lindbergh/config.c +++ b/src/lindbergh/config.c @@ -40,6 +40,13 @@ static int detectGame(uint32_t elf_crc) return 0; } + if(elf_crc == 0x3cc635ee) + { + config.game = SEGABOOT_2_4_SYM; + config.gameStatus = WORKING; + return 0; + } + if (elf_crc == 0xbc0c9ffa) { config.game = THE_HOUSE_OF_THE_DEAD_4; @@ -151,6 +158,8 @@ char *getGameName() return "SEGABOOT"; case SEGABOOT_2_4: return "SEGABOOT 2.4"; + case SEGABOOT_2_4_SYM: + return "SEGABOOT 2.4"; case SEGABOOT_2_6: return "SEGABOOT 2.6"; case OUTRUN: diff --git a/src/lindbergh/config.h b/src/lindbergh/config.h index e3ac82d..94e19ba 100644 --- a/src/lindbergh/config.h +++ b/src/lindbergh/config.h @@ -7,6 +7,7 @@ typedef enum UNKNOWN, SEGABOOT, SEGABOOT_2_4, + SEGABOOT_2_4_SYM, SEGABOOT_2_6, THE_HOUSE_OF_THE_DEAD_4, THE_HOUSE_OF_THE_DEAD_4_TEST, diff --git a/src/lindbergh/graphics.c b/src/lindbergh/graphics.c index bb7c369..11973a5 100644 --- a/src/lindbergh/graphics.c +++ b/src/lindbergh/graphics.c @@ -163,10 +163,11 @@ int XNextEvent(Display *display, XEvent *event_return) { case 28: setSwitch(SYSTEM, BUTTON_TEST, event_return->type == KeyPress); - //securityBoardSetSwitch(BUTTON_TEST, 1); + //securityBoardSetSwitch(BUTTON_TEST, event_return->type == KeyPress); break; case 39: setSwitch(PLAYER_1, BUTTON_SERVICE, event_return->type == KeyPress); + //securityBoardSetSwitch(BUTTON_SERVICE, event_return->type == KeyPress); break; case 14: incrementCoin(PLAYER_1, event_return->type == KeyPress); diff --git a/src/lindbergh/hook.c b/src/lindbergh/hook.c index 1dbc367..bc2b8d8 100644 --- a/src/lindbergh/hook.c +++ b/src/lindbergh/hook.c @@ -27,6 +27,7 @@ #include "rideboard.h" #include "securityboard.h" #include "patch.h" +#include "pcidata.h" #define HOOK_FILE_NAME "/dev/zero" @@ -37,10 +38,11 @@ #define CPUINFO 0 #define OSRELEASE 1 +#define PCI_CARD_1F0 2 int hooks[5] = {-1, -1, -1, -1}; -FILE *fileHooks[2] = {NULL, NULL}; -int fileRead[2] = {0, 0}; +FILE *fileHooks[3] = {NULL, NULL, NULL}; +int fileRead[3] = {0, 0, 0}; uint32_t elf_crc = 0; cpuvendor cpu_vendor = {0}; @@ -59,12 +61,10 @@ static void handleSegfault(int signal, siginfo_t *info, void *ptr) { ucontext_t *ctx = ptr; - //printf("Caught segfault at address %p\n", info->si_addr); - // Get the address of the instruction causing the segfault uint8_t *code = (uint8_t *)ctx->uc_mcontext.gregs[REG_EIP]; - printf("Code: 0x%08x - Port: 0x%08x\n", *code, (ctx->uc_mcontext.gregs[REG_EDX] & 0xFFFF) - basePortAddress); + printf("Code: 0x%08x - Port: 0x%08x\n", *code, (ctx->uc_mcontext.gregs[REG_EDX] & 0xFFFF)); switch (*code) { case 0xED: @@ -140,11 +140,6 @@ void __attribute__((constructor)) hook_init() // Get CPU ID getCPUID(); - FILE *file = fopen("dump_unpatched.bin","w+b"); - - fwrite((void *)0x08048000,0x630fac,1,file); - fclose(file); - // Implement SIGSEGV handler struct sigaction act; act.sa_sigaction = handleSegfault; @@ -291,6 +286,13 @@ FILE *fopen(const char *restrict pathname, const char *restrict mode) { return _fopen("SEGA_KakuGothic-DB-Roman_12.abc", mode); } + + if (strcmp(pathname, "/proc/bus/pci/00/1f.0") == 0) + { + fileRead[PCI_CARD_1F0] = 0; + fileHooks[PCI_CARD_1F0] = _fopen(HOOK_FILE_NAME, mode); + return fileHooks[PCI_CARD_1F0]; + } return _fopen(pathname, mode); } @@ -330,6 +332,20 @@ FILE *fopen64(const char *pathname, const char *mode) return _fopen64(pathname, mode); } +int fclose(FILE *stream) +{ + int (*_fclose)(FILE * stream) = dlsym(RTLD_NEXT, "fclose"); + for (int i = 0; i < 3; i++) + { + if(fileHooks[i] == stream) + { + int r = _fclose(stream); + fileHooks[i] = NULL; + return r; + } + } + return _fclose(stream); +} int openat(int dirfd, const char *pathname, int flags) { int (*_openat)(int dirfd, const char *pathname, int flags) = dlsym(RTLD_NEXT, "openat"); @@ -421,6 +437,18 @@ ssize_t read(int fd, void *buf, size_t count) return _read(fd, buf, count); } +size_t fread(void *buf, size_t size, size_t count, FILE *stream) +{ + size_t (*_fread)(void *buf, size_t size, size_t count, FILE *stream) = dlsym(RTLD_NEXT, "fread"); + + if(stream == fileHooks[PCI_CARD_1F0]) + { + memcpy(buf, pcidata, 68); + return 68; + } + return _fread(buf, size, count, stream); +} + ssize_t write(int fd, const void *buf, size_t count) { int (*_write)(int fd, const void *buf, size_t count) = dlsym(RTLD_NEXT, "write"); diff --git a/src/lindbergh/patch.c b/src/lindbergh/patch.c index ce2328c..3920cc1 100644 --- a/src/lindbergh/patch.c +++ b/src/lindbergh/patch.c @@ -7,6 +7,7 @@ #include "patch.h" #include "config.h" #include "hook.h" +#include "securityboard.h" extern cpuvendor cpu_vendor; @@ -91,6 +92,76 @@ int amDongleUpdate() return 0; } +int amLibInit() +{ + uint32_t *amLibContext = (uint32_t *)0x08dfa2c0;//0x0809cb00; + *amLibContext = 1; + uint32_t *amLibInitializad = (uint32_t *)0x08dfa2c4;//0x0809cb04; + uint16_t *amLibPort1 = (uint16_t *)(0x08dfa2c4 + 4);//(0x0809cb04 + 4); + uint16_t *amLibPort2 = (uint16_t *)(0x08dfa2c4 + 4);//(0x0809cb04 + 6); + uint32_t *bcLibInitialized = (uint32_t *)(0x08dfa2c4 + 8);//0x0809cb0c; + *amLibInitializad = 1; + *amLibPort1 = 0xd000; + *amLibPort2 = 0x0004; + *bcLibInitialized = 0; + int res = ((int (*)(void))0x084dedc4)();//0x08065d80)(); + if (res == 1) + *bcLibInitialized = 1; + return 0; +} + +int amDipswInit() +{ + uint32_t *amDipswContext = (uint32_t *)0x08df9cec;//0x0809c12c; + uint32_t *amDipswContext1 = (uint32_t *)(0x08df9cec + 4);//(0x0809c12c + 4); + uint32_t *amDipswContext2 = (uint32_t *)(0x08df9cec + 8);//(0x0809c12c + 8); + uint32_t *amDipswContext3 = (uint32_t *)(0x08df9cec + 12);//(0x0809c12c + 12); + //typedef void *(*___constant_c_and_count_memset)(uint32_t *, int, size_t); + //___constant_c_and_count_memset func = (___constant_c_and_count_memset)//0x0805c3d5; + //func(amDipswContext, 0, 4); + *amDipswContext = 1; + *amDipswContext1 = 1; + *amDipswContext2 = 1; + *amDipswContext3 = 1; + return 0; +} + +void print_binary(unsigned int number) +{ + if (number >> 1) + { + print_binary(number >> 1); + } + putc((number & 1) ? '1' : '0', stdout); +} + +int amDipswGetData(uint8_t *dip) +{ + //printf("amDipswGetData Called!!!!!\n"); + uint8_t result; + uint32_t data; + + securityBoardIn(0x38, &data); + + result = (~data & 4) != 0; // Test Button + if ((~data & 8) != 0) + result |= 2; // Service Button + if ((~data & 0x10) != 0) + result |= 4; // ?? + if ((char)data >= 0) + result |= 8; // ?? + if ((~data & 0x100) != 0) + result |= 0x10; // Rotation + if ((~data & 0x200) != 0) + result |= 0x20; // Resolution Dip 4 + if ((~data & 0x400) != 0) + result |= 0x40; // Resolution Dip 5 + if ((~data & 0x800) != 0) + result |= 0x80; // Resolution Dip 6 + *dip = result; + return 0; +} + void _putConsole(const char *format, ...) { va_list args; @@ -115,7 +186,7 @@ void _putConsole(const char *format, ...) } else if (*format == '0') { - format ++; + format++; if (*format == '2') { format++; @@ -161,6 +232,10 @@ int initPatch() detourFunction(0x084d5b40, amDongleInit); detourFunction(0x084d45f9, amDongleIsAvailable); detourFunction(0x084d4fef, amDongleUpdate); + detourFunction(0x084d44fc, stub0); + detourFunction(0x084d4485, amDipswGetData); + detourFunction(0x084d9118, amLibInit); + detourFunction(0x084d438c, amDipswInit); } break; case ABC_2006: @@ -199,7 +274,7 @@ int initPatch() detourFunction(0x081e3424, amDongleInit); detourFunction(0x081e3772, amDongleIsAvailable); detourFunction(0x081e369e, amDongleUpdate); - setVariable(0x081e7945, 0x00000001); //Test + setVariable(0x081e7945, 0x00000001); // Test } break; case OUTRUN: @@ -261,10 +336,10 @@ int initPatch() detourFunction(0x085c6010, amDongleInit); detourFunction(0x085c63cc, amDongleIsAvailable); detourFunction(0x085c62f0, amDongleUpdate); - detourFunction(0x080b3426, stub0); // Stub returns 0 - detourFunction(0x080cb6d4, stub0); // Stub returns 0 - detourFunction(0x0840889e, stub0); // Stub returns 0 - detourFunction(0x0840ab90, stub0); // Stub returns 0 + detourFunction(0x080b3426, stub0); // Stub returns 0 + detourFunction(0x080cb6d4, stub0); // Stub returns 0 + detourFunction(0x0840889e, stub0); // Stub returns 0 + detourFunction(0x0840ab90, stub0); // Stub returns 0 setVariable(0x080e17af, 0x000000b8); // Patch IDK what setVariable(0x080e17b3, 0x01e88300); // Patch IDK what } @@ -284,22 +359,22 @@ int initPatch() setVariable(0x08c08640, 2); // bcLibDebugLevel setVariable(0x08c08634, 2); // amOsinfoDebugLevel setVariable(0x08c08644, 0x0FFFFFFF); // s_logMask + detourFunction(0x08074a8c, _putConsole); // Debug Messages + detourFunction(0x084e50d8, amDongleInit); detourFunction(0x084e5459, amDongleIsAvailable); detourFunction(0x084e537d, amDongleUpdate); - detourFunction(0x08074a8c, _putConsole); + detourFunction(0x084e500e, amDipswGetData); + setVariable(0x080d1f02, 0x90909090); // Patch acpSystem::checkDongle setVariable(0x080d1f06, 0xE8C3C990); // Patch acpSystem::checkDongle setVariable(0x0807b76a, 0xc2839090); // Patch initializeArcadeBackup -// setVariable(0x082E006b, 0x00000280); // Set ResX -// setVariable(0x082E0078, 0x000001E0); // Set ResY + setVariable(0x082E006b, 0x00000780); // Set ResX + setVariable(0x082E0078, 0x00000438); // Set ResY - detourFunction(0x084e4efc, stub0); // Stub amDipswInit - detourFunction(0x084e500e, stub0); // Stub amDipswGetData - detourFunction(0x084e5086, stub0); // Stub amDipswSetLed - detourFunction(0x084e4f98, stub0); // Stub amDipswExit + detourFunction(0x084e5086, stub0); // Stub amDipswSetLed setVariable(0x0840d858, 0x1c899090); // No more Full Screen from the Game - //From Teknoparrot + // From Teknoparrot AMDFIX setVariable(0x083ef701, 0x00036ee9); // AMDFIX setVariable(0x084032e0, 0x8b90c933); // fix shader compilation with AMD GPUs setVariable(0x08523950, 0x000000c3); // Remove ADXM_SetupFramework (Not necessary) @@ -324,8 +399,8 @@ int initPatch() detourFunction(0x085106dc, amDongleIsAvailable); detourFunction(0x08510600, amDongleUpdate); detourFunction(0x08075012, _putConsole); - //setVariable(0x08303C4B, 0x00000780); // Set ResX - //setVariable(0x08303C58, 0x00000438); // Set ResY + // setVariable(0x08303C4B, 0x00000780); // Set ResX + // setVariable(0x08303C58, 0x00000438); // Set ResY setVariable(0x080dad63, 0x90909090); // Patch acpSystem::checkDongle setVariable(0x080dad67, 0xE8C3C990); // Patch acpSystem::checkDongle setVariable(0x0807e609, 0x90909090); // Patch initializeArcadeBackup @@ -352,12 +427,34 @@ int initPatch() detourFunction(0x086e2336, amDongleInit); detourFunction(0x086e0d81, amDongleIsAvailable); detourFunction(0x086e17e5, amDongleUpdate); + detourFunction(0x086e0c0d, amDipswGetData); + detourFunction(0x086e0c84, stub0); detourFunction(0x0808f9a8, _putConsole); setVariable(0x080dad63, 0x90909090); // Patch acpSystem::checkDongle setVariable(0x080dad67, 0xE8C3C990); // Patch acpSystem::checkDongle setVariable(0x0807e609, 0x90909090); // Patch initializeArcadeBackup setVariable(0x0807e60D, 0xC2839090); // Patch initializeArcadeBackup } + break; + case SEGABOOT_2_4_SYM: + { + detourFunction(0x0805e8b0, amDongleInit); + detourFunction(0x0805ebc3, amDongleIsAvailable); + detourFunction(0x0805eb2a, amDongleUpdate); + //detourFunction(0x08062cf8, amLibInit); + //detourFunction(0x0805c200, amDipswInit); + detourFunction(0x0805c30b, amDipswGetData); + } + break; + case VT3: + { + detourFunction(0x0831c724, amDongleInit); + detourFunction(0x0831ca37, amDongleIsAvailable); + detourFunction(0x0831c99e, amDongleUpdate); + detourFunction(0x0831c5d7, amDipswGetData); + detourFunction(0x0831c64f, stub0); + } + break; default: // Don't do any patches for random games break; diff --git a/src/lindbergh/pcidata.h b/src/lindbergh/pcidata.h new file mode 100644 index 0000000..b9614ee --- /dev/null +++ b/src/lindbergh/pcidata.h @@ -0,0 +1,28 @@ +const char pcidata[256] = { + 0x86, 0x80, 0x18, 0x29, 0x03, 0x01, 0x00, 0x00, 0x02, 0x00, 0x01, + 0x06, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf4, 0x1a, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, + 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x8a, 0x8b, + 0x8b, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x8a, 0x8b, 0x8b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc0, + 0xd1, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00 +}; + +const int pcidata_length = 256; \ No newline at end of file diff --git a/src/lindbergh/securityboard.c b/src/lindbergh/securityboard.c index 149a7ce..3b5415e 100644 --- a/src/lindbergh/securityboard.c +++ b/src/lindbergh/securityboard.c @@ -77,7 +77,6 @@ int securityBoardSetDipSwitch(int switchNumber, int value) int securityBoardSetSwitch(JVSInput switchNumber, int value) { - printf("Pressed\n"); switch (switchNumber) { case BUTTON_TEST: @@ -107,26 +106,26 @@ int securityBoardIn(uint16_t port, uint32_t *data) case SECURITY_BOARD_FRONT_PANEL: { uint32_t result = 0xFFFFFFFF; - if (securityBoard.serviceSwitch) - result &= ~0x08; - if (securityBoard.testSwitch) - result &= ~0x04; - if (securityBoard.dipSwitch[6]) + if (securityBoard.dipSwitch[6]) // bit12 result &= ~0x800; // DIP 6 - if (securityBoard.dipSwitch[5]) + if (securityBoard.dipSwitch[5]) // bit11 result &= ~0x400; // DIP 5 - if (securityBoard.dipSwitch[4]) + if (securityBoard.dipSwitch[4]) // bit10 result &= ~0x200; // DIP 4 - if (securityBoard.dipSwitch[3]) + if (securityBoard.dipSwitch[3]) // bit9 result &= ~0x100; // DIP 3 - if (securityBoard.dipSwitch[2]) + if (securityBoard.dipSwitch[2]) // bit8 result &= ~0x80; // DIP 2 - if (securityBoard.dipSwitch[1]) + if (securityBoard.dipSwitch[1]) // bit7 result &= ~0x40; // DIP 1 - if (securityBoard.dipSwitch[8]) + if (securityBoard.dipSwitch[8]) // bit6 result &= ~0x20; - if (securityBoard.dipSwitch[7]) + if (securityBoard.dipSwitch[7]) // bit5 result &= ~0x10; + if (securityBoard.serviceSwitch) // bit4 + result &= ~0x08; + if (securityBoard.testSwitch) // bit3 + result &= ~0x04; *data = result; } break;