Skip to content

Commit 97f76c4

Browse files
committed
Fixes for updated compiler.
1 parent 59c01bd commit 97f76c4

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

ic/ncr53c9x.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,7 +1892,7 @@ _tme_ncr53c9x_callout(struct tme_ncr53c9x *ncr53c9x)
18921892
return;
18931893
}
18941894

1895-
tlb_local = TME_ALIGN((uintptr_t)tlb_buffer,16);
1895+
tlb_local = (struct tme_bus_tlb *)TME_ALIGN((uintptr_t)tlb_buffer,16);
18961896
/* callouts are now running: */
18971897
ncr53c9x->tme_ncr53c9x_callout_flags |= TME_NCR53C9X_CALLOUTS_RUNNING;
18981898

@@ -2269,7 +2269,7 @@ _tme_ncr53c9x_callout(struct tme_ncr53c9x *ncr53c9x)
22692269

22702270
/* start the SCSI DMA structure: */
22712271
/* XXX parity? */
2272-
scsi_dma = TME_ALIGN((uintptr_t)scsi_dma_buffer,16);
2272+
scsi_dma = (struct tme_scsi_dma *)TME_ALIGN((uintptr_t)scsi_dma_buffer,16);
22732273
scsi_dma->tme_scsi_dma_flags = TME_SCSI_DMA_8BIT;
22742274
scsi_dma->tme_scsi_dma_sync_offset = 0;
22752275
scsi_dma->tme_scsi_dma_sync_period = 0;

scsi/scsi-bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ _tme_scsi_bus_callout(struct tme_scsi_bus *scsi_bus, int new_callouts)
193193
events_triggered = conn_int->tme_scsi_connection_int_events_triggered;
194194
actions_taken = conn_int->tme_scsi_connection_int_actions_taken;
195195
if (conn_int->tme_scsi_connection_int_dma != NULL) {
196-
dma = TME_ALIGN((uintptr_t)dma_buffer,16);
196+
dma = (const struct tme_scsi_dma *)TME_ALIGN((uintptr_t)dma_buffer,16);
197197
memcpy(dma, conn_int->tme_scsi_connection_int_dma, sizeof(struct tme_scsi_dma));
198198
}
199199
conn_int->tme_scsi_connection_int_events_triggered = 0;

scsi/scsi-device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ _tme_scsi_device_callout(struct tme_scsi_device *scsi_device,
105105
/* run a target information transfer phase DMA sequence: */
106106
events = TME_SCSI_EVENT_NONE;
107107
actions = TME_SCSI_ACTION_DMA_TARGET;
108-
dma = TME_ALIGN((uintptr_t)dma_buffer,16);
108+
dma = (const struct tme_scsi_dma *)TME_ALIGN((uintptr_t)dma_buffer,16);
109109
memcpy(dma, &scsi_device->tme_scsi_device_dma, sizeof(struct tme_scsi_dma));
110110
}
111111

tmesh/tmesh.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ _TME_RCSID("$Id: tmesh.c,v 1.4 2009/08/30 17:06:38 fredette Exp $");
4747
#endif
4848
#include <stdio.h>
4949
#include <string.h>
50+
#include <libgen.h>
5051

5152
/* macros: */
5253

0 commit comments

Comments
 (0)