--- BasiliskII/src/timer.cpp 1999/10/03 14:16:25 1.1 +++ BasiliskII/src/timer.cpp 2004/01/12 15:29:22 1.7 @@ -1,7 +1,7 @@ /* * timer.cpp - Time Manager emulation * - * Basilisk II (C) 1997-1999 Christian Bauer + * Basilisk II (C) 1997-2004 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 @@ -196,7 +196,7 @@ int16 RmvTime(uint32 tm) // Find descriptor int i = find_desc(tm); if (i < 0) { - printf("WARNING: RmvTime(%08lx): Descriptor not found\n", tm); + printf("WARNING: RmvTime(%08x): Descriptor not found\n", tm); return 0; } @@ -214,7 +214,7 @@ int16 RmvTime(uint32 tm) WriteMacInt32(tm + tmCount, timer_host2mac_time(remaining)); } else WriteMacInt32(tm + tmCount, 0); - D(bug(" tmCount %ld\n", ReadMacInt32(tm + tmCount))); + D(bug(" tmCount %d\n", ReadMacInt32(tm + tmCount))); // Free descriptor free_desc(i); @@ -228,7 +228,7 @@ int16 RmvTime(uint32 tm) int16 PrimeTime(uint32 tm, int32 time) { - D(bug("PrimeTime %08lx, time %ld\n", tm, time)); + D(bug("PrimeTime %08x, time %d\n", tm, time)); // Find descriptor int i = find_desc(tm); @@ -249,10 +249,8 @@ int16 PrimeTime(uint32 tm, int32 time) //!! PrimeTime(0) means continue previous delay // (save wakeup time in RmvTime?) - if (time == 0) { - printf("FATAL: Unsupported PrimeTime(0)\n"); - return 0; - } + if (time == 0) + printf("WARNING: Unsupported PrimeTime(0)\n"); // Yes, calculate wakeup time relative to last scheduled time tm_time_t wakeup;