--- BasiliskII/src/AmigaOS/main_amiga.cpp 2001/01/25 22:24:36 1.14 +++ BasiliskII/src/AmigaOS/main_amiga.cpp 2001/07/03 15:59:45 1.18 @@ -1,7 +1,7 @@ /* * main_amiga.cpp - Startup code for AmigaOS * - * Basilisk II (C) 1997-2000 Christian Bauer + * Basilisk II (C) 1997-2001 Christian Bauer * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -174,17 +174,17 @@ int main(int argc, char **argv) QuitEmulator(); GadToolsBase = OpenLibrary((UBYTE *)"gadtools.library", 39); if (GadToolsBase == NULL) { - ErrorAlert(GetString(STR_NO_GADTOOLS_LIB_ERR)); + ErrorAlert(STR_NO_GADTOOLS_LIB_ERR); QuitEmulator(); } IFFParseBase = OpenLibrary((UBYTE *)"iffparse.library", 39); if (IFFParseBase == NULL) { - ErrorAlert(GetString(STR_NO_IFFPARSE_LIB_ERR)); + ErrorAlert(STR_NO_IFFPARSE_LIB_ERR); QuitEmulator(); } AslBase = OpenLibrary((UBYTE *)"asl.library", 36); if (AslBase == NULL) { - ErrorAlert(GetString(STR_NO_ASL_LIB_ERR)); + ErrorAlert(STR_NO_ASL_LIB_ERR); QuitEmulator(); } @@ -217,18 +217,18 @@ int main(int argc, char **argv) // Check start of Chip memory (because we need access to 0x0000..0x2000) if ((uint32)FindName(&SysBase->MemList, (UBYTE *)"chip memory") < 0x2000) { - ErrorAlert(GetString(STR_NO_PREPARE_EMUL_ERR)); + ErrorAlert(STR_NO_PREPARE_EMUL_ERR); QuitEmulator(); } // Open timer.device timereq = (struct timerequest *)AllocVec(sizeof(timerequest), MEMF_PUBLIC | MEMF_CLEAR); if (timereq == NULL) { - ErrorAlert(GetString(STR_NO_MEM_ERR)); + ErrorAlert(STR_NO_MEM_ERR); QuitEmulator(); } if (OpenDevice((UBYTE *)TIMERNAME, UNIT_MICROHZ, (struct IORequest *)timereq, 0)) { - ErrorAlert(GetString(STR_NO_TIMER_DEV_ERR)); + ErrorAlert(STR_NO_TIMER_DEV_ERR); QuitEmulator(); } TimerBase = (struct Library *)timereq->tr_node.io_Device; @@ -236,7 +236,7 @@ int main(int argc, char **argv) // Allocate scratch memory ScratchMem = (uint8 *)AllocMem(SCRATCH_MEM_SIZE, MEMF_PUBLIC); if (ScratchMem == NULL) { - ErrorAlert(GetString(STR_NO_MEM_ERR)); + ErrorAlert(STR_NO_MEM_ERR); QuitEmulator(); } ScratchMem += SCRATCH_MEM_SIZE/2; // ScratchMem points to middle of block @@ -261,7 +261,7 @@ int main(int argc, char **argv) RAMSize = newRAMSize; RAMBaseHost = (uint8 *)AllocVec(RAMSize + 0x100000, MEMF_PUBLIC); if (RAMBaseHost == NULL) { - ErrorAlert(GetString(STR_NO_MEM_ERR)); + ErrorAlert(STR_NO_MEM_ERR); QuitEmulator(); } } @@ -276,21 +276,21 @@ int main(int argc, char **argv) // Load Mac ROM BPTR rom_fh = Open(rom_path ? (char *)rom_path : (char *)ROM_FILE_NAME, MODE_OLDFILE); - if (rom_fh == NULL) { - ErrorAlert(GetString(STR_NO_ROM_FILE_ERR)); + if (rom_fh == 0) { + ErrorAlert(STR_NO_ROM_FILE_ERR); QuitEmulator(); } printf(GetString(STR_READING_ROM_FILE)); Seek(rom_fh, 0, OFFSET_END); ROMSize = Seek(rom_fh, 0, OFFSET_CURRENT); if (ROMSize != 512*1024 && ROMSize != 1024*1024) { - ErrorAlert(GetString(STR_ROM_SIZE_ERR)); + ErrorAlert(STR_ROM_SIZE_ERR); Close(rom_fh); QuitEmulator(); } Seek(rom_fh, 0, OFFSET_BEGINNING); if (Read(rom_fh, ROMBaseHost, ROMSize) != ROMSize) { - ErrorAlert(GetString(STR_ROM_FILE_READ_ERR)); + ErrorAlert(STR_ROM_FILE_READ_ERR); Close(rom_fh); QuitEmulator(); } @@ -471,6 +471,33 @@ void FlushCodeCache(void *start, uint32 } +/* + * Mutexes + */ + +struct B2_mutex { + int dummy; //!! +}; + +B2_mutex *B2_create_mutex(void) +{ + return new B2_mutex; +} + +void B2_lock_mutex(B2_mutex *mutex) +{ +} + +void B2_unlock_mutex(B2_mutex *mutex) +{ +} + +void B2_delete_mutex(B2_mutex *mutex) +{ + delete mutex; +} + + /* * Interrupt flags (must be handled atomically!) */