[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src globals.h,1.14,1.14.2.1 init_arm.cpp,1.2,1.2.2.1

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26048

Modified Files:
      Tag: branch-0-7-0
	globals.h init_arm.cpp 
Log Message:
Better ARM spport

Index: globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/globals.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- globals.h	9 Nov 2004 11:50:04 -0000	1.14
+++ globals.h	20 Dec 2004 18:55:49 -0000	1.14.2.1
@@ -25,7 +25,7 @@
 
 #include <VFSMgr.h>
 #include "scumm_globals.h"
-#include "arm/native.h"
+#include "arm/pnodefs.h"
 
 enum {
 	kOptNone				=	0,
@@ -63,6 +63,12 @@
 };
 
 typedef struct {
+	char headerBuffer[sizeof(PnoEntryHeader) + 2];
+	PnoEntryHeader *alignedHeader;
+	PnoDescriptor pnoDesc;
+} PNOInitType;
+
+typedef struct {
 	DmOpenRef globals[GBVARS_COUNT];
 	UInt32 memory[kMemGamesCount];
 
@@ -73,8 +79,6 @@
 	UInt16 volRefNum;
 	UInt16 slkRefNum;
 	UInt32 slkVersion;
-	Boolean skinSet;
-	Boolean pinUpdate;
 
 	FileRef	logFile;
 
@@ -86,10 +90,7 @@
 	Coord screenFullWidth, screenFullHeight;	// silkarea hidden
 	UInt32 screenPitch;
 
-	struct {
-		PnoDescriptor pnoDesc;
-		MemPtr pnoPtr;
-	} arm[PNO_COUNT];
+	PNOInitType arm[ARM_COUNT];
 
 	struct {
 		UInt8 on;

Index: init_arm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/init_arm.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- init_arm.cpp	10 Dec 2004 15:29:34 -0000	1.2
+++ init_arm.cpp	20 Dec 2004 18:55:49 -0000	1.2.2.1
@@ -5,17 +5,20 @@
 static void PnoInit(DmResID resID,PNOInitType *pnoP) {
 	// Load and allocate PNO
 	MemHandle armH = DmGetResource('ARMC', resID);
-	MemPtr armP = MemHandleLock(armH);
-	PnoLoad(&pnoP->pnoDesc, armP);
-	MemPtrUnlock(armP);
-	DmReleaseResource(armH);
 	
-	// Init PNO
-	PnoEntryHeader *header = (PnoEntryHeader *)ALIGN_4BYTE(pnoP->headerBuffer); 
-	pnoP->alignedHeader = header;
+	if (armH) {
+		MemPtr armP = MemHandleLock(armH);
+		PnoLoad(&pnoP->pnoDesc, armP);
+		MemPtrUnlock(armP);
+		DmReleaseResource(armH);
+		
+		// Init PNO
+		PnoEntryHeader *header = (PnoEntryHeader *)ALIGN_4BYTE(pnoP->headerBuffer); 
+		pnoP->alignedHeader = header;
 
-	header->r10Value		= pnoP->pnoDesc.r10Value;
-	header->pnoMainAddress	= pnoP->pnoDesc.pnoMainAddress;
+		header->r10Value		= pnoP->pnoDesc.r10Value;
+		header->pnoMainAddress	= pnoP->pnoDesc.pnoMainAddress;
+	}
 }
 
 void ARMInit() {