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

Comparing BasiliskII/src/AmigaOS/timer_amiga.cpp (file contents):
Revision 1.3 by cebix, 1999-11-01T16:24:13Z vs.
Revision 1.8 by jlachmann, 2002-06-23T08:27:05Z

# Line 1 | Line 1
1   /*
2   *  timer_amiga.cpp - Time Manager emulation, AmigaOS specific stuff
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2001 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 20 | Line 20
20  
21   #include <exec/types.h>
22   #include <devices/timer.h>
23 + #define __USE_SYSBASE
24   #include <proto/timer.h>
25   #include <proto/intuition.h>
26 + #include <inline/timer.h>
27 + #include <inline/intuition.h>
28  
29   #include "sysdeps.h"
30   #include "timer.h"
# Line 51 | Line 54 | void Microseconds(uint32 &hi, uint32 &lo
54  
55   uint32 TimerDateTime(void)
56   {
57 <        ULONG secs;
55 <        ULONG mics;
57 >        ULONG secs, mics;
58          CurrentTime(&secs, &mics);
59 <        return secs + TIME_OFFSET;
59 >        return secs + 0x8b31ef80;
60   }
61  
62  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines