Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / AcessNative / acesskernel_src / keyboard.c

diff --git a/AcessNative/acesskernel_src/keyboard.c b/AcessNative/acesskernel_src/keyboard.c
index 7689483..f008fd8 100644 (file)
--- a/AcessNative/acesskernel_src/keyboard.c
+++ b/AcessNative/acesskernel_src/keyboard.c
@@ -6,8 +6,7 @@
 #include <acess.h>
 #include <modules.h>
 #include <fs_devfs.h>
-#include <tpl_drv_common.h>
-#include <tpl_drv_keyboard.h>
+#include <api_drv_keyboard.h>
 #include "ui.h"
 
 // === PROTOTYPES ===
@@ -16,13 +15,12 @@
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x0100, NativeKeyboard, NativeKeyboard_Install, NULL, NULL);
+tVFS_NodeType  gKB_NodeType = {
+       .IOCtl = NativeKeyboard_IOCtl
+};
 tDevFS_Driver  gKB_DevInfo = {
        NULL, "NativeKeyboard",
-       {
-       .NumACLs = 0,
-       .Size = 0,
-       .IOCtl = NativeKeyboard_IOCtl
-       }
+       { .Type = &gKB_NodeType }
 };
 
 // === CODE ===
@@ -35,7 +33,7 @@ int NativeKeyboard_Install(char **Arguments)
        return MODULE_ERR_OK;
 }
 
-static const char * const csaIOCTL_NAMES[] = {
+static const char * csaIOCTL_NAMES[] = {
        DRV_IOCTLNAMES,
        DRV_KEYBAORD_IOCTLNAMES,
        NULL