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-HP2100_hp2100__dp.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-HP2100_hp2100__dp.c')
| -rw-r--r-- | emulators/simh/files/patch-HP2100_hp2100__dp.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/emulators/simh/files/patch-HP2100_hp2100__dp.c b/emulators/simh/files/patch-HP2100_hp2100__dp.c new file mode 100644 index 000000000000..847bf16cd899 --- /dev/null +++ b/emulators/simh/files/patch-HP2100_hp2100__dp.c @@ -0,0 +1,39 @@ +--- HP2100/hp2100_dp.c.orig 2016-12-01 22:43:42 UTC ++++ HP2100/hp2100_dp.c +@@ -694,7 +694,7 @@ void dp_goc (int32 fnc, int32 drv, int32 + { + int32 t; + +-if (t = sim_is_active (&dpc_unit[drv])) { /* still seeking? */ ++if ((t = sim_is_active (&dpc_unit[drv]))) { /* still seeking? */ + sim_cancel (&dpc_unit[drv]); /* stop seek */ + dpc_sta[drv] = dpc_sta[drv] & ~STA_BSY; /* clear busy */ + time = time + t; /* include seek time */ +@@ -906,10 +906,10 @@ switch (uptr->FNC) { + dpc_rarh = dpc_rarh ^ 1; /* incr head */ + dpc_eoc = ((dpc_rarh & 1) == 0); /* calc eoc */ + } +- if (err = fseek (uptr->fileref, da * sizeof (int16), +- SEEK_SET)) break; ++ if ((err = fseek (uptr->fileref, da * sizeof (int16), ++ SEEK_SET))) break; + fxread (dpxb, sizeof (int16), DP_NUMWD, uptr->fileref); +- if (err = ferror (uptr->fileref)) break; ++ if ((err = ferror (uptr->fileref))) break; + } + dpd_ibuf = dpxb[dp_ptr++]; /* get word */ + if (dp_ptr >= DP_NUMWD) { /* end of sector? */ +@@ -953,10 +953,10 @@ switch (uptr->FNC) { + dpc_rarh = dpc_rarh ^ 1; /* incr head */ + dpc_eoc = ((dpc_rarh & 1) == 0); /* calc eoc */ + } +- if (err = fseek (uptr->fileref, da * sizeof (int16), +- SEEK_SET)) break; ++ if ((err = fseek (uptr->fileref, da * sizeof (int16), ++ SEEK_SET))) break; + fxwrite (dpxb, sizeof (int16), DP_NUMWD, uptr->fileref); +- if (err = ferror (uptr->fileref)) break; /* error? */ ++ if ((err = ferror (uptr->fileref))) break; /* error? */ + dp_ptr = 0; /* next sector */ + } + if (dpd.command && dpd_xfer) /* dch on, xfer? */ |