Remove PalmOS port

svn-id: r50964

2 files changed, 2 insertions, 32 deletions

diff --git a/sound/rate_arm_asm.s b/sound/rate_arm_asm.s
index a0e116f8f7..9431ae0649 100644
--- a/sound/rate_arm_asm.s
+++ b/sound/rate_arm_asm.s
@@ -212,9 +212,6 @@ SimpleRate_M_end:
 SimpleRate_M_read:
         LDR     r0, [r13,#8]            @ r0 = sr (8 = 4*2)
         ADD     r0, r0, #16             @ r0 = inPtr = inBuf
- .ifdef PALMOS_MODE
-	LDR	r10,[r13,#4*8]		@ restore r10
- .endif
         STMFD   r13!,{r0,r2-r3,r12,r14}
 
         MOV     r1, r0                  @ r1 = inBuf
@@ -229,9 +226,6 @@ SimpleRate_M_read:
         SUBS    r1, r0, #1              @ r1 = inLen-1
         LDMFD   r13!,{r0,r2-r3,r12,r14}
         BLT     SimpleRate_M_end
- .ifdef PALMOS_MODE
-	MOV	r10,#0
- .endif
         SUBS    r2, r2, #1              @ r2 = opos--
         ADDGE   r0, r0, #2              @ if (r2 >= 0) { sr.inPtr++
         BGE     SimpleRate_M_loop       @                and loop }
@@ -297,9 +291,6 @@ SimpleRate_S_end:
 SimpleRate_S_read:
         LDR     r0, [r13,#8]            @ r0 = sr (8 = 4*2)
         ADD     r0, r0, #16             @ r0 = inPtr = inBuf
- .ifdef PALMOS_MODE
-	LDR	r10,[r13,#4*8]		@ restore r10
- .endif
         STMFD   r13!,{r0,r2-r3,r12,r14}
         MOV     r1, r0                  @ r1 = inBuf
         LDR     r0, [r13,#20]           @ r0 = AudioStream & input (20 = 4*5)
@@ -313,9 +304,6 @@ SimpleRate_S_read:
         SUBS    r1, r0, #2              @ r1 = inLen-2
         LDMFD   r13!,{r0,r2-r3,r12,r14}
         BLT     SimpleRate_S_end
- .ifdef PALMOS_MODE
-	MOV	r10,#0
- .endif
         SUBS    r2, r2, #1              @ r2 = opos--
         ADDGE   r0, r0, #4              @ if (r2 >= 0) { sr.inPtr += 2
         BGE     SimpleRate_S_loop       @                and loop }
@@ -382,9 +370,6 @@ SimpleRate_R_end:
 SimpleRate_R_read:
         LDR     r0, [r13,#8]            @ r0 = sr (8 = 4*2)
         ADD     r0, r0, #16             @ r0 = inPtr = inBuf
- .ifdef PALMOS_MODE
-	LDR	r10,[r13,#4*8]		@ restore r10
- .endif
         STMFD   r13!,{r0,r2-r3,r12,r14}
 
         MOV     r1, r0                  @ r1 = inBuf
@@ -399,9 +384,6 @@ SimpleRate_R_read:
         SUBS    r1, r0, #2              @ r1 = inLen-2
         LDMFD   r13!,{r0,r2-r3,r12,r14}
         BLT     SimpleRate_R_end
- .ifdef PALMOS_MODE
-	MOV	r10,#0
- .endif
         SUBS    r2, r2, #1              @ r2 = opos--
         ADDGE   r0, r0, #4              @ if (r2 >= 0) { sr.inPtr += 2
         BGE     SimpleRate_R_loop       @                and loop }
@@ -484,9 +466,6 @@ LinearRate_M_end:
         LDMFD   r13!,{r4-r11,PC}
 LinearRate_M_read:
         ADD     r0, r2, #28             @ r0 = inPtr = inBuf
- .ifdef PALMOS_MODE
-	LDR	r10,[r13,#4*8]		@ restore r10
- .endif
         STMFD   r13!,{r0,r2-r3,r12,r14}
 
         MOV     r1, r0                  @ r1 = inBuf
@@ -501,9 +480,6 @@ LinearRate_M_read:
         SUBS    r1, r0, #1              @ r1 = inLen-1
         LDMFD   r13!,{r0,r2-r3,r12,r14}
         BLT     LinearRate_M_end
- .ifdef PALMOS_MODE
-	MOV	r10,#0
- .endif
         B       LinearRate_M_read_return
 
 _ARM_LinearRate_S:
@@ -592,9 +568,6 @@ LinearRate_S_end:
         LDMFD   r13!,{r4-r11,PC}
 LinearRate_S_read:
         ADD     r0, r2, #28             @ r0 = inPtr = inBuf
- .ifdef PALMOS_MODE
-	LDR	r10,[r13,#4*8]		@ restore r10
- .endif
         STMFD   r13!,{r0,r2-r3,r12,r14}
 
         MOV     r1, r0                  @ r1 = inBuf
@@ -697,9 +670,6 @@ LinearRate_R_end:
         LDMFD   r13!,{r4-r11,PC}
 LinearRate_R_read:
         ADD     r0, r2, #28             @ r0 = inPtr = inBuf
- .ifdef PALMOS_MODE
-	LDR	r10,[r13,#4*8]		@ restore r10
- .endif
         STMFD   r13!,{r0,r2-r3,r12,r14}
 
         MOV     r1, r0                  @ r1 = inBuf
diff --git a/sound/softsynth/opl/mame.cpp b/sound/softsynth/opl/mame.cpp
index 9e7cbfe3dc..f6da659918 100644
--- a/sound/softsynth/opl/mame.cpp
+++ b/sound/softsynth/opl/mame.cpp
@@ -33,7 +33,7 @@
 
 #include "mame.h"
 
-#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined(GP2X) || defined (__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__)
+#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined (__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__)
 #include "common/config-manager.h"
 #endif
 
@@ -1212,7 +1212,7 @@ FM_OPL *makeAdLibOPL(int rate) {
 	// We need to emulate one YM3812 chip
 	int env_bits = FMOPL_ENV_BITS_HQ;
 	int eg_ent = FMOPL_EG_ENT_HQ;
-#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined (GP2X) || defined(__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__)
+#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined (GP2X) || defined(__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__)
 	if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) {
 		env_bits = FMOPL_ENV_BITS_HQ;
 		eg_ent = FMOPL_EG_ENT_HQ;