From 38cf66edaacc4e58b561bea8a77abfd3facf59fe Mon Sep 17 00:00:00 2001 From: dzwdz Date: Tue, 23 Aug 2022 19:15:59 +0200 Subject: shared/ring: rename ring_size to ring_used, add ring_avail --- src/kernel/arch/amd64/driver/ps2.c | 2 +- src/kernel/arch/amd64/driver/serial.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/kernel/arch') diff --git a/src/kernel/arch/amd64/driver/ps2.c b/src/kernel/arch/amd64/driver/ps2.c index 35165d9..9148c98 100644 --- a/src/kernel/arch/amd64/driver/ps2.c +++ b/src/kernel/arch/amd64/driver/ps2.c @@ -91,7 +91,7 @@ enum { }; static void read_backlog(struct vfs_request *req, ring_t *r, struct vfs_request **queue) { - if (ring_size(r) == 0) { + if (ring_used(r) == 0) { /* nothing to read, join queue */ assert(!req->postqueue_next); while (*queue) queue = &(*queue)->postqueue_next; diff --git a/src/kernel/arch/amd64/driver/serial.c b/src/kernel/arch/amd64/driver/serial.c index b3bfe29..cf21b61 100644 --- a/src/kernel/arch/amd64/driver/serial.c +++ b/src/kernel/arch/amd64/driver/serial.c @@ -72,7 +72,7 @@ static void accept(struct vfs_request *req) { vfsreq_finish_short(req, valid ? 0 : -1); break; case VFSOP_READ: - if (ring_size((void*)&backlog) == 0) { + if (ring_used((void*)&backlog) == 0) { /* nothing to read, join queue */ assert(!req->postqueue_next); struct vfs_request **slot = &blocked_on; -- cgit v1.2.3