X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/5ea8e2ba737f903db81d49b56778e883634512a5..baca54322c66983205edecd2ebb00d997878be50:/lunaix-os/kernel/device/input.c diff --git a/lunaix-os/kernel/device/input.c b/lunaix-os/kernel/device/input.c index 5ddf6a4..cc3cc13 100644 --- a/lunaix-os/kernel/device/input.c +++ b/lunaix-os/kernel/device/input.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -8,7 +9,7 @@ static DEFINE_LLIST(listener_chain); -static struct device* input_devcat = NULL; +static struct device_cat* input_devcat = NULL; void input_init() @@ -62,8 +63,14 @@ __input_dev_read(struct device* dev, void* buf, size_t offset, size_t len) return sizeof(struct input_evt_pkt); } +int +__input_dev_read_pg(struct device* dev, void* buf, size_t offset) +{ + return __input_dev_read(dev, buf, offset, PAGE_SIZE); +} + struct input_device* -input_add_device(char* name_fmt, ...) +input_add_device(struct devclass* class, char* name_fmt, ...) { assert(input_devcat); @@ -73,11 +80,14 @@ input_add_device(char* name_fmt, ...) va_list args; va_start(args, name_fmt); - struct device* dev = - device_add(input_devcat, idev, name_fmt, DEV_IFSEQ, args); + struct device* dev = device_allocseq(dev_meta(input_devcat), idev); + + device_setname_vargs(dev_meta(dev), name_fmt, args); + register_device(dev, class, NULL); idev->dev_if = dev; - dev->read = __input_dev_read; + dev->ops.read = __input_dev_read; + dev->ops.read_page = __input_dev_read_pg; va_end(args);