1
0
mirror of https://github.com/open-simh/simh.git synced 2026-05-05 15:43:58 +00:00

Merge with v3.9-0-rc2 first pass

This commit is contained in:
Mark Pizzolato
2012-03-24 19:46:37 -07:00
parent 6d11b3bd25
commit 6e813b8364
104 changed files with 415 additions and 348 deletions

View File

@@ -22,6 +22,8 @@
Except as contained in this notice, the name of Robert M Supnik shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik.
19-Mar-12 RMS Fixed declaration of CCT (Mark Pizzolato)
*/
#include "i1620_defs.h"
@@ -122,7 +124,8 @@ const char *sim_stop_messages[] = {
t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
{
int32 col, rpt, ptr, mask, cctbuf[CCT_LNT];
uint32 col, mask, cctbuf[CCT_LNT];
int32 ptr, rpt;
t_stat r;
extern int32 cct_lnt, cct_ptr;
extern uint32 cct[CCT_LNT];