[Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.33,1.34 misc.cpp,1.9,1.10

Max Horn fingolfin at users.sourceforge.net
Sat Sep 13 11:07:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv16549/driver

Modified Files:
	driver96.h misc.cpp 
Log Message:
cleanup

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- driver96.h	13 Sep 2003 17:36:39 -0000	1.33
+++ driver96.h	13 Sep 2003 18:06:19 -0000	1.34
@@ -1231,15 +1231,15 @@
 //	---------------------
 //
 
-#if !defined(__GNUC__)
-	#pragma START_PACK_STRUCTS
-#endif
-
 typedef struct
 {
 	uint16 buttons;
 } _mouseEvent;
 
+#if !defined(__GNUC__)
+	#pragma START_PACK_STRUCTS
+#endif
+
 typedef struct
 {
 	uint16	w;
@@ -1247,6 +1247,11 @@
 	uint32	offset[2];	// 2 is arbitrary
 } GCC_PACK _parallax;
 
+#if !defined(__GNUC__)
+	#pragma END_PACK_STRUCTS
+#endif
+
+
 //	The _spriteInfo structure is used to tell the driver96 code what attributes
 //	are linked to a sprite for drawing.  These include position, scaling and
 //	compression.
@@ -1359,23 +1364,6 @@
 } _drvKeyStatus;
 
 
-// should probably remove this struct as it just replaces a windows struct...
-typedef struct {
-    uint32 dwLength;
-    uint32 dwMemoryLoad;
-    uint32 dwTotalPhys;
-    uint32 dwAvailPhys;
-    uint32 dwTotalPageFile;
-    uint32 dwAvailPageFile;
-    uint32 dwTotalVirtual;
-    uint32 dwAvailVirtual;
-} GCC_PACK SVM_MEMORYSTATUS;
-
-#if !defined(__GNUC__)
-	#pragma END_PACK_STRUCTS
-#endif
-
-
 //
 //	Function Prototypes
 //	-------------------
@@ -1496,8 +1484,6 @@
 //	Misc functions - from misc.cpp
 //-----------------------------------------------------------------------------
 extern uint32 SVM_timeGetTime(void);
-extern void SVM_VirtualUnlock(uint8 *free_memman, uint32 total_free_memory);
-extern void SVM_GlobalMemoryStatus(SVM_MEMORYSTATUS *memo);
 extern void SVM_SetFileAttributes(char *file, uint32 atrib);
 extern void SVM_DeleteFile(char *file);
 extern void SVM_GetCurrentDirectory(uint32 max, char* path);

Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- misc.cpp	31 Jul 2003 15:24:23 -0000	1.9
+++ misc.cpp	13 Sep 2003 18:06:19 -0000	1.10
@@ -25,15 +25,6 @@
 	return g_system->get_msecs();
 }
 
-void SVM_VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) {
-	warning("stub VirtualUnlock");
-}
-
-void SVM_GlobalMemoryStatus(SVM_MEMORYSTATUS *memo) {
-	warning("stub GlobalMemoryStatus");
-	memo->dwTotalPhys = 16000*1024; // hard code 16mb for now
-}
-
 void SVM_SetFileAttributes(char *file, uint32 atrib) {
 	warning("stub SetFileAttributes");
 }





More information about the Scummvm-git-logs mailing list