New rewritten serial driver + dev interface
This commit is contained in:
@ -6,6 +6,7 @@
|
||||
#include "hal/hal.h"
|
||||
#include "termdev.h"
|
||||
#include "ps2kbdev.h"
|
||||
#include "serialdev.h"
|
||||
|
||||
DevTable DEVTABLE;
|
||||
|
||||
@ -15,4 +16,5 @@ void dev_init(void) {
|
||||
|
||||
termdev_init();
|
||||
ps2kbdev_init();
|
||||
serialdev_init();
|
||||
}
|
||||
|
@ -12,6 +12,7 @@ typedef struct {
|
||||
int _hshtbstate;
|
||||
char ident[0x100];
|
||||
DevFn fns[DEV_FNS_MAX];
|
||||
SpinLock spinlock;
|
||||
} Dev;
|
||||
|
||||
|
||||
|
@ -33,5 +33,6 @@ void ps2kbdev_init(void) {
|
||||
|
||||
Dev *ps2kbdev;
|
||||
HSHTB_ALLOC(DEVTABLE.devs, ident, "ps2kbdev", ps2kbdev);
|
||||
spinlock_init(&ps2kbdev->spinlock);
|
||||
ps2kbdev->fns[0] = &ps2kbdev_readch;
|
||||
}
|
||||
|
42
kernel/dev/serialdev.c
Normal file
42
kernel/dev/serialdev.c
Normal file
@ -0,0 +1,42 @@
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include "dev.h"
|
||||
#include "serialdev.h"
|
||||
#include "errors.h"
|
||||
#include "util/util.h"
|
||||
#include "hshtb.h"
|
||||
#include "sysdefs/devctl.h"
|
||||
#include "drivers/serial/serial.h"
|
||||
#include "kprintf.h"
|
||||
|
||||
int32_t serialdev_sendb(uint8_t *buffer, size_t len, void *extra) {
|
||||
(void)len; (void)extra;
|
||||
serial_sendb(buffer[0]);
|
||||
return E_OK;
|
||||
}
|
||||
|
||||
int32_t serialdev_sendready(uint8_t *buffer, size_t len, void *extra) {
|
||||
(void)buffer; (void)len; (void) extra;
|
||||
return serial_sendready();
|
||||
}
|
||||
|
||||
int32_t serialdev_recvb(uint8_t *buffer, size_t len, void *extra) {
|
||||
(void)buffer; (void)len; (void)extra;
|
||||
return serial_recvb();
|
||||
}
|
||||
|
||||
int32_t serialdev_recvready(uint8_t *buffer, size_t len, void *extra) {
|
||||
(void)buffer; (void)len; (void)extra;
|
||||
return serial_recvready();
|
||||
}
|
||||
|
||||
void serialdev_init(void) {
|
||||
Dev *serialdev = NULL;
|
||||
HSHTB_ALLOC(DEVTABLE.devs, ident, "serialdev", serialdev);
|
||||
serialdev->fns[DEV_SERIALDEV_SENDB] = &serialdev_sendb;
|
||||
serialdev->fns[DEV_SERIALDEV_SENDREADY] = &serialdev_sendready;
|
||||
serialdev->fns[DEV_SERIALDEV_RECVB] = &serialdev_recvb;
|
||||
serialdev->fns[DEV_SERIALDEV_RECVREADY] = &serialdev_recvready;
|
||||
spinlock_init(&serialdev->spinlock);
|
||||
serial_init();
|
||||
}
|
10
kernel/dev/serialdev.h
Normal file
10
kernel/dev/serialdev.h
Normal file
@ -0,0 +1,10 @@
|
||||
#ifndef DEV_SERIALDEV_H_
|
||||
#define DEV_SERIALDEV_H_
|
||||
|
||||
int32_t serialdev_sendb(uint8_t *buffer, size_t len, void *extra);
|
||||
int32_t serialdev_sendready(uint8_t *buffer, size_t len, void *extra);
|
||||
int32_t serialdev_recvb(uint8_t *buffer, size_t len, void *extra);
|
||||
int32_t serialdev_recvready(uint8_t *buffer, size_t len, void *extra);
|
||||
void serialdev_init(void);
|
||||
|
||||
#endif // DEV_SERIALDEV_H_
|
@ -17,4 +17,5 @@ void termdev_init(void) {
|
||||
Dev *termdev = NULL;
|
||||
HSHTB_ALLOC(DEVTABLE.devs, ident, "termdev", termdev);
|
||||
termdev->fns[0] = &termdev_putch;
|
||||
spinlock_init(&termdev->spinlock);
|
||||
}
|
||||
|
Reference in New Issue
Block a user