Compiler nits for void * assignments from Bob Supnik

This commit is contained in:
Mark Pizzolato 2013-09-04 19:50:47 -07:00
parent 4cc4d12e19
commit 4e5f910fed
13 changed files with 40 additions and 26 deletions

View file

@ -1,6 +1,6 @@
/* h316_fhd.c: H316/516 fixed head simulator
Copyright (c) 2003-2012, Robert M. Supnik
Copyright (c) 2003-2013, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
fhd 516-4400 fixed head disk
03-Sep-13 RMS Added explicit void * cast
19-Mar-12 RMS Fixed declaration of chan_req (Mark Pizzolato)
15-May-06 RMS Fixed bug in autosize attach (David Gesswein)
04-Jan-04 RMS Changed sim_fsize calling sequence
@ -373,7 +374,7 @@ uint32 tk = CW1_GETTK (fhd_cw1); /* track */
uint32 ca = CW2_GETCA (fhd_cw2); /* char addr */
uint32 wa = ca >> 1; /* word addr */
uint32 ba = (((sf * FH_NUMTK) + tk) * FH_NUMWD) + wa; /* buffer offset */
uint16 *fbuf = uptr->filebuf; /* buffer base */
uint16 *fbuf = (uint16 *) uptr->filebuf; /* buffer base */
uint32 wd;
if (fhd_bad_wa (wa)) /* addr bad? */

View file

@ -1,6 +1,6 @@
/* id_fd.c: Interdata floppy disk simulator
Copyright (c) 2001-2012, Robert M Supnik
Copyright (c) 2001-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
fd M46-630 floppy disk
03-Sep-13 RMS Added explicit void * cast
19-Mar-12 RMS Fixed macro naming conflict (Mark Pizzolato)
A diskette consists of 77 tracks, each with 26 sectors of 128B. The
@ -306,7 +307,7 @@ return 0;
t_stat fd_svc (UNIT *uptr)
{
uint32 i, u, tk, sc, crc, fnc, da;
uint8 *fbuf = uptr->filebuf;
uint8 *fbuf = (uint8 *) uptr->filebuf;
u = uptr - fd_dev.units; /* get unit number */
fnc = GET_FNC (uptr->FNC); /* get function */

View file

@ -1,6 +1,6 @@
/* nova_dsk.c: 4019 fixed head disk simulator
Copyright (c) 1993-2008, Robert M. Supnik
Copyright (c) 1993-2013, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
dsk fixed head disk
03-Sep-13 RMS Added explicit void * cast
04-Jul-07 BKR device name changed to DG's DSK from DEC's DK,
DEV_xxx macros now used for consistency,
added secret DG DIC function,
@ -235,7 +236,7 @@ return rval;
t_stat dsk_svc (UNIT *uptr)
{
int32 i, da, pa;
int16 *fbuf = uptr->filebuf;
int16 *fbuf = (int16 *) uptr->filebuf;
DEV_CLR_BUSY( INT_DSK ) ;
DEV_SET_DONE( INT_DSK ) ;

View file

@ -1,6 +1,6 @@
/* pdp1_drm.c: PDP-1 drum simulator
Copyright (c) 1993-2008, Robert M Supnik
Copyright (c) 1993-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -26,6 +26,7 @@
drp Type 23 parallel drum
drm Type 24 serial drum
03-Sep-13 RMS Added explicit void * cast
21-Dec-06 RMS Added 16-chan SBS support
08-Dec-03 RMS Added parallel drum support
Fixed bug in DBL/DCN decoding
@ -276,7 +277,7 @@ return (stop_inst << IOT_V_REASON) | dat; /* stop if requested */
t_stat drm_svc (UNIT *uptr)
{
uint32 i, da;
uint32 *fbuf = uptr->filebuf;
uint32 *fbuf = (uint32 *) uptr->filebuf;
if ((uptr->flags & UNIT_BUF) == 0) { /* not buf? abort */
drm_err = 1; /* set error */

View file

@ -1,6 +1,6 @@
/* pdp11_rc.c: RC11/RS64 fixed head disk simulator
Copyright (c) 2007-2008, John A. Dundas III
Copyright (c) 2007-2013, John A. Dundas III
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
rc RC11/RS64 fixed head disk
03-Dec-13 RMS Added explicit void * cast
28-Dec-07 JAD Correct extraction of unit number from da in rc_svc.
Clear _all_ error bits when a new operation starts.
Passes all diagnostics in all configurations.
@ -448,7 +449,7 @@ static t_stat rc_svc (UNIT *uptr)
{
uint32 ma, da, t, u_old, u_new, last_da = 0;
uint16 dat;
uint16 *fbuf = uptr->filebuf;
uint16 *fbuf = (uint16 *) uptr->filebuf;
if ((uptr->flags & UNIT_BUF) == 0) { /* not buf? abort */
update_rccs (RCCS_NED | RCCS_DONE, 0); /* nx disk */

View file

@ -1,6 +1,6 @@
/* pdp11_rf.c: RF11 fixed head disk simulator
Copyright (c) 2006-2012, Robert M Supnik
Copyright (c) 2006-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
rf RF11 fixed head disk
03-Sep-13 RMS Added explicit void * cast
19-Mar-12 RMS Fixed bug in updating mem addr extension (Peter Schorn)
25-Dec-06 RMS Fixed bug in unit mask (John Dundas)
26-Jun-06 RMS Cloned from RF08 simulator
@ -322,7 +323,7 @@ t_stat rf_svc (UNIT *uptr)
{
uint32 ma, da, t;
uint16 dat;
uint16 *fbuf = uptr->filebuf;
uint16 *fbuf = (uint16 *) uptr->filebuf;
if ((uptr->flags & UNIT_BUF) == 0) { /* not buf? abort */
update_rfcs (RFCS_NED|RFCS_DONE, 0); /* nx disk */

View file

@ -1,6 +1,6 @@
/* pdp11_rx.c: RX11/RX01 floppy disk simulator
Copyright (c) 1993-2008, Robert M Supnik
Copyright (c) 1993-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
rx RX11/RX01 floppy disk
03-Sep-13 RMS Added explicit void * cast
07-Jul-05 RMS Removed extraneous externs
12-Oct-02 RMS Added autoconfigure support
08-Oct-02 RMS Added variable address support to bootstrap
@ -332,7 +333,7 @@ t_stat rx_svc (UNIT *uptr)
{
int32 i, func;
uint32 da;
int8 *fbuf = uptr->filebuf;
int8 *fbuf = (int8 *) uptr->filebuf;
func = RXCS_GETFNC (rx_csr); /* get function */
switch (rx_state) { /* case on state */

View file

@ -1,6 +1,6 @@
/* pdp11_ry.c: RX211/RXV21/RX02 floppy disk simulator
Copyright (c) 1993-2008, Robert M Supnik
Copyright (c) 1993-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
ry RX211/RXV21/RX02 floppy disk
03-Sep-13 RMS Added explicit void * cast
15-May-06 RMS Fixed bug in autosize attach (David Gesswein)
07-Jul-05 RMS Removed extraneous externs
18-Feb-05 RMS Fixed bug in boot code (Graham Toal)
@ -386,7 +387,7 @@ t_stat ry_svc (UNIT *uptr)
int32 i, t, func, bps;
static uint8 estat[8];
uint32 ba, da;
int8 *fbuf = uptr->filebuf;
int8 *fbuf = (int8 *) uptr->filebuf;
func = RYCS_GETFNC (ry_csr); /* get function */
bps = (ry_csr & RYCS_DEN)? RY_NUMBY: RX_NUMBY; /* get sector size */

View file

@ -1,6 +1,6 @@
/* pdp18b_drm.c: drum/fixed head disk simulator
Copyright (c) 1993-2008, Robert M Supnik
Copyright (c) 1993-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
drm (PDP-4,PDP-7) Type 24 serial drum
03-Sep-13 RMS Added explicit void * cast
14-Jan-04 RMS Revised IO device call interface
26-Oct-03 RMS Cleaned up buffer copy code
05-Dec-02 RMS Updated from Type 24 documentation
@ -181,7 +182,7 @@ t_stat drm_svc (UNIT *uptr)
{
int32 i;
uint32 da;
int32 *fbuf = uptr->filebuf;
int32 *fbuf = (int32 *) uptr->filebuf;
if ((uptr->flags & UNIT_BUF) == 0) { /* not buf? abort */
drm_err = 1; /* set error */

View file

@ -1,6 +1,6 @@
/* pdp18b_rb.c: RB09 fixed head disk simulator
Copyright (c) 2003-2008, Robert M Supnik
Copyright (c) 2003-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
rb RB09 fixed head disk
03-Sep-13 RMS Added explicit void * cast
14-Jan-04 RMS Revised IO device call interface
26-Oct-03 RMS Cleaned up buffer copy code
@ -240,7 +241,7 @@ return r;
t_stat rb_svc (UNIT *uptr)
{
int32 t, sw;
int32 *fbuf = uptr->filebuf;
int32 *fbuf = (int32 *) uptr->filebuf;
if ((uptr->flags & UNIT_BUF) == 0) { /* not buf? abort */
rb_updsta (RBS_NRY | RBS_DON); /* set nxd, done */

View file

@ -1,6 +1,6 @@
/* pdp18b_rf.c: fixed head disk simulator
Copyright (c) 1993-2008, Robert M Supnik
Copyright (c) 1993-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -26,6 +26,7 @@
rf (PDP-9) RF09/RF09
(PDP-15) RF15/RS09
03-Sep-13 RMS Added explicit void * cast
04-Oct-06 RMS Fixed bug, DSCD does not clear function register
15-May-06 RMS Fixed bug in autosize attach (David Gesswein)
14-Jan-04 RMS Revised IO device call interface
@ -265,7 +266,7 @@ return dat;
t_stat rf_svc (UNIT *uptr)
{
int32 f, pa, d, t;
int32 *fbuf = uptr->filebuf;
int32 *fbuf = (int32 *) uptr->filebuf;
if ((uptr->flags & UNIT_BUF) == 0) { /* not buf? abort */
rf_updsta (RFS_NED | RFS_DON); /* set nxd, done */

View file

@ -1,6 +1,6 @@
/* pdp8_rx.c: RX8E/RX01, RX28/RX02 floppy disk simulator
Copyright (c) 1993-2011, Robert M Supnik
Copyright (c) 1993-2013, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
rx RX8E/RX01, RX28/RX02 floppy disk
03-Sep-13 RMS Added explicit void * cast
15-May-06 RMS Fixed bug in autosize attach (Dave Gesswein)
04-Jan-04 RMS Changed sim_fsize calling sequence
05-Nov-03 RMS Fixed bug in RX28 read status (Charles Dickman)
@ -366,7 +367,7 @@ return;
t_stat rx_svc (UNIT *uptr)
{
int32 i, func, byptr, bps, wps;
int8 *fbuf = uptr->filebuf;
int8 *fbuf = (int8 *) uptr->filebuf;
uint32 da;
#define PTR12(x) (((x) + (x) + (x)) >> 1)

View file

@ -1,6 +1,6 @@
/* sds_drm.c: SDS 940 Project Genie drum simulator
Copyright (c) 2002-2008, Robert M. Supnik
Copyright (c) 2002-2013, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,8 @@
drm drum
03-Sep-13 RMS Added explicit void * cast
The drum is buffered in memory.
Note: the Project Genie documentation and the actual monitor sources disagree
@ -191,7 +193,7 @@ t_stat drm_svc (UNIT *uptr)
{
int32 t, rda;
uint32 dpc, dwd;
uint32 *fbuf = uptr->filebuf;
uint32 *fbuf = (uint32 *) uptr->filebuf;
if (drm_sta != DRM_SXFR) { /* fetch drum prog? */
dpc = M[DRM_PC]; /* get drum PC */