diff options
| author | Matthew Seaman <matthew@FreeBSD.org> | 2017-01-03 14:00:47 +0000 |
|---|---|---|
| committer | Matthew Seaman <matthew@FreeBSD.org> | 2017-01-03 14:00:47 +0000 |
| commit | 7c084f620e6dcec68140cd4df90f64870cae813b (patch) | |
| tree | 0752b4ea3e6f7dda7f1a2ab4235d6bffb9455613 /emulators/simh/files/patch-SDS_sds__io.c | |
| parent | Update to 7.1.0. Changes include: (diff) | |
Fixes to allow building on 12-CURRENT
- fix build failures in i386 and amd64 due to compiler changes
- fix numerous compilation warnings and logical errors that may trap
in the future
- convert all distribution files from DOS format to ease future changes
- convert legacy patch file to new naming convention
PR: 214990
Submitted by: bob@eager.cx (maintainer)
Diffstat (limited to 'emulators/simh/files/patch-SDS_sds__io.c')
| -rw-r--r-- | emulators/simh/files/patch-SDS_sds__io.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/emulators/simh/files/patch-SDS_sds__io.c b/emulators/simh/files/patch-SDS_sds__io.c new file mode 100644 index 000000000000..7c480454dd87 --- /dev/null +++ b/emulators/simh/files/patch-SDS_sds__io.c @@ -0,0 +1,20 @@ +--- SDS/sds_io.c.orig 2016-12-01 22:43:43 UTC ++++ SDS/sds_io.c +@@ -336,7 +336,7 @@ switch (mod) { + chan_mode[ch] = chan_uar[ch] = 0; + if (ch >= CHAN_E) + chan_mode[ch] = CHM_CE; +- if (r = dev_dsp[dev][ch] (IO_CONN, inst, NULL)) /* connect */ ++ if ((r = dev_dsp[dev][ch] (IO_CONN, inst, NULL))) /* connect */ + return r; + if ((inst & I_IND) || (ch >= CHAN_C)) { /* C-H? alert ilc */ + alert = POT_ILCY + ch; +@@ -958,7 +958,7 @@ for (i = 0; i < NUM_CHAN; i++) { + + /* Test each device for conflict; add to map; init tables */ + +-for (i = 0; dptr = sim_devices[i]; i++) { /* loop thru devices */ ++for (i = 0; (dptr = sim_devices[i]); i++) { /* loop thru devices */ + dibp = (DIB *) dptr->ctxt; /* get DIB */ + if ((dibp == NULL) || (dptr->flags & DEV_DIS)) /* exist, enabled? */ + continue; |