ViewVC Help

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

root/cebix/BasiliskII/src/serial.cpp

Comparing BasiliskII/src/serial.cpp (file contents):
Revision 1.1 by cebix, 1999-10-03T14:16:25Z vs.
Revision 1.4 by cebix, 2001-02-02T20:52:57Z

#	Line 1 | Line 1
1		/*
2		*  serial.cpp - Serial device driver
3		*
4	<	*  Basilisk II (C) 1997-1999 Christian Bauer
4	>	*  Basilisk II (C) 1997-2001 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 70 | Line 70 | int16 SerialOpen(uint32 pb, uint32 dce,
70		the_port->cum_errors = 0;
71
72		// Open port
73	<	int16 res = the_port->Open(ReadMacInt16(0x1fc + (port & 2)));
73	>	int16 res = the_port->open(ReadMacInt16(0x1fc + (port & 2)));
74		if (res)
75		return res;
76
#	Line 79 | Line 79 | int16 SerialOpen(uint32 pb, uint32 dce,
79		r.d[0] = SIZEOF_serdt * 2;
80		Execute68kTrap(0xa71e, &r);             // NewPtrSysClear()
81		if (r.a[0] == 0) {
82	<	the_port->Close();
82	>	the_port->close();
83		return openErr;
84		}
85		uint32 input_dt = the_port->input_dt = r.a[0];
#	Line 128 | Line 128 | int16 SerialPrime(uint32 pb, uint32 dce,
128		printf("FATAL: SerialPrimeIn() called while request is pending\n");
129		return readErr;
130		} else
131	<	return the_port->PrimeIn(pb, dce);
131	>	return the_port->prime_in(pb, dce);
132		} else {
133		if (the_port->write_pending) {
134		printf("FATAL: SerialPrimeOut() called while request is pending\n");
135		return readErr;
136		} else
137	<	return the_port->PrimeOut(pb, dce);
137	>	return the_port->prime_out(pb, dce);
138		}
139		}
140
#	Line 158 | Line 158 | int16 SerialControl(uint32 pb, uint32 dc
158		return noErr;
159
160		default:
161	<	return the_port->Control(pb, dce, code);
161	>	return the_port->control(pb, dce, code);
162		}
163		}
164
#	Line 189 | Line 189 | int16 SerialStatus(uint32 pb, uint32 dce
189		return noErr;
190
191		default:
192	<	return the_port->Status(pb, dce, code);
192	>	return the_port->status(pb, dce, code);
193		}
194		}
195
#	Line 212 | Line 212 | int16 SerialClose(uint32 pb, uint32 dce,
212		// Close port if open
213		SERDPort *the_port = the_serd_port[port >> 1];
214		if (the_port->is_open) {
215	<	int16 res = the_port->Close();
215	>	int16 res = the_port->close();
216		M68kRegisters r;                                // Free Deferred Task structures
217		r.a[0] = the_port->input_dt;
218		Execute68kTrap(0xa01f, &r);             // DisposePtr()
#	Line 232 | Line 232 | static void serial_irq(SERDPort *p)
232		{
233		if (p->is_open) {
234		if (p->read_pending && p->read_done) {
235	<	Enqueue(p->input_dt, 0xd92);
235	>	EnqueueMac(p->input_dt, 0xd92);
236		p->read_pending = p->read_done = false;
237		}
238		if (p->write_pending && p->write_done) {
239	<	Enqueue(p->output_dt, 0xd92);
239	>	EnqueueMac(p->output_dt, 0xd92);
240		p->write_pending = p->write_done = false;
241		}
242		}

Diff Legend

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