File 0009-cast-TME_ALIGN.patch of Package tme
From 3d309fb636f0f494da3d7e3498d7ebc4ce507a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Thu, 3 Oct 2024 16:12:17 +0200
Subject: [PATCH 09/12] cast TME_ALIGN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Klaus Kämpf <kkaempf@gmail.com>
---
ic/ncr53c9x.c | 4 ++--
scsi/scsi-bus.c | 2 +-
scsi/scsi-device.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ic/ncr53c9x.c b/ic/ncr53c9x.c
index 4c121c8..4f21c6a 100644
--- a/ic/ncr53c9x.c
+++ b/ic/ncr53c9x.c
@@ -1892,7 +1892,7 @@ _tme_ncr53c9x_callout(struct tme_ncr53c9x *ncr53c9x)
return;
}
- tlb_local = TME_ALIGN((uintptr_t)tlb_buffer,16);
+ tlb_local = (struct tme_bus_tlb *)TME_ALIGN((uintptr_t)tlb_buffer,16);
/* callouts are now running: */
ncr53c9x->tme_ncr53c9x_callout_flags |= TME_NCR53C9X_CALLOUTS_RUNNING;
@@ -2269,7 +2269,7 @@ _tme_ncr53c9x_callout(struct tme_ncr53c9x *ncr53c9x)
/* start the SCSI DMA structure: */
/* XXX parity? */
- scsi_dma = TME_ALIGN((uintptr_t)scsi_dma_buffer,16);
+ scsi_dma = (struct tme_scsi_dma *)TME_ALIGN((uintptr_t)scsi_dma_buffer,16);
scsi_dma->tme_scsi_dma_flags = TME_SCSI_DMA_8BIT;
scsi_dma->tme_scsi_dma_sync_offset = 0;
scsi_dma->tme_scsi_dma_sync_period = 0;
diff --git a/scsi/scsi-bus.c b/scsi/scsi-bus.c
index 422b99f..bd56367 100644
--- a/scsi/scsi-bus.c
+++ b/scsi/scsi-bus.c
@@ -193,7 +193,7 @@ _tme_scsi_bus_callout(struct tme_scsi_bus *scsi_bus, int new_callouts)
events_triggered = conn_int->tme_scsi_connection_int_events_triggered;
actions_taken = conn_int->tme_scsi_connection_int_actions_taken;
if (conn_int->tme_scsi_connection_int_dma != NULL) {
- dma = TME_ALIGN((uintptr_t)dma_buffer,16);
+ dma = (const struct tme_scsi_dma *)TME_ALIGN((uintptr_t)dma_buffer,16);
memcpy(dma, conn_int->tme_scsi_connection_int_dma, sizeof(struct tme_scsi_dma));
}
conn_int->tme_scsi_connection_int_events_triggered = 0;
diff --git a/scsi/scsi-device.c b/scsi/scsi-device.c
index f853974..f028080 100644
--- a/scsi/scsi-device.c
+++ b/scsi/scsi-device.c
@@ -105,7 +105,7 @@ _tme_scsi_device_callout(struct tme_scsi_device *scsi_device,
/* run a target information transfer phase DMA sequence: */
events = TME_SCSI_EVENT_NONE;
actions = TME_SCSI_ACTION_DMA_TARGET;
- dma = TME_ALIGN((uintptr_t)dma_buffer,16);
+ dma = (const struct tme_scsi_dma *)TME_ALIGN((uintptr_t)dma_buffer,16);
memcpy(dma, &scsi_device->tme_scsi_device_dma, sizeof(struct tme_scsi_dma));
}
--
2.47.0