From a81e61d839943db8444e2da451d9ac86de204e94 Mon Sep 17 00:00:00 2001 From: nyan Date: Thu, 22 Aug 2002 13:24:00 +0000 Subject: Merged from sys/dev/syscons/scvtb.c revision 1.9. --- sys/pc98/cbus/scvtb.c | 8 ++++---- sys/pc98/pc98/scvtbpc98.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/pc98') diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c index 48ad3f1..2d0ea3f 100644 --- a/sys/pc98/cbus/scvtb.c +++ b/sys/pc98/cbus/scvtb.c @@ -93,7 +93,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait) vtb->vtb_cols = cols; vtb->vtb_rows = rows; vtb->vtb_size = cols*rows; - vtb->vtb_buffer = NULL; + vtb->vtb_buffer = 0; vtb->vtb_tail = 0; switch (type) { @@ -104,7 +104,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait) (vm_offset_t)malloc(cols*rows*sizeof(u_int16_t)*2, M_DEVBUF, ((wait) ? M_WAITOK : M_NOWAIT) | M_ZERO); - if (vtb->vtb_buffer != NULL) { + if (vtb->vtb_buffer != 0) { vtb->vtb_flags |= VTB_ALLOCED; } } else { @@ -132,11 +132,11 @@ sc_vtb_destroy(sc_vtb_t *vtb) vtb->vtb_tail = 0; p = vtb->vtb_buffer; - vtb->vtb_buffer = NULL; + vtb->vtb_buffer = 0; switch (vtb->vtb_type) { case VTB_MEMORY: case VTB_RINGBUFFER: - if ((vtb->vtb_flags & VTB_ALLOCED) && (p != NULL)) + if ((vtb->vtb_flags & VTB_ALLOCED) && (p != 0)) free((void *)p, M_DEVBUF); break; default: diff --git a/sys/pc98/pc98/scvtbpc98.c b/sys/pc98/pc98/scvtbpc98.c index 48ad3f1..2d0ea3f 100644 --- a/sys/pc98/pc98/scvtbpc98.c +++ b/sys/pc98/pc98/scvtbpc98.c @@ -93,7 +93,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait) vtb->vtb_cols = cols; vtb->vtb_rows = rows; vtb->vtb_size = cols*rows; - vtb->vtb_buffer = NULL; + vtb->vtb_buffer = 0; vtb->vtb_tail = 0; switch (type) { @@ -104,7 +104,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait) (vm_offset_t)malloc(cols*rows*sizeof(u_int16_t)*2, M_DEVBUF, ((wait) ? M_WAITOK : M_NOWAIT) | M_ZERO); - if (vtb->vtb_buffer != NULL) { + if (vtb->vtb_buffer != 0) { vtb->vtb_flags |= VTB_ALLOCED; } } else { @@ -132,11 +132,11 @@ sc_vtb_destroy(sc_vtb_t *vtb) vtb->vtb_tail = 0; p = vtb->vtb_buffer; - vtb->vtb_buffer = NULL; + vtb->vtb_buffer = 0; switch (vtb->vtb_type) { case VTB_MEMORY: case VTB_RINGBUFFER: - if ((vtb->vtb_flags & VTB_ALLOCED) && (p != NULL)) + if ((vtb->vtb_flags & VTB_ALLOCED) && (p != 0)) free((void *)p, M_DEVBUF); break; default: -- cgit v1.1