--- hatari/src/includes/tos.h	2019/04/01 07:09:16	1.1
+++ hatari/src/includes/tos.h	2019/04/01 07:10:35	1.1.1.2
@@ -1,13 +1,16 @@
 /*
-  Hatari
+  Hatari - tos.h
+
+  This file is distributed under the GNU Public License, version 2 or at
+  your option any later version. Read the file gpl.txt for details.
 */
 
-#ifndef MAIN_H
-#include "main.h"
-#endif
+#ifndef HATARI_TOS_H
+#define HATARI_TOS_H
 
 /* Standard available ST memory configurations */
-enum {
+enum
+{
   MEMORYSIZE_512,
   MEMORYSIZE_1024,
   MEMORYSIZE_2MB,
@@ -15,20 +18,21 @@ enum {
 };
 
 /* List of TOS settings for different memory size */
-typedef struct {
-  unsigned long PhysTop;       /* phys top */
-  unsigned long MemoryConfig;  /* 512k configure 0x00=128k 0x01=512k 0x10=2Mb 11=reserved eg 0x1010 = 4Mb */
-  unsigned long MemoryEnd;     /* Above this address causes a BusError */
+typedef struct
+{
+  unsigned long PhysTop;    /* phys top */
+  int MemoryConfig;         /* %00=128k %01=512k %10=2Mb %11=reserved. eg %1010 = 4Mb */
+  unsigned long MemoryEnd;  /* Above this address causes a BusError */
 } MEMORY_INFO;
 
-extern unsigned short int TOSVersion;
-extern unsigned long TOSAddress,TOSSize;
+
+extern unsigned short int TosVersion;
+extern unsigned long TosAddress, TosSize;
+extern BOOL bTosImageLoaded;
 extern unsigned int ConnectedDriveMask;
-extern BOOL bOverrideTOSImage;
-extern char szTOSImageOverrideFileName[MAX_FILENAME_LENGTH];
-extern char *pszTOSNameExts[];
+extern char *pszTosNameExts[];
 
 extern void TOS_MemorySnapShot_Capture(BOOL bSave);
-extern void TOS_LoadImage(void);
-extern void TOS_FixRom(void);
-extern void TOS_SetDefaultMemoryConfig(void);
+extern int TOS_LoadImage(void);
+
+#endif