You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "serial.h"
#include <Types.h>
#include <Devices.h>
-#include <Serial.h>
+/* This is the regular Mac Serial.h, but copied to a different name
+ so as not to get confused with the GDB serial.h above. */
+#include "MacSerial.h"
/* This is unused for now. We just return a placeholder. */
/* Alloc buffer space first - that way any allocation failures are
intercepted before the serial driver gets involved. */
if (mac_input_buffer == NULL)
- mac_input_buffer = (char *) xmalloc (256);
+ mac_input_buffer = (char *) xmalloc (4096);
/* Match on a name and open a port. */
if (strcmp (name, "modem") == 0)
{
}
else
{
- error ("You must specify a port. Choices are `modem' or `printer'.");
+ error ("You must specify a valid serial port name; your choices are `modem' or `printer'.");
errno = ENOENT;
return (-1);
}
/* We got something open. */
if (1 /* using custom buffer */)
- SerSetBuf (input_refnum, mac_input_buffer, 256);
+ SerSetBuf (input_refnum, mac_input_buffer, 4096);
/* Set to a GDB-preferred state. */
SerReset (input_refnum, stop10|noParity|data8|baud9600);
SerReset (output_refnum, stop10|noParity|data8|baud9600);
int timeout;
{
int status, n;
- /* time_t */ unsigned long starttime, now;
+ /* time_t */ unsigned long start_time, now;
OSErr err;
CntrlParam cb;
IOParam pb;
if (scb->bufcnt-- > 0)
return *scb->bufp++;
- time (&starttime);
+ time (&start_time);
while (1)
{
else
{
time (&now);
- if (now > starttime + timeout) {
- printf_unfiltered ("start %u, now %u, timeout %d\n", starttime, now, timeout);
+ if (now > start_time + timeout)
return SERIAL_TIMEOUT;
- }
}
+ PROGRESS (1);
}
}
return;
}
+/* If there is a tricky formula to relate real baud rates
+ to what the serial driver wants, we should use it. Until
+ we get one, this table will have to do. */
+
+static struct {
+ int real_rate;
+ int bits;
+} mac_baud_rate_table[] = {
+ { 57600, baud57600 },
+ { 38400, 1 },
+ { 19200, baud19200 },
+ { 9600, baud9600 },
+ { 7200, baud7200 },
+ { 4800, baud4800 },
+ { 3600, baud3600 },
+ { 2400, baud2400 },
+ { 1800, baud1800 },
+ { 1200, baud1200 },
+ { 600, baud600 },
+ { 300, baud300 },
+ { 0, 0 }
+};
+
static int
mac_set_baud_rate (scb, rate)
serial_t scb;
int rate;
+{
+ int i, bits;
+
+ for (i = 0; mac_baud_rate_table[i].real_rate != 0; ++i)
+ {
+ if (mac_baud_rate_table[i].real_rate == rate)
+ {
+ bits = mac_baud_rate_table[i].bits;
+ break;
+ }
+ }
+ SerReset (input_refnum, stop10|noParity|data8|bits);
+ SerReset (output_refnum, stop10|noParity|data8|bits);
+}
+
+static int
+mac_set_stop_bits (scb, num)
+ serial_t scb;
+ int num;
{
return 0;
}
OSErr err;
IOParam pb;
- if (first_mac_write++ < 8)
+ if (first_mac_write++ < 4)
{
sleep (1);
}
}
static void
-mac_close (scb)
- serial_t scb;
+mac_close (serial_t scb)
{
if (input_refnum)
{
if (output_refnum)
{
if (0 /* custom buffer */)
- SetSetBuf (input_refnum, mac_output_buffer, 0);
+ SerSetBuf (input_refnum, mac_output_buffer, 0);
CloseDriver (output_refnum);
output_refnum = 0;
}
mac_print_tty_state,
mac_noflush_set_tty_state,
mac_set_baud_rate,
+ mac_set_stop_bits,
+ mac_noop, /* wait for output to drain */
};
void