32/64 bit time corrections

struct timerequest is now frozen at 32 bits and uses struct timeval32. Copy fields manually.
aros-development-team · Dec 26, 2022 · b1e2d24 · b1e2d24
1 parent ea113fe
commit b1e2d24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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));