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

14
include/socks/device.h
View File

@@ -29,8 +29,8 @@ enum device_type {
};
struct block_device_ops {
kern_status_t(*read_blocks)(struct device *, size_t, size_t *, void *);
kern_status_t(*write_blocks)(struct device *, size_t, size_t *, const void *);
kern_status_t(*read_blocks)(struct device *, size_t, size_t *, void *, socks_flags_t);
kern_status_t(*write_blocks)(struct device *, size_t, size_t *, const void *, socks_flags_t);
kern_status_t(*ioctl)(struct device *, unsigned int, void *);
};
@@ -42,8 +42,8 @@ struct net_device_ops {
};
struct char_device_ops {
kern_status_t(*read)(struct device *, size_t, size_t *, void *);
kern_status_t(*write)(struct device *, size_t, size_t *, const void *);
kern_status_t(*read)(struct device *, size_t, size_t *, void *, socks_flags_t);
kern_status_t(*write)(struct device *, size_t, size_t *, const void *, socks_flags_t);
};
struct input_device_ops {
@@ -110,8 +110,8 @@ static inline void device_unlock_irqrestore(struct device *dev, unsigned long fl
object_unlock(&dev->dev_base, flags);
}
extern kern_status_t device_read(struct device *dev, void *buf, size_t size, size_t *bytes_read);
extern kern_status_t device_write(struct device *dev, const void *buf, size_t size, size_t *bytes_written);
extern kern_status_t device_read(struct device *dev, void *buf, size_t size, size_t *bytes_read, socks_flags_t flags);
extern kern_status_t device_write(struct device *dev, const void *buf, size_t size, size_t *bytes_written, socks_flags_t flags);
extern struct device *cast_to_device(struct object *obj);
@@ -149,7 +149,7 @@ static inline struct device *bus_device_base(struct bus_device *dev)
extern kern_status_t device_register(struct device *dev, struct device *parent);
extern kern_status_t input_device_report_event(struct input_device *dev, const struct input_event *ev, bool noblock);
extern kern_status_t input_device_read(struct device *dev, void *buf, size_t size, size_t *bytes_read);
extern kern_status_t input_device_read(struct device *dev, void *buf, size_t size, size_t *bytes_read, socks_flags_t flags);
extern kern_status_t input_device_generate_name(struct input_device *dev);
#endif

11
include/socks/flags.h Normal file
View File

@@ -0,0 +1,11 @@
#ifndef SOCKS_FLAGS_H_
#define SOCKS_FLAGS_H_
#include <stdint.h>
typedef enum {
S_NORMAL = 0x00u,
S_NOBLOCK = 0x01u,
} socks_flags_t;
#endif

5
include/socks/object.h
View File

@@ -3,6 +3,7 @@
#include <socks/locks.h>
#include <socks/status.h>
#include <socks/flags.h>
#include <socks/vm.h>
#include <stddef.h>
@@ -30,6 +31,8 @@ enum object_type_flags {
struct object_ops {
kern_status_t(*open)(struct object *obj);
kern_status_t(*close)(struct object *obj);
kern_status_t(*read)(struct object *obj, void *p, size_t *r, socks_flags_t flags);
kern_status_t(*write)(struct object *obj, const void *p, size_t *w, socks_flags_t flags);
kern_status_t(*destroy)(struct object *obj);
kern_status_t(*query_name)(struct object *obj, char out[OBJECT_NAME_MAX]);
kern_status_t(*parse)(struct object *obj, const char *path, struct object **out);
@@ -85,6 +88,8 @@ static inline kern_status_t object_get(const char *path, struct object **out)
{
return object_namespace_get_object(global_namespace(), path, out);
}
extern kern_status_t object_read(struct object *obj, void *p, size_t max, size_t *nr_read, socks_flags_t flags);
extern kern_status_t object_write(struct object *obj, const void *p, size_t max, size_t *nr_written, socks_flags_t flags);
extern kern_status_t object_get_child_named(struct object *obj, const char *name, struct object **out);
extern kern_status_t object_get_child_at(struct object *obj, size_t at, struct object **out);
extern kern_status_t object_query_name(struct object *obj, char name[OBJECT_NAME_MAX]);

9
include/socks/ringbuffer.h
View File

@@ -14,11 +14,6 @@ struct ringbuffer {
struct waitqueue r_wait_writers;
};
enum ringbuffer_flags {
RB_NORMAL = 0x00u,
RB_NOBLOCK = 0x01u,
};
extern struct ringbuffer *ringbuffer_create(size_t size);
extern void ringbuffer_destroy(struct ringbuffer *buf);
@@ -27,8 +22,8 @@ extern kern_status_t ringbuffer_deinit(struct ringbuffer *buf);
extern size_t ringbuffer_unread(struct ringbuffer *buf);
extern size_t ringbuffer_avail(struct ringbuffer *buf);
extern size_t ringbuffer_read(struct ringbuffer *buf, size_t size, void *buffer, enum ringbuffer_flags flags);
extern size_t ringbuffer_write(struct ringbuffer *buf, size_t size, const void *buffer, enum ringbuffer_flags flags);
extern size_t ringbuffer_read(struct ringbuffer *buf, size_t size, void *buffer, socks_flags_t flags);
extern size_t ringbuffer_write(struct ringbuffer *buf, size_t size, const void *buffer, socks_flags_t flags);
extern int ringbuffer_write_would_block(struct ringbuffer *buf);

3
include/socks/tty.h
View File

@@ -3,6 +3,7 @@
#include <socks/status.h>
#include <socks/queue.h>
#include <socks/object.h>
#include <stdint.h>
/* The TTY system.
@@ -58,6 +59,8 @@ enum tty_scroll_dir {
typedef uint64_t tty_attrib_t;
struct tty_driver {
struct object tty_base;
char tty_name[16];
enum tty_driver_type tty_type;
struct queue_entry tty_list;