summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@gnu.org>2001-04-29 20:29:29 +0000
committerMarcus Brinkmann <marcus@gnu.org>2001-04-29 20:29:29 +0000
commitb497bcd012c70f62cf12fe5468c4e0d65ebe9885 (patch)
tree20c90c3e7e68260a7010f9dc944b0de44473526c
parent0d186c61a42d545e399b4f821b4dcdc2de7248ce (diff)
2001-04-29 Marcus Brinkmann <marcus@gnu.org>
* device/chario.c: Set number of elements of tthiwat and ttlowat to NSPEEDS rather than 16. Initialize the two new elements. (chario_init): Initialize pdma_timeouts and pdma_water_mark for B57600 and B115200.
-rw-r--r--ChangeLog7
-rw-r--r--device/chario.c14
2 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d951cca..f04b50e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-29 Marcus Brinkmann <marcus@gnu.org>
+
+ * device/chario.c: Set number of elements of tthiwat and ttlowat
+ to NSPEEDS rather than 16. Initialize the two new elements.
+ (chario_init): Initialize pdma_timeouts and pdma_water_mark for
+ B57600 and B115200.
+
2001-04-27 Marcus Brinkmann <marcus@gnu.org>
* include/device/tty_status.h: New macros B57600 and B115200,
diff --git a/device/chario.c b/device/chario.c
index e072d3a..3b5841d 100644
--- a/device/chario.c
+++ b/device/chario.c
@@ -54,10 +54,12 @@
/* If you change these, check that tty_outq_size and tty_inq_size
* is greater than largest tthiwat entry.
*/
-short tthiwat[16] =
- { 100,100,100,100,100,100,100,200,200,400,400,400,650,650,1300,2000 };
-short ttlowat[16] =
- { 30, 30, 30, 30, 30, 30, 30, 50, 50,120,120,120,125,125, 125, 125 };
+short tthiwat[NSPEEDS] =
+ { 100,100,100,100,100,100,100,200,200,400,400,400,650,650,1300,2000,
+ 2000,2000 };
+short ttlowat[NSPEEDS] =
+ { 30, 30, 30, 30, 30, 30, 30, 50, 50,120,120,120,125,125, 125, 125,
+ 125,125 };
/*
* forward declarations
@@ -122,6 +124,8 @@ void chario_init(void)
pdma_timeouts[B9600] = _PR(960);
pdma_timeouts[EXTA] = _PR(1440); /* >14400 baud */
pdma_timeouts[EXTB] = _PR(1920); /* >19200 baud */
+ pdma_timeouts[B57600] = _PR(5760);
+ pdma_timeouts[B115200] = _PR(11520);
for (i = B0; i < B300; i++)
pdma_water_mark[i] = 0;
@@ -143,6 +147,8 @@ void chario_init(void)
pdma_water_mark[B9600] = i;
pdma_water_mark[EXTA] = i; /* >14400 baud */
pdma_water_mark[EXTB] = i; /* >19200 baud */
+ pdma_water_mark[B57600] = i;
+ pdma_water_mark[B115200] = i;
return;
}