wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

obj: add read() and write() object callbacks

Browse Source
This commit is contained in:
max 🍓
2023-05-14 21:11:32 +01:00
parent 0238008986
commit d02d05d922
10 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dev/core.c
View File

@@ -9,13 +9,18 @@ static struct object *dev_folder = NULL;
static struct device *__root_device = NULL;
static struct device *__misc_device = NULL;
static kern_status_t device_object_destroy(struct object *);
static kern_status_t device_object_read(struct object *obj, void *, size_t *, socks_flags_t);
static kern_status_t device_object_write(struct object *obj, const void *, size_t *, socks_flags_t);
static kern_status_t device_object_query_name(struct object *, char out[OBJECT_NAME_MAX]);
static kern_status_t device_object_get_child_at(struct object *, size_t, struct object **);
static kern_status_t device_object_get_child_named(struct object *, const char *, struct object **);
static struct object_type device_type = {
.ob_name = "device",
.ob_size = sizeof(struct device),
.ob_ops = {
.read = device_object_read,
.write = device_object_write,
.destroy = device_object_destroy,
.query_name = device_object_query_name,
.get_at = device_object_get_child_at,
@@ -91,17 +96,17 @@ struct device *device_alloc(void)
return DEVICE_CAST(dev_object);
}
kern_status_t device_read(struct device *dev, void *buf, size_t size, size_t *bytes_read)
kern_status_t device_read(struct device *dev, void *buf, size_t size, size_t *bytes_read, socks_flags_t flags)
{
switch (dev->dev_type) {
case DEV_TYPE_INPUT:
return input_device_read(dev, buf, size, bytes_read);
return input_device_read(dev, buf, size, bytes_read, flags);
default:
return KERN_UNSUPPORTED;
}
}
kern_status_t device_write(struct device *dev, const void *buf, size_t size, size_t *bytes_written)
kern_status_t device_write(struct device *dev, const void *buf, size_t size, size_t *bytes_written, socks_flags_t flags)
{
return KERN_UNSUPPORTED;
}
@@ -111,6 +116,18 @@ struct device *cast_to_device(struct object *obj)
return DEVICE_CAST(obj);
}
static kern_status_t device_object_read(struct object *obj, void *p, size_t *count, socks_flags_t flags)
{
struct device *dev = DEVICE_CAST(obj);
return device_read(dev, p, *count, count, flags);
}
static kern_status_t device_object_write(struct object *obj, const void *p, size_t *count, socks_flags_t flags)
{
struct device *dev = DEVICE_CAST(obj);
return device_write(dev, p, *count, count, flags);
}
static kern_status_t device_object_destroy(struct object *obj)
{
return KERN_OK;

8
dev/input.c
View File

@@ -35,9 +35,9 @@ struct input_device *input_device_create(void)
kern_status_t input_device_report_event(struct input_device *dev, const struct input_event *ev, bool noblock)
{
struct ringbuffer *event_queue = &dev->i_events;
enum ringbuffer_flags flags = RB_NORMAL;
socks_flags_t flags = S_NORMAL;
if (noblock) {
flags = RB_NOBLOCK;
flags = S_NOBLOCK;
}
size_t r = ringbuffer_write(event_queue, sizeof *ev, ev, flags);
@@ -45,7 +45,7 @@ kern_status_t input_device_report_event(struct input_device *dev, const struct i
return r == sizeof *ev ? KERN_OK : KERN_WOULD_BLOCK;
}
kern_status_t input_device_read(struct device *dev, void *buf, size_t size, size_t *bytes_read)
kern_status_t input_device_read(struct device *dev, void *buf, size_t size, size_t *bytes_read, socks_flags_t flags)
{
if (dev->dev_type != DEV_TYPE_INPUT || (size % sizeof (struct input_event)) != 0) {
return KERN_INVALID_ARGUMENT;
@@ -54,7 +54,7 @@ kern_status_t input_device_read(struct device *dev, void *buf, size_t size, size
struct input_device *input_dev = INPUT_DEVICE(dev);
struct ringbuffer *event_queue = &input_dev->i_events;
size_t r = ringbuffer_read(event_queue, size, buf, RB_NORMAL);
size_t r = ringbuffer_read(event_queue, size, buf, flags);
if (bytes_read) {
*bytes_read = r;