github.com/open-simh.simh
1
0
Fork 0
mirror of https://github.com/open-simh/simh.git synced 2026-03-25 17:58:54 +00:00
Code Issues Projects Releases Wiki Activity

ALL: Massive 'const' cleanup

Browse Source 
These changes facilitate more robust parameter type checking and helps
to identify unexpected coding errors.

Most simulators can now also be compiled with a C++ compiler without
warnings.

Additionally, these changes have also been configured to facilitate easier
backporting of simulator and device simulation modules to run under the
simh v3.9+ SCP framework.
This commit is contained in:
Mark Pizzolato
2016-05-15 15:25:33 -07:00
parent 60a8a2d43d
commit 5531ccb175
444 changed files with 4119 additions and 3798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Interdata/id16_cpu.c
View File

@@ -237,11 +237,11 @@ uint32 display (uint32 dev, uint32 op, uint32 dat);
t_stat cpu_ex (t_value *vptr, t_addr addr, UNIT *uptr, int32 sw);
t_stat cpu_dep (t_value val, t_addr addr, UNIT *uptr, int32 sw);
t_stat cpu_reset (DEVICE *dptr);
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_consint (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_model (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_consint (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
extern t_bool devtab_init (void);
extern void int_eval (void);
@@ -1920,7 +1920,7 @@ return SCPE_OK;
/* Change memory size */
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int32 mc = 0;
uint32 i;
@@ -1940,7 +1940,7 @@ return SCPE_OK;
/* Change CPU model */
t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_model (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
uint32 i;
@@ -1955,7 +1955,7 @@ return SCPE_OK;
/* Set console interrupt */
t_stat cpu_set_consint (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_consint (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if ((uptr->flags & (UNIT_716 | UNIT_816 | UNIT_816E)) == 0)
return SCPE_NOFNC;
@@ -1966,7 +1966,7 @@ return SCPE_OK;
/* Set history */
t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
uint32 i, lnt;
t_stat r;
@@ -1997,10 +1997,10 @@ return SCPE_OK;
/* Show history */
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
int32 op, k, di, lnt;
char *cptr = (char *) desc;
const char *cptr = (const char *) desc;
t_value sim_eval[2];
t_stat r;
InstHistory *h;

2
Interdata/id16_dboot.c
View File

@@ -305,7 +305,7 @@ static uint8 dboot_rom[] = {
*/
struct dboot_id {
char *name;
const char *name;
uint32 sw;
uint32 cap;
uint32 dtype;

12
Interdata/id16_sys.c
View File

@@ -48,9 +48,9 @@ extern REG cpu_reg[];
extern uint16 *M;
t_stat fprint_sym_m (FILE *of, t_addr addr, t_value *val);
t_stat parse_sym_m (char *cptr, t_addr addr, t_value *val);
extern t_stat lp_load (FILE *fileref, char *cptr, char *fnam);
extern t_stat pt_dump (FILE *of, char *cptr, char *fnam);
t_stat parse_sym_m (const char *cptr, t_addr addr, t_value *val);
extern t_stat lp_load (FILE *fileref, CONST char *cptr, CONST char *fnam);
extern t_stat pt_dump (FILE *of, CONST char *cptr, CONST char *fnam);
/* SCP data structures and interface routines
@@ -98,7 +98,7 @@ const char *sim_stop_messages[] = {
/* Binary loader -- load carriage control tape
Binary dump -- paper tape dump */
t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag)
{
if (flag)
return pt_dump (fileref, cptr, fnam);
@@ -489,7 +489,7 @@ return SCPE_OK;
/* Symbolic input */
t_stat parse_sym (char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
t_stat parse_sym (CONST char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
{
int32 bflag, by, rdx, num;
t_stat r;
@@ -571,7 +571,7 @@ return -1;
<= 0 -number of extra words
*/
t_stat parse_sym_m (char *cptr, t_addr addr, t_value *val)
t_stat parse_sym_m (const char *cptr, t_addr addr, t_value *val)
{
uint32 i, j, t, df, db, inst;
int32 r1, r2;

18
Interdata/id32_cpu.c
View File

@@ -268,10 +268,10 @@ uint32 display (uint32 dev, uint32 op, uint32 dat);
t_stat cpu_ex (t_value *vptr, t_addr addr, UNIT *uptr, int32 sw);
t_stat cpu_dep (t_value val, t_addr addr, UNIT *uptr, int32 sw);
t_stat cpu_reset (DEVICE *dptr);
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_consint (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_consint (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
void set_r_display (uint32 *rbase);
extern t_bool devtab_init (void);
@@ -2310,7 +2310,7 @@ return SCPE_OK;
/* Change memory size */
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
uint32 mc = 0;
uint32 i;
@@ -2344,7 +2344,7 @@ return;
/* Set console interrupt */
t_stat cpu_set_consint (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_consint (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (PSW & PSW_EXI)
SET_INT (v_DS);
@@ -2353,7 +2353,7 @@ return SCPE_OK;
/* Set history */
t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
uint32 i, lnt;
t_stat r;
@@ -2384,10 +2384,10 @@ return SCPE_OK;
/* Show history */
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
int32 op, k, di, lnt;
char *cptr = (char *) desc;
const char *cptr = (const char *) desc;
t_value sim_eval[3];
t_stat r;
InstHistory *h;

2
Interdata/id32_dboot.c
View File

@@ -267,7 +267,7 @@ static uint8 dboot_rom[] = {
*/
struct dboot_id {
char *name;
const char *name;
uint32 sw;
uint32 cap;
uint32 dtype;

12
Interdata/id32_sys.c
View File

@@ -52,9 +52,9 @@ extern REG cpu_reg[];
extern uint32 *M;
t_stat fprint_sym_m (FILE *of, t_addr addr, t_value *val);
t_stat parse_sym_m (char *cptr, t_addr addr, t_value *val);
extern t_stat lp_load (FILE *fileref, char *cptr, char *fnam);
extern t_stat pt_dump (FILE *of, char *cptr, char *fnam);
t_stat parse_sym_m (const char *cptr, t_addr addr, t_value *val);
extern t_stat lp_load (FILE *fileref, CONST char *cptr, CONST char *fnam);
extern t_stat pt_dump (FILE *of, CONST char *cptr, CONST char *fnam);
/* SCP data structures and interface routines
@@ -102,7 +102,7 @@ const char *sim_stop_messages[] = {
/* Binary loader -- load carriage control tape
Binary dump -- paper tape dump */
t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag)
{
if (flag)
return pt_dump (fileref, cptr, fnam);
@@ -591,7 +591,7 @@ return SCPE_OK;
/* Symbolic input */
t_stat parse_sym (char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
t_stat parse_sym (CONST char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
{
int32 bflag, by, rdx, num;
t_stat r;
@@ -672,7 +672,7 @@ return -3;
<= 0 -number of extra words
*/
t_stat parse_sym_m (char *cptr, t_addr addr, t_value *val)
t_stat parse_sym_m (const char *cptr, t_addr addr, t_value *val)
{
uint32 i, j, df, db, t, inst;
int32 st, r1, r2, rx2;

11
Interdata/id_defs.h
View File

@@ -483,11 +483,14 @@ t_bool sch_actv (uint32 sch, uint32 devno);
void sch_stop (uint32 sch);
uint32 sch_wrmem (uint32 sch, uint8 *buf, uint32 cnt);
uint32 sch_rdmem (uint32 sch, uint8 *buf, uint32 cnt);
t_stat set_sch (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat set_dev (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat show_sch (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat show_dev (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat set_sch (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat set_dev (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat show_sch (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat show_dev (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
int32 lfc_cosched (int32 wait);
extern uint32 PC, dec_flgs;
extern const uint16 decrom[256];
#endif

9
Interdata/id_dp.c
View File

@@ -156,14 +156,13 @@ int32 dp_rtime = 100; /* rotate latency */
int32 dp_wtime = 1; /* word time */
uint8 dp_tplte[(2 * DP_NUMDR) + 2]; /* fix/rmv + ctrl + end */
DEVICE dp_dev;
uint32 dp (uint32 dev, uint32 op, uint32 dat);
void dp_ini (t_bool dtpl);
t_stat dp_svc (UNIT *uptr);
t_stat dp_reset (DEVICE *dptr);
t_stat dp_attach (UNIT *uptr, char *cptr);
t_stat dp_attach (UNIT *uptr, CONST char *cptr);
t_stat dp_detach (UNIT *uptr);
t_stat dp_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat dp_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat dp_rds (UNIT *uptr);
t_stat dp_wds (UNIT *uptr);
t_bool dp_dter (UNIT *uptr, uint32 first);
@@ -564,7 +563,7 @@ return SCPE_OK;
/* Attach routine (with optional autosizing) */
t_stat dp_attach (UNIT *uptr, char *cptr)
t_stat dp_attach (UNIT *uptr, CONST char *cptr)
{
uint32 i, p;
t_stat r;
@@ -603,7 +602,7 @@ return detach_unit (uptr);
/* Set size command validation routine */
t_stat dp_set_size (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat dp_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (uptr->flags & UNIT_ATT)
return SCPE_ALATT;

4
Interdata/id_fd.c
View File

@@ -132,7 +132,6 @@ static uint32 ctab[16] = {
0, 0, 0, 0
};
DEVICE fd_dev;
uint32 fd (uint32 dev, uint32 op, uint32 dat);
t_stat fd_svc (UNIT *uptr);
t_stat fd_reset (DEVICE *dptr);
@@ -516,9 +515,6 @@ static uint8 boot_rom[] = {
t_stat fd_boot (int32 unitno, DEVICE *dptr)
{
extern uint32 PC, dec_flgs;
extern uint16 decrom[];
if (decrom[0xD5] & dec_flgs) /* AL defined? */
return SCPE_NOFNC;
IOWriteBlk (BOOT_START, BOOT_LEN, boot_rom); /* copy boot */

5
Interdata/id_fp.c
View File

@@ -115,7 +115,6 @@ struct ufp { /* unpacked fp */
extern uint32 *R;
extern uint32 F[8];
extern dpr_t D[8];
extern uint16 decrom[];
extern uint32 fp_in_hwre;
extern uint32 ReadF (uint32 loc, uint32 rel);
extern void WriteF (uint32 loc, uint32 dat, uint32 rel);
@@ -318,7 +317,7 @@ return StoreFPR (&fop1, op, r1, Q_RND_AS (op)); /* store result */
- Double precision multiply generates 56b with no guard bits
*/
int32 f_m (uint32 op, uint32 r1, uint32 r2, uint32 ea)
uint32 f_m (uint32 op, uint32 r1, uint32 r2, uint32 ea)
{
struct ufp fop1, fop2;
struct ufp res = { 0, 0, 0, 0 };
@@ -366,7 +365,7 @@ return StoreFPR (&res, op, r1, Q_RND (op)); /* store */
/* Floating point divide - see overflow/underflow notes for multiply */
int32 f_d (uint32 op, uint32 r1, uint32 r2, uint32 ea)
uint32 f_d (uint32 op, uint32 r1, uint32 r2, uint32 ea)
{
struct ufp fop1, fop2;
struct ufp quo = { 0, 0, 0, 0 };

9
Interdata/id_idc.c
View File

@@ -219,12 +219,11 @@ int32 idc_rtime = 100; /* rotate latency */
int32 idc_ctime = 5; /* command latency */
uint8 idc_tplte[] = { 0, 1, 2, 3, 4, TPL_END }; /* ctrl + drive */
DEVICE idc_dev;
uint32 id (uint32 dev, uint32 op, uint32 dat);
t_stat idc_svc (UNIT *uptr);
t_stat idc_reset (DEVICE *dptr);
t_stat idc_attach (UNIT *uptr, char *cptr);
t_stat idc_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat idc_attach (UNIT *uptr, CONST char *cptr);
t_stat idc_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
void idc_wd_byte (uint32 dat);
t_stat idc_rds (UNIT *uptr);
t_stat idc_wds (UNIT *uptr);
@@ -770,7 +769,7 @@ return SCPE_OK;
/* Attach routine (with optional autosizing) */
t_stat idc_attach (UNIT *uptr, char *cptr)
t_stat idc_attach (UNIT *uptr, CONST char *cptr)
{
uint32 i, p;
t_stat r;
@@ -796,7 +795,7 @@ return SCPE_OK;
/* Set size command validation routine */
t_stat idc_set_size (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat idc_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (uptr->flags & UNIT_ATT)
return SCPE_ALATT;

20
Interdata/id_io.c
View File

@@ -81,9 +81,9 @@ uint8 sch_tplte[SCH_NUMCH + 1]; /* dnum template */
uint32 sch (uint32 dev, uint32 op, uint32 dat);
void sch_ini (t_bool dtpl);
t_stat sch_reset (DEVICE *dptr);
t_stat sch_set_nchan (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat sch_show_nchan (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat sch_show_reg (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat sch_set_nchan (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat sch_show_nchan (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat sch_show_reg (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
/* Selector channel data structures
@@ -341,7 +341,7 @@ return SCPE_OK;
/* Set number of channels */
t_stat sch_set_nchan (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat sch_set_nchan (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
DEVICE *dptr;
DIB *dibp;
@@ -372,7 +372,7 @@ return SCPE_OK;
/* Show number of channels */
t_stat sch_show_nchan (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat sch_show_nchan (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
fprintf (st, "channels=%d", sch_max);
return SCPE_OK;
@@ -380,7 +380,7 @@ return SCPE_OK;
/* Show channel registers */
t_stat sch_show_reg (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat sch_show_reg (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
if (val < 0)
return SCPE_IERR;
@@ -513,7 +513,7 @@ return cnt;
/* Change selector channel for a device */
t_stat set_sch (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat set_sch (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
DEVICE *dptr;
DIB *dibp;
@@ -539,7 +539,7 @@ return SCPE_OK;
/* Show selector channel for a device */
t_stat show_sch (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat show_sch (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
DEVICE *dptr;
DIB *dibp;
@@ -558,7 +558,7 @@ return SCPE_OK;
/* Change device number for a device */
t_stat set_dev (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat set_dev (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
DEVICE *dptr;
DIB *dibp;
@@ -586,7 +586,7 @@ return SCPE_OK;
/* Show device number for a device */
t_stat show_dev (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat show_dev (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
DEVICE *dptr;
DIB *dibp;

7
Interdata/id_lp.c
View File

@@ -67,11 +67,10 @@ int32 lpt_stopioe = 0; /* stop on err */
extern uint32 int_req[INTSZ], int_enb[INTSZ];
DEVICE lpt_dev;
uint32 lpt (uint32 dev, uint32 op, uint32 dat);
t_stat lpt_svc (UNIT *uptr);
t_stat lpt_reset (DEVICE *dptr);
t_stat lpt_attach (UNIT *uptr, char *cptr);
t_stat lpt_attach (UNIT *uptr, CONST char *cptr);
t_stat lpt_bufout (UNIT *uptr);
t_stat lpt_vfu (UNIT *uptr, int32 ch);
t_stat lpt_spc (UNIT *uptr, int32 cnt);
@@ -283,7 +282,7 @@ return SCPE_OK;
/* Attach routine */
t_stat lpt_attach (UNIT *uptr, char *cptr)
t_stat lpt_attach (UNIT *uptr, CONST char *cptr)
{
lpt_vfup = 0; /* top of form */
return attach_unit (uptr, cptr);
@@ -291,7 +290,7 @@ return attach_unit (uptr, cptr);
/* Carriage control load routine */
t_stat lp_load (FILE *fileref, char *cptr, char *fnam)
t_stat lp_load (FILE *fileref, CONST char *cptr, CONST char *fnam)
{
int32 col, ptr, mask, vfubuf[VFU_LNT];
uint32 rpt;

7
Interdata/id_mt.c
View File

@@ -101,11 +101,10 @@ static const uint8 bad_cmd[64] = {
0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1
};
DEVICE mt_dev;
uint32 mt (uint32 dev, uint32 op, uint32 dat);
t_stat mt_svc (UNIT *uptr);
t_stat mt_reset (DEVICE *dptr);
t_stat mt_attach (UNIT *uptr, char *cptr);
t_stat mt_attach (UNIT *uptr, CONST char *cptr);
t_stat mt_detach (UNIT *uptr);
t_stat mt_boot (int32 unitno, DEVICE *dptr);
t_stat mt_map_err (UNIT *uptr, t_stat st);
@@ -483,7 +482,7 @@ return SCPE_OK;
/* Attach routine */
t_stat mt_attach (UNIT *uptr, char *cptr)
t_stat mt_attach (UNIT *uptr, CONST char *cptr)
{
int32 u = uptr - mt_dev.units;
t_stat r;
@@ -527,8 +526,6 @@ static uint8 boot_rom[] = {
t_stat mt_boot (int32 unitno, DEVICE *dptr)
{
extern uint32 PC, dec_flgs;
extern uint16 decrom[];
extern DIB sch_dib;
uint32 sch_dev;

8
Interdata/id_pas.c
View File

@@ -113,10 +113,10 @@ void pas_ini (t_bool dtpl);
t_stat pasi_svc (UNIT *uptr);
t_stat paso_svc (UNIT *uptr);
t_stat pas_reset (DEVICE *dptr);
t_stat pas_attach (UNIT *uptr, char *cptr);
t_stat pas_attach (UNIT *uptr, CONST char *cptr);
t_stat pas_detach (UNIT *uptr);
int32 pas_par (int32 cmd, int32 c);
t_stat pas_vlines (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat pas_vlines (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
void pas_reset_ln (int32 i);
/* PAS data structures
@@ -479,7 +479,7 @@ return SCPE_OK;
/* Attach master unit */
t_stat pas_attach (UNIT *uptr, char *cptr)
t_stat pas_attach (UNIT *uptr, CONST char *cptr)
{
t_stat r;
@@ -506,7 +506,7 @@ return r;
/* Change number of lines */
t_stat pas_vlines (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat pas_vlines (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int32 newln, i, t;
t_stat r;

6
Interdata/id_pt.c
View File

@@ -54,7 +54,6 @@ uint32 pt_arm = 0; /* int arm */
uint32 pt_sta = STA_BSY; /* status */
uint32 ptr_stopioe = 0, ptp_stopioe = 0; /* stop on error */
DEVICE pt_dev;
uint32 pt (uint32 dev, uint32 op, uint32 dat);
t_stat ptr_svc (UNIT *uptr);
t_stat ptp_svc (UNIT *uptr);
@@ -285,9 +284,6 @@ static uint8 boot3_rom[] = {
t_stat pt_boot (int32 unitno, DEVICE *dptr)
{
extern uint32 PC, dec_flgs;
extern uint16 decrom[];
if (decrom[0xD5] & dec_flgs) /* AL defined? */
IOWriteBlk (BOOT3_START, BOOT3_LEN, boot3_rom); /* no, 50 seq */
else IOWriteBlk (BOOT_START, BOOT_LEN, boot_rom); /* copy AL boot */
@@ -342,7 +338,7 @@ static uint8 load_rom[] = {
0x22, 0x03 /* BS .-6 */
};
t_stat pt_dump (FILE *of, char *cptr, char *fnam)
t_stat pt_dump (FILE *of, CONST char *cptr, CONST char *fnam)
{
uint32 i, lo, hi, cs;
const char *tptr;

12
Interdata/id_tt.c
View File

@@ -64,9 +64,9 @@ uint32 tt (uint32 dev, uint32 op, uint32 dat);
t_stat tti_svc (UNIT *uptr);
t_stat tto_svc (UNIT *uptr);
t_stat tt_reset (DEVICE *dptr);
t_stat tt_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat tt_set_break (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat tt_set_enbdis (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat tt_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat tt_set_break (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat tt_set_enbdis (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
/* TT data structures
@@ -254,7 +254,7 @@ return SCPE_OK;
/* Make mode flags uniform */
t_stat tt_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat tt_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
tt_unit[TTO].flags = (tt_unit[TTO].flags & ~TT_MODE) | val;
if (val == TT_MODE_7P)
@@ -265,7 +265,7 @@ return SCPE_OK;
/* Set input break */
t_stat tt_set_break (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat tt_set_break (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (tt_dev.flags & DEV_DIS)
return SCPE_NOFNC;
@@ -282,7 +282,7 @@ return SCPE_OK;
/* Set enabled/disabled */
t_stat tt_set_enbdis (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat tt_set_enbdis (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
extern DEVICE ttp_dev;
extern t_stat ttp_reset (DEVICE *dptr);

12
Interdata/id_ttp.c
View File

@@ -69,9 +69,9 @@ uint32 ttp (uint32 dev, uint32 op, uint32 dat);
t_stat ttpi_svc (UNIT *uptr);
t_stat ttpo_svc (UNIT *uptr);
t_stat ttp_reset (DEVICE *dptr);
t_stat ttp_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat ttp_set_break (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat ttp_set_enbdis (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat ttp_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat ttp_set_break (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat ttp_set_enbdis (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
/* TTP data structures */
@@ -253,7 +253,7 @@ return SCPE_OK;
/* Make mode flags uniform */
t_stat ttp_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat ttp_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
ttp_unit[TTO].flags = (ttp_unit[TTO].flags & ~TT_MODE) | val;
if (val == TT_MODE_7P)
@@ -264,7 +264,7 @@ return SCPE_OK;
/* Set input break */
t_stat ttp_set_break (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat ttp_set_break (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (ttp_dev.flags & DEV_DIS)
return SCPE_NOFNC;
@@ -278,7 +278,7 @@ return SCPE_OK;
/* Set enabled/disabled */
t_stat ttp_set_enbdis (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat ttp_set_enbdis (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
extern DEVICE tt_dev;
extern t_stat tt_reset (DEVICE *dptr);

10
Interdata/id_uvc.c
View File

@@ -70,7 +70,6 @@ static int32 pic_map[16] = { /* map rate to delay */
0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0
};
DEVICE pic_dev;
uint32 pic (uint32 dev, uint32 op, uint32 dat);
t_stat pic_svc (UNIT *uptr);
t_stat pic_reset (DEVICE *dptr);
@@ -81,12 +80,11 @@ int32 lfc_tps = 120; /* ticks per */
int32 lfc_poll = 8000;
uint32 lfc_arm = 0; /* int arm */
DEVICE lfc_dev;
uint32 lfc (uint32 dev, uint32 op, uint32 dat);
t_stat lfc_svc (UNIT *uptr);
t_stat lfc_reset (DEVICE *dptr);
t_stat lfc_set_freq (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat lfc_show_freq (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat lfc_set_freq (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat lfc_show_freq (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
/* PIC data structures
@@ -376,7 +374,7 @@ return SCPE_OK;
/* Set frequency */
t_stat lfc_set_freq (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat lfc_set_freq (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
if (cptr)
return SCPE_ARG;
@@ -388,7 +386,7 @@ return SCPE_OK;
/* Show frequency */
t_stat lfc_show_freq (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat lfc_show_freq (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
fprintf (st, (lfc_tps == 100)? "50Hz": "60Hz");
return SCPE_OK;