Rewrite PS2KB using the new devctl interface
This commit is contained in:
35
kernel/dev/ps2kbdev.c
Normal file
35
kernel/dev/ps2kbdev.c
Normal file
@ -0,0 +1,35 @@
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include "kprintf.h"
|
||||
#include "hal/hal.h"
|
||||
#include "ps2kbdev.h"
|
||||
#include "dev.h"
|
||||
#include "errors.h"
|
||||
#include "dlmalloc/malloc.h"
|
||||
|
||||
Dev PS2KBDEV;
|
||||
Ps2KbFastBuf PS2KB_BUF;
|
||||
|
||||
int32_t ps2kbdev_readch(uint8_t *buffer, size_t len, void *extra) {
|
||||
(void)buffer; (void)len; (void)extra;
|
||||
uint8_t b = 0;
|
||||
spinlock_acquire(&PS2KB_BUF.spinlock);
|
||||
int32_t r = rbuf_pop(&PS2KB_BUF.rbuf, &b);
|
||||
spinlock_release(&PS2KB_BUF.spinlock);
|
||||
|
||||
if (r == 0) {
|
||||
return b;
|
||||
} else {
|
||||
return E_NOTYET;
|
||||
}
|
||||
}
|
||||
|
||||
void ps2kbdev_init(void) {
|
||||
hal_memset(&PS2KBDEV, 0, sizeof(PS2KBDEV));
|
||||
PS2KBDEV.fns[0] = &ps2kbdev_readch;
|
||||
|
||||
const int bufsz = 0x1000;
|
||||
uint8_t *buf = dlmalloc(bufsz);
|
||||
rbuf_init(&PS2KB_BUF.rbuf, buf, bufsz);
|
||||
PS2KB_BUF.init = true;
|
||||
}
|
22
kernel/dev/ps2kbdev.h
Normal file
22
kernel/dev/ps2kbdev.h
Normal file
@ -0,0 +1,22 @@
|
||||
#ifndef DEV_PS2KBDEV_H_
|
||||
#define DEV_PS2KBDEV_H_
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include "dev.h"
|
||||
#include "rbuf/rbuf.h"
|
||||
#include "spinlock/spinlock.h"
|
||||
|
||||
typedef struct {
|
||||
RBuf rbuf;
|
||||
SpinLock spinlock;
|
||||
bool init;
|
||||
} Ps2KbFastBuf;
|
||||
|
||||
void ps2kbdev_init(void);
|
||||
|
||||
extern Dev PS2KBDEV;
|
||||
|
||||
extern Ps2KbFastBuf PS2KB_BUF;
|
||||
|
||||
#endif // DEV_PS2KBDEV_H_
|
Reference in New Issue
Block a user