From: John Hodge (sonata) <tpg@mutabah.net>
Date: Wed, 5 Nov 2014 09:29:31 +0000 (+0800)
Subject: AcessNative - Fix incorrect VT name, clean up a warning
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=99aab0b8f0bcaf33a6f979550e8844fa6092ad65;p=tpg%2Facess2.git

AcessNative - Fix incorrect VT name, clean up a warning
---

diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile
index 4f388a21..a55910cf 100644
--- a/AcessNative/acesskernel_src/Makefile
+++ b/AcessNative/acesskernel_src/Makefile
@@ -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
 KERNEL_OBJ += vfs/nodecache.o vfs/mount.o vfs/memfile.o vfs/select.o
 KERNEL_OBJ += vfs/fs/root.o vfs/fs/devfs.o
-KERNEL_OBJ += drv/fifo.o drv/proc.o drv/dgram_pipe.o
+KERNEL_OBJ += drv/fifo.o drv/proc.o drv/dgram_pipe.o	# drv/shm.o
 KERNEL_OBJ += drv/vterm.o drv/vterm_font.o drv/vterm_output.o drv/vterm_input.o drv/vterm_termbuf.o
 KERNEL_OBJ += drv/vterm_vt100.o drv/vterm_2d.o
 KERNEL_OBJ += drv/pty.o
diff --git a/AcessNative/acesskernel_src/include/arch.h b/AcessNative/acesskernel_src/include/arch.h
index ab27de1f..868a0569 100644
--- a/AcessNative/acesskernel_src/include/arch.h
+++ b/AcessNative/acesskernel_src/include/arch.h
@@ -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>
diff --git a/AcessNative/acesskernel_src/main.c b/AcessNative/acesskernel_src/main.c
index 9ef49c9b..4f5de239 100644
--- a/AcessNative/acesskernel_src/main.c
+++ b/AcessNative/acesskernel_src/main.c
@@ -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();
diff --git a/AcessNative/acesskernel_src/video.c b/AcessNative/acesskernel_src/video.c
index b1b65b01..d78f6dad 100644
--- a/AcessNative/acesskernel_src/video.c
+++ b/AcessNative/acesskernel_src/video.c
@@ -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: