Store device structs in a dynamic list
This commit is contained in:
@ -10,10 +10,7 @@
|
||||
#include "dev/ps2kbdev.h"
|
||||
#include "util/util.h"
|
||||
|
||||
Dev *DEVS[] = {
|
||||
[0x10] = &TERMDEV,
|
||||
[0x11] = &PS2KBDEV,
|
||||
};
|
||||
Dev *DEVS = NULL;
|
||||
|
||||
int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
|
||||
uint64_t *devh = (uint64_t *)devh1;
|
||||
@ -26,9 +23,18 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
|
||||
|
||||
switch (cmd) {
|
||||
case DEVCTL_GET_HANDLE: {
|
||||
uint64_t devid = buffer1;
|
||||
if (devid >= LEN(DEVS)) {
|
||||
ret = E_INVALIDARGUMENT;
|
||||
Dev *founddev = NULL;
|
||||
size_t i = 0;
|
||||
Dev *dev, *devtmp;
|
||||
LL_FOREACH_SAFE_IDX(DEVS, dev, devtmp, i) {
|
||||
if (i == buffer1) {
|
||||
founddev = dev;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (founddev == NULL) {
|
||||
ret = E_NOENTRY;
|
||||
goto done;
|
||||
}
|
||||
|
||||
@ -36,14 +42,14 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
|
||||
for (size_t i = 0; i < PROC_DEVHANDLES_MAX; i++) {
|
||||
if (proc->devs[i] == NULL) {
|
||||
found = true;
|
||||
proc->devs[i] = DEVS[devid];
|
||||
proc->devs[i] = founddev;
|
||||
*devh = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!found) {
|
||||
ret = E_NOENTRY;
|
||||
ret = E_NOMEMORY;
|
||||
goto done;
|
||||
}
|
||||
} break;
|
||||
@ -59,6 +65,10 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
|
||||
}
|
||||
|
||||
Dev *dev = proc->devs[*devh];
|
||||
if (dev == NULL) {
|
||||
ret = E_NOENTRY;
|
||||
goto done;
|
||||
}
|
||||
ret = dev->fns[cmd]((uint8_t *)buffer1, (size_t)len1, (void *)extra1);
|
||||
} break;
|
||||
}
|
||||
|
@ -3,6 +3,9 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include "syscall.h"
|
||||
#include "dev/dev.h"
|
||||
|
||||
extern Dev *DEVS;
|
||||
|
||||
int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1);
|
||||
|
||||
|
Reference in New Issue
Block a user