This is more in line with the call to kalloc() in cb_alloc(). * device/chario.c (tty_inq_size, tty_outq_size): Use unsigned int instead if an int. * device/cirbuf.c (cb_alloc) (buf_size): Use vm_size_t instead of an int. * device/cirbuf.h (cb_alloc) (buf_size): Likewise.
--- device/chario.c | 6 +++--- device/cirbuf.c | 2 +- device/cirbuf.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/device/chario.c b/device/chario.c index 2e38248..4b7522f 100644 --- a/device/chario.c +++ b/device/chario.c @@ -80,9 +80,9 @@ struct ldisc_switch linesw[] = { /* * Sizes for input and output circular buffers. */ -const int tty_inq_size = 4096; /* big nuf */ -const int tty_outq_size = 2048; /* Must be bigger that tthiwat */ -boolean_t pdma_default = TRUE; /* turn pseudo dma on by default */ +const unsigned int tty_inq_size = 4096; /* big nuf */ +const unsigned int tty_outq_size = 2048; /* Must be bigger that tthiwat */ +boolean_t pdma_default = TRUE; /* turn pseudo dma on by default */ /* * compute pseudo-dma tables diff --git a/device/cirbuf.c b/device/cirbuf.c index 491e89c..374af34 100644 --- a/device/cirbuf.c +++ b/device/cirbuf.c @@ -270,7 +270,7 @@ void cb_clear(struct cirbuf *cb) void cb_alloc( struct cirbuf *cb, - int buf_size) + vm_size_t buf_size) { char *buf; diff --git a/device/cirbuf.h b/device/cirbuf.h index 5e4360b..64771ce 100644 --- a/device/cirbuf.h +++ b/device/cirbuf.h @@ -55,7 +55,7 @@ extern int b_to_q(char *, int, struct cirbuf *); extern void ndflush(struct cirbuf *, int); extern void cb_clear(struct cirbuf *); -extern void cb_alloc(struct cirbuf *, int); +extern void cb_alloc(struct cirbuf *, vm_size_t); extern void cb_free(struct cirbuf *); #endif /* _DEVICE_CIRBUF_H_ */ -- 1.8.1.4