mirror of
https://github.com/simh/simh.git
synced 2026-04-10 14:49:16 +00:00
ALL: Massive 'const' cleanup
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:
@@ -386,9 +386,9 @@ t_bool build_dev_tab (void);
|
||||
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_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_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 cpu_caf (void);
|
||||
void cpu_inst_hist (int32 addr, int32 inst);
|
||||
void cpu_intr_hist (int32 flag, int32 lvl);
|
||||
@@ -2165,7 +2165,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;
|
||||
@@ -2184,7 +2184,7 @@ return SCPE_OK;
|
||||
|
||||
/* Change device number for a device */
|
||||
|
||||
t_stat set_devno (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat set_devno (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
DEVICE *dptr;
|
||||
DIB *dibp;
|
||||
@@ -2210,7 +2210,7 @@ return SCPE_OK;
|
||||
|
||||
/* Show device number for a device */
|
||||
|
||||
t_stat show_devno (FILE *st, UNIT *uptr, int32 val, void *desc)
|
||||
t_stat show_devno (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
|
||||
{
|
||||
DEVICE *dptr;
|
||||
DIB *dibp;
|
||||
@@ -2280,7 +2280,7 @@ return FALSE;
|
||||
|
||||
/* Set in memory 3-cycle databreak register */
|
||||
|
||||
t_stat set_3cyc_reg (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat set_3cyc_reg (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
t_stat r;
|
||||
int32 newv;
|
||||
@@ -2296,16 +2296,16 @@ return SCPE_OK;
|
||||
|
||||
/* Show in-memory 3-cycle databreak register */
|
||||
|
||||
t_stat show_3cyc_reg (FILE *st, UNIT *uptr, int32 val, void *desc)
|
||||
t_stat show_3cyc_reg (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
|
||||
{
|
||||
fprintf (st, "%s=", (char *) desc);
|
||||
fprintf (st, "%s=", (const char *) desc);
|
||||
fprint_val (st, (t_value) M[val], 8, 18, PV_RZRO);
|
||||
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)
|
||||
{
|
||||
int32 i, lnt;
|
||||
t_stat r;
|
||||
@@ -2336,10 +2336,11 @@ 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 l, j, k, di, lnt;
|
||||
char *cptr = (char *) desc;
|
||||
|
||||
const char *cptr = (const char *) desc;
|
||||
t_value sim_eval[2];
|
||||
t_stat r;
|
||||
InstHistory *h;
|
||||
|
||||
@@ -555,9 +555,14 @@ typedef struct {
|
||||
|
||||
/* Function prototypes */
|
||||
|
||||
t_stat set_devno (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
t_stat show_devno (FILE *st, UNIT *uptr, int32 val, void *desc);
|
||||
t_stat set_3cyc_reg (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
t_stat show_3cyc_reg (FILE *st, UNIT *uptr, int32 val, void *desc);
|
||||
t_stat set_devno (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
t_stat show_devno (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
|
||||
t_stat set_3cyc_reg (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
t_stat show_3cyc_reg (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
|
||||
|
||||
/* Translation tables */
|
||||
extern const int32 asc_to_baud[128];
|
||||
extern const char baud_to_asc[64];
|
||||
extern const char fio_to_asc[64];
|
||||
|
||||
#endif
|
||||
|
||||
@@ -76,7 +76,6 @@ int32 drm_wlk = 0; /* write lock */
|
||||
int32 drm_time = 10; /* inter-word time */
|
||||
int32 drm_stopioe = 1; /* stop on error */
|
||||
|
||||
DEVICE drm_dev;
|
||||
int32 drm60 (int32 dev, int32 pulse, int32 AC);
|
||||
int32 drm61 (int32 dev, int32 pulse, int32 AC);
|
||||
int32 drm62 (int32 dev, int32 pulse, int32 AC);
|
||||
|
||||
@@ -347,13 +347,12 @@ static const int32 map_unit[16] = { /* Type 550 unit map */
|
||||
0, -1, -1, -1, -1, -1, -1, -1
|
||||
};
|
||||
|
||||
DEVICE dt_dev;
|
||||
int32 dt75 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 dt76 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 dt_iors (void);
|
||||
t_stat dt_svc (UNIT *uptr);
|
||||
t_stat dt_reset (DEVICE *dptr);
|
||||
t_stat dt_attach (UNIT *uptr, char *cptr);
|
||||
t_stat dt_attach (UNIT *uptr, CONST char *cptr);
|
||||
void dt_flush (UNIT *uptr);
|
||||
t_stat dt_detach (UNIT *uptr);
|
||||
void dt_deselect (int32 oldf);
|
||||
@@ -433,8 +432,8 @@ MTAB dt_mod[] = {
|
||||
{ UNIT_8FMT + UNIT_11FMT, UNIT_8FMT, "12b", NULL, NULL },
|
||||
{ UNIT_8FMT + UNIT_11FMT, UNIT_11FMT, "16b", NULL, NULL },
|
||||
#if defined (TC02)
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, DT_WC, "WC", "WC", &set_3cyc_reg, &show_3cyc_reg, "WC" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, DT_CA, "CA", "CA", &set_3cyc_reg, &show_3cyc_reg, "CA" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, DT_WC, "WC", "WC", &set_3cyc_reg, &show_3cyc_reg, (void *)"WC" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, DT_CA, "CA", "CA", &set_3cyc_reg, &show_3cyc_reg, (void *)"CA" },
|
||||
#endif
|
||||
{ MTAB_XTD|MTAB_VDV, 0, "DEVNO", "DEVNO", &set_devno, &show_devno },
|
||||
{ 0 }
|
||||
@@ -1412,7 +1411,7 @@ return 0;
|
||||
If 18b/36b, read data into buffer
|
||||
*/
|
||||
|
||||
t_stat dt_attach (UNIT *uptr, char *cptr)
|
||||
t_stat dt_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
uint16 pdp8b[D8_NBSIZE];
|
||||
uint16 pdp11b[D18_BSIZE];
|
||||
|
||||
@@ -182,7 +182,7 @@ static void g2out_process_display_list ();
|
||||
static int g2out_send_new ();
|
||||
|
||||
/* both G2IN/G2OUT: */
|
||||
t_stat g2_attach (UNIT *uptr, char *cptr);
|
||||
t_stat g2_attach (UNIT *uptr, CONST char *cptr);
|
||||
t_stat g2_detach (UNIT *uptr);
|
||||
t_stat g2_reset (DEVICE *dptr);
|
||||
|
||||
@@ -518,8 +518,8 @@ static void g2out_process_display_list() {
|
||||
*/
|
||||
static int g2out_send_new() {
|
||||
struct dspbuf *old = g2out_dspbufs + OLD;
|
||||
struct dspbuf *new = g2out_dspbufs + NEW;
|
||||
char *cp = new->buffer;
|
||||
struct dspbuf *New = g2out_dspbufs + NEW;
|
||||
char *cp = New->buffer;
|
||||
int cur = 0;
|
||||
int start;
|
||||
|
||||
@@ -527,23 +527,23 @@ static int g2out_send_new() {
|
||||
* COULD have had undisplayed stuff on last screen before it was cleared??
|
||||
* would need to have a transmit queue??
|
||||
*/
|
||||
if (new->count == 0)
|
||||
if (New->count == 0)
|
||||
return 0;
|
||||
|
||||
if (old->count && /* have old chars */
|
||||
memcmp(old->buffer, new->buffer, old->count) == 0) { /* and a prefix */
|
||||
memcmp(old->buffer, New->buffer, old->count) == 0) { /* and a prefix */
|
||||
cur = old->count;
|
||||
cp += cur;
|
||||
}
|
||||
/* loop for chars while connected & tx enabled */
|
||||
start = cur;
|
||||
while (cur < new->count && g2_ldsc.conn && g2_ldsc.xmte) {
|
||||
while (cur < New->count && g2_ldsc.conn && g2_ldsc.xmte) {
|
||||
if (g2out_putchar(*cp)) {
|
||||
cp++;
|
||||
cur++;
|
||||
}
|
||||
}
|
||||
new->count = cur; /* only remember what's been sent */
|
||||
New->count = cur; /* only remember what's been sent */
|
||||
return cur - start; /* remember number sent */
|
||||
}
|
||||
|
||||
@@ -580,7 +580,7 @@ return SCPE_OK;
|
||||
}
|
||||
|
||||
/* Attach master unit */
|
||||
t_stat g2_attach (UNIT *uptr, char *cptr)
|
||||
t_stat g2_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
t_stat r;
|
||||
|
||||
|
||||
@@ -85,7 +85,6 @@ static const char *lp62_cc[] = {
|
||||
"\f"
|
||||
};
|
||||
|
||||
DEVICE lp62_dev;
|
||||
int32 lp62_65 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 lp62_66 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 lp62_iors (void);
|
||||
@@ -269,13 +268,12 @@ static const char *lp647_cc[] = {
|
||||
"\f"
|
||||
};
|
||||
|
||||
DEVICE lp647_dev;
|
||||
int32 lp647_65 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 lp647_66 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 lp647_iors (void);
|
||||
t_stat lp647_svc (UNIT *uptr);
|
||||
t_stat lp647_reset (DEVICE *dptr);
|
||||
t_stat lp647_attach (UNIT *uptr, char *cptr);
|
||||
t_stat lp647_attach (UNIT *uptr, CONST char *cptr);
|
||||
t_stat lp647_detach (UNIT *uptr);
|
||||
|
||||
/* Type 647 LPT data structures
|
||||
@@ -479,7 +477,7 @@ return (lp647_don? IOS_LPT: 0) | (lp647_err? IOS_LPT1: 0);
|
||||
|
||||
/* Attach routine */
|
||||
|
||||
t_stat lp647_attach (UNIT *uptr, char *cptr)
|
||||
t_stat lp647_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
t_stat reason;
|
||||
|
||||
@@ -508,13 +506,12 @@ int32 lp09_don = 0; /* ready */
|
||||
int32 lp09_err = 0; /* error */
|
||||
int32 lp09_ie = 1; /* int enable */
|
||||
int32 lp09_stopioe = 0;
|
||||
DEVICE lp09_dev;
|
||||
|
||||
int32 lp09_66 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 lp09_iors (void);
|
||||
t_stat lp09_svc (UNIT *uptr);
|
||||
t_stat lp09_reset (DEVICE *dptr);
|
||||
t_stat lp09_attach (UNIT *uptr, char *cptr);
|
||||
t_stat lp09_attach (UNIT *uptr, CONST char *cptr);
|
||||
t_stat lp09_detach (UNIT *uptr);
|
||||
|
||||
/* LP09 LPT data structures
|
||||
@@ -644,7 +641,7 @@ return (lp09_don? IOS_LPT: 0);
|
||||
|
||||
/* Attach routine */
|
||||
|
||||
t_stat lp09_attach (UNIT *uptr, char *cptr)
|
||||
t_stat lp09_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
t_stat reason;
|
||||
|
||||
@@ -691,14 +688,13 @@ int32 lp15_lc = 0;
|
||||
int32 lp15_bp = 0;
|
||||
char lp15_buf[LP15_BSIZE + 1] = { 0 };
|
||||
|
||||
DEVICE lp15_dev;
|
||||
int32 lp15_65 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 lp15_66 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 lp15_iors (void);
|
||||
t_stat lp15_svc (UNIT *uptr);
|
||||
t_stat lp15_reset (DEVICE *dptr);
|
||||
|
||||
int32 lp15_updsta (int32 new);
|
||||
int32 lp15_updsta (int32 New);
|
||||
|
||||
/* LP15 LPT data structures
|
||||
|
||||
@@ -730,7 +726,7 @@ REG lp15_reg[] = {
|
||||
};
|
||||
|
||||
MTAB lp15_mod[] = {
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, LPT_CA, "CA", "CA", &set_3cyc_reg, &show_3cyc_reg, "CA" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, LPT_CA, "CA", "CA", &set_3cyc_reg, &show_3cyc_reg, (void *)"CA" },
|
||||
{ MTAB_XTD|MTAB_VDV, 0, "DEVNO", "DEVNO", &set_devno, &show_devno },
|
||||
{ 0 }
|
||||
};
|
||||
@@ -856,9 +852,9 @@ return SCPE_OK;
|
||||
|
||||
/* Update status */
|
||||
|
||||
int32 lp15_updsta (int32 new)
|
||||
int32 lp15_updsta (int32 New)
|
||||
{
|
||||
lp15_sta = (lp15_sta | new) & ~(STA_CLR | STA_ERR | STA_BUSY);
|
||||
lp15_sta = (lp15_sta | New) & ~(STA_CLR | STA_ERR | STA_BUSY);
|
||||
if (lp15_sta & STA_EFLGS) /* update errors */
|
||||
lp15_sta = lp15_sta | STA_ERR;
|
||||
if (sim_is_active (&lp15_unit))
|
||||
|
||||
@@ -138,12 +138,11 @@ int32 mt_time = 10; /* record latency */
|
||||
int32 mt_stopioe = 1; /* stop on error */
|
||||
uint8 *mtxb = NULL; /* transfer buffer */
|
||||
|
||||
DEVICE mt_dev;
|
||||
int32 mt (int32 dev, int32 pulse, int32 dat);
|
||||
int32 mt_iors (void);
|
||||
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);
|
||||
int32 mt_updcsta (UNIT *uptr, int32 val);
|
||||
t_stat mt_map_err (UNIT *uptr, t_stat st);
|
||||
@@ -191,10 +190,9 @@ MTAB mt_mod[] = {
|
||||
&sim_tape_set_fmt, &sim_tape_show_fmt, NULL },
|
||||
{ MTAB_XTD|MTAB_VUN, 0, "TCAPACITY", "TCAPACITY",
|
||||
&sim_tape_set_capac, &sim_tape_show_capac, NULL },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, MT_WC, "WC", "WC", &set_3cyc_reg, &show_3cyc_reg, "WC" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, MT_CA, "CA", "CA", &set_3cyc_reg, &show_3cyc_reg, "CA" },
|
||||
{ MTAB_XTD|MTAB_VDV, 0, "DEVNO", "DEVNO",
|
||||
&set_devno, &show_devno, NULL },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, MT_WC, "WC", "WC", &set_3cyc_reg, &show_3cyc_reg, (void *)"WC" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, MT_CA, "CA", "CA", &set_3cyc_reg, &show_3cyc_reg, (void *)"CA" },
|
||||
{ MTAB_XTD|MTAB_VDV, 0, "DEVNO", "DEVNO", &set_devno, &show_devno, NULL },
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
@@ -510,7 +508,7 @@ return (mt_sta & (STA_ERR | STA_DON))? IOS_MTA: 0;
|
||||
|
||||
/* Attach routine */
|
||||
|
||||
t_stat mt_attach (UNIT *uptr, char *cptr)
|
||||
t_stat mt_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
t_stat r;
|
||||
|
||||
|
||||
@@ -91,11 +91,10 @@ int32 rb_time = 10; /* inter-word time */
|
||||
int32 rb_burst = 1; /* burst mode flag */
|
||||
int32 rb_stopioe = 1; /* stop on error */
|
||||
|
||||
DEVICE rb_dev;
|
||||
int32 rb71 (int32 dev, int32 pulse, int32 AC);
|
||||
t_stat rb_svc (UNIT *uptr);
|
||||
t_stat rb_reset (DEVICE *dptr);
|
||||
int32 rb_updsta (int32 new);
|
||||
int32 rb_updsta (int32 val);
|
||||
int32 rb_make_da (int32 dat);
|
||||
int32 rb_make_bcd (int32 dat);
|
||||
int32 rb_set_da (int32 dat, int32 old);
|
||||
@@ -280,9 +279,9 @@ return SCPE_OK;
|
||||
|
||||
/* Update status */
|
||||
|
||||
int32 rb_updsta (int32 new)
|
||||
int32 rb_updsta (int32 val)
|
||||
{
|
||||
rb_sta = (rb_sta | new) & ~(RBS_ERR | RBS_MBZ); /* clear err, mbz */
|
||||
rb_sta = (rb_sta | val) & ~(RBS_ERR | RBS_MBZ); /* clear err, mbz */
|
||||
if (rb_sta & RBS_EFLGS) /* error? */
|
||||
rb_sta = rb_sta | RBS_ERR;
|
||||
if (rb_sta & RBS_DON) /* done? clear busy */
|
||||
|
||||
@@ -124,15 +124,14 @@ int32 rf_time = 10; /* inter-word time */
|
||||
int32 rf_burst = 1; /* burst mode flag */
|
||||
int32 rf_stopioe = 1; /* stop on error */
|
||||
|
||||
DEVICE rf_dev;
|
||||
int32 rf70 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 rf72 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 rf_iors (void);
|
||||
t_stat rf_svc (UNIT *uptr);
|
||||
t_stat rf_reset (DEVICE *dptr);
|
||||
int32 rf_updsta (int32 new);
|
||||
t_stat rf_attach (UNIT *uptr, char *cptr);
|
||||
t_stat rf_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
int32 rf_updsta (int32 news);
|
||||
t_stat rf_attach (UNIT *uptr, CONST char *cptr);
|
||||
t_stat rf_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
|
||||
/* RF data structures
|
||||
|
||||
@@ -173,8 +172,8 @@ MTAB rf_mod[] = {
|
||||
{ UNIT_PLAT, (6 << UNIT_V_PLAT), NULL, "7P", &rf_set_size },
|
||||
{ UNIT_PLAT, (7 << UNIT_V_PLAT), NULL, "8P", &rf_set_size },
|
||||
{ UNIT_AUTO, UNIT_AUTO, "autosize", "AUTOSIZE", NULL },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, RF_WC, "WC", "WC", &set_3cyc_reg, &show_3cyc_reg, "WC" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, RF_CA, "CA", "CA", &set_3cyc_reg, &show_3cyc_reg, "CA" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, RF_WC, "WC", "WC", &set_3cyc_reg, &show_3cyc_reg, (void *)"WC" },
|
||||
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, RF_CA, "CA", "CA", &set_3cyc_reg, &show_3cyc_reg, (void *)"CA" },
|
||||
{ MTAB_XTD|MTAB_VDV, 0, "DEVNO", "DEVNO", &set_devno, &show_devno },
|
||||
{ 0 }
|
||||
};
|
||||
@@ -346,7 +345,7 @@ return ((rf_sta & (RFS_ERR | RFS_DON))? IOS_RF: 0);
|
||||
|
||||
/* Attach routine */
|
||||
|
||||
t_stat rf_attach (UNIT *uptr, char *cptr)
|
||||
t_stat rf_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
uint32 p, sz;
|
||||
uint32 ds_bytes = RF_DKSIZE * sizeof (int32);
|
||||
@@ -364,7 +363,7 @@ return attach_unit (uptr, cptr);
|
||||
|
||||
/* Change disk size */
|
||||
|
||||
t_stat rf_set_size (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat rf_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
if (val < 0)
|
||||
return SCPE_IERR;
|
||||
|
||||
@@ -162,15 +162,14 @@ int32 rp_stopioe = 1; /* stop on error */
|
||||
int32 rp_swait = 10; /* seek time */
|
||||
int32 rp_rwait = 10; /* rotate time */
|
||||
|
||||
DEVICE rp_dev;
|
||||
int32 rp63 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 rp64 (int32 dev, int32 pulse, int32 dat);
|
||||
int32 rp_iors (void);
|
||||
t_stat rp_svc (UNIT *uptr);
|
||||
void rp_updsta (int32 newa, int32 newb);
|
||||
t_stat rp_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
t_stat rp_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
t_stat rp_reset (DEVICE *dptr);
|
||||
t_stat rp_attach (UNIT *uptr, char *cptr);
|
||||
t_stat rp_attach (UNIT *uptr, CONST char *cptr);
|
||||
t_stat rp_detach (UNIT *uptr);
|
||||
|
||||
/* RP15 data structures
|
||||
@@ -525,7 +524,7 @@ return ((rp_sta & (STA_ERR | STA_DON)) || (rp_stb & STB_ATTN))? IOS_RP: 0;
|
||||
|
||||
/* Attach unit */
|
||||
|
||||
t_stat rp_attach (UNIT *uptr, char *cptr)
|
||||
t_stat rp_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
t_stat reason;
|
||||
|
||||
@@ -548,7 +547,7 @@ return reason;
|
||||
|
||||
/* Set size routine */
|
||||
|
||||
t_stat rp_set_size (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat rp_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
if (uptr->flags & UNIT_ATT)
|
||||
return SCPE_ALATT;
|
||||
|
||||
@@ -153,14 +153,14 @@ t_stat ptr_reset (DEVICE *dptr);
|
||||
t_stat ptp_reset (DEVICE *dptr);
|
||||
t_stat tti_reset (DEVICE *dptr);
|
||||
t_stat tto_reset (DEVICE *dptr);
|
||||
t_stat ptr_attach (UNIT *uptr, char *cptr);
|
||||
t_stat ptp_attach (UNIT *uptr, char *cptr);
|
||||
t_stat ptr_attach (UNIT *uptr, CONST char *cptr);
|
||||
t_stat ptp_attach (UNIT *uptr, CONST char *cptr);
|
||||
t_stat ptr_detach (UNIT *uptr);
|
||||
t_stat ptp_detach (UNIT *uptr);
|
||||
t_stat ptr_boot (int32 unitno, DEVICE *dptr);
|
||||
t_stat tty_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
t_stat clk_set_freq (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
t_stat clk_show_freq (FILE *st, UNIT *uptr, int32 val, void *desc);
|
||||
t_stat tty_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
t_stat clk_set_freq (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
t_stat clk_show_freq (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
|
||||
int32 clk_task_upd (t_bool clr);
|
||||
|
||||
extern int32 upd_iors (void);
|
||||
@@ -513,7 +513,7 @@ return SCPE_OK;
|
||||
|
||||
/* Set frequency */
|
||||
|
||||
t_stat clk_set_freq (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat clk_set_freq (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
if (cptr)
|
||||
return SCPE_ARG;
|
||||
@@ -525,7 +525,7 @@ return SCPE_OK;
|
||||
|
||||
/* Show frequency */
|
||||
|
||||
t_stat clk_show_freq (FILE *st, UNIT *uptr, int32 val, void *desc)
|
||||
t_stat clk_show_freq (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
|
||||
{
|
||||
fprintf (st, (clk_tps == 50)? "50Hz": "60Hz");
|
||||
return SCPE_OK;
|
||||
@@ -647,7 +647,7 @@ return ((TST_INT (PTR)? IOS_PTR: 0)
|
||||
|
||||
/* Attach routine */
|
||||
|
||||
t_stat ptr_attach (UNIT *uptr, char *cptr)
|
||||
t_stat ptr_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
t_stat reason;
|
||||
|
||||
@@ -965,7 +965,7 @@ return SCPE_OK;
|
||||
|
||||
/* Attach routine */
|
||||
|
||||
t_stat ptp_attach (UNIT *uptr, char *cptr)
|
||||
t_stat ptp_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
t_stat reason;
|
||||
|
||||
@@ -1172,7 +1172,7 @@ return SCPE_OK;
|
||||
|
||||
/* Set mode */
|
||||
|
||||
t_stat tty_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat tty_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
tti_unit.flags = (tti_unit.flags & ~(TTUF_UNIX|TT_PAR|TT_MODE)) | val;
|
||||
tto_unit.flags = (tto_unit.flags & ~(TTUF_UNIX|TT_PAR|TT_MODE)) | val;
|
||||
|
||||
@@ -110,9 +110,6 @@ extern REG cpu_reg[];
|
||||
extern int32 *M;
|
||||
extern int32 memm;
|
||||
extern int32 PC;
|
||||
extern const char asc_to_baud[128];
|
||||
extern const char baud_to_asc[64];
|
||||
extern const char fio_to_asc[64];
|
||||
|
||||
/* SCP data structures and interface routines
|
||||
|
||||
@@ -234,7 +231,7 @@ return word;
|
||||
jmp addr or hlt
|
||||
*/
|
||||
|
||||
t_stat rim_load_47 (FILE *fileref, char *cptr)
|
||||
t_stat rim_load_47 (FILE *fileref, const char *cptr)
|
||||
{
|
||||
int32 origin, val;
|
||||
|
||||
@@ -271,7 +268,7 @@ return SCPE_OK; /* done */
|
||||
word to execute (bit 1 of last character set)
|
||||
*/
|
||||
|
||||
t_stat hri_load_7915 (FILE *fileref, char *cptr)
|
||||
t_stat hri_load_7915 (FILE *fileref, const char *cptr)
|
||||
{
|
||||
int32 bits, origin, val;
|
||||
char gbuf[CBUFSIZE];
|
||||
@@ -317,7 +314,7 @@ return SCPE_OK;
|
||||
endblock/ origin (< 0)
|
||||
*/
|
||||
|
||||
t_stat bin_load_915 (FILE *fileref, char *cptr)
|
||||
t_stat bin_load_915 (FILE *fileref, const char *cptr)
|
||||
{
|
||||
int32 i, val, bits, origin, count, cksum;
|
||||
|
||||
@@ -359,7 +356,7 @@ return SCPE_OK;
|
||||
|
||||
/* Binary loader, all formats */
|
||||
|
||||
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 != 0)
|
||||
return SCPE_NOFNC;
|
||||
@@ -1149,11 +1146,11 @@ return get_uint (cptr, 8, 0777777, status);
|
||||
Outputs:
|
||||
status = error status
|
||||
*/
|
||||
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 d, i, j, k, sign, damask, epcmask;
|
||||
t_stat r, sta = SCPE_OK;
|
||||
char gbuf[CBUFSIZE];
|
||||
char gbuf[CBUFSIZE], cbuf[2*CBUFSIZE];
|
||||
t_bool cflag;
|
||||
DEVICE *dptr;
|
||||
|
||||
@@ -1165,12 +1162,9 @@ if (dptr == NULL)
|
||||
|
||||
while (isspace (*cptr))
|
||||
cptr++;
|
||||
for (i = 1; (i < 5) && (cptr[i] != 0); i++) {
|
||||
if (cptr[i] == 0) {
|
||||
for (j = i + 1; j <= 5; j++)
|
||||
cptr[j] = 0;
|
||||
}
|
||||
}
|
||||
memset (cbuf, '\0', sizeof(cbuf));
|
||||
strcpy (cbuf, cptr);
|
||||
cptr = cbuf;
|
||||
if ((sw & SWMASK ('A')) || ((*cptr == '\'') && cptr++)) { /* ASCII char? */
|
||||
if (cptr[0] == 0) /* must have 1 char */
|
||||
return SCPE_ARG;
|
||||
|
||||
@@ -80,11 +80,11 @@ t_bool ttox_test_done (int32 ln);
|
||||
void ttox_set_done (int32 ln);
|
||||
void ttox_clr_done (int32 ln);
|
||||
int32 ttx_getln (int32 dev, int32 pulse);
|
||||
t_stat ttx_attach (UNIT *uptr, char *cptr);
|
||||
t_stat ttx_attach (UNIT *uptr, CONST char *cptr);
|
||||
t_stat ttx_detach (UNIT *uptr);
|
||||
t_stat ttx_reset (DEVICE *dptr);
|
||||
void ttx_reset_ln (int32 i);
|
||||
t_stat ttx_vlines (UNIT *uptr, int32 val, char *cptr, void *desc);
|
||||
t_stat ttx_vlines (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
|
||||
|
||||
/* TTIx data structures
|
||||
|
||||
@@ -398,7 +398,7 @@ return;
|
||||
|
||||
/* Attach master unit */
|
||||
|
||||
t_stat ttx_attach (UNIT *uptr, char *cptr)
|
||||
t_stat ttx_attach (UNIT *uptr, CONST char *cptr)
|
||||
{
|
||||
t_stat r;
|
||||
|
||||
@@ -425,7 +425,7 @@ return r;
|
||||
|
||||
/* Change number of lines */
|
||||
|
||||
t_stat ttx_vlines (UNIT *uptr, int32 val, char *cptr, void *desc)
|
||||
t_stat ttx_vlines (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||
{
|
||||
int32 newln, i, t;
|
||||
t_stat r;
|
||||
|
||||
Reference in New Issue
Block a user