11 files changed, 1170 insertions, 1170 deletions
diff --git a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c
index 4650913ce3..2d8d25cf31 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c
+++ b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c
@@ -5,7 +5,7 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
- * $Id: lcd-clipzip.c 30465 2011-09-06 16:55:52Z bertrik $
+ * $Id$
 *
 * Copyright (C) 2011 Bertrik Sikken
 *
diff --git a/firmware/target/arm/s5l8700/postmortemstub.S b/firmware/target/arm/s5l8700/postmortemstub.S
index 73f192a553..d0874c418b 100644
--- a/firmware/target/arm/s5l8700/postmortemstub.S
+++ b/firmware/target/arm/s5l8700/postmortemstub.S
@@ -1,308 +1,308 @@
-.section .text.post_mortem_stub, "ax", %progbits
+.section .text.post_mortem_stub, "ax", %progbits
-.align 4
+.align 4
-.global post_mortem_stub
+.global post_mortem_stub
-.type post_mortem_stub, %function
+.type post_mortem_stub, %function
-post_mortem_stub:
+post_mortem_stub:
-MSR CPSR_c, #0xD3          @ Supervisor mode, no IRQs, no FIQs
+MSR CPSR_c, #0xD3          @ Supervisor mode, no IRQs, no FIQs
-MRC p15, 0, R0,c1,c0
+MRC p15, 0, R0,c1,c0
-BIC R0, R0, #5
+BIC R0, R0, #5
-MCR p15, 0, R0,c1,c0       @ Disable the Protection Unit and DCache
+MCR p15, 0, R0,c1,c0       @ Disable the Protection Unit and DCache
-MOV R13, #0
+MOV R13, #0
-pms_flushcache_loop:
+pms_flushcache_loop:
-  MCR p15, 0, R13,c7,c14,2
+  MCR p15, 0, R13,c7,c14,2
-  ADD R0, R13, #0x10
+  ADD R0, R13, #0x10
-  MCR p15, 0, R0,c7,c14,2
+  MCR p15, 0, R0,c7,c14,2
-  ADD R0, R0, #0x10
+  ADD R0, R0, #0x10
-  MCR p15, 0, R0,c7,c14,2
+  MCR p15, 0, R0,c7,c14,2
-  ADD R0, R0, #0x10
+  ADD R0, R0, #0x10
-  MCR p15, 0, R0,c7,c14,2
+  MCR p15, 0, R0,c7,c14,2
-  ADDS R13, R13, #0x04000000
+  ADDS R13, R13, #0x04000000
-BNE pms_flushcache_loop
+BNE pms_flushcache_loop
-MCR p15, 0, R13,c7,c10,4
+MCR p15, 0, R13,c7,c10,4
-LDR R7, pms_00080200
+LDR R7, pms_00080200
-ORR R8, R7, #0x8000
+ORR R8, R7, #0x8000
-ADR R9, pms_recvbuf
+ADR R9, pms_recvbuf
-LDR R10, pms_20080040
+LDR R10, pms_20080040
-MOV R11, #0x38800000
+MOV R11, #0x38800000
-MOV R12, #1
+MOV R12, #1
-MOV R2, #0x3C400000
+MOV R2, #0x3C400000
-ADD R1, R2, #0x00100000    @ Enable USB clocks
+ADD R1, R2, #0x00100000    @ Enable USB clocks
-LDR R0, [R1,#0x28]
+LDR R0, [R1,#0x28]
-BIC R0, R0, #0x4000
+BIC R0, R0, #0x4000
-STR R0, [R1,#0x28]
+STR R0, [R1,#0x28]
-LDR R0, [R1,#0x40]
+LDR R0, [R1,#0x40]
-BIC R0, R0, #0x800
+BIC R0, R0, #0x800
-STR R0, [R1,#0x40]
+STR R0, [R1,#0x40]
-LDR R0, pms_20803180       @ Clocking config
+LDR R0, pms_20803180       @ Clocking config
-STR R0, [R1]
+STR R0, [R1]
-MOV R0, #0x280
+MOV R0, #0x280
-STR R0, [R1,#0x3C]
+STR R0, [R1,#0x3C]
-MRC p15, 0, R0,c1,c0
+MRC p15, 0, R0,c1,c0
-ORR R0, R0, #0xc0000000
+ORR R0, R0, #0xc0000000
-MCR p15, 0, R0,c1,c0       @ Asynchronous mode
+MCR p15, 0, R0,c1,c0       @ Asynchronous mode
-STR R13, [R11,#0xE00]        @ PHY clock enable
+STR R13, [R11,#0xE00]        @ PHY clock enable
-MOV R1, #0x800
+MOV R1, #0x800
-ORR R0, R2, #2
+ORR R0, R2, #2
-STR R0, [R11,#0x804]        @ USB2 Gadget: Soft disconnect
+STR R0, [R11,#0x804]        @ USB2 Gadget: Soft disconnect
-STR R13, [R2]              @ USB2 PHY: Power on
+STR R13, [R2]              @ USB2 PHY: Power on
-STR R12, [R2,#0x08]         @ USB2 PHY: Assert Software Reset
+STR R12, [R2,#0x08]         @ USB2 PHY: Assert Software Reset
-MOV R0, #0x10000
+MOV R0, #0x10000
-pms_wait:
+pms_wait:
-SUBS R0, R0, #1
+SUBS R0, R0, #1
-BNE pms_wait
+BNE pms_wait
-STR R13, [R2,#0x08]         @ USB2 PHY: Deassert Software Reset
+STR R13, [R2,#0x08]         @ USB2 PHY: Deassert Software Reset
-STR R13, [R2,#0x04]         @ USB2 PHY: Clock is 48MHz
+STR R13, [R2,#0x04]         @ USB2 PHY: Clock is 48MHz
-STR R12, [R11,#0x10]        @ USB2 Gadget: Assert Core Software Reset
+STR R12, [R11,#0x10]        @ USB2 Gadget: Assert Core Software Reset
-pms_waitcorereset:
+pms_waitcorereset:
-LDR R0, [R11,#0x10]         @ USB2 Gadget: Wait for Core to reset
+LDR R0, [R11,#0x10]         @ USB2 Gadget: Wait for Core to reset
-TST R0, #1
+TST R0, #1
-BNE pms_waitcorereset
+BNE pms_waitcorereset
-TST R0, #0x80000000        @ USB2 Gadget: Wait for AHB IDLE
+TST R0, #0x80000000        @ USB2 Gadget: Wait for AHB IDLE
-BEQ pms_waitcorereset
+BEQ pms_waitcorereset
-MOV R0, #0x200
+MOV R0, #0x200
-STR R0, [R11,#0x24]         @ USB2 Gadget: RX FIFO size: 512 bytes
+STR R0, [R11,#0x24]         @ USB2 Gadget: RX FIFO size: 512 bytes
-ORR R0, R0, #0x2000000
+ORR R0, R0, #0x2000000
-STR R0, [R11,#0x28]         @ USB2 Gadget: Non-periodic TX FIFO size: 512 bytes
+STR R0, [R11,#0x28]         @ USB2 Gadget: Non-periodic TX FIFO size: 512 bytes
-MOV R0, #0x26
+MOV R0, #0x26
-STR R0, [R11,#0x08]         @ USB2 Gadget: DMA Enable, Burst Length: 4, Mask Interrupts
+STR R0, [R11,#0x08]         @ USB2 Gadget: DMA Enable, Burst Length: 4, Mask Interrupts
-MOV R0, #0x1400
+MOV R0, #0x1400
-ADD R0, R0, #8
+ADD R0, R0, #8
-STR R0, [R11,#0x0C]         @ USB2 Gadget: PHY IF is 16bit, Turnaround 5
+STR R0, [R11,#0x0C]         @ USB2 Gadget: PHY IF is 16bit, Turnaround 5
-STR R1, [R11,#0x804]        @ USB2 Gadget: Soft reconnect
+STR R1, [R11,#0x804]        @ USB2 Gadget: Soft reconnect
-ADR R14, pms_ctrlbuf
+ADR R14, pms_ctrlbuf
-ORR R5, R8, #0x84000000
+ORR R5, R8, #0x84000000
-@ fallthrough
+@ fallthrough
-pms_mainloop:
+pms_mainloop:
-  LDR R3, [R11,#0x14]         @ Global USB interrupts
+  LDR R3, [R11,#0x14]         @ Global USB interrupts
-  TST R3, #0x00001000        @ BUS reset
+  TST R3, #0x00001000        @ BUS reset
-  BEQ pms_noreset
+  BEQ pms_noreset
-    MOV R0, #0x500
+    MOV R0, #0x500
-    STR R0, [R11,#0x804]
+    STR R0, [R11,#0x804]
-    MOV R0, #4
+    MOV R0, #4
-    STR R0, [R11,#0x800]        @ USB2 Gadget: Device Address 0, STALL on non-zero length status stage
+    STR R0, [R11,#0x800]        @ USB2 Gadget: Device Address 0, STALL on non-zero length status stage
-    MOV R0, #0x8000
+    MOV R0, #0x8000
-    STR R0, [R11,#0x900]        @ USB2 Gadget: Endpoint 0 IN Control: ACTIVE
+    STR R0, [R11,#0x900]        @ USB2 Gadget: Endpoint 0 IN Control: ACTIVE
-    STR R10, [R11,#0xB10]        @ USB2 Gadget: Endpoint 0 OUT Transfer Size: 64 Bytes, 1 Packet, 1 Setup Packet
+    STR R10, [R11,#0xB10]        @ USB2 Gadget: Endpoint 0 OUT Transfer Size: 64 Bytes, 1 Packet, 1 Setup Packet
-    STR R14, [R11,#0xB14]        @ USB2 Gadget: Endpoint 0 OUT DMA Address: pms_ctrlbuf
+    STR R14, [R11,#0xB14]        @ USB2 Gadget: Endpoint 0 OUT DMA Address: pms_ctrlbuf
-    ORR R6, R0, #0x84000000
+    ORR R6, R0, #0x84000000
-    STR R6, [R11,#0xB00]        @ USB2 Gadget: Endpoint 0 OUT Control: ENABLE CLEARNAK
+    STR R6, [R11,#0xB00]        @ USB2 Gadget: Endpoint 0 OUT Control: ENABLE CLEARNAK
-    STR R8, [R11,#0x960]        @ USB2 Gadget: Endpoint 3 IN Control: ACTIVE BULK, 512 byte packets
+    STR R8, [R11,#0x960]        @ USB2 Gadget: Endpoint 3 IN Control: ACTIVE BULK, 512 byte packets
-    STR R8, [R11,#0xB80]        @ USB2 Gadget: Endpoint 4 OUT Control: ACTIVE BULK, 512 byte packets
+    STR R8, [R11,#0xB80]        @ USB2 Gadget: Endpoint 4 OUT Control: ACTIVE BULK, 512 byte packets
-    STR R7, [R11,#0xB90]        @ USB2 Gadget: Endpoint 4 OUT Transfer Size: 512 Bytes, 1 Packet
+    STR R7, [R11,#0xB90]        @ USB2 Gadget: Endpoint 4 OUT Transfer Size: 512 Bytes, 1 Packet
-    STR R9, [R11,#0xB94]        @ USB2 Gadget: Endpoint 4 OUT DMA Address: pms_recvbuf
+    STR R9, [R11,#0xB94]        @ USB2 Gadget: Endpoint 4 OUT DMA Address: pms_recvbuf
-    ORR R4, R5, #0x10000000
+    ORR R4, R5, #0x10000000
-    STR R4, [R11,#0xB80]        @ USB2 Gadget: Endpoint 4 OUT Control: ENABLE CLEARNAK DATA0
+    STR R4, [R11,#0xB80]        @ USB2 Gadget: Endpoint 4 OUT Control: ENABLE CLEARNAK DATA0
-  pms_noreset:
+  pms_noreset:
-  LDR R0, [R11,#0x908]        @ Just ACK all IN events...
+  LDR R0, [R11,#0x908]        @ Just ACK all IN events...
-  STR R0, [R11,#0x908]
+  STR R0, [R11,#0x908]
-  LDR R0, [R11,#0x968]
+  LDR R0, [R11,#0x968]
-  STR R0, [R11,#0x968]
+  STR R0, [R11,#0x968]
-  LDR R2, [R11,#0xB08]
+  LDR R2, [R11,#0xB08]
-  MOVS R2, R2                @ Event on OUT EP0
+  MOVS R2, R2                @ Event on OUT EP0
-  BEQ pms_noep0out
+  BEQ pms_noep0out
-    TST R2, #8                 @ SETUP phase done
+    TST R2, #8                 @ SETUP phase done
-    BEQ pms_controldone
+    BEQ pms_controldone
-      LDRB R0, [R14,#1] @ Get request type
+      LDRB R0, [R14,#1] @ Get request type
-      CMP R0, #0
+      CMP R0, #0
-        BEQ pms_GET_STATUS
+        BEQ pms_GET_STATUS
-      CMP R0, #1
+      CMP R0, #1
-        BEQ pms_CLEAR_FEATURE
+        BEQ pms_CLEAR_FEATURE
-      CMP R0, #3
+      CMP R0, #3
-        BEQ pms_SET_FEATURE
+        BEQ pms_SET_FEATURE
-      CMP R0, #5
+      CMP R0, #5
-        BEQ pms_SET_ADDRESS
+        BEQ pms_SET_ADDRESS
-      CMP R0, #6
+      CMP R0, #6
-        BEQ pms_GET_DESCRIPTOR
+        BEQ pms_GET_DESCRIPTOR
-      CMP R0, #8
+      CMP R0, #8
-        BEQ pms_GET_CONFIGURATION
+        BEQ pms_GET_CONFIGURATION
-      CMP R0, #9
+      CMP R0, #9
-        BEQ pms_SET_CONFIGURATION
+        BEQ pms_SET_CONFIGURATION
-      pms_ctrlstall:
+      pms_ctrlstall:
-      LDR R0, [R11,#0x900]
+      LDR R0, [R11,#0x900]
-      ORR R0, R0, #0x00200000
+      ORR R0, R0, #0x00200000
-      STR R0, [R11,#0x900]        @ Stall IN EP0
+      STR R0, [R11,#0x900]        @ Stall IN EP0
-      LDR R0, [R11,#0xB00]
+      LDR R0, [R11,#0xB00]
-      ORR R0, R0, #0x00200000
+      ORR R0, R0, #0x00200000
-      STR R0, [R11,#0xB00]        @ Stall OUT EP0
+      STR R0, [R11,#0xB00]        @ Stall OUT EP0
-    pms_controldone:
+    pms_controldone:
-    STR R10, [R11,#0xB10]        @ OUT EP0: 64 Bytes, 1 Packet, 1 Setup Packet
+    STR R10, [R11,#0xB10]        @ OUT EP0: 64 Bytes, 1 Packet, 1 Setup Packet
-    STR R14, [R11,#0xB14]        @ OUT EP0: DMA address
+    STR R14, [R11,#0xB14]        @ OUT EP0: DMA address
-    STR R6, [R11,#0xB00]        @ OUT EP0: Enable ClearNAK
+    STR R6, [R11,#0xB00]        @ OUT EP0: Enable ClearNAK
-  pms_noep0out:
+  pms_noep0out:
-  STR R2, [R11,#0xB08]        @ ACK it, whatever it was...
+  STR R2, [R11,#0xB08]        @ ACK it, whatever it was...
-  LDR R2, [R11,#0xB88]
+  LDR R2, [R11,#0xB88]
-  MOVS R2, R2                @ Event on OUT EP4
+  MOVS R2, R2                @ Event on OUT EP4
-  BEQ pms_noep1out
+  BEQ pms_noep1out
-    TST R2, #1                 @ XFER complete
+    TST R2, #1                 @ XFER complete
-    BEQ pms_datadone
+    BEQ pms_datadone
-      LDR R0, pms_000001FF
+      LDR R0, pms_000001FF
-      LDR R1, pms_recvbuf+4
+      LDR R1, pms_recvbuf+4
-      ADD R0, R0, R1
+      ADD R0, R0, R1
-      MOV R0, R0,LSR#9
+      MOV R0, R0,LSR#9
-      ORR R1, R1, R0,LSL#19      @ Number of packets
+      ORR R1, R1, R0,LSL#19      @ Number of packets
-      LDR R0, pms_recvbuf
+      LDR R0, pms_recvbuf
-      STR R1, [R11,#0x970]        @ EP3 IN: Number of packets, size
+      STR R1, [R11,#0x970]        @ EP3 IN: Number of packets, size
-      STR R0, [R11,#0x974]        @ EP3 IN: DMA address
+      STR R0, [R11,#0x974]        @ EP3 IN: DMA address
-      STR R5, [R11,#0x960]        @ EP3 IN: Enable ClearNAK
+      STR R5, [R11,#0x960]        @ EP3 IN: Enable ClearNAK
-    pms_datadone:
+    pms_datadone:
-    STR R7, [R11,#0xB90]        @ OUT EP4: 512 Bytes, 1 Packet
+    STR R7, [R11,#0xB90]        @ OUT EP4: 512 Bytes, 1 Packet
-    STR R9, [R11,#0xB94]        @ Out EP4: DMA address
+    STR R9, [R11,#0xB94]        @ Out EP4: DMA address
-    STR R5, [R11,#0xB80]        @ Out EP4: Enable ClearNAK
+    STR R5, [R11,#0xB80]        @ Out EP4: Enable ClearNAK
-  pms_noep1out:
+  pms_noep1out:
-  STR R2, [R11,#0xB88]        @ ACK it, whatever it was...
+  STR R2, [R11,#0xB88]        @ ACK it, whatever it was...
-  STR R3, [R11,#0x14]         @ ACK global ints
+  STR R3, [R11,#0x14]         @ ACK global ints
-B pms_mainloop
+B pms_mainloop
-pms_CLEAR_FEATURE:
+pms_CLEAR_FEATURE:
-  LDRB R0, [R14]
+  LDRB R0, [R14]
-  CMP R0, #2
+  CMP R0, #2
-  LDREQ R0, [R14,#2]
+  LDREQ R0, [R14,#2]
-  BICEQ R0, R0, #0x00800000
+  BICEQ R0, R0, #0x00800000
-  CMPEQ R0, #0x00010000
+  CMPEQ R0, #0x00010000
-@ fallthrough
+@ fallthrough
-pms_SET_CONFIGURATION:
+pms_SET_CONFIGURATION:
-  ORREQ R0, R8, #0x10000000
+  ORREQ R0, R8, #0x10000000
-  STREQ R0, [R11,#0x960]      @ EP3 IN: Set DATA0 PID
+  STREQ R0, [R11,#0x960]      @ EP3 IN: Set DATA0 PID
-  STREQ R4, [R11,#0xB80]      @ EP4 OUT: Set DATA0 PID
+  STREQ R4, [R11,#0xB80]      @ EP4 OUT: Set DATA0 PID
-B pms_SET_FEATURE              @ zero-length ACK
+B pms_SET_FEATURE              @ zero-length ACK
-pms_GET_CONFIGURATION:
+pms_GET_CONFIGURATION:
-  MOV R1, #1
+  MOV R1, #1
-  STR R1, [R14]
+  STR R1, [R14]
-@ fallthrough
+@ fallthrough
-pms_ctrlsend:
+pms_ctrlsend:
-  ORR R0, R1, #0x00080000    @ 1 Packet
+  ORR R0, R1, #0x00080000    @ 1 Packet
-  STR R0, [R11,#0x910]        @ EP0 IN: 1 Packet, Size as in R1
+  STR R0, [R11,#0x910]        @ EP0 IN: 1 Packet, Size as in R1
-  STR R14, [R11,#0x914]        @ EP0 IN: DMA address
+  STR R14, [R11,#0x914]        @ EP0 IN: DMA address
-  ORR R0, R6, #0x1800
+  ORR R0, R6, #0x1800
-  STR R0, [R11,#0x900]        @ EP0 IN: Enable ClearNAK
+  STR R0, [R11,#0x900]        @ EP0 IN: Enable ClearNAK
-  ADR R14, pms_ctrlbuf
+  ADR R14, pms_ctrlbuf
-B pms_controldone
+B pms_controldone
-pms_GET_DESCRIPTOR:
+pms_GET_DESCRIPTOR:
-  LDRB R0, [R14,#3]           @ Descriptor type
+  LDRB R0, [R14,#3]           @ Descriptor type
-  CMP R0, #1
+  CMP R0, #1
-    ADREQ R14, pms_devicedescriptor
+    ADREQ R14, pms_devicedescriptor
-    BEQ pms_senddescriptor
+    BEQ pms_senddescriptor
-  CMP R0, #2
+  CMP R0, #2
-    ADREQ R14, pms_configurationdescriptor
+    ADREQ R14, pms_configurationdescriptor
-    MOVEQ R1, #0x20
+    MOVEQ R1, #0x20
-    BEQ pms_senddescriptorcustomsize
+    BEQ pms_senddescriptorcustomsize
-  CMP R0, #3
+  CMP R0, #3
-  BNE pms_ctrlstall
+  BNE pms_ctrlstall
-  LDRB R0, [R14,#2]           @ String descriptor index
+  LDRB R0, [R14,#2]           @ String descriptor index
-  CMP R0, #0
+  CMP R0, #0
-    LDREQ R0, pms_langstringdescriptor
+    LDREQ R0, pms_langstringdescriptor
-    STREQ R0, [R14]
+    STREQ R0, [R14]
-    BEQ pms_senddescriptor
+    BEQ pms_senddescriptor
-  CMP R0, #1
+  CMP R0, #1
-  CMPNE R0, #2
+  CMPNE R0, #2
-    ADREQ R14, pms_devnamestringdescriptor
+    ADREQ R14, pms_devnamestringdescriptor
-  BNE pms_ctrlstall
+  BNE pms_ctrlstall
-@ fallthrough
+@ fallthrough
-pms_senddescriptor:
+pms_senddescriptor:
-  LDRB R1, [R14]              @ Descriptor length
+  LDRB R1, [R14]              @ Descriptor length
-@ fallthrough
+@ fallthrough
-pms_senddescriptorcustomsize:
+pms_senddescriptorcustomsize:
-  LDRH R0, pms_ctrlbuf+6        @ Requested length
+  LDRH R0, pms_ctrlbuf+6        @ Requested length
-  CMP R0, R1
+  CMP R0, R1
-  MOVLO R1, R0
+  MOVLO R1, R0
-B pms_ctrlsend
+B pms_ctrlsend
-pms_SET_ADDRESS:
+pms_SET_ADDRESS:
-  LDRH R1, [R14,#2]        @ new address
+  LDRH R1, [R14,#2]        @ new address
-  LDR R0, [R11,#0x800]
+  LDR R0, [R11,#0x800]
-  BIC R0, R0, #0x000007F0
+  BIC R0, R0, #0x000007F0
-  ORR R0, R0, R1,LSL#4
+  ORR R0, R0, R1,LSL#4
-  STR R0, [R11,#0x800]        @ set new address
+  STR R0, [R11,#0x800]        @ set new address
-@ fallthrough
+@ fallthrough
-pms_SET_FEATURE:
+pms_SET_FEATURE:
-  MOV R1, #0                 @ zero-length ACK
+  MOV R1, #0                 @ zero-length ACK
-B pms_ctrlsend
+B pms_ctrlsend
-pms_20803180:
+pms_20803180:
-.word 0x20803180
+.word 0x20803180
-.ltorg
+.ltorg
-.align 4
+.align 4
-pms_configurationdescriptor:
+pms_configurationdescriptor:
-.word 0x00200209
+.word 0x00200209
-.word 0xC0000101
+.word 0xC0000101
-.word 0x00040932
+.word 0x00040932
-.word 0xFFFF0200
+.word 0xFFFF0200
-.word 0x050700FF
+.word 0x050700FF
-.word 0x02000204
+.word 0x02000204
-.word 0x83050701
+.word 0x83050701
-.word 0x01020002
+.word 0x01020002
-pms_devicedescriptor:
+pms_devicedescriptor:
-.word 0x02000112
+.word 0x02000112
-.word 0x40FFFFFF
+.word 0x40FFFFFF
-.word 0xA112FFFF
+.word 0xA112FFFF
-.word 0x02010001
+.word 0x02010001
-.word 0x00010100
+.word 0x00010100
-pms_00080200:
+pms_00080200:
-.word 0x00080200
+.word 0x00080200
-pms_20080040:
+pms_20080040:
-.word 0x20080040
+.word 0x20080040
-pms_000001FF:
+pms_000001FF:
-.word 0x000001FF
+.word 0x000001FF
-pms_devnamestringdescriptor:
+pms_devnamestringdescriptor:
-.word 0x0052030C
+.word 0x0052030C
-.word 0x00500042
+.word 0x00500042
-.word 0x0053004D
+.word 0x0053004D
-pms_langstringdescriptor:
+pms_langstringdescriptor:
-.word 0x04090304
+.word 0x04090304
-pms_ctrlbuf:
+pms_ctrlbuf:
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-.word 0
+.word 0
-pms_recvbuf:
+pms_recvbuf:
-.word 0
+.word 0
-.word 0
+.word 0
-pms_GET_STATUS:
+pms_GET_STATUS:
-  LDRB R0, [R14]
+  LDRB R0, [R14]
-  CMP R0, #0x80
+  CMP R0, #0x80
-  STREQ R12, [R14]
+  STREQ R12, [R14]
-  STRNE R13, [R14]
+  STRNE R13, [R14]
-  MOV R1, #2
+  MOV R1, #2
-B pms_ctrlsend
+B pms_ctrlsend
-.size post_mortem_stub, .-post_mortem_stub
+.size post_mortem_stub, .-post_mortem_stub
diff --git a/firmware/target/arm/s5l8702/debug-s5l8702.c b/firmware/target/arm/s5l8702/debug-s5l8702.c
index 5001d61f70..f49595aa00 100644
--- a/firmware/target/arm/s5l8702/debug-s5l8702.c
+++ b/firmware/target/arm/s5l8702/debug-s5l8702.c
@@ -1,166 +1,166 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- * $Id: debug-s5l8700.c 28719 2010-12-01 18:35:01Z Buschel $
+ * $Id: debug-s5l8700.c 28719 2010-12-01 18:35:01Z Buschel $
- *
+ *
- * Copyright © 2008 Rafaël Carré
+ * Copyright © 2008 Rafaël Carré
- *
+ *
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
-#include <stdbool.h>
+#include <stdbool.h>
-#include "config.h"
+#include "config.h"
-#include "kernel.h"
+#include "kernel.h"
-#include "debug-target.h"
+#include "debug-target.h"
-#include "button.h"
+#include "button.h"
-#include "lcd.h"
+#include "lcd.h"
-#include "font.h"
+#include "font.h"
-#include "storage.h"
+#include "storage.h"
-#include "power.h"
+#include "power.h"
-#include "pmu-target.h"
+#include "pmu-target.h"
-#include "pcm-target.h"
+#include "pcm-target.h"
-/*  Skeleton for adding target specific debug info to the debug menu
+/*  Skeleton for adding target specific debug info to the debug menu
- */
+ */
-#define _DEBUG_PRINTF(a, varargs...) lcd_putsf(0, line++, (a), ##varargs);
+#define _DEBUG_PRINTF(a, varargs...) lcd_putsf(0, line++, (a), ##varargs);
-extern int lcd_type;
+extern int lcd_type;
-bool dbg_hw_info(void)
+bool dbg_hw_info(void)
-{
+{
-    int line;
+    int line;
-    int i;
+    int i;
-    unsigned int state = 0;
+    unsigned int state = 0;
-    const unsigned int max_states=3;
+    const unsigned int max_states=3;
-    lcd_clear_display();
+    lcd_clear_display();
-    lcd_setfont(FONT_SYSFIXED);
+    lcd_setfont(FONT_SYSFIXED);
-    state=0;
+    state=0;
-    while(1)
+    while(1)
-    {
+    {
-        lcd_clear_display();
+        lcd_clear_display();
-        line = 0;
+        line = 0;
-        if(state == 0)
+        if(state == 0)
-        {
+        {
-            _DEBUG_PRINTF("CPU:");
+            _DEBUG_PRINTF("CPU:");
-            _DEBUG_PRINTF("current_tick: %d", (unsigned int)current_tick);
+            _DEBUG_PRINTF("current_tick: %d", (unsigned int)current_tick);
-            line++;
+            line++;
-            _DEBUG_PRINTF("LCD type: %d", lcd_type);
+            _DEBUG_PRINTF("LCD type: %d", lcd_type);
-            line++;
+            line++;
-        }
+        }
-        else if(state==1)
+        else if(state==1)
-        {
+        {
-            _DEBUG_PRINTF("PMU:");
+            _DEBUG_PRINTF("PMU:");
-            for(i=0;i<7;i++)
+            for(i=0;i<7;i++)
-            {
+            {
-                char *device[] = {"(unknown)", 
+                char *device[] = {"(unknown)", 
-                                  "(unknown)", 
+                                  "(unknown)", 
-                                  "(unknown)", 
+                                  "(unknown)", 
-                                  "(unknown)", 
+                                  "(unknown)", 
-                                  "(unknown)", 
+                                  "(unknown)", 
-                                  "(unknown)",
+                                  "(unknown)",
-                                  "(unknown)"};
+                                  "(unknown)"};
-                _DEBUG_PRINTF("ldo%d %s: %dmV %s",i,
+                _DEBUG_PRINTF("ldo%d %s: %dmV %s",i,
-                    pmu_read(0x2e + (i << 1))?" on":"off",
+                    pmu_read(0x2e + (i << 1))?" on":"off",
-                    900 + pmu_read(0x2d + (i << 1))*100,
+                    900 + pmu_read(0x2d + (i << 1))*100,
-                    device[i]);
+                    device[i]);
-            }
+            }
-            _DEBUG_PRINTF("cpu voltage: %dmV",625 + pmu_read(0x1e)*25);
+            _DEBUG_PRINTF("cpu voltage: %dmV",625 + pmu_read(0x1e)*25);
-            _DEBUG_PRINTF("memory voltage: %dmV",625 + pmu_read(0x22)*25);
+            _DEBUG_PRINTF("memory voltage: %dmV",625 + pmu_read(0x22)*25);
-            line++;
+            line++;
-            _DEBUG_PRINTF("charging: %s", charging_state() ? "true" : "false");
+            _DEBUG_PRINTF("charging: %s", charging_state() ? "true" : "false");
-            _DEBUG_PRINTF("backlight: %s", pmu_read(0x29) ? "on" : "off");
+            _DEBUG_PRINTF("backlight: %s", pmu_read(0x29) ? "on" : "off");
-            _DEBUG_PRINTF("brightness value: %d", pmu_read(0x28));
+            _DEBUG_PRINTF("brightness value: %d", pmu_read(0x28));
-        }
+        }
-        else if(state==2)
+        else if(state==2)
-        {
+        {
-            _DEBUG_PRINTF("Audio DMA:");
+            _DEBUG_PRINTF("Audio DMA:");
-            _DEBUG_PRINTF(">%08X %08X %08X %08X %08X", DMAC0C0CONFIG, DMAC0C0SRCADDR,
+            _DEBUG_PRINTF(">%08X %08X %08X %08X %08X", DMAC0C0CONFIG, DMAC0C0SRCADDR,
-                          DMAC0C0DESTADDR, DMAC0C0NEXTLLI, DMAC0C0CONTROL);
+                          DMAC0C0DESTADDR, DMAC0C0NEXTLLI, DMAC0C0CONTROL);
-            for(i = 0; i < PCM_LLICOUNT; i++)
+            for(i = 0; i < PCM_LLICOUNT; i++)
-                _DEBUG_PRINTF("%08X: %08X %08X %08X %08X", &pcm_lli[i], pcm_lli[i].srcaddr,
+                _DEBUG_PRINTF("%08X: %08X %08X %08X %08X", &pcm_lli[i], pcm_lli[i].srcaddr,
-                              pcm_lli[i].dstaddr, pcm_lli[i].nextlli, pcm_lli[i].control);
+                              pcm_lli[i].dstaddr, pcm_lli[i].nextlli, pcm_lli[i].control);
-            _DEBUG_PRINTF("chunk: %08X %08X", pcm_chunksize, pcm_remaining);
+            _DEBUG_PRINTF("chunk: %08X %08X", pcm_chunksize, pcm_remaining);
-        }
+        }
-        else
+        else
-        {
+        {
-            state=0;
+            state=0;
-        }
+        }
-        lcd_update(); 
+        lcd_update(); 
-        switch(button_get_w_tmo(HZ/20))
+        switch(button_get_w_tmo(HZ/20))
-        {
+        {
-            case BUTTON_SCROLL_BACK:
+            case BUTTON_SCROLL_BACK:
-                if(state!=0) state--;
+                if(state!=0) state--;
-                break;
+                break;
-            case BUTTON_SCROLL_FWD:
+            case BUTTON_SCROLL_FWD:
-                if(state!=max_states-1)
+                if(state!=max_states-1)
-                {
+                {
-                    state++;
+                    state++;
-                }
+                }
-                break;
+                break;
-            case DEBUG_CANCEL:
+            case DEBUG_CANCEL:
-            case BUTTON_REL:
+            case BUTTON_REL:
-                lcd_setfont(FONT_UI);
+                lcd_setfont(FONT_UI);
-                return false;
+                return false;
-        }
+        }
-    }
+    }
-    lcd_setfont(FONT_UI);
+    lcd_setfont(FONT_UI);
-    return false;
+    return false;
-}
+}
-bool dbg_ports(void)
+bool dbg_ports(void)
-{
+{
-    int line;
+    int line;
-    lcd_setfont(FONT_SYSFIXED);
+    lcd_setfont(FONT_SYSFIXED);
-    while(1)
+    while(1)
-    {
+    {
-        lcd_clear_display();
+        lcd_clear_display();
-        line = 0;
+        line = 0;
-        
+        
-        _DEBUG_PRINTF("GPIO  0: %08x",(unsigned int)PDAT(0));
+        _DEBUG_PRINTF("GPIO  0: %08x",(unsigned int)PDAT(0));
-        _DEBUG_PRINTF("GPIO  1: %08x",(unsigned int)PDAT(1));
+        _DEBUG_PRINTF("GPIO  1: %08x",(unsigned int)PDAT(1));
-        _DEBUG_PRINTF("GPIO  2: %08x",(unsigned int)PDAT(2));
+        _DEBUG_PRINTF("GPIO  2: %08x",(unsigned int)PDAT(2));
-        _DEBUG_PRINTF("GPIO  3: %08x",(unsigned int)PDAT(3));
+        _DEBUG_PRINTF("GPIO  3: %08x",(unsigned int)PDAT(3));
-        _DEBUG_PRINTF("GPIO  4: %08x",(unsigned int)PDAT(4));
+        _DEBUG_PRINTF("GPIO  4: %08x",(unsigned int)PDAT(4));
-        _DEBUG_PRINTF("GPIO  5: %08x",(unsigned int)PDAT(5));
+        _DEBUG_PRINTF("GPIO  5: %08x",(unsigned int)PDAT(5));
-        _DEBUG_PRINTF("GPIO  6: %08x",(unsigned int)PDAT(6));
+        _DEBUG_PRINTF("GPIO  6: %08x",(unsigned int)PDAT(6));
-        _DEBUG_PRINTF("GPIO  7: %08x",(unsigned int)PDAT(7));
+        _DEBUG_PRINTF("GPIO  7: %08x",(unsigned int)PDAT(7));
-        _DEBUG_PRINTF("GPIO  8: %08x",(unsigned int)PDAT(8));
+        _DEBUG_PRINTF("GPIO  8: %08x",(unsigned int)PDAT(8));
-        _DEBUG_PRINTF("GPIO  9: %08x",(unsigned int)PDAT(9));
+        _DEBUG_PRINTF("GPIO  9: %08x",(unsigned int)PDAT(9));
-        _DEBUG_PRINTF("GPIO 10: %08x",(unsigned int)PDAT(10));
+        _DEBUG_PRINTF("GPIO 10: %08x",(unsigned int)PDAT(10));
-        _DEBUG_PRINTF("GPIO 11: %08x",(unsigned int)PDAT(11));
+        _DEBUG_PRINTF("GPIO 11: %08x",(unsigned int)PDAT(11));
-        _DEBUG_PRINTF("GPIO 12: %08x",(unsigned int)PDAT(12));
+        _DEBUG_PRINTF("GPIO 12: %08x",(unsigned int)PDAT(12));
-        _DEBUG_PRINTF("GPIO 13: %08x",(unsigned int)PDAT(13));
+        _DEBUG_PRINTF("GPIO 13: %08x",(unsigned int)PDAT(13));
-        _DEBUG_PRINTF("GPIO 14: %08x",(unsigned int)PDAT(14));
+        _DEBUG_PRINTF("GPIO 14: %08x",(unsigned int)PDAT(14));
-        _DEBUG_PRINTF("GPIO 15: %08x",(unsigned int)PDAT(15));
+        _DEBUG_PRINTF("GPIO 15: %08x",(unsigned int)PDAT(15));
-        _DEBUG_PRINTF("USEC   : %08x",(unsigned int)USEC_TIMER);
+        _DEBUG_PRINTF("USEC   : %08x",(unsigned int)USEC_TIMER);
-        lcd_update();
+        lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
-            break;
+            break;
-    }
+    }
-    lcd_setfont(FONT_UI);
+    lcd_setfont(FONT_UI);
-    return false;
+    return false;
-}
+}
diff --git a/firmware/target/arm/s5l8702/debug-target.h b/firmware/target/arm/s5l8702/debug-target.h
index 55ea497f00..a493c0e3dd 100644
--- a/firmware/target/arm/s5l8702/debug-target.h
+++ b/firmware/target/arm/s5l8702/debug-target.h
@@ -1,33 +1,33 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- * $Id: debug-target.h 28522 2010-11-06 14:24:25Z wodz $
+ * $Id: debug-target.h 28522 2010-11-06 14:24:25Z wodz $
- *
+ *
- * Copyright (C) 2007 by Karl Kurbjun
+ * Copyright (C) 2007 by Karl Kurbjun
- *
+ *
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
-#ifndef _DEBUG_TARGET_H_
+#ifndef _DEBUG_TARGET_H_
-#define _DEBUG_TARGET_H_
+#define _DEBUG_TARGET_H_
-#include <stdbool.h>
+#include <stdbool.h>
-#define DEBUG_CANCEL BUTTON_MENU
+#define DEBUG_CANCEL BUTTON_MENU
-bool dbg_hw_info(void);
+bool dbg_hw_info(void);
-bool dbg_ports(void);
+bool dbg_ports(void);
-#endif /* _DEBUG_TARGET_H_ */
+#endif /* _DEBUG_TARGET_H_ */
diff --git a/firmware/target/arm/s5l8702/i2c-s5l8702.c b/firmware/target/arm/s5l8702/i2c-s5l8702.c
index 294e5b58ce..4d0e4188ab 100644
--- a/firmware/target/arm/s5l8702/i2c-s5l8702.c
+++ b/firmware/target/arm/s5l8702/i2c-s5l8702.c
@@ -1,196 +1,196 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- * $Id: i2c-s5l8700.c 28589 2010-11-14 15:19:30Z theseven $
+ * $Id: i2c-s5l8700.c 28589 2010-11-14 15:19:30Z theseven $
- *
+ *
- * Copyright (C) 2009 by Bertrik Sikken
+ * Copyright (C) 2009 by Bertrik Sikken
- *
+ *
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
- 
+ 
-#include "config.h"
+#include "config.h"
-#include "system.h"
+#include "system.h"
-#include "kernel.h"
+#include "kernel.h"
-#include "i2c-s5l8702.h"
+#include "i2c-s5l8702.h"
-/*  Driver for the s5l8700 built-in I2C controller in master mode
+/*  Driver for the s5l8700 built-in I2C controller in master mode
-    
+    
-    Both the i2c_read and i2c_write function take the following arguments:
+    Both the i2c_read and i2c_write function take the following arguments:
-    * slave, the address of the i2c slave device to read from / write to
+    * slave, the address of the i2c slave device to read from / write to
-    * address, optional sub-address in the i2c slave (unused if -1)
+    * address, optional sub-address in the i2c slave (unused if -1)
-    * len, number of bytes to be transfered
+    * len, number of bytes to be transfered
-    * data, pointer to data to be transfered
+    * data, pointer to data to be transfered
-    A return value < 0 indicates an error.
+    A return value < 0 indicates an error.
-    
+    
-    Note:
+    Note:
-    * blocks the calling thread for the entire duraton of the i2c transfer but
+    * blocks the calling thread for the entire duraton of the i2c transfer but
-      uses wakeup_wait/wakeup_signal to allow other threads to run.
+      uses wakeup_wait/wakeup_signal to allow other threads to run.
-    * ACK from slave is not checked, so functions never return an error
+    * ACK from slave is not checked, so functions never return an error
-*/
+*/
-static struct mutex i2c_mtx[2];
+static struct mutex i2c_mtx[2];
-static void i2c_on(int bus)
+static void i2c_on(int bus)
-{
+{
-    /* enable I2C clock */
+    /* enable I2C clock */
-    PWRCON(1) &= ~(1 << 4);
+    PWRCON(1) &= ~(1 << 4);
-    IICCON(bus) = (1 << 7) | /* ACK_GEN */
+    IICCON(bus) = (1 << 7) | /* ACK_GEN */
-                  (0 << 6) | /* CLKSEL = PCLK/16 */
+                  (0 << 6) | /* CLKSEL = PCLK/16 */
-                  (1 << 5) | /* INT_EN */
+                  (1 << 5) | /* INT_EN */
-                  (1 << 4) | /* IRQ clear */
+                  (1 << 4) | /* IRQ clear */
-                  (7 << 0);  /* CK_REG */
+                  (7 << 0);  /* CK_REG */
-    /* serial output on */
+    /* serial output on */
-    IICSTAT(bus) = (1 << 4);
+    IICSTAT(bus) = (1 << 4);
-}
+}
-static void i2c_off(int bus)
+static void i2c_off(int bus)
-{
+{
-    /* serial output off */
+    /* serial output off */
-    IICSTAT(bus) = 0;
+    IICSTAT(bus) = 0;
-    /* disable I2C clock */
+    /* disable I2C clock */
-    PWRCON(1) |= (1 << 4);
+    PWRCON(1) |= (1 << 4);
-}
+}
-void i2c_init()
+void i2c_init()
-{
+{
-    mutex_init(&i2c_mtx[0]);
+    mutex_init(&i2c_mtx[0]);
-    mutex_init(&i2c_mtx[1]);
+    mutex_init(&i2c_mtx[1]);
-}
+}
-int i2c_write(int bus, unsigned char slave, int address, int len, const unsigned char *data)
+int i2c_write(int bus, unsigned char slave, int address, int len, const unsigned char *data)
-{
+{
-    mutex_lock(&i2c_mtx[bus]);
+    mutex_lock(&i2c_mtx[bus]);
-    i2c_on(bus);
+    i2c_on(bus);
-    long timeout = current_tick + HZ / 50;
+    long timeout = current_tick + HZ / 50;
-    /* START */
+    /* START */
-    IICDS(bus) = slave & ~1;
+    IICDS(bus) = slave & ~1;
-    IICSTAT(bus) = 0xF0;
+    IICSTAT(bus) = 0xF0;
-    IICCON(bus) = 0xB3;
+    IICCON(bus) = 0xB3;
-    while ((IICCON(bus) & 0x10) == 0)
+    while ((IICCON(bus) & 0x10) == 0)
-        if (TIME_AFTER(current_tick, timeout))
+        if (TIME_AFTER(current_tick, timeout))
-        {
+        {
-            mutex_unlock(&i2c_mtx[bus]);
+            mutex_unlock(&i2c_mtx[bus]);
-            return 1;
+            return 1;
-        }
+        }
-    
+    
-    if (address >= 0) {
+    if (address >= 0) {
-        /* write address */
+        /* write address */
-        IICDS(bus) = address;
+        IICDS(bus) = address;
-        IICCON(bus) = 0xB3;
+        IICCON(bus) = 0xB3;
-        while ((IICCON(bus) & 0x10) == 0)
+        while ((IICCON(bus) & 0x10) == 0)
-            if (TIME_AFTER(current_tick, timeout))
+            if (TIME_AFTER(current_tick, timeout))
-            {
+            {
-                mutex_unlock(&i2c_mtx[bus]);
+                mutex_unlock(&i2c_mtx[bus]);
-                return 2;
+                return 2;
-            }
+            }
-    }
+    }
-    
+    
-    /* write data */
+    /* write data */
-    while (len--) {
+    while (len--) {
-        IICDS(bus) = *data++;
+        IICDS(bus) = *data++;
-        IICCON(bus) = 0xB3;
+        IICCON(bus) = 0xB3;
-        while ((IICCON(bus) & 0x10) == 0)
+        while ((IICCON(bus) & 0x10) == 0)
-            if (TIME_AFTER(current_tick, timeout))
+            if (TIME_AFTER(current_tick, timeout))
-            {
+            {
-                mutex_unlock(&i2c_mtx[bus]);
+                mutex_unlock(&i2c_mtx[bus]);
-                return 4;
+                return 4;
-            }
+            }
-    }
+    }
-    /* STOP */
+    /* STOP */
-    IICSTAT(bus) = 0xD0;
+    IICSTAT(bus) = 0xD0;
-    IICCON(bus) = 0xB3;
+    IICCON(bus) = 0xB3;
-    while ((IICSTAT(bus) & (1 << 5)) != 0)
+    while ((IICSTAT(bus) & (1 << 5)) != 0)
-        if (TIME_AFTER(current_tick, timeout))
+        if (TIME_AFTER(current_tick, timeout))
-        {
+        {
-            mutex_unlock(&i2c_mtx[bus]);
+            mutex_unlock(&i2c_mtx[bus]);
-            return 5;
+            return 5;
-        }
+        }
-    
+    
-    i2c_off(bus);
+    i2c_off(bus);
-    mutex_unlock(&i2c_mtx[bus]);
+    mutex_unlock(&i2c_mtx[bus]);
-    return 0;
+    return 0;
-}
+}
-int i2c_read(int bus, unsigned char slave, int address, int len, unsigned char *data)
+int i2c_read(int bus, unsigned char slave, int address, int len, unsigned char *data)
-{
+{
-    mutex_lock(&i2c_mtx[bus]);
+    mutex_lock(&i2c_mtx[bus]);
-    i2c_on(bus);
+    i2c_on(bus);
-    long timeout = current_tick + HZ / 50;
+    long timeout = current_tick + HZ / 50;
-    if (address >= 0) {
+    if (address >= 0) {
-        /* START */
+        /* START */
-        IICDS(bus) = slave & ~1;
+        IICDS(bus) = slave & ~1;
-        IICSTAT(bus) = 0xF0;
+        IICSTAT(bus) = 0xF0;
-        IICCON(bus) = 0xB3;
+        IICCON(bus) = 0xB3;
-        while ((IICCON(bus) & 0x10) == 0)
+        while ((IICCON(bus) & 0x10) == 0)
-            if (TIME_AFTER(current_tick, timeout))
+            if (TIME_AFTER(current_tick, timeout))
-            {
+            {
-                mutex_unlock(&i2c_mtx[bus]);
+                mutex_unlock(&i2c_mtx[bus]);
-                return 1;
+                return 1;
-            }
+            }
-        /* write address */
+        /* write address */
-        IICDS(bus) = address;
+        IICDS(bus) = address;
-        IICCON(bus) = 0xB3;
+        IICCON(bus) = 0xB3;
-        while ((IICCON(bus) & 0x10) == 0)
+        while ((IICCON(bus) & 0x10) == 0)
-            if (TIME_AFTER(current_tick, timeout))
+            if (TIME_AFTER(current_tick, timeout))
-            {
+            {
-                mutex_unlock(&i2c_mtx[bus]);
+                mutex_unlock(&i2c_mtx[bus]);
-                return 2;
+                return 2;
-            }
+            }
-    }
+    }
-    
+    
-    /* (repeated) START */
+    /* (repeated) START */
-    IICDS(bus) = slave | 1;
+    IICDS(bus) = slave | 1;
-    IICSTAT(bus) = 0xB0;
+    IICSTAT(bus) = 0xB0;
-    IICCON(bus) = 0xB3;
+    IICCON(bus) = 0xB3;
-    while ((IICCON(bus) & 0x10) == 0)
+    while ((IICCON(bus) & 0x10) == 0)
-        if (TIME_AFTER(current_tick, timeout))
+        if (TIME_AFTER(current_tick, timeout))
-        {
+        {
-            mutex_unlock(&i2c_mtx[bus]);
+            mutex_unlock(&i2c_mtx[bus]);
-            return 3;
+            return 3;
-        }
+        }
-    
+    
-    while (len--) {
+    while (len--) {
-        IICCON(bus) = (len == 0) ? 0x33 : 0xB3; /* NAK or ACK */
+        IICCON(bus) = (len == 0) ? 0x33 : 0xB3; /* NAK or ACK */
-        while ((IICCON(bus) & 0x10) == 0)
+        while ((IICCON(bus) & 0x10) == 0)
-            if (TIME_AFTER(current_tick, timeout))
+            if (TIME_AFTER(current_tick, timeout))
-            {
+            {
-                mutex_unlock(&i2c_mtx[bus]);
+                mutex_unlock(&i2c_mtx[bus]);
-                return 4;
+                return 4;
-            }
+            }
-        *data++ = IICDS(bus);
+        *data++ = IICDS(bus);
-    }
+    }
-    /* STOP */
+    /* STOP */
-    IICSTAT(bus) = 0x90;
+    IICSTAT(bus) = 0x90;
-    IICCON(bus) = 0xB3;
+    IICCON(bus) = 0xB3;
-    while ((IICSTAT(bus) & (1 << 5)) != 0)
+    while ((IICSTAT(bus) & (1 << 5)) != 0)
-        if (TIME_AFTER(current_tick, timeout))
+        if (TIME_AFTER(current_tick, timeout))
-        {
+        {
-            mutex_unlock(&i2c_mtx[bus]);
+            mutex_unlock(&i2c_mtx[bus]);
-            return 5;
+            return 5;
-        }
+        }
-    
+    
-    i2c_off(bus);
+    i2c_off(bus);
-    mutex_unlock(&i2c_mtx[bus]);
+    mutex_unlock(&i2c_mtx[bus]);
-    return 0;
+    return 0;
-}
+}
diff --git a/firmware/target/arm/s5l8702/kernel-s5l8702.c b/firmware/target/arm/s5l8702/kernel-s5l8702.c
index 7c5a697043..af54e4dca4 100644
--- a/firmware/target/arm/s5l8702/kernel-s5l8702.c
+++ b/firmware/target/arm/s5l8702/kernel-s5l8702.c
@@ -1,56 +1,56 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- * $Id: kernel-s5l8700.c 28795 2010-12-11 17:52:52Z Buschel $
+ * $Id: kernel-s5l8700.c 28795 2010-12-11 17:52:52Z Buschel $
- *
+ *
- * Copyright � 2009 Bertrik Sikken
+ * Copyright � 2009 Bertrik Sikken
- *
+ *
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
-#include "config.h"
+#include "config.h"
-#include "system.h"
+#include "system.h"
-#include "kernel.h"
+#include "kernel.h"
-/*  S5L8702 driver for the kernel timer
+/*  S5L8702 driver for the kernel timer
-    Timer B is configured as a 10 kHz timer
+    Timer B is configured as a 10 kHz timer
- */
+ */
-void INT_TIMERB(void)
+void INT_TIMERB(void)
-{
+{
-    /* clear interrupt */
+    /* clear interrupt */
-    TBCON = TBCON;
+    TBCON = TBCON;
-    call_tick_tasks();  /* Run through the list of tick tasks */
+    call_tick_tasks();  /* Run through the list of tick tasks */
-}
+}
-void tick_start(unsigned int interval_in_ms)
+void tick_start(unsigned int interval_in_ms)
-{
+{
-    int cycles = 10 * interval_in_ms;
+    int cycles = 10 * interval_in_ms;
-    
+    
-    /* configure timer for 10 kHz */
+    /* configure timer for 10 kHz */
-    TBCMD = (1 << 1);   /* TB_CLR */
+    TBCMD = (1 << 1);   /* TB_CLR */
-    TBPRE = 337 - 1;    /* prescaler */
+    TBPRE = 337 - 1;    /* prescaler */
-    TBCON = (0 << 13) | /* TB_INT1_EN */
+    TBCON = (0 << 13) | /* TB_INT1_EN */
-            (1 << 12) | /* TB_INT0_EN */
+            (1 << 12) | /* TB_INT0_EN */
-            (0 << 11) | /* TB_START */
+            (0 << 11) | /* TB_START */
-            (2 << 8) |  /* TB_CS = PCLK / 16 */
+            (2 << 8) |  /* TB_CS = PCLK / 16 */
-            (0 << 4);   /* TB_MODE_SEL = interval mode */
+            (0 << 4);   /* TB_MODE_SEL = interval mode */
-    TBDATA0 = cycles;   /* set interval period */
+    TBDATA0 = cycles;   /* set interval period */
-    TBCMD = (1 << 0);   /* TB_EN */
+    TBCMD = (1 << 0);   /* TB_EN */
-    /* enable timer interrupt */
+    /* enable timer interrupt */
-    VIC0INTENABLE = 1 << IRQ_TIMER;
+    VIC0INTENABLE = 1 << IRQ_TIMER;
-}
+}
diff --git a/firmware/target/arm/s5l8702/pcm-s5l8702.c b/firmware/target/arm/s5l8702/pcm-s5l8702.c
index c3df77f14f..6461418744 100644
--- a/firmware/target/arm/s5l8702/pcm-s5l8702.c
+++ b/firmware/target/arm/s5l8702/pcm-s5l8702.c
@@ -1,228 +1,228 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- * $Id: pcm-s5l8700.c 28600 2010-11-14 19:49:20Z Buschel $
+ * $Id: pcm-s5l8700.c 28600 2010-11-14 19:49:20Z Buschel $
- *
+ *
- * Copyright © 2011 Michael Sparmann
+ * Copyright © 2011 Michael Sparmann
- *
+ *
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
-#include <string.h>
+#include <string.h>
-#include "config.h"
+#include "config.h"
-#include "system.h"
+#include "system.h"
-#include "audio.h"
+#include "audio.h"
-#include "s5l8702.h"
+#include "s5l8702.h"
-#include "panic.h"
+#include "panic.h"
-#include "audiohw.h"
+#include "audiohw.h"
-#include "pcm.h"
+#include "pcm.h"
-#include "pcm-internal.h"
+#include "pcm-internal.h"
-#include "pcm_sampr.h"
+#include "pcm_sampr.h"
-#include "mmu-arm.h"
+#include "mmu-arm.h"
-#include "pcm-target.h"
+#include "pcm-target.h"
-static volatile int locked = 0;
+static volatile int locked = 0;
-static const int zerosample = 0;
+static const int zerosample = 0;
-static unsigned char dblbuf[2][PCM_WATERMARK * 4];
+static unsigned char dblbuf[2][PCM_WATERMARK * 4];
-static int active_dblbuf;
+static int active_dblbuf;
-struct dma_lli pcm_lli[PCM_LLICOUNT] __attribute__((aligned(16)));
+struct dma_lli pcm_lli[PCM_LLICOUNT] __attribute__((aligned(16)));
-static struct dma_lli* lastlli;
+static struct dma_lli* lastlli;
-static const unsigned char* dataptr;
+static const unsigned char* dataptr;
-size_t pcm_remaining;
+size_t pcm_remaining;
-size_t pcm_chunksize;
+size_t pcm_chunksize;
-/* Mask the DMA interrupt */
+/* Mask the DMA interrupt */
-void pcm_play_lock(void)
+void pcm_play_lock(void)
-{
+{
-    if (locked++ == 0) {
+    if (locked++ == 0) {
-        //TODO: Urgh, I don't like that at all...
+        //TODO: Urgh, I don't like that at all...
-        VIC0INTENCLEAR = 1 << IRQ_DMAC0;
+        VIC0INTENCLEAR = 1 << IRQ_DMAC0;
-    }
+    }
-}
+}
-/* Unmask the DMA interrupt if enabled */
+/* Unmask the DMA interrupt if enabled */
-void pcm_play_unlock(void)
+void pcm_play_unlock(void)
-{
+{
-    if (--locked == 0) {
+    if (--locked == 0) {
-        VIC0INTENABLE = 1 << IRQ_DMAC0;
+        VIC0INTENABLE = 1 << IRQ_DMAC0;
-    }
+    }
-}
+}
-void INT_DMAC0C0(void) ICODE_ATTR;
+void INT_DMAC0C0(void) ICODE_ATTR;
-void INT_DMAC0C0(void)
+void INT_DMAC0C0(void)
-{
+{
-    DMAC0INTTCCLR = 1;
+    DMAC0INTTCCLR = 1;
-    if (!pcm_remaining)
+    if (!pcm_remaining)
-    {
+    {
-        pcm_play_get_more_callback((void**)&dataptr, &pcm_remaining);
+        pcm_play_get_more_callback((void**)&dataptr, &pcm_remaining);
-        pcm_chunksize = pcm_remaining;
+        pcm_chunksize = pcm_remaining;
-    }
+    }
-    if (!pcm_remaining)
+    if (!pcm_remaining)
-    {
+    {
-        pcm_lli->nextlli = NULL;
+        pcm_lli->nextlli = NULL;
-        pcm_lli->control = 0x75249000;
+        pcm_lli->control = 0x75249000;
-        clean_dcache();
+        clean_dcache();
-        return;
+        return;
-    }
+    }
-    uint32_t lastsize = MIN(PCM_WATERMARK * 4, pcm_remaining / 2 + 1) & ~1;
+    uint32_t lastsize = MIN(PCM_WATERMARK * 4, pcm_remaining / 2 + 1) & ~1;
-    pcm_remaining -= lastsize;
+    pcm_remaining -= lastsize;
-    if (pcm_remaining) lastlli = &pcm_lli[ARRAYLEN(pcm_lli) - 1];
+    if (pcm_remaining) lastlli = &pcm_lli[ARRAYLEN(pcm_lli) - 1];
-    else lastlli = pcm_lli;
+    else lastlli = pcm_lli;
-    uint32_t chunksize = MIN(PCM_CHUNKSIZE * 4 - lastsize, pcm_remaining);
+    uint32_t chunksize = MIN(PCM_CHUNKSIZE * 4 - lastsize, pcm_remaining);
-    if (pcm_remaining > chunksize && chunksize > pcm_remaining - PCM_WATERMARK * 8)
+    if (pcm_remaining > chunksize && chunksize > pcm_remaining - PCM_WATERMARK * 8)
-        chunksize = pcm_remaining - PCM_WATERMARK * 8;
+        chunksize = pcm_remaining - PCM_WATERMARK * 8;
-    pcm_remaining -= chunksize;
+    pcm_remaining -= chunksize;
-    bool last = !chunksize;
+    bool last = !chunksize;
-    int i = 0;
+    int i = 0;
-    while (chunksize)
+    while (chunksize)
-    {
+    {
-        uint32_t thislli = MIN(PCM_LLIMAX * 4, chunksize);
+        uint32_t thislli = MIN(PCM_LLIMAX * 4, chunksize);
-        chunksize -= thislli;
+        chunksize -= thislli;
-        pcm_lli[i].srcaddr = (void*)dataptr;
+        pcm_lli[i].srcaddr = (void*)dataptr;
-        pcm_lli[i].dstaddr = (void*)((int)&I2STXDB0);
+        pcm_lli[i].dstaddr = (void*)((int)&I2STXDB0);
-        pcm_lli[i].nextlli = chunksize ? &pcm_lli[i + 1] : lastlli;
+        pcm_lli[i].nextlli = chunksize ? &pcm_lli[i + 1] : lastlli;
-        pcm_lli[i].control = (chunksize ? 0x75249000 : 0xf5249000) | (thislli / 2);
+        pcm_lli[i].control = (chunksize ? 0x75249000 : 0xf5249000) | (thislli / 2);
-        dataptr += thislli;
+        dataptr += thislli;
-        i++;
+        i++;
-    }
+    }
-    if (!pcm_remaining)
+    if (!pcm_remaining)
-    {
+    {
-        memcpy(dblbuf[active_dblbuf], dataptr, lastsize);
+        memcpy(dblbuf[active_dblbuf], dataptr, lastsize);
-        lastlli->srcaddr = dblbuf[active_dblbuf];
+        lastlli->srcaddr = dblbuf[active_dblbuf];
-        active_dblbuf ^= 1;
+        active_dblbuf ^= 1;
-    }
+    }
-    else lastlli->srcaddr = dataptr;
+    else lastlli->srcaddr = dataptr;
-    lastlli->dstaddr = (void*)((int)&I2STXDB0);
+    lastlli->dstaddr = (void*)((int)&I2STXDB0);
-    lastlli->nextlli = last ? NULL : pcm_lli;
+    lastlli->nextlli = last ? NULL : pcm_lli;
-    lastlli->control = (last ? 0xf5249000 : 0x75249000) | (lastsize / 2);
+    lastlli->control = (last ? 0xf5249000 : 0x75249000) | (lastsize / 2);
-    dataptr += lastsize;
+    dataptr += lastsize;
-    clean_dcache();
+    clean_dcache();
-    if (!(DMAC0C0CONFIG & 1) && (pcm_lli[0].control & 0xfff))
+    if (!(DMAC0C0CONFIG & 1) && (pcm_lli[0].control & 0xfff))
-    {
+    {
-        DMAC0C0LLI = pcm_lli[0];
+        DMAC0C0LLI = pcm_lli[0];
-        DMAC0C0CONFIG = 0x8a81;
+        DMAC0C0CONFIG = 0x8a81;
-    }
+    }
-    else DMAC0C0NEXTLLI = pcm_lli;
+    else DMAC0C0NEXTLLI = pcm_lli;
-    pcm_play_dma_started_callback();
+    pcm_play_dma_started_callback();
-}
+}
-void pcm_play_dma_start(const void* addr, size_t size)
+void pcm_play_dma_start(const void* addr, size_t size)
-{
+{
-    dataptr = (const unsigned char*)addr;
+    dataptr = (const unsigned char*)addr;
-    pcm_remaining = size;
+    pcm_remaining = size;
-    I2STXCOM = 0xe;
+    I2STXCOM = 0xe;
-    DMAC0CONFIG |= 4;
+    DMAC0CONFIG |= 4;
-    INT_DMAC0C0();
+    INT_DMAC0C0();
-}
+}
-void pcm_play_dma_stop(void)
+void pcm_play_dma_stop(void)
-{
+{
-    DMAC0C0CONFIG = 0x8a80;
+    DMAC0C0CONFIG = 0x8a80;
-    I2STXCOM = 0xa;
+    I2STXCOM = 0xa;
-}
+}
-/* pause playback by disabling LRCK */
+/* pause playback by disabling LRCK */
-void pcm_play_dma_pause(bool pause)
+void pcm_play_dma_pause(bool pause)
-{
+{
-    if (pause) I2STXCOM |= 1;
+    if (pause) I2STXCOM |= 1;
-    else  I2STXCOM &= ~1;
+    else  I2STXCOM &= ~1;
-}
+}
-void pcm_play_dma_init(void)
+void pcm_play_dma_init(void)
-{
+{
-    PWRCON(0) &= ~(1 << 4);
+    PWRCON(0) &= ~(1 << 4);
-    PWRCON(1) &= ~(1 << 7);
+    PWRCON(1) &= ~(1 << 7);
-    I2S40 = 0x110;
+    I2S40 = 0x110;
-    I2STXCON = 0xb100059;
+    I2STXCON = 0xb100059;
-    I2SCLKCON = 1;
+    I2SCLKCON = 1;
-    VIC0INTENABLE = 1 << IRQ_DMAC0;
+    VIC0INTENABLE = 1 << IRQ_DMAC0;
-    audiohw_preinit();
+    audiohw_preinit();
-}
+}
-void pcm_play_dma_postinit(void)
+void pcm_play_dma_postinit(void)
-{
+{
-    audiohw_postinit();
+    audiohw_postinit();
-}
+}
-void pcm_dma_apply_settings(void)
+void pcm_dma_apply_settings(void)
-{
+{
-}
+}
-size_t pcm_get_bytes_waiting(void)
+size_t pcm_get_bytes_waiting(void)
-{
+{
-    int bytes = pcm_remaining;
+    int bytes = pcm_remaining;
-    const struct dma_lli* lli = (const struct dma_lli*)((int)&DMAC0C0LLI);
+    const struct dma_lli* lli = (const struct dma_lli*)((int)&DMAC0C0LLI);
-    while (lli)
+    while (lli)
-    {
+    {
-        bytes += (lli->control & 0xfff) * 2;
+        bytes += (lli->control & 0xfff) * 2;
-        if (lli == lastlli) break;
+        if (lli == lastlli) break;
-        lli = lli->nextlli;
+        lli = lli->nextlli;
-    }
+    }
-    return bytes;
+    return bytes;
-}
+}
-const void* pcm_play_dma_get_peak_buffer(int *count)
+const void* pcm_play_dma_get_peak_buffer(int *count)
-{
+{
-    *count = (DMAC0C0LLI.control & 0xfff) * 2;
+    *count = (DMAC0C0LLI.control & 0xfff) * 2;
-    return (void*)(((uint32_t)DMAC0C0LLI.srcaddr) & ~3);
+    return (void*)(((uint32_t)DMAC0C0LLI.srcaddr) & ~3);
-}
+}
-#ifdef HAVE_PCM_DMA_ADDRESS
+#ifdef HAVE_PCM_DMA_ADDRESS
-void * pcm_dma_addr(void *addr)
+void * pcm_dma_addr(void *addr)
-{
+{
-    return addr;
+    return addr;
-}
+}
-#endif
+#endif
-/****************************************************************************
+/****************************************************************************
- ** Recording DMA transfer
+ ** Recording DMA transfer
- **/
+ **/
-#ifdef HAVE_RECORDING
+#ifdef HAVE_RECORDING
-void pcm_rec_lock(void)
+void pcm_rec_lock(void)
-{
+{
-}
+}
-void pcm_rec_unlock(void)
+void pcm_rec_unlock(void)
-{
+{
-}
+}
-void pcm_rec_dma_stop(void)
+void pcm_rec_dma_stop(void)
-{
+{
-}
+}
-void pcm_rec_dma_start(void *addr, size_t size)
+void pcm_rec_dma_start(void *addr, size_t size)
-{
+{
-    (void)addr;
+    (void)addr;
-    (void)size;
+    (void)size;
-}
+}
-void pcm_rec_dma_close(void)
+void pcm_rec_dma_close(void)
-{
+{
-}
+}
-void pcm_rec_dma_init(void)
+void pcm_rec_dma_init(void)
-{
+{
-}
+}
-const void * pcm_rec_dma_get_peak_buffer(void)
+const void * pcm_rec_dma_get_peak_buffer(void)
-{
+{
-    return NULL;
+    return NULL;
-}
+}
-#endif /* HAVE_RECORDING */
+#endif /* HAVE_RECORDING */
diff --git a/firmware/target/arm/s5l8702/pcm-target.h b/firmware/target/arm/s5l8702/pcm-target.h
index 1b149a6e0b..aefb64e328 100644
--- a/firmware/target/arm/s5l8702/pcm-target.h
+++ b/firmware/target/arm/s5l8702/pcm-target.h
@@ -1,40 +1,40 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- * $Id: system-target.h 28791 2010-12-11 09:39:33Z Buschel $
+ * $Id: system-target.h 28791 2010-12-11 09:39:33Z Buschel $
- *
+ *
- * Copyright (C) 2010 by Michael Sparmann
+ * Copyright (C) 2010 by Michael Sparmann
- *
+ *
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
-#ifndef __PCM_TARGET_H__
+#ifndef __PCM_TARGET_H__
-#define __PCM_TARGET_H__
+#define __PCM_TARGET_H__
-/* S5L8702 PCM driver tunables: */
+/* S5L8702 PCM driver tunables: */
-#define PCM_LLIMAX (2047)     /* Maximum number of samples per LLI */
+#define PCM_LLIMAX (2047)     /* Maximum number of samples per LLI */
-#define PCM_CHUNKSIZE (10747) /* Maximum number of samples to handle with one IRQ */
+#define PCM_CHUNKSIZE (10747) /* Maximum number of samples to handle with one IRQ */
-                              /* (bigger chunks will be segmented internally)     */
+                              /* (bigger chunks will be segmented internally)     */
-#define PCM_WATERMARK (512)   /* Number of remaining samples to schedule IRQ at */
+#define PCM_WATERMARK (512)   /* Number of remaining samples to schedule IRQ at */
-#define PCM_LLICOUNT ((PCM_CHUNKSIZE - PCM_WATERMARK + PCM_LLIMAX - 1) / PCM_LLIMAX + 1)
+#define PCM_LLICOUNT ((PCM_CHUNKSIZE - PCM_WATERMARK + PCM_LLIMAX - 1) / PCM_LLIMAX + 1)
-extern struct dma_lli pcm_lli[PCM_LLICOUNT];
+extern struct dma_lli pcm_lli[PCM_LLICOUNT];
-extern size_t pcm_remaining;
+extern size_t pcm_remaining;
-extern size_t pcm_chunksize;
+extern size_t pcm_chunksize;
-#endif /* __PCM_TARGET_H__ */
+#endif /* __PCM_TARGET_H__ */
diff --git a/firmware/target/arm/s5l8702/system-target.h b/firmware/target/arm/s5l8702/system-target.h
index 30e53ad6ea..799efb7006 100644
--- a/firmware/target/arm/s5l8702/system-target.h
+++ b/firmware/target/arm/s5l8702/system-target.h
@@ -1,47 +1,47 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- * $Id: system-target.h 28791 2010-12-11 09:39:33Z Buschel $
+ * $Id: system-target.h 28791 2010-12-11 09:39:33Z Buschel $
- *
+ *
- * Copyright (C) 2007 by Dave Chapman
+ * Copyright (C) 2007 by Dave Chapman
- *
+ *
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
-#ifndef SYSTEM_TARGET_H
+#ifndef SYSTEM_TARGET_H
-#define SYSTEM_TARGET_H
+#define SYSTEM_TARGET_H
-#include "system-arm.h"
+#include "system-arm.h"
-#include "mmu-arm.h"
+#include "mmu-arm.h"
-#define CPUFREQ_SLEEP      32768
+#define CPUFREQ_SLEEP      32768
-#define CPUFREQ_MAX     216000000
+#define CPUFREQ_MAX     216000000
-#define CPUFREQ_DEFAULT 108000000
+#define CPUFREQ_DEFAULT 108000000
-#define CPUFREQ_NORMAL  108000000
+#define CPUFREQ_NORMAL  108000000
-#define STORAGE_WANTS_ALIGN
+#define STORAGE_WANTS_ALIGN
-#define inl(a)    (*(volatile unsigned long *) (a))
+#define inl(a)    (*(volatile unsigned long *) (a))
-#define outl(a,b) (*(volatile unsigned long *) (b) = (a))
+#define outl(a,b) (*(volatile unsigned long *) (b) = (a))
-#define inb(a)    (*(volatile unsigned char *) (a))
+#define inb(a)    (*(volatile unsigned char *) (a))
-#define outb(a,b) (*(volatile unsigned char *) (b) = (a))
+#define outb(a,b) (*(volatile unsigned char *) (b) = (a))
-#define inw(a)    (*(volatile unsigned short*) (a))
+#define inw(a)    (*(volatile unsigned short*) (a))
-#define outw(a,b) (*(volatile unsigned short*) (b) = (a))
+#define outw(a,b) (*(volatile unsigned short*) (b) = (a))
-static inline void udelay(unsigned usecs)
+static inline void udelay(unsigned usecs)
-{
+{
-    unsigned stop = USEC_TIMER + usecs;
+    unsigned stop = USEC_TIMER + usecs;
-    while (TIME_BEFORE(USEC_TIMER, stop));
+    while (TIME_BEFORE(USEC_TIMER, stop));
-}
+}
-#endif /* SYSTEM_TARGET_H */
+#endif /* SYSTEM_TARGET_H */
diff --git a/firmware/target/arm/s5l8702/timer-s5l8702.c b/firmware/target/arm/s5l8702/timer-s5l8702.c
index fb56a9ffcf..61d4d590e4 100644
--- a/firmware/target/arm/s5l8702/timer-s5l8702.c
+++ b/firmware/target/arm/s5l8702/timer-s5l8702.c
@@ -1,94 +1,94 @@
-/***************************************************************************
+/***************************************************************************
-*             __________               __   ___.
+*             __________               __   ___.
-*   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+*   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
-*   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+*   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
-*   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+*   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
-*   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+*   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-*                     \/            \/     \/    \/            \/
+*                     \/            \/     \/    \/            \/
-* $Id: timer-s5l8700.c 23103 2009-10-11 11:35:14Z theseven $
+* $Id: timer-s5l8700.c 23103 2009-10-11 11:35:14Z theseven $
-*
+*
-* Copyright (C) 2009 Bertrik Sikken
+* Copyright (C) 2009 Bertrik Sikken
-*
+*
-* This program is free software; you can redistribute it and/or
+* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
+* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
+* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
+* of the License, or (at your option) any later version.
-*
+*
-* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-* KIND, either express or implied.
+* KIND, either express or implied.
-*
+*
-****************************************************************************/
+****************************************************************************/
-#include "config.h"
+#include "config.h"
-#include "inttypes.h"
+#include "inttypes.h"
-#include "s5l8702.h"
+#include "s5l8702.h"
-#include "system.h"
+#include "system.h"
-#include "timer.h"
+#include "timer.h"
-//TODO: This needs calibration once we figure out the clocking
+//TODO: This needs calibration once we figure out the clocking
-void INT_TIMERC(void)
+void INT_TIMERC(void)
-{
+{
-    /* clear interrupt */
+    /* clear interrupt */
-    TCCON = TCCON;
+    TCCON = TCCON;
-    
+    
-    if (pfn_timer != NULL) {
+    if (pfn_timer != NULL) {
-        pfn_timer();
+        pfn_timer();
-    }
+    }
-}
+}
-bool timer_set(long cycles, bool start)
+bool timer_set(long cycles, bool start)
-{
+{
-    static const int cs_table[] = {1, 2, 4, 6};
+    static const int cs_table[] = {1, 2, 4, 6};
-    int prescale, cs;
+    int prescale, cs;
-    long count;
+    long count;
-    /* stop and clear timer */
+    /* stop and clear timer */
-    TCCMD = (1 << 1);   /* TD_CLR */
+    TCCMD = (1 << 1);   /* TD_CLR */
-    /* optionally unregister any previously registered timer user */
+    /* optionally unregister any previously registered timer user */
-    if (start) {
+    if (start) {
-        if (pfn_unregister != NULL) {
+        if (pfn_unregister != NULL) {
-            pfn_unregister();
+            pfn_unregister();
-            pfn_unregister = NULL;
+            pfn_unregister = NULL;
-        }
+        }
-    }
+    }
-    /* scale the count down with the clock select */
+    /* scale the count down with the clock select */
-    for (cs = 0; cs < 4; cs++) {
+    for (cs = 0; cs < 4; cs++) {
-        count = cycles >> cs_table[cs];
+        count = cycles >> cs_table[cs];
-        if ((count < 65536) || (cs == 3)) {
+        if ((count < 65536) || (cs == 3)) {
-            break;
+            break;
-        }
+        }
-    }
+    }
-    
+    
-    /* scale the count down with the prescaler */
+    /* scale the count down with the prescaler */
-    prescale = 1;
+    prescale = 1;
-    while (count >= 65536) {
+    while (count >= 65536) {
-        count >>= 1;
+        count >>= 1;
-        prescale <<= 1;
+        prescale <<= 1;
-    }
+    }
-    /* configure timer */
+    /* configure timer */
-    TCCON = (1 << 12) |     /* TD_INT0_EN */
+    TCCON = (1 << 12) |     /* TD_INT0_EN */
-            (cs << 8) |     /* TS_CS */
+            (cs << 8) |     /* TS_CS */
-            (0 << 4);       /* TD_MODE_SEL, 0 = interval mode */
+            (0 << 4);       /* TD_MODE_SEL, 0 = interval mode */
-    TCPRE = prescale - 1;
+    TCPRE = prescale - 1;
-    TCDATA0 = count;
+    TCDATA0 = count;
-    TCCMD = (1 << 0);       /* TD_ENABLE */
+    TCCMD = (1 << 0);       /* TD_ENABLE */
-    
+    
-    return true;
+    return true;
-}
+}
-bool timer_start(void)
+bool timer_start(void)
-{
+{
-    TCCMD = (1 << 0);       /* TD_ENABLE */
+    TCCMD = (1 << 0);       /* TD_ENABLE */
-    return true;
+    return true;
-}
+}
-void timer_stop(void)
+void timer_stop(void)
-{
+{
-    TCCMD = (0 << 0);       /* TD_ENABLE */
+    TCCMD = (0 << 0);       /* TD_ENABLE */
-}
+}
diff --git a/firmware/target/sh/archos/mascodec-archos.c b/firmware/target/sh/archos/mascodec-archos.c
index 3f932166eb..1eb6e1044d 100644
--- a/firmware/target/sh/archos/mascodec-archos.c
+++ b/firmware/target/sh/archos/mascodec-archos.c
@@ -5,7 +5,7 @@
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
- * $Id: mas.c 18807 2008-10-14 11:12:20Z zagor $
+ * $Id$
 *
 * Copyright (C) 2002 by Linus Nielsen Feltzing
 *