ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/serial_unix.cpp

Comparing BasiliskII/src/Unix/serial_unix.cpp (file contents):
Revision 1.5 by cebix, 2000-04-10T18:53:06Z vs.
Revision 1.6 by cebix, 2000-09-25T17:54:01Z

#	Line 663 | Line 663 | void *XSERDPort::input_func(void *arg)
663		// KillIO called? Then simply return
664		if (s->io_killed) {
665
666	<	WriteMacInt16(s->input_pb + ioResult, abortErr);
666	>	WriteMacInt16(s->input_pb + ioResult, uint16(abortErr));
667		WriteMacInt32(s->input_pb + ioActCount, 0);
668		s->read_pending = s->read_done = false;
669
#	Line 675 | Line 675 | void *XSERDPort::input_func(void *arg)
675		WriteMacInt32(s->input_dt + serdtResult, noErr);
676		} else {
677		WriteMacInt32(s->input_pb + ioActCount, 0);
678	<	WriteMacInt32(s->input_dt + serdtResult, readErr);
678	>	WriteMacInt32(s->input_dt + serdtResult, uint16(readErr));
679		}
680
681		// Trigger serial interrupt
#	Line 723 | Line 723 | void *XSERDPort::output_func(void *arg)
723		// KillIO called? Then simply return
724		if (s->io_killed) {
725
726	<	WriteMacInt16(s->output_pb + ioResult, abortErr);
726	>	WriteMacInt16(s->output_pb + ioResult, uint16(abortErr));
727		WriteMacInt32(s->output_pb + ioActCount, 0);
728		s->write_pending = s->write_done = false;
729
#	Line 735 | Line 735 | void *XSERDPort::output_func(void *arg)
735		WriteMacInt32(s->output_dt + serdtResult, noErr);
736		} else {
737		WriteMacInt32(s->output_pb + ioActCount, 0);
738	<	WriteMacInt32(s->output_dt + serdtResult, writErr);
738	>	WriteMacInt32(s->output_dt + serdtResult, uint16(writErr));
739		}
740
741		// Trigger serial interrupt

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines