From aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 25 Jan 2010 01:39:44 +0000 Subject: Strip trailing spaces/tabs. svn-id: r47541 --- backends/platform/ds/arm9/source/fat/io_dldi.s | 14 +-- backends/platform/ds/arm9/source/fat/io_m3sd_asm.s | 26 ++--- backends/platform/ds/arm9/source/fat/io_scsd_asm.s | 112 ++++++++++----------- 3 files changed, 76 insertions(+), 76 deletions(-) (limited to 'backends/platform/ds') diff --git a/backends/platform/ds/arm9/source/fat/io_dldi.s b/backends/platform/ds/arm9/source/fat/io_dldi.s index c2314e772d..311d43f3ff 100644 --- a/backends/platform/ds/arm9/source/fat/io_dldi.s +++ b/backends/platform/ds/arm9/source/fat/io_dldi.s @@ -18,7 +18,7 @@ .byte 0x0F @32KiB @ Log [base-2] of the size of this driver in bytes. .byte 0x00 @ Sections to fix .byte 0x0F @32KiB @ Log [base-2] of the allocated space in bytes. - + @--------------------------------------------------------------------------------- @ Text identifier - can be anything up to 47 chars + terminating null -- 16 bytes .align 4 @@ -42,13 +42,13 @@ _dldi_driver_name: _io_dldi: .ascii "DLDI" @ ioType .word 0x00000000 @ Features - .word _DLDI_startup @ - .word _DLDI_isInserted @ + .word _DLDI_startup @ + .word _DLDI_isInserted @ .word _DLDI_readSectors @ Function pointers to standard device driver functions - .word _DLDI_writeSectors @ - .word _DLDI_clearStatus @ - .word _DLDI_shutdown @ - + .word _DLDI_writeSectors @ + .word _DLDI_clearStatus @ + .word _DLDI_shutdown @ + @--------------------------------------------------------------------------------- _DLDI_startup: diff --git a/backends/platform/ds/arm9/source/fat/io_m3sd_asm.s b/backends/platform/ds/arm9/source/fat/io_m3sd_asm.s index ffaa971aca..a6bb8dc187 100644 --- a/backends/platform/ds/arm9/source/fat/io_m3sd_asm.s +++ b/backends/platform/ds/arm9/source/fat/io_m3sd_asm.s @@ -54,7 +54,7 @@ sd_write_loop2: sd_write_busy: bl clkin - ldrh r0,[r1] + ldrh r0,[r1] tst r0,#0x100 beq sd_write_busy ldmfd r13!,{r0-r1} @@ -68,10 +68,10 @@ SD_crc16: stmfd r13!,{r4-r9} mov r9,r2 - mov r3,#0 - mov r4,#0 - mov r5,#0 - mov r6,#0 + mov r3,#0 + mov r4,#0 + mov r5,#0 + mov r6,#0 ldr r7,=0x80808080 ldr r8,=0x1021 @@ -86,19 +86,19 @@ sd_crc16_loop: eorne r3,r3,r8 tst r2,r7,lsr #24 eorne r3,r3,r8 - + mov r4,r4,lsl #1 tst r4,#0x10000 eorne r4,r4,r8 tst r2,r7,lsr #25 eorne r4,r4,r8 - + mov r5,r5,lsl #1 tst r5,#0x10000 eorne r5,r5,r8 tst r2,r7,lsr #26 eorne r5,r5,r8 - + mov r6,r6,lsl #1 tst r6,#0x10000 eorne r6,r6,r8 @@ -107,7 +107,7 @@ sd_crc16_loop: mov r7,r7,ror #4 subs r1,r1,#4 - bne sd_crc16_loop + bne sd_crc16_loop mov r2,r9 mov r8,#16 @@ -145,7 +145,7 @@ SD_data_write: mov r2,#SDODA sd_data_write_busy: bl clkin - ldrh r3,[r2] + ldrh r3,[r2] tst r3,#0x100 beq sd_data_write_busy @@ -169,7 +169,7 @@ sd_data_write_loop: bl clkout subs r5, r5, #2 - bne sd_data_write_loop + bne sd_data_write_loop cmp r1,#0 movne r0,r1 @@ -184,10 +184,10 @@ sd_data_write_loop2: bl clkout subs r5, r5, #1 bne sd_data_write_loop2 - + sd_data_write_busy2: bl clkin - ldrh r3,[r2] + ldrh r3,[r2] tst r3,#0x100 beq sd_data_write_busy2 diff --git a/backends/platform/ds/arm9/source/fat/io_scsd_asm.s b/backends/platform/ds/arm9/source/fat/io_scsd_asm.s index 498cbb96c2..390d36afeb 100644 --- a/backends/platform/ds/arm9/source/fat/io_scsd_asm.s +++ b/backends/platform/ds/arm9/source/fat/io_scsd_asm.s @@ -1,22 +1,22 @@ .TEXT @--------------------------------sd data-------------------------------- .equ sd_comadd,0x9800000 -.equ sd_dataadd,0x9000000 +.equ sd_dataadd,0x9000000 .equ sd_dataradd,0x9100000 @-----------------viod sd_data_write_s(u16 *buff,u16* crc16buff)------------------- .ALIGN - .GLOBAL sd_data_write_s + .GLOBAL sd_data_write_s .CODE 32 sd_data_write_s: stmfd r13!,{r4-r5} mov r5,#512 mov r2,#sd_dataadd sd_data_write_busy: - ldrh r3,[r2] + ldrh r3,[r2] tst r3,#0x100 beq sd_data_write_busy - ldrh r3,[r2] + ldrh r3,[r2] mov r3,#0 @star bit strh r3,[r2] @@ -24,10 +24,10 @@ sd_data_write_loop: ldrh r3,[r0],#2 add r3,r3,r3,lsl #20 mov r4,r3,lsl #8 - stmia r2,{r3-r4} - - subs r5, r5, #2 - bne sd_data_write_loop + stmia r2,{r3-r4} + + subs r5, r5, #2 + bne sd_data_write_loop cmp r1,#0 movne r0,r1 @@ -38,11 +38,11 @@ sd_data_write_loop: mov r3,#0xff @end bit strh r3,[r2] sd_data_write_loop2: - ldrh r3,[r2] + ldrh r3,[r2] tst r3,#0x100 bne sd_data_write_loop2 - ldmia r2,{r3-r4} + ldmia r2,{r3-r4} ldmfd r13!,{r4-r5} bx r14 @@ -50,7 +50,7 @@ sd_data_write_loop2: @----------void sd_data_read_s(u16 *buff)------------- .ALIGN - .GLOBAL sd_data_read_s + .GLOBAL sd_data_read_s .CODE 32 sd_data_read_s: stmfd r13!,{r4} @@ -61,62 +61,62 @@ sd_data_read_loop1: bne sd_data_read_loop1 mov r2,#512 sd_data_read_loop: - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} mov r3,r4,lsr #16 strh r3 ,[r0],#2 - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} mov r3,r4,lsr #16 strh r3 ,[r0],#2 - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} mov r3,r4,lsr #16 strh r3 ,[r0],#2 - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} mov r3,r4,lsr #16 strh r3 ,[r0],#2 - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} mov r3,r4,lsr #16 strh r3 ,[r0],#2 - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} mov r3,r4,lsr #16 strh r3 ,[r0],#2 - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} mov r3,r4,lsr #16 strh r3 ,[r0],#2 - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} mov r3,r4,lsr #16 strh r3 ,[r0],#2 - subs r2, r2, #16 - bne sd_data_read_loop + subs r2, r2, #16 + bne sd_data_read_loop ldmia r1,{r3-r4} @crc 16 - ldmia r1,{r3-r4} - ldmia r1,{r3-r4} - ldmia r1,{r3-r4} + ldmia r1,{r3-r4} + ldmia r1,{r3-r4} + ldmia r1,{r3-r4} ldrh r3,[r1] @end bit - ldmfd r13!,{r4} + ldmfd r13!,{r4} bx r14 @----------end sd_data_read_s------------- @------void sd_com_crc16_s(u16* buff,u16 num,u16* crc16buff) .ALIGN - .GLOBAL sd_crc16_s + .GLOBAL sd_crc16_s .CODE 32 sd_crc16_s: stmfd r13!,{r4-r9} mov r9,r2 - mov r3,#0 - mov r4,#0 - mov r5,#0 - mov r6,#0 + mov r3,#0 + mov r4,#0 + mov r5,#0 + mov r6,#0 ldr r7,=0x80808080 ldr r8,=0x1021 @@ -131,19 +131,19 @@ sd_crc16_loop: eorne r3,r3,r8 tst r2,r7,lsr #24 eorne r3,r3,r8 - + mov r4,r4,lsl #1 tst r4,#0x10000 eorne r4,r4,r8 tst r2,r7,lsr #25 eorne r4,r4,r8 - + mov r5,r5,lsl #1 tst r5,#0x10000 eorne r5,r5,r8 tst r2,r7,lsr #26 eorne r5,r5,r8 - + mov r6,r6,lsl #1 tst r6,#0x10000 eorne r6,r6,r8 @@ -152,7 +152,7 @@ sd_crc16_loop: mov r7,r7,ror #4 subs r1,r1,#4 - bne sd_crc16_loop + bne sd_crc16_loop mov r2,r9 mov r8,#16 @@ -184,7 +184,7 @@ sd_crc16_write_data: @--------------u8 sd_crc7_s(u16* buff,u16 num)---------------------------- .ALIGN - .GLOBAL sd_crc7_s + .GLOBAL sd_crc7_s .CODE 32 sd_crc7_s: stmfd r13!,{r4} @@ -206,7 +206,7 @@ sd_crc7_loop: mov r4,r4,ror #1 subs r1,r1,#1 - bne sd_crc7_loop + bne sd_crc7_loop mov r3,r3,lsl #1 add r0,r3,#1 @@ -216,7 +216,7 @@ sd_crc7_loop: @--------------sd_com_read_s(u16* buff,u32 num)------------------ .ALIGN - .GLOBAL sd_com_read_s + .GLOBAL sd_com_read_s .CODE 32 sd_com_read_s: @@ -229,8 +229,8 @@ sd_com_read_loop1: sd_com_read_loop: ldmia r2,{r3-r6} - subs r1, r1, #1 - bne sd_com_read_loop + subs r1, r1, #1 + bne sd_com_read_loop ldmfd r13!,{r4-r6} bx r14 @--------------end sd_com_read_s------------------ @@ -242,14 +242,14 @@ sd_com_read_loop: .CODE 32 sd_com_write_s: stmfd r13!,{r4-r6} - + mov r2,#sd_comadd sd_com_write_busy: - ldrh r3,[r2] + ldrh r3,[r2] tst r3,#0x1 beq sd_com_write_busy - ldrh r3,[r2] + ldrh r3,[r2] sd_com_write_loop: ldrb r3,[r0],#1 @@ -257,9 +257,9 @@ sd_com_write_loop: mov r4,r3,lsl #2 mov r5,r4,lsl #2 mov r6,r5,lsl #2 - stmia r2,{r3-r6} - subs r1, r1, #1 - bne sd_com_write_loop + stmia r2,{r3-r6} + subs r1, r1, #1 + bne sd_com_write_loop ldmfd r13!,{r4-r6} bx r14 @@ -267,7 +267,7 @@ sd_com_write_loop: @-----------------void send_clk(u32 num)--------- .ALIGN - .GLOBAL send_clk + .GLOBAL send_clk .CODE 32 send_clk: @@ -281,7 +281,7 @@ send_clk_loop1: @---------------------------void SDCommand(u8 command,u8 num,u32 sector)-------------------- .ALIGN - .GLOBAL SDCommand + .GLOBAL SDCommand .CODE 32 @void SDCommand(u8 command,u8 num,u32 sector ) @{ @@ -338,12 +338,12 @@ SDCommand: @ register u16 i,j; @ i=readnum; @ sectno<<=9; -@ SDCommand(18,0,sector); +@ SDCommand(18,0,sector); @ for (j=0;j