From 1a98f0783e14433db54f18d704a6b76204e7f892 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Thu, 1 Sep 2022 14:15:37 -0700 Subject: [PATCH] Replace Addr68k related macros with NativeAligned inline functions --- src/rs232c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rs232c.c b/src/rs232c.c index 885e690..9576f6e 100644 --- a/src/rs232c.c +++ b/src/rs232c.c @@ -222,10 +222,10 @@ rs232c_read() { if (RS232C_Fd >= 0) { if (RS232CGetFlag->busy) { iocb = - (DLRS232C_IOCB *)Addr68k_from_LADDR(((*(RS232CGetCSB + 1) & 0xff) << 16) + *RS232CGetCSB); + (DLRS232C_IOCB *)NativeAligned4FromLAddr(((*(RS232CGetCSB + 1) & 0xff) << 16) + *RS232CGetCSB); if ((count = - read(RS232C_Fd, (char *)Addr68k_from_LADDR(((iocb->block_pointer_hi & 0xff) << 16) + + read(RS232C_Fd, (char *)NativeAligned2FromLAddr(((iocb->block_pointer_hi & 0xff) << 16) + iocb->block_pointer_lo), iocb->byte_count)) < 0) { ((DLRS232C_IOCB_TRANSFER_STATUS *)(&iocb->transfer_status))->success = 0; @@ -270,12 +270,12 @@ RS232C_write() { char *buf; DLRS232C_IOCB *iocb; - iocb = (DLRS232C_IOCB *)Addr68k_from_LADDR(((*(RS232CPutCSB + 1) & 0xff) << 16) + *RS232CPutCSB); + iocb = (DLRS232C_IOCB *)NativeAligned4FromLAddr(((*(RS232CPutCSB + 1) & 0xff) << 16) + *RS232CPutCSB); if (RS232CPutFlag->busy && RS232C_Fd >= 0) { if (iocb->put) { for (size = iocb->byte_count, - buf = (char *)Addr68k_from_LADDR(((iocb->block_pointer_hi & 0xff) << 16) + + buf = (char *)NativeAligned2FromLAddr(((iocb->block_pointer_hi & 0xff) << 16) + iocb->block_pointer_lo); size > 0; size -= count, buf += count) { trynum = 0; @@ -762,7 +762,7 @@ rs232c_debug( name, sw ) printf("DEBUG:\n"); printf("DEBUG: \t\tSymbol Address Contents\n"); - printf("DEBUG: \t\tIOPAGE %#x\n",Addr68k_from_LADDR(IOPAGE_OFFSET)); + printf("DEBUG: \t\tIOPAGE %#x\n",NativeAligned4FromLAddr(IOPAGE_OFFSET)); printf("DEBUG: \t\tHardWareConfig %#x %#x\n", HardWareConfig, *(DLword*) HardWareConfig); printf("DEBUG: \t\tRS232CGetFlag %#x %#x\n", RS232CGetFlag, *(DLword*)