diff options
| author | Chris Apers | 2004-10-06 09:33:26 +0000 |
|---|---|---|
| committer | Chris Apers | 2004-10-06 09:33:26 +0000 |
| commit | 2f72e6fe2d958ab7d180317065ee0d6079cf6c20 (patch) | |
| tree | eebcc1efd6647b877176e6f1f2056bfc603b3e54 /backends/PalmOS/Src/arm | |
| parent | 270de2a503a00c34648a18ec268768808a6a040c (diff) | |
| download | scummvm-rg350-2f72e6fe2d958ab7d180317065ee0d6079cf6c20.tar.gz scummvm-rg350-2f72e6fe2d958ab7d180317065ee0d6079cf6c20.tar.bz2 scummvm-rg350-2f72e6fe2d958ab7d180317065ee0d6079cf6c20.zip | |
Adjustments
svn-id: r15426
Diffstat (limited to 'backends/PalmOS/Src/arm')
| -rw-r--r-- | backends/PalmOS/Src/arm/copyrectangle.cpp | 6 | ||||
| -rw-r--r-- | backends/PalmOS/Src/arm/copyrectangle.h | 4 | ||||
| -rw-r--r-- | backends/PalmOS/Src/arm/macros.h | 6 | ||||
| -rw-r--r-- | backends/PalmOS/Src/arm/widelandscape.cpp | 5 | ||||
| -rw-r--r-- | backends/PalmOS/Src/arm/widelandscape.h | 4 | ||||
| -rw-r--r-- | backends/PalmOS/Src/arm/wideportrait.cpp | 6 | ||||
| -rw-r--r-- | backends/PalmOS/Src/arm/wideportrait.h | 4 |
7 files changed, 15 insertions, 20 deletions
diff --git a/backends/PalmOS/Src/arm/copyrectangle.cpp b/backends/PalmOS/Src/arm/copyrectangle.cpp index 76850b54d0..24088791b4 100644 --- a/backends/PalmOS/Src/arm/copyrectangle.cpp +++ b/backends/PalmOS/Src/arm/copyrectangle.cpp @@ -4,7 +4,7 @@ #define MAIN_TYPE CopyRectangleType #include "macros.h" -UInt32 OSystem_CopyRectToScreen(void *userData68KP) { +void OSystem_CopyRectToScreen(void *userData68KP) { // import variables SETPTR (UInt8 *, dst ) SETPTR (UInt8 *, buf ) @@ -23,6 +23,4 @@ UInt32 OSystem_CopyRectToScreen(void *userData68KP) { buf += pitch; } while (--h); } - - return 0; -}
\ No newline at end of file +} diff --git a/backends/PalmOS/Src/arm/copyrectangle.h b/backends/PalmOS/Src/arm/copyrectangle.h index b464eb9f31..45a5e70a52 100644 --- a/backends/PalmOS/Src/arm/copyrectangle.h +++ b/backends/PalmOS/Src/arm/copyrectangle.h @@ -6,6 +6,6 @@ #define COMPILE_COPYRECT #define COMPILE_PACE -UInt32 OSystem_CopyRectToScreen(void *userData68KP); +void OSystem_CopyRectToScreen(void *userData68KP); -#endif
\ No newline at end of file +#endif diff --git a/backends/PalmOS/Src/arm/macros.h b/backends/PalmOS/Src/arm/macros.h index 7353081af5..e8e038fdcd 100644 --- a/backends/PalmOS/Src/arm/macros.h +++ b/backends/PalmOS/Src/arm/macros.h @@ -13,7 +13,7 @@ #define ARM_ADDP(member) data.member = &member; #define ARM_ADDM(member) data.member = member; #define ARM_ADDV(member, var) data.member = var; - #define ARM_INIT(id) data.funcID = id; +// #define ARM_INIT(id) data.funcID = id; #define ARM_DATA() &data #define ARM_CONTINUE() } else @@ -36,7 +36,7 @@ #define ARM_ADDP(member) #define ARM_ADDM(member) #define ARM_ADDV(member, var) - #define ARM_INIT(id) +// #define ARM_INIT(id) #define ARM_DATA() #define ARM_CONTINUE() @@ -72,4 +72,4 @@ # define SET8(type, member) _SET8 (MAIN_TYPE, member, type, member) #endif -#endif
\ No newline at end of file +#endif diff --git a/backends/PalmOS/Src/arm/widelandscape.cpp b/backends/PalmOS/Src/arm/widelandscape.cpp index 2d3691b8cf..38c4e5777e 100644 --- a/backends/PalmOS/Src/arm/widelandscape.cpp +++ b/backends/PalmOS/Src/arm/widelandscape.cpp @@ -5,7 +5,7 @@ #define MAIN_TYPE WideType #include "macros.h" -UInt32 OSystem_updateScreen_wideLandscape(void *userData68KP) { +void OSystem_updateScreen_wideLandscape(void *userData68KP) { // import variables SETPTR(UInt8 * ,dst) SETPTR(UInt8 * ,src) @@ -24,6 +24,5 @@ UInt32 OSystem_updateScreen_wideLandscape(void *userData68KP) { MemMove(dst, dst - 480, 480); dst += 480; } - - return 0; } + diff --git a/backends/PalmOS/Src/arm/widelandscape.h b/backends/PalmOS/Src/arm/widelandscape.h index 5ecbcdd5b7..eebddd9e0d 100644 --- a/backends/PalmOS/Src/arm/widelandscape.h +++ b/backends/PalmOS/Src/arm/widelandscape.h @@ -6,6 +6,6 @@ #define COMPILE_WIDELANDSCAPE #define COMPILE_PACE -UInt32 OSystem_updateScreen_wideLandscape(void *userData68KP); +void OSystem_updateScreen_wideLandscape(void *userData68KP); -#endif
\ No newline at end of file +#endif diff --git a/backends/PalmOS/Src/arm/wideportrait.cpp b/backends/PalmOS/Src/arm/wideportrait.cpp index 5cbbcad04c..44ad083f28 100644 --- a/backends/PalmOS/Src/arm/wideportrait.cpp +++ b/backends/PalmOS/Src/arm/wideportrait.cpp @@ -5,7 +5,7 @@ #define MAIN_TYPE WideType #include "macros.h" -UInt32 OSystem_updateScreen_widePortrait(void *userData68KP) { +void OSystem_updateScreen_widePortrait(void *userData68KP) { // import variables SETPTR(UInt8 * ,dst) SETPTR(UInt8 * ,src) @@ -38,6 +38,4 @@ UInt32 OSystem_updateScreen_widePortrait(void *userData68KP) { MemMove(dst, dst - WIDE_PITCH, 300); // 300 = 200 x 1.5 dst += WIDE_PITCH; } - - return 0; -}
\ No newline at end of file +} diff --git a/backends/PalmOS/Src/arm/wideportrait.h b/backends/PalmOS/Src/arm/wideportrait.h index cb27c2c372..c9f756368f 100644 --- a/backends/PalmOS/Src/arm/wideportrait.h +++ b/backends/PalmOS/Src/arm/wideportrait.h @@ -6,6 +6,6 @@ #define COMPILE_WIDEPORTRAIT #define COMPILE_PACE -UInt32 OSystem_updateScreen_widePortrait(void *userData68KP); +void OSystem_updateScreen_widePortrait(void *userData68KP); -#endif
\ No newline at end of file +#endif |