[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.72,1.73
Chris Apers
chrilith at users.sourceforge.net
Sat Dec 3 10:59:01 CET 2005
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5863
Modified Files:
disk.cpp
Log Message:
Not needed anymore :)
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- disk.cpp 5 Nov 2005 18:57:41 -0000 1.72
+++ disk.cpp 3 Dec 2005 18:58:31 -0000 1.73
@@ -28,11 +28,6 @@
#include "sky/sky.h"
#include "sky/struc.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
namespace Sky {
static const char *dataFilename = "sky.dsk";
@@ -164,14 +159,6 @@
if ((fileFlags >> 22) & 0x1) { //do we include the header?
// don't return the file's header
output = uncompDest;
-#ifdef PALMOS_68K
- ARM_START(RncDecoderType)
- ARM_INIT(SKY_UNPACKM1)
- ARM_ADDM(input)
- ARM_ADDM(output)
- ARM_CALL_VALUE(ARM_ENGINE, PNO_DATA(), unpackLen)
- ARM_CONTINUE()
-#endif
unpackLen = _rncDecoder.unpackM1(input, output, 0);
} else {
#ifdef SCUMM_BIG_ENDIAN
@@ -183,15 +170,6 @@
memcpy(uncompDest, fileDest, sizeof(dataFileHeader));
output = uncompDest + sizeof(dataFileHeader);
-
-#ifdef PALMOS_68K
- ARM_START(RncDecoderType)
- ARM_INIT(SKY_UNPACKM1)
- ARM_ADDM(input)
- ARM_ADDM(output)
- ARM_CALL_VALUE(ARM_ENGINE, PNO_DATA(), unpackLen)
- ARM_CONTINUE()
-#endif
unpackLen = _rncDecoder.unpackM1(input, output, 0);
if (unpackLen)
unpackLen += sizeof(dataFileHeader);
More information about the Scummvm-git-logs
mailing list