diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-29 14:53:02 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-29 14:53:02 +0000 |
commit | 32b8506b2409a01d434dd0ab5024c7718852ebcb (patch) | |
tree | 24b3215851217bf05c40cc8a62af4d021019b5d1 /c/src/lib/libbsp/arm/nds/dswifi/common | |
parent | Whitespace removal. (diff) | |
download | rtems-32b8506b2409a01d434dd0ab5024c7718852ebcb.tar.bz2 |
Whitespace removal.
Diffstat (limited to '')
4 files changed, 42 insertions, 42 deletions
diff --git a/c/src/lib/libbsp/arm/nds/dswifi/common/source/dsregs.h b/c/src/lib/libbsp/arm/nds/dswifi/common/source/dsregs.h index 4faf61e525..3d4c489a85 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/common/source/dsregs.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/common/source/dsregs.h @@ -2,7 +2,7 @@ // DSRegs.h - (c) 2005-2006 Stephen Stair // General reference mumbo jumbo to give me easy access to the regs I like. ////////////////////////////////////////////////////////////////////////// -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -135,7 +135,7 @@ SOFTWARE. if((bank)&1) { VRAMBANKCNT[(bank)>>1] = (VRAMBANKCNT[(bank)>>1]&0x00ff) | (((set)&0xff)<<8); } else \ { VRAMBANKCNT[(bank)>>1] = (VRAMBANKCNT[(bank)>>1]&0xff00) | ((set)&0xff); } -// joypad input +// joypad input #define KEYINPUT (*((u16 volatile *) 0x04000130)) #define KEYCNT (*((u16 volatile *) 0x04000132)) diff --git a/c/src/lib/libbsp/arm/nds/dswifi/common/source/spinlock.S b/c/src/lib/libbsp/arm/nds/dswifi/common/source/spinlock.S index e2f36ef81e..024230337c 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/common/source/spinlock.S +++ b/c/src/lib/libbsp/arm/nds/dswifi/common/source/spinlock.S @@ -4,36 +4,36 @@ .code 32 -.GLOBL SLasm_Acquire, SLasm_Release -.ARM -SLasm_Acquire: - ldr r2,[r0] - cmp r2,#0 - movne r0,#1 - bxne lr - mov r2,r1 - swp r2,r2,[r0] - cmp r2,#0 - cmpne r2,r1 - moveq r0,#0 - bxeq lr - swp r2,r2,[r0] - mov r0,#1 - bx lr - - - -SLasm_Release: - ldr r2,[r0] - cmp r2,r1 - movne r0,#2 - bxne lr - mov r2,#0 - swp r2,r2,[r0] - cmp r2,r1 - moveq r0,#0 - movne r0,#2 - bx lr +.GLOBL SLasm_Acquire, SLasm_Release +.ARM +SLasm_Acquire: + ldr r2,[r0] + cmp r2,#0 + movne r0,#1 + bxne lr + mov r2,r1 + swp r2,r2,[r0] + cmp r2,#0 + cmpne r2,r1 + moveq r0,#0 + bxeq lr + swp r2,r2,[r0] + mov r0,#1 + bx lr + + + +SLasm_Release: + ldr r2,[r0] + cmp r2,r1 + movne r0,#2 + bxne lr + mov r2,#0 + swp r2,r2,[r0] + cmp r2,r1 + moveq r0,#0 + movne r0,#2 + bx lr diff --git a/c/src/lib/libbsp/arm/nds/dswifi/common/source/spinlock.h b/c/src/lib/libbsp/arm/nds/dswifi/common/source/spinlock.h index ef89e475b8..773891dbce 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/common/source/spinlock.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/common/source/spinlock.h @@ -1,7 +1,7 @@ // DS Wifi interface code // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org // spinlock.h - code for spinlocking for basic wifi structure memory protection -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -56,7 +56,7 @@ __asm ( " cmp r2,r1 \n" " moveq r0,#0 \n" " movne r0,#2 \n" -" bx lr \n" +" bx lr \n" ); */ diff --git a/c/src/lib/libbsp/arm/nds/dswifi/common/source/wifi_shared.h b/c/src/lib/libbsp/arm/nds/dswifi/common/source/wifi_shared.h index 9c83af9502..8656feea6d 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/common/source/wifi_shared.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/common/source/wifi_shared.h @@ -1,7 +1,7 @@ // DS Wifi interface code // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org // wifi_shared.h - Shared structures to be used by arm9 and arm7 -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -35,7 +35,7 @@ SOFTWARE. // on spinlock contention, the side unsuccessfully attempting the lock reverts the lock. // if the unlocking side sees the lock incorrectly set, the unlocking side will delay until it has reverted to the correct value, then continue unlocking. // there should be a delay of at least about ~10-20 cycles between a lock and unlock, to prevent contention. -#define SPINLOCK_NOBODY 0x0000 +#define SPINLOCK_NOBODY 0x0000 #define SPINLOCK_ARM7 0x0001 #define SPINLOCK_ARM9 0x0002 @@ -143,11 +143,11 @@ enum WIFI_STATS { WSTAT_ARM7_UPDATES, WSTAT_DEBUG, // harware stats (function mostly unknown.) - WSTAT_HW_1B0,WSTAT_HW_1B1,WSTAT_HW_1B2,WSTAT_HW_1B3,WSTAT_HW_1B4,WSTAT_HW_1B5,WSTAT_HW_1B6,WSTAT_HW_1B7, - WSTAT_HW_1B8,WSTAT_HW_1B9,WSTAT_HW_1BA,WSTAT_HW_1BB,WSTAT_HW_1BC,WSTAT_HW_1BD,WSTAT_HW_1BE,WSTAT_HW_1BF, + WSTAT_HW_1B0,WSTAT_HW_1B1,WSTAT_HW_1B2,WSTAT_HW_1B3,WSTAT_HW_1B4,WSTAT_HW_1B5,WSTAT_HW_1B6,WSTAT_HW_1B7, + WSTAT_HW_1B8,WSTAT_HW_1B9,WSTAT_HW_1BA,WSTAT_HW_1BB,WSTAT_HW_1BC,WSTAT_HW_1BD,WSTAT_HW_1BE,WSTAT_HW_1BF, WSTAT_HW_1C0,WSTAT_HW_1C1,WSTAT_HW_1C4,WSTAT_HW_1C5, - WSTAT_HW_1D0,WSTAT_HW_1D1,WSTAT_HW_1D2,WSTAT_HW_1D3,WSTAT_HW_1D4,WSTAT_HW_1D5,WSTAT_HW_1D6,WSTAT_HW_1D7, - WSTAT_HW_1D8,WSTAT_HW_1D9,WSTAT_HW_1DA,WSTAT_HW_1DB,WSTAT_HW_1DC,WSTAT_HW_1DD,WSTAT_HW_1DE,WSTAT_HW_1DF, + WSTAT_HW_1D0,WSTAT_HW_1D1,WSTAT_HW_1D2,WSTAT_HW_1D3,WSTAT_HW_1D4,WSTAT_HW_1D5,WSTAT_HW_1D6,WSTAT_HW_1D7, + WSTAT_HW_1D8,WSTAT_HW_1D9,WSTAT_HW_1DA,WSTAT_HW_1DB,WSTAT_HW_1DC,WSTAT_HW_1DD,WSTAT_HW_1DE,WSTAT_HW_1DF, NUM_WIFI_STATS }; @@ -258,7 +258,7 @@ typedef struct WIFI_MAINSTRUCT { Wifi_AccessPoint wfc_ap[3]; unsigned long wfc_config[3][5]; // ip, snmask, gateway, primarydns, 2nddns u8 wfc_wepkey[3][16]; - + // wifi data u32 rxbufIn, rxbufOut; // bufIn/bufOut have 2-byte granularity. @@ -269,7 +269,7 @@ typedef struct WIFI_MAINSTRUCT { // stats data u32 stats[NUM_WIFI_STATS]; - + u16 debug[30]; u32 random; // semirandom number updated at the convenience of the arm7. use for initial seeds & such. |