Kernel/arm7 - Updated ARM7 code to newer HAL API changes

[tpg/acess2.git] / Usermode / Applications / axwin2_src / WM / main.c

diff --git a/Usermode/Applications/axwin2_src/WM/main.c b/Usermode/Applications/axwin2_src/WM/main.c
index 67ceb63..48e47ff 100644 (file)
--- a/Usermode/Applications/axwin2_src/WM/main.c
+++ b/Usermode/Applications/axwin2_src/WM/main.c
@@ -6,19 +6,12 @@
 #include <acess/sys.h>
 
 // === IMPORTS ===
-extern void    ParseCommandline(int argc, char *argv[]);
-extern void    Video_Setup(void);
 extern void    WM_Update(void);
-extern void    Interface_Init(void);
-extern void    IPC_Init(void);
-extern void    IPC_FillSelect(int *nfds, fd_set *set);
-extern void    IPC_HandleSelect(fd_set *set);
-extern void    Input_FillSelect(int *nfds, fd_set *set);
-extern void    Input_HandleSelect(fd_set *set);
+extern int     Input_Init(void);
 
 // === GLOBALS ===
-char   *gsTerminalDevice = NULL;
-char   *gsMouseDevice = NULL;
+const char     *gsTerminalDevice = NULL;
+const char     *gsMouseDevice = NULL;
 
  int   giScreenWidth = 640;
  int   giScreenHeight = 480;
@@ -46,6 +39,7 @@ int main(int argc, char *argv[])
        Video_Setup();
        Interface_Init();
        IPC_Init();
+       Input_Init();
        
        WM_Update();
        
@@ -58,7 +52,8 @@ int main(int argc, char *argv[])
        
                Input_FillSelect(&nfds, &fds);
                IPC_FillSelect(&nfds, &fds);
-
+               
+               nfds ++;
                select(nfds, &fds, NULL, NULL, NULL);
 
                Input_HandleSelect(&fds);