diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-19 23:11:21 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-19 23:11:21 +1000 |
| commit | 143a1dec7e04e0a9712ff93e779aabfb21dfd97c (patch) | |
| tree | 3a60a4e630d792fb3cdc6e962ce0ecfd94bb2672 /arch/powerpc/platforms/powermac/pmac.h | |
| parent | 7ed476d17f04473f70d796cb6c172bdcfcc9b8e5 (diff) | |
powerpc: Merge machdep.h
A few things change for consistency between ppc32 and ppc64:
idle functions return void; *_get_boot_time functions return
unsigned long (i.e. time_t) rather than filling in a struct rtc_time
(since that's useful to the callers and easier for pmac to
generate); *_get_rtc_time and *_set_rtc_time functions take
a struct rtc_time; irq_canonicalize is gone; nvram_sync returns
void.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac/pmac.h')
| -rw-r--r-- | arch/powerpc/platforms/powermac/pmac.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h index 81f52512b046..0a9ba704865e 100644 --- a/arch/powerpc/platforms/powermac/pmac.h +++ b/arch/powerpc/platforms/powermac/pmac.h @@ -10,9 +10,12 @@ * pmac_* files. Mostly for use by pmac_setup */ +struct rtc_time; + extern long pmac_time_init(void); -extern unsigned long pmac_get_rtc_time(void); -extern int pmac_set_rtc_time(unsigned long nowtime); +extern unsigned long pmac_get_boot_time(void); +extern void pmac_get_rtc_time(struct rtc_time *); +extern int pmac_set_rtc_time(struct rtc_time *); extern void pmac_read_rtc_time(void); extern void pmac_calibrate_decr(void); extern void pmac_pcibios_fixup(void); |