From b1e2d247de16a8b97a91ed434b674ad4c75f2eb0 Mon Sep 17 00:00:00 2001 From: deadwood Date: Tue, 1 Mar 2022 11:56:34 +0100 Subject: [PATCH] 32/64 bit time corrections struct timerequest is now frozen at 32 bits and uses struct timeval32. Copy fields manually. --- aminet/comm/term/term/Extras/Source/Accountant.c | 6 ++++-- aminet/comm/term/term/Extras/Source/Sound.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/aminet/comm/term/term/Extras/Source/Accountant.c b/aminet/comm/term/term/Extras/Source/Accountant.c index 8db6bfa29c..e3528611da 100644 --- a/aminet/comm/term/term/Extras/Source/Accountant.c +++ b/aminet/comm/term/term/Extras/Source/Accountant.c @@ -150,7 +150,8 @@ AccountantEntry(VOID) /* Start waiting again */ TimeRequest->tr_node.io_Command = TR_ADDREQUEST; - TimeRequest->tr_time = TimeVal; + TimeRequest->tr_time.tv_secs = TimeVal.tv_secs; + TimeRequest->tr_time.tv_micro = TimeVal.tv_micro; SendIO((struct IORequest *)TimeRequest); @@ -193,7 +194,8 @@ AccountantEntry(VOID) /* Start waiting */ TimeRequest->tr_node.io_Command = TR_ADDREQUEST; - TimeRequest->tr_time = Message->Time; + TimeRequest->tr_time.tv_secs = Message->Time.tv_secs; + TimeRequest->tr_time.tv_micro = Message->Time.tv_micro; SendIO((struct IORequest *)TimeRequest); diff --git a/aminet/comm/term/term/Extras/Source/Sound.c b/aminet/comm/term/term/Extras/Source/Sound.c index dd03edce7c..81f44493c5 100644 --- a/aminet/comm/term/term/Extras/Source/Sound.c +++ b/aminet/comm/term/term/Extras/Source/Sound.c @@ -697,7 +697,8 @@ PlaySound(struct SoundInfo *SoundInfo) if(!OpenDevice(TIMERNAME,UNIT_VBLANK,(struct IORequest *)SoundTimeRequest,0)) { SoundTimeRequest->tr_node.io_Command = TR_ADDREQUEST; - SoundTimeRequest->tr_time = SoundInfo->SoundTime; + SoundTimeRequest->tr_time.tv_secs = SoundInfo->SoundTime.tv_secs; + SoundTimeRequest->tr_time.tv_micro = SoundInfo->SoundTime.tv_micro; SetSignal(0,PORTMASK(SoundTimePort));