ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/timer.cpp
(Generate patch)

Comparing BasiliskII/src/timer.cpp (file contents):
Revision 1.1.1.1 by cebix, 1999-10-03T14:16:25Z vs.
Revision 1.9 by gbeauche, 2008-01-01T09:40:31Z

# Line 1 | Line 1
1   /*
2   *  timer.cpp - Time Manager emulation
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2008 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 196 | Line 196 | int16 RmvTime(uint32 tm)
196          // Find descriptor
197          int i = find_desc(tm);
198          if (i < 0) {
199 <                printf("WARNING: RmvTime(%08lx): Descriptor not found\n", tm);
199 >                printf("WARNING: RmvTime(%08x): Descriptor not found\n", tm);
200                  return 0;
201          }
202  
# Line 214 | Line 214 | int16 RmvTime(uint32 tm)
214                  WriteMacInt32(tm + tmCount, timer_host2mac_time(remaining));
215          } else
216                  WriteMacInt32(tm + tmCount, 0);
217 <        D(bug(" tmCount %ld\n", ReadMacInt32(tm + tmCount)));
217 >        D(bug(" tmCount %d\n", ReadMacInt32(tm + tmCount)));
218  
219          // Free descriptor
220          free_desc(i);
# Line 228 | Line 228 | int16 RmvTime(uint32 tm)
228  
229   int16 PrimeTime(uint32 tm, int32 time)
230   {
231 <        D(bug("PrimeTime %08lx, time %ld\n", tm, time));
231 >        D(bug("PrimeTime %08x, time %d\n", tm, time));
232  
233          // Find descriptor
234          int i = find_desc(tm);
# Line 249 | Line 249 | int16 PrimeTime(uint32 tm, int32 time)
249  
250                          //!! PrimeTime(0) means continue previous delay
251                          // (save wakeup time in RmvTime?)
252 <                        if (time == 0) {
253 <                                printf("FATAL: Unsupported PrimeTime(0)\n");
254 <                                return 0;
255 <                        }
252 >                        if (time == 0)
253 >                                printf("WARNING: Unsupported PrimeTime(0)\n");
254  
255                          // Yes, calculate wakeup time relative to last scheduled time
256                          tm_time_t wakeup;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines