kernel: devfs: Add cdev_read()

Signed-off-by: Ian Moffett <ian@osmora.org>

1 files changed, 16 insertions, 1 deletions

diff --git a/sys/fs/devfs.c b/sys/fs/devfs.c
index 6e8efc9..79606eb 100644
--- a/sys/fs/devfs.c
+++ b/sys/fs/devfs.c
@@ -64,6 +64,17 @@ node_from_name(const char *name)
 }
 
 static int
+cdev_read(struct device *dev, struct device_node *node, struct sio_txn *sio)
+{
+    size_t n_bytes;
+
+    spinlock_acquire(&node->lock);
+    n_bytes = dev->read(dev, sio);
+    spinlock_release(&node->lock);
+    return n_bytes;
+}
+
+static int
 blkdev_read(struct device *dev, struct device_node *node, struct sio_txn *sio)
 {
     char *buf;
@@ -139,7 +150,11 @@ vop_read(struct vnode *vp, struct sio_txn *sio)
 
     node = vp->data;
     dev = device_fetch(node->major, node->minor);
-    return blkdev_read(dev, node, sio);
+
+    if (dev->blocksize > 1)
+        return blkdev_read(dev, node, sio);
+
+    return cdev_read(dev, node, sio);
 }
 
 static int