AcessNative - Fix incorrect VT name, clean up a warning
authorJohn Hodge (sonata) <[email protected]>
Wed, 5 Nov 2014 09:29:31 +0000 (17:29 +0800)
committerJohn Hodge (sonata) <[email protected]>
Wed, 5 Nov 2014 09:29:31 +0000 (17:29 +0800)
AcessNative/acesskernel_src/Makefile
AcessNative/acesskernel_src/include/arch.h
AcessNative/acesskernel_src/main.c
AcessNative/acesskernel_src/video.c

index 4f388a2..a55910c 100644 (file)
@@ -21,7 +21,7 @@ KERNEL_OBJ += mutex.o semaphore.o rwlock.o workqueue.o events.o
 KERNEL_OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/io.o vfs/dir.o\r
 KERNEL_OBJ += vfs/nodecache.o vfs/mount.o vfs/memfile.o vfs/select.o\r
 KERNEL_OBJ += vfs/fs/root.o vfs/fs/devfs.o\r
-KERNEL_OBJ += drv/fifo.o drv/proc.o drv/dgram_pipe.o\r
+KERNEL_OBJ += drv/fifo.o drv/proc.o drv/dgram_pipe.o   # drv/shm.o\r
 KERNEL_OBJ += drv/vterm.o drv/vterm_font.o drv/vterm_output.o drv/vterm_input.o drv/vterm_termbuf.o\r
 KERNEL_OBJ += drv/vterm_vt100.o drv/vterm_2d.o\r
 KERNEL_OBJ += drv/pty.o\r
index ab27de1..868a056 100644 (file)
@@ -28,6 +28,7 @@ typedef intptr_t      tPAddr;
 
 typedef        int     BOOL;
 
+extern void    exit(int status) __attribute__((noreturn));
 #define HALT_CPU()     exit(1)
 
 #include <stddef.h>
index 9ef49c9..4f5de23 100644 (file)
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
        VFS_MkDir("/Acess");    
        VFS_Mount(gsAcessDir, "/Acess", "nativefs", "");
 
-       Debug_SetKTerminal("/Devices/pts/vt7c");
+       Debug_SetKTerminal("/Devices/pts/vt7");
        
        // Start syscall server
        SyscallServer();
index b1b65b0..d78f6da 100644 (file)
@@ -30,7 +30,9 @@ tVFS_NodeType gVideo_NodeType = {
 };
 tDevFS_Driver  gVideo_DriverStruct = {
        NULL, "NativeVideo",
-       {.Type = &gVideo_NodeType}
+       {
+               .Type = &gVideo_NodeType
+       }
 };
  int   giVideo_DriverID;
  int   giVideo_CurrentFormat;
@@ -255,6 +257,8 @@ int Video_IOCtl(tVFS_Node *Node, int ID, void *Data)
        // Video mode control
        // - We cheat, and only have one mode
        case VIDEO_IOCTL_GETSETMODE:
+               // - Abuse GETSETMODE to update size
+               Node->Size = giUI_Pitch * giUI_Height;
                return 0;
        case VIDEO_IOCTL_FINDMODE:
        case VIDEO_IOCTL_MODEINFO:

UCC git Repository :: git.ucc.asn.au