2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>

	* dswifi/arm7/makefile, dswifi/include/netinet/in.h,
	libnds/basicARM7/source/defaultARM7.c, libnds/include/gbfs.h,
	libnds/include/nds/bios.h, libnds/include/nds/card.h,
	libnds/include/nds/dma.h, libnds/include/nds/interrupts.h,
	libnds/include/nds/ipc.h, libnds/include/nds/jtypes.h,
	libnds/include/nds/registers_alt.h, libnds/include/nds/system.h,
	libnds/include/nds/timers.h, libnds/include/nds/arm7/audio.h,
	libnds/include/nds/arm7/clock.h, libnds/include/nds/arm7/serial.h,
	libnds/include/nds/arm7/touch.h, libnds/include/nds/arm9/boxtest.h,
	libnds/include/nds/arm9/cache.h, libnds/include/nds/arm9/console.h,
	libnds/include/nds/arm9/ndsmotion.h, libnds/include/nds/arm9/video.h,
	libnds/include/nds/arm9/videoGL.h, libnds/source/arm7/audio.c,
	libnds/source/arm7/clock.c, libnds/source/arm7/microphone.c,
	libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
	libnds/source/arm9/boxtest.c, libnds/source/arm9/gurumeditation.c,
	libnds/source/arm9/ndsmotion.c, libnds/source/arm9/videoGL.c,
	libnds/source/common/card.c,
	libnds/source/common/interruptDispatcher.S, touchscreen/reco.c: Fix
	various warnings by fixing prototypes. Remove unused .bin files.
	Convert all files to UNIX CF/LF.
	* libnds/source/arm9/COS.bin, libnds/source/arm9/SIN.bin,
	libnds/source/arm9/TAN.bin, libnds/source/arm9/default_font.bin: Removed.

2 files changed, 564 insertions, 546 deletions

diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c b/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
index 8aad2d93aa..6990380471 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
@@ -1,394 +1,394 @@
-/*---------------------------------------------------------------------------------

-	$Id$

-

-	Copyright (C) 2005

-		Michael Noland (joat)

-		Jason Rogers (dovoto)

-		Dave Murphy (WinterMute)

-

-	This software is provided 'as-is', without any express or implied

-	warranty.  In no event will the authors be held liable for any

-	damages arising from the use of this software.

-

-	Permission is granted to anyone to use this software for any

-	purpose, including commercial applications, and to alter it and

-	redistribute it freely, subject to the following restrictions:

-

-	1.	The origin of this software must not be misrepresented; you

-		must not claim that you wrote the original software. If you use

-		this software in a product, an acknowledgment in the product

-		documentation would be appreciated but is not required.

-	2.	Altered source versions must be plainly marked as such, and

-		must not be misrepresented as being the original software.

-	3.	This notice may not be removed or altered from any source

-		distribution.

-

-

----------------------------------------------------------------------------------*/

-#include "nds/card.h"

-#include "nds/dma.h"

-#include "nds/memory.h"

-

-

-//---------------------------------------------------------------------------------

-void cardWriteCommand(const uint8 * command) {

-//---------------------------------------------------------------------------------

-	int index;

-

-	CARD_CR1H = CARD_CR1_ENABLE | CARD_CR1_IRQ;

-

-	for (index = 0; index < 8; index++) {

-		CARD_COMMAND[7-index] = command[index];

-	}

-}

-

-

-//---------------------------------------------------------------------------------

-void cardPolledTransfer(uint32 flags, uint32 * destination, uint32 length, const uint8 * command) {

-//---------------------------------------------------------------------------------

-	u32 data;;

-	cardWriteCommand(command);

-	CARD_CR2 = flags;

-	uint32 * target = destination + length;

-	do {

-		// Read data if available

-		if (CARD_CR2 & CARD_DATA_READY) {

-			data=CARD_DATA_RD;

-			if (destination < target)

-				*destination = data;

-			destination++;

-		}

-	} while (CARD_CR2 & CARD_BUSY);

-}

-

-

-//---------------------------------------------------------------------------------

-void cardStartTransfer(const uint8 * command, uint32 * destination, int channel, uint32 flags) {

-//---------------------------------------------------------------------------------

-	cardWriteCommand(command);

-

-	// Set up a DMA channel to transfer a word every time the card makes one

-	DMA_SRC(channel) = (uint32)&CARD_DATA_RD;

-	DMA_DEST(channel) = (uint32)destination;

-	DMA_CR(channel) = DMA_ENABLE | DMA_START_CARD | DMA_32_BIT | DMA_REPEAT | DMA_SRC_FIX | 0x0001;;

-

-	CARD_CR2 = flags;

-}

-

-

-//---------------------------------------------------------------------------------

-uint32 cardWriteAndRead(const uint8 * command, uint32 flags) {

-//---------------------------------------------------------------------------------

-	cardWriteCommand(command);

-	CARD_CR2 = flags | CARD_ACTIVATE | CARD_nRESET | 0x07000000;

-	while (!(CARD_CR2 & CARD_DATA_READY)) ;

-	return CARD_DATA_RD;

-}

-

-

-//---------------------------------------------------------------------------------

-void cardRead00(uint32 address, uint32 * destination, uint32 length, uint32 flags) {

-//---------------------------------------------------------------------------------f

-	uint8 command[8];

-	command[7] = 0;

-	command[6] = (address >> 24) & 0xff;

-	command[5] = (address >> 16) & 0xff;

-	command[4] = (address >> 8) & 0xff;

-	command[3] = address & 0xff;

-	command[2] = 0;

-	command[1] = 0;

-	command[0] = 0;

-	cardPolledTransfer(flags, destination, length, command);

-}

-

-

-//---------------------------------------------------------------------------------

-void cardReadHeader(uint8 * header) {

-//---------------------------------------------------------------------------------

-	cardRead00(0, (uint32 *)header, 512, 0xA93F1FFF);

-}

-

-

-//---------------------------------------------------------------------------------

-int cardReadID(uint32 flags) {

-//---------------------------------------------------------------------------------

-	uint8 command[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90};

-	return cardWriteAndRead(command, flags);

-}

-

-

-//---------------------------------------------------------------------------------

-static inline void EepromWaitBusy()	{

-//---------------------------------------------------------------------------------

-	while (CARD_CR1 & /*BUSY*/0x80);

-}

-

-//---------------------------------------------------------------------------------

-uint8 cardEepromReadID(uint8 i) {

-//---------------------------------------------------------------------------------

-    return cardEepromCommand(/*READID*/0xAB, i&1);

-}

-

-//---------------------------------------------------------------------------------

-uint8 cardEepromCommand(uint8 command, uint32 address) {

-//---------------------------------------------------------------------------------

-    uint8 retval;

-    int k;

-    CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;

-

-    CARD_CR1 = 0xFFFF;

-    CARD_EEPDATA = command;

-

-    EepromWaitBusy();

-

-    CARD_EEPDATA = (address >> 16) & 0xFF;

-    EepromWaitBusy();

-

-    CARD_EEPDATA = (address >> 8) & 0xFF;

-    EepromWaitBusy();

-

-    CARD_EEPDATA = (address) & 0xFF;

-    EepromWaitBusy();

-

-    for(k=0;k<256;k++)

-    {

-        retval = CARD_EEPDATA;

-        if(retval!=0xFF)

-            break;

-        EepromWaitBusy();

-    }

-

-    CARD_CR1 = /*MODE*/0x40;

-    return retval;

-}

-

-//---------------------------------------------------------------------------------

-int cardEepromGetType(void)

-//---------------------------------------------------------------------------------

-{

-        uint8 c00;

-        uint8 c05;

-        uint8 c9f;

-        uint8 c03;

-

-#ifdef ARM9

-        sysSetBusOwners(BUS_OWNER_ARM9, BUS_OWNER_ARM9);

-#endif

-

-        c03=cardEepromCommand(0x03,0);

-        c05=cardEepromCommand(0x05,0);

-        c9f=cardEepromCommand(0x9f,0);

-        c00=cardEepromCommand(0x00,0);

-

-        if((c00==0x00) && (c9f==0x00)) return 0; // PassMe? 

-        if((c00==0xff) && (c05==0xff) && (c9f==0xff))return -1;

-

-        if((c00==0xff) &&  (c05 & 0xFD) == 0xF0 && (c9f==0xff))return 1;

-        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0xff))return 2;

-        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0x00))return 3;

-        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0x12))return 3;        //      NEW TYPE 3

-        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0x13))return 3;        //      NEW TYPE 3+  4Mbit

-        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0x14))return 3;        //      NEW TYPE 3++ 8Mbit MK4-FLASH Memory

-

-        return 0;

-}

-

-//---------------------------------------------------------------------------------

-uint32 cardEepromGetSize() {

-//---------------------------------------------------------------------------------

-

-    int type = cardEepromGetType();

-

-    if(type == -1)

-        return 0;

-    if(type == 0)

-        return 8192;

-    if(type == 1)

-        return 512;

-    if(type == 2) {

-        static const uint32 offset0 = (8*1024-1);        //      8KB

-        static const uint32 offset1 = (2*8*1024-1);      //      16KB

-        u8 buf1;     //      +0k data        read -> write

-        u8 buf2;     //      +8k data        read -> read

-        u8 buf3;     //      +0k ~data          write

-        u8 buf4;     //      +8k data new    comp buf2

-        cardReadEeprom(offset0,&buf1,1,type);

-        cardReadEeprom(offset1,&buf2,1,type);

-        buf3=~buf1;

-        cardWriteEeprom(offset0,&buf3,1,type);

-        cardReadEeprom (offset1,&buf4,1,type);

-        cardWriteEeprom(offset0,&buf1,1,type);

-        if(buf4!=buf2)      //      +8k

-            return 8*1024;  //       8KB(64kbit)

-        else

-            return 64*1024; //      64KB(512kbit)

-    }

-    if(type == 3) {

-        uint8 c9f;

-        c9f=cardEepromCommand(0x9f,0);

-

-        if(c9f==0x14)         

-            return 1024*1024; //   NEW TYPE 3++ 8Mbit(1024KByte)

-

-        if(c9f==0x13)         

-            return 512*1024;  //   NEW TYPE 3+ 4Mbit(512KByte)

-

-        return 256*1024;      //   TYPE 3  2Mbit(256KByte)

-    }

-

-    return 0;

-}

-

-

-//---------------------------------------------------------------------------------

-void cardReadEeprom(uint32 address, uint8 *data, uint32 length, uint32 addrtype) {

-//---------------------------------------------------------------------------------

-

-    CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;

-    CARD_EEPDATA = 0x03 | ((addrtype == 1) ? address>>8<<3 : 0);

-    EepromWaitBusy();

-

-    if (addrtype == 3) {

-        CARD_EEPDATA = (address >> 16) & 0xFF;

-	    EepromWaitBusy();

-    } 

-    

-    if (addrtype >= 2) {

-        CARD_EEPDATA = (address >> 8) & 0xFF;

-	    EepromWaitBusy();

-    }

-

-

-	CARD_EEPDATA = (address) & 0xFF;

-    EepromWaitBusy();

-

-    while (length > 0) {

-        CARD_EEPDATA = 0;

-        EepromWaitBusy();

-        *data++ = CARD_EEPDATA;

-        length--;

-    }

-

-    EepromWaitBusy();

-    CARD_CR1 = /*MODE*/0x40;

-}

-

-

-//---------------------------------------------------------------------------------

-void cardWriteEeprom(uint32 address, uint8 *data, uint32 length, uint32 addrtype) {

-//---------------------------------------------------------------------------------

-

-	uint32 address_end = address + length;

-	int i;

-    int maxblocks = 32;

-    if(addrtype == 1) maxblocks = 16;

-    if(addrtype == 2) maxblocks = 32;

-    if(addrtype == 3) maxblocks = 256;

-

-	while (address < address_end) {

-		// set WEL (Write Enable Latch)

-		CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;

-		CARD_EEPDATA = 0x06; EepromWaitBusy();

-		CARD_CR1 = /*MODE*/0x40;

-

-		// program maximum of 32 bytes

-		CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;

-

-        if(addrtype == 1) {

-        //  WRITE COMMAND 0x02 + A8 << 3

-            CARD_EEPDATA = 0x02 | (address & BIT(8)) >> (8-3) ;

-            EepromWaitBusy();

-            CARD_EEPDATA = address & 0xFF;

-            EepromWaitBusy();

-        }

-        else if(addrtype == 2) {

-            CARD_EEPDATA = 0x02;

-            EepromWaitBusy();

-            CARD_EEPDATA = address >> 8;

-            EepromWaitBusy();

-            CARD_EEPDATA = address & 0xFF;

-            EepromWaitBusy();

-        }

-        else if(addrtype == 3) {

-            CARD_EEPDATA = 0x02;

-            EepromWaitBusy();

-            CARD_EEPDATA = (address >> 16) & 0xFF;

-            EepromWaitBusy();

-            CARD_EEPDATA = (address >> 8) & 0xFF;

-            EepromWaitBusy();

-            CARD_EEPDATA = address & 0xFF;

-            EepromWaitBusy();

-        }

-

-		for (i=0; address<address_end && i<maxblocks; i++, address++) { 

-            CARD_EEPDATA = *data++; 

-            EepromWaitBusy(); 

-        }

-		CARD_CR1 = /*MODE*/0x40;

-

-		// wait programming to finish

-		CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;

-		CARD_EEPDATA = 0x05; EepromWaitBusy();

-		do { CARD_EEPDATA = 0; EepromWaitBusy(); } while (CARD_EEPDATA & 0x01);	// WIP (Write In Progress) ?

-        EepromWaitBusy();

-        CARD_CR1 = /*MODE*/0x40;

-	}

-}

-

-

-//  Chip Erase : clear FLASH MEMORY (TYPE 3 ONLY)

-//---------------------------------------------------------------------------------

-void cardEepromChipErase(void) {

-//---------------------------------------------------------------------------------

-    int sz;

-    sz=cardEepromGetSize();

-    cardEepromSectorErase(0x00000);

-    cardEepromSectorErase(0x10000);

-    cardEepromSectorErase(0x20000);

-    cardEepromSectorErase(0x30000);

-    if(sz==512*1024)

-    {

-        cardEepromSectorErase(0x40000);

-        cardEepromSectorErase(0x50000);

-        cardEepromSectorErase(0x60000);

-        cardEepromSectorErase(0x70000);

-    }

-}

-

-//  COMMAND Sec.erase 0xD8

-void cardEepromSectorErase(uint32 address)

-{

-        // set WEL (Write Enable Latch)

-        CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;

-        CARD_EEPDATA = 0x06;

-        EepromWaitBusy();

-

-        CARD_CR1 = /*MODE*/0x40;

-

-        // SectorErase 0xD8

-        CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;

-        CARD_EEPDATA = 0xD8;

-        EepromWaitBusy();

-        CARD_EEPDATA = (address >> 16) & 0xFF;

-        EepromWaitBusy();

-        CARD_EEPDATA = (address >> 8) & 0xFF;

-        EepromWaitBusy();

-        CARD_EEPDATA = address & 0xFF;

-        EepromWaitBusy();

-

-        CARD_CR1 = /*MODE*/0x40;

-

-        // wait erase to finish

-        CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;

-        CARD_EEPDATA = 0x05;

-        EepromWaitBusy();

-

-        do

-        {

-            CARD_EEPDATA = 0;

-            EepromWaitBusy();

-        } while (CARD_EEPDATA & 0x01);  // WIP (Write In Progress) ?

-        CARD_CR1 = /*MODE*/0x40;

-}

-

-

+/*---------------------------------------------------------------------------------
+	$Id$
+
+	Copyright (C) 2005
+		Michael Noland (joat)
+		Jason Rogers (dovoto)
+		Dave Murphy (WinterMute)
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any
+	damages arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any
+	purpose, including commercial applications, and to alter it and
+	redistribute it freely, subject to the following restrictions:
+
+	1.	The origin of this software must not be misrepresented; you
+		must not claim that you wrote the original software. If you use
+		this software in a product, an acknowledgment in the product
+		documentation would be appreciated but is not required.
+	2.	Altered source versions must be plainly marked as such, and
+		must not be misrepresented as being the original software.
+	3.	This notice may not be removed or altered from any source
+		distribution.
+
+
+---------------------------------------------------------------------------------*/
+#include "nds/card.h"
+#include "nds/dma.h"
+#include "nds/memory.h"
+
+
+//---------------------------------------------------------------------------------
+void cardWriteCommand(const uint8 * command) {
+//---------------------------------------------------------------------------------
+	int index;
+
+	CARD_CR1H = CARD_CR1_ENABLE | CARD_CR1_IRQ;
+
+	for (index = 0; index < 8; index++) {
+		CARD_COMMAND[7-index] = command[index];
+	}
+}
+
+
+//---------------------------------------------------------------------------------
+void cardPolledTransfer(uint32 flags, uint32 * destination, uint32 length, const uint8 * command) {
+//---------------------------------------------------------------------------------
+	u32 data;;
+	cardWriteCommand(command);
+	CARD_CR2 = flags;
+	uint32 * target = destination + length;
+	do {
+		// Read data if available
+		if (CARD_CR2 & CARD_DATA_READY) {
+			data=CARD_DATA_RD;
+			if (destination < target)
+				*destination = data;
+			destination++;
+		}
+	} while (CARD_CR2 & CARD_BUSY);
+}
+
+
+//---------------------------------------------------------------------------------
+void cardStartTransfer(const uint8 * command, uint32 * destination, int channel, uint32 flags) {
+//---------------------------------------------------------------------------------
+	cardWriteCommand(command);
+
+	// Set up a DMA channel to transfer a word every time the card makes one
+	DMA_SRC(channel) = (uint32)&CARD_DATA_RD;
+	DMA_DEST(channel) = (uint32)destination;
+	DMA_CR(channel) = DMA_ENABLE | DMA_START_CARD | DMA_32_BIT | DMA_REPEAT | DMA_SRC_FIX | 0x0001;;
+
+	CARD_CR2 = flags;
+}
+
+
+//---------------------------------------------------------------------------------
+uint32 cardWriteAndRead(const uint8 * command, uint32 flags) {
+//---------------------------------------------------------------------------------
+	cardWriteCommand(command);
+	CARD_CR2 = flags | CARD_ACTIVATE | CARD_nRESET | 0x07000000;
+	while (!(CARD_CR2 & CARD_DATA_READY)) ;
+	return CARD_DATA_RD;
+}
+
+
+//---------------------------------------------------------------------------------
+void cardRead00(uint32 address, uint32 * destination, uint32 length, uint32 flags) {
+//---------------------------------------------------------------------------------f
+	uint8 command[8];
+	command[7] = 0;
+	command[6] = (address >> 24) & 0xff;
+	command[5] = (address >> 16) & 0xff;
+	command[4] = (address >> 8) & 0xff;
+	command[3] = address & 0xff;
+	command[2] = 0;
+	command[1] = 0;
+	command[0] = 0;
+	cardPolledTransfer(flags, destination, length, command);
+}
+
+
+//---------------------------------------------------------------------------------
+void cardReadHeader(uint8 * header) {
+//---------------------------------------------------------------------------------
+	cardRead00(0, (uint32 *)header, 512, 0xA93F1FFF);
+}
+
+
+//---------------------------------------------------------------------------------
+int cardReadID(uint32 flags) {
+//---------------------------------------------------------------------------------
+	uint8 command[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90};
+	return cardWriteAndRead(command, flags);
+}
+
+
+//---------------------------------------------------------------------------------
+static inline void EepromWaitBusy()	{
+//---------------------------------------------------------------------------------
+	while (CARD_CR1 & /*BUSY*/0x80);
+}
+
+//---------------------------------------------------------------------------------
+uint8 cardEepromReadID(uint8 i) {
+//---------------------------------------------------------------------------------
+    return cardEepromCommand(/*READID*/0xAB, i&1);
+}
+
+//---------------------------------------------------------------------------------
+uint8 cardEepromCommand(uint8 command, uint32 address) {
+//---------------------------------------------------------------------------------
+    uint8 retval;
+    int k;
+    CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;
+
+    CARD_CR1 = 0xFFFF;
+    CARD_EEPDATA = command;
+
+    EepromWaitBusy();
+
+    CARD_EEPDATA = (address >> 16) & 0xFF;
+    EepromWaitBusy();
+
+    CARD_EEPDATA = (address >> 8) & 0xFF;
+    EepromWaitBusy();
+
+    CARD_EEPDATA = (address) & 0xFF;
+    EepromWaitBusy();
+
+    for(k=0;k<256;k++)
+    {
+        retval = CARD_EEPDATA;
+        if(retval!=0xFF)
+            break;
+        EepromWaitBusy();
+    }
+
+    CARD_CR1 = /*MODE*/0x40;
+    return retval;
+}
+
+//---------------------------------------------------------------------------------
+int cardEepromGetType(void)
+//---------------------------------------------------------------------------------
+{
+        uint8 c00;
+        uint8 c05;
+        uint8 c9f;
+        uint8 c03;
+
+#ifdef ARM9
+        sysSetBusOwners(BUS_OWNER_ARM9, BUS_OWNER_ARM9);
+#endif
+
+        c03=cardEepromCommand(0x03,0);
+        c05=cardEepromCommand(0x05,0);
+        c9f=cardEepromCommand(0x9f,0);
+        c00=cardEepromCommand(0x00,0);
+
+        if((c00==0x00) && (c9f==0x00)) return 0; // PassMe? 
+        if((c00==0xff) && (c05==0xff) && (c9f==0xff))return -1;
+
+        if((c00==0xff) &&  (c05 & 0xFD) == 0xF0 && (c9f==0xff))return 1;
+        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0xff))return 2;
+        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0x00))return 3;
+        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0x12))return 3;        //      NEW TYPE 3
+        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0x13))return 3;        //      NEW TYPE 3+  4Mbit
+        if((c00==0xff) &&  (c05 & 0xFD) == 0x00 && (c9f==0x14))return 3;        //      NEW TYPE 3++ 8Mbit MK4-FLASH Memory
+
+        return 0;
+}
+
+//---------------------------------------------------------------------------------
+uint32 cardEepromGetSize() {
+//---------------------------------------------------------------------------------
+
+    int type = cardEepromGetType();
+
+    if(type == -1)
+        return 0;
+    if(type == 0)
+        return 8192;
+    if(type == 1)
+        return 512;
+    if(type == 2) {
+        static const uint32 offset0 = (8*1024-1);        //      8KB
+        static const uint32 offset1 = (2*8*1024-1);      //      16KB
+        u8 buf1;     //      +0k data        read -> write
+        u8 buf2;     //      +8k data        read -> read
+        u8 buf3;     //      +0k ~data          write
+        u8 buf4;     //      +8k data new    comp buf2
+        cardReadEeprom(offset0,&buf1,1,type);
+        cardReadEeprom(offset1,&buf2,1,type);
+        buf3=~buf1;
+        cardWriteEeprom(offset0,&buf3,1,type);
+        cardReadEeprom (offset1,&buf4,1,type);
+        cardWriteEeprom(offset0,&buf1,1,type);
+        if(buf4!=buf2)      //      +8k
+            return 8*1024;  //       8KB(64kbit)
+        else
+            return 64*1024; //      64KB(512kbit)
+    }
+    if(type == 3) {
+        uint8 c9f;
+        c9f=cardEepromCommand(0x9f,0);
+
+        if(c9f==0x14)         
+            return 1024*1024; //   NEW TYPE 3++ 8Mbit(1024KByte)
+
+        if(c9f==0x13)         
+            return 512*1024;  //   NEW TYPE 3+ 4Mbit(512KByte)
+
+        return 256*1024;      //   TYPE 3  2Mbit(256KByte)
+    }
+
+    return 0;
+}
+
+
+//---------------------------------------------------------------------------------
+void cardReadEeprom(uint32 address, uint8 *data, uint32 length, uint32 addrtype) {
+//---------------------------------------------------------------------------------
+
+    CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;
+    CARD_EEPDATA = 0x03 | ((addrtype == 1) ? address>>8<<3 : 0);
+    EepromWaitBusy();
+
+    if (addrtype == 3) {
+        CARD_EEPDATA = (address >> 16) & 0xFF;
+	    EepromWaitBusy();
+    } 
+    
+    if (addrtype >= 2) {
+        CARD_EEPDATA = (address >> 8) & 0xFF;
+	    EepromWaitBusy();
+    }
+
+
+	CARD_EEPDATA = (address) & 0xFF;
+    EepromWaitBusy();
+
+    while (length > 0) {
+        CARD_EEPDATA = 0;
+        EepromWaitBusy();
+        *data++ = CARD_EEPDATA;
+        length--;
+    }
+
+    EepromWaitBusy();
+    CARD_CR1 = /*MODE*/0x40;
+}
+
+
+//---------------------------------------------------------------------------------
+void cardWriteEeprom(uint32 address, uint8 *data, uint32 length, uint32 addrtype) {
+//---------------------------------------------------------------------------------
+
+	uint32 address_end = address + length;
+	int i;
+    int maxblocks = 32;
+    if(addrtype == 1) maxblocks = 16;
+    if(addrtype == 2) maxblocks = 32;
+    if(addrtype == 3) maxblocks = 256;
+
+	while (address < address_end) {
+		// set WEL (Write Enable Latch)
+		CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;
+		CARD_EEPDATA = 0x06; EepromWaitBusy();
+		CARD_CR1 = /*MODE*/0x40;
+
+		// program maximum of 32 bytes
+		CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;
+
+        if(addrtype == 1) {
+        //  WRITE COMMAND 0x02 + A8 << 3
+            CARD_EEPDATA = 0x02 | (address & BIT(8)) >> (8-3) ;
+            EepromWaitBusy();
+            CARD_EEPDATA = address & 0xFF;
+            EepromWaitBusy();
+        }
+        else if(addrtype == 2) {
+            CARD_EEPDATA = 0x02;
+            EepromWaitBusy();
+            CARD_EEPDATA = address >> 8;
+            EepromWaitBusy();
+            CARD_EEPDATA = address & 0xFF;
+            EepromWaitBusy();
+        }
+        else if(addrtype == 3) {
+            CARD_EEPDATA = 0x02;
+            EepromWaitBusy();
+            CARD_EEPDATA = (address >> 16) & 0xFF;
+            EepromWaitBusy();
+            CARD_EEPDATA = (address >> 8) & 0xFF;
+            EepromWaitBusy();
+            CARD_EEPDATA = address & 0xFF;
+            EepromWaitBusy();
+        }
+
+		for (i=0; address<address_end && i<maxblocks; i++, address++) { 
+            CARD_EEPDATA = *data++; 
+            EepromWaitBusy(); 
+        }
+		CARD_CR1 = /*MODE*/0x40;
+
+		// wait programming to finish
+		CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;
+		CARD_EEPDATA = 0x05; EepromWaitBusy();
+		do { CARD_EEPDATA = 0; EepromWaitBusy(); } while (CARD_EEPDATA & 0x01);	// WIP (Write In Progress) ?
+        EepromWaitBusy();
+        CARD_CR1 = /*MODE*/0x40;
+	}
+}
+
+
+//  Chip Erase : clear FLASH MEMORY (TYPE 3 ONLY)
+//---------------------------------------------------------------------------------
+void cardEepromChipErase(void) {
+//---------------------------------------------------------------------------------
+    int sz;
+    sz=cardEepromGetSize();
+    cardEepromSectorErase(0x00000);
+    cardEepromSectorErase(0x10000);
+    cardEepromSectorErase(0x20000);
+    cardEepromSectorErase(0x30000);
+    if(sz==512*1024)
+    {
+        cardEepromSectorErase(0x40000);
+        cardEepromSectorErase(0x50000);
+        cardEepromSectorErase(0x60000);
+        cardEepromSectorErase(0x70000);
+    }
+}
+
+//  COMMAND Sec.erase 0xD8
+void cardEepromSectorErase(uint32 address)
+{
+        // set WEL (Write Enable Latch)
+        CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;
+        CARD_EEPDATA = 0x06;
+        EepromWaitBusy();
+
+        CARD_CR1 = /*MODE*/0x40;
+
+        // SectorErase 0xD8
+        CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;
+        CARD_EEPDATA = 0xD8;
+        EepromWaitBusy();
+        CARD_EEPDATA = (address >> 16) & 0xFF;
+        EepromWaitBusy();
+        CARD_EEPDATA = (address >> 8) & 0xFF;
+        EepromWaitBusy();
+        CARD_EEPDATA = address & 0xFF;
+        EepromWaitBusy();
+
+        CARD_CR1 = /*MODE*/0x40;
+
+        // wait erase to finish
+        CARD_CR1 = /*E*/0x8000 | /*SEL*/0x2000 | /*MODE*/0x40;
+        CARD_EEPDATA = 0x05;
+        EepromWaitBusy();
+
+        do
+        {
+            CARD_EEPDATA = 0;
+            EepromWaitBusy();
+        } while (CARD_EEPDATA & 0x01);  // WIP (Write In Progress) ?
+        CARD_CR1 = /*MODE*/0x40;
+}
+
+
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S b/c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S
index 4ef656f132..c971bb3b20 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S
@@ -1,27 +1,45 @@
-/*---------------------------------------------------------------------------------

-	$Id$

-

-	Copyright (C) 2005

-		Dave Murphy (WinterMute)

-

-	This software is provided 'as-is', without any express or implied

-	warranty.  In no event will the authors be held liable for any

-	damages arising from the use of this software.

-

-	Permission is granted to anyone to use this software for any

-	purpose, including commercial applications, and to alter it and

-	redistribute it freely, subject to the following restrictions:

-

-	1.	The origin of this software must not be misrepresented; you

-		must not claim that you wrote the original software. If you use

-		this software in a product, an acknowledgment in the product

-		documentation would be appreciated but is not required.

-	2.	Altered source versions must be plainly marked as such, and

-		must not be misrepresented as being the original software.

-	3.	This notice may not be removed or altered from any source

-		distribution.

-

+/*---------------------------------------------------------------------------------
+	$Id$
+
+	Copyright (C) 2005
+		Dave Murphy (WinterMute)
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any
+	damages arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any
+	purpose, including commercial applications, and to alter it and
+	redistribute it freely, subject to the following restrictions:
+
+	1.	The origin of this software must not be misrepresented; you
+		must not claim that you wrote the original software. If you use
+		this software in a product, an acknowledgment in the product
+		documentation would be appreciated but is not required.
+	2.	Altered source versions must be plainly marked as such, and
+		must not be misrepresented as being the original software.
+	3.	This notice may not be removed or altered from any source
+		distribution.
+
 	$Log$
+	Revision 1.1  2008/04/17 23:09:41  joel
+	2008-04-17	Joel Sherrill <joel.sherrill@OARcorp.com>
+	
+		* Makefile.am: Move .s files to .S
+		* dswifi/common/source/spinlock.S, libfat/source/disc_io/io_dldi.S,
+		libfat/source/disc_io/io_scsd_s.S, libnds/source/arm9/COS.S,
+		libnds/source/arm9/SIN.S, libnds/source/arm9/TAN.S,
+		libnds/source/arm9/dcache.S, libnds/source/arm9/default_font.S,
+		libnds/source/arm9/icache.S, libnds/source/common/biosCalls.S,
+		libnds/source/common/interruptDispatcher.S: New files.
+		* dswifi/common/source/spinlock.s, libfat/source/disc_io/io_dldi.s,
+		libfat/source/disc_io/io_scsd_s.s, libnds/source/arm9/COS.s,
+		libnds/source/arm9/SIN.s, libnds/source/arm9/TAN.s,
+		libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.s,
+		libnds/source/arm9/exceptionHandler.s, libnds/source/arm9/icache.s,
+		libnds/source/common/biosCalls.s,
+		libnds/source/common/interruptDispatcher.s: Removed.
+	
 	Revision 1.1  2008/04/16 18:37:33  joel
 	2008-04-16	Matthieu Bucchianeri <mbucchia@gmail.com>
 	
@@ -159,132 +177,132 @@
 		touchscreen/reco.h, touchscreen/touchscreen.c,
 		touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
 		New files.
-	

-	Revision 1.10  2007/08/11 06:00:23  wntrmute

-	make nesting really work

-	

-	Revision 1.9  2007/01/10 15:48:27  wntrmute

-	remove unused code

-	

-	Revision 1.8  2006/12/16 09:10:02  wntrmute

-	acknowledge interrupt before calling handler

-	

-	Revision 1.7  2006/04/26 05:11:31  wntrmute

-	rebase dtcm, take __irq_flags and __irq_vector from linker script

-	move arm7 irq vector & irq flags to actual locations

-	

-	Revision 1.6  2006/04/23 18:19:15  wntrmute

-	reworked interrupt code to allow dtcm moving

-	

-	Revision 1.5  2005/12/12 13:01:55  wntrmute

-	disable interrupts on return from user handler

-	

-	Revision 1.4  2005/10/21 22:43:42  wntrmute

-	restore REG_IME on exit from null handler

-	

-	Revision 1.3  2005/09/27 18:21:53  wntrmute

-	safer nested interrupt support

-	

-	Revision 1.2  2005/09/04 16:37:01  wntrmute

-	check for NULL handler

-	

-	Revision 1.1  2005/09/03 17:09:35  wntrmute

-	added interworking aware interrupt dispatcher

-	

-

----------------------------------------------------------------------------------*/

-

-#ifdef ARM7

-	.text

-#endif

-

-#ifdef ARM9

-	.section	.itcm,"ax",%progbits

-#endif

-

-	.extern	irqTable

-	.code 32

-

-	.global	IntrMain

-@---------------------------------------------------------------------------------

-IntrMain:

-@---------------------------------------------------------------------------------

-	mov	r3, #0x4000000		@ REG_BASE

-

-	ldr	r1, [r3, #0x208]	@ r1 = IME

-	str	r3, [r3, #0x208]	@ disable IME

-	mrs	r0, spsr

-	stmfd	sp!, {r0-r1,r3,lr}	@ {spsr, IME, REG_BASE, lr_irq}

-

-	ldr	r1, [r3,#0x210]		@ REG_IE

-	ldr	r2, [r3,#0x214]		@ REG_IF

-	and	r1,r1,r2

-

-	ldr	r0,=__irq_flags		@ defined by linker script

-

-	ldr	r2,[r0]

-	orr	r2,r2,r1

-	str	r2,[r0]

-

-	ldr	r2,=irqTable

-@---------------------------------------------------------------------------------

-findIRQ:

-@---------------------------------------------------------------------------------

-	ldr r0, [r2, #4]

-	cmp	r0,#0

-	beq	no_handler

-	ands	r0, r0, r1

-	bne	jump_intr

-	add	r2, r2, #8

-	b	findIRQ

-

-@---------------------------------------------------------------------------------

-no_handler:

-@---------------------------------------------------------------------------------

-	str	r1, [r3, #0x0214]	@ IF Clear

-	ldmfd   sp!, {r0-r1,r3,lr}	@ {spsr, IME, REG_BASE, lr_irq}

-	str	r1, [r3, #0x208]	@ restore REG_IME

-	mov	pc,lr

-

-@---------------------------------------------------------------------------------

-jump_intr:

-@---------------------------------------------------------------------------------

-	ldr	r1, [r2]		@ user IRQ handler address

-	cmp	r1, #0

-	bne	got_handler

-	mov	r1, r0

-	b	no_handler

-@---------------------------------------------------------------------------------

-got_handler:

-@---------------------------------------------------------------------------------

-

-	mrs	r2, cpsr

-	bic	r2, r2, #0xdf		@ \__

-	orr	r2, r2, #0x1f		@ /  --> Enable IRQ & FIQ. Set CPU mode to System.

-	msr	cpsr,r2

-

-	str	r0, [r3, #0x0214]	@ IF Clear

-	

-	push	{lr}

-	adr	lr, IntrRet

-	bx	r1

-

-@---------------------------------------------------------------------------------

-IntrRet:

-@---------------------------------------------------------------------------------

-	mov	r3, #0x4000000		@ REG_BASE

-	str	r3, [r3, #0x208]	@ disable IME

-	pop	{lr}

-

-	mrs	r3, cpsr

-	bic	r3, r3, #0xdf		@ \__

-	orr	r3, r3, #0x92		@ /  --> Disable IRQ. Enable FIQ. Set CPU mode to IRQ.

-	msr	cpsr, r3

-

-	ldmfd   sp!, {r0-r1,r3,lr}	@ {spsr, IME, REG_BASE, lr_irq}

-	msr	spsr, r0		@ restore spsr

-	str	r1, [r3, #0x208]	@ restore REG_IME

-	mov	pc,lr

-

-	.pool

-	.end

+	
+	Revision 1.10  2007/08/11 06:00:23  wntrmute
+	make nesting really work
+	
+	Revision 1.9  2007/01/10 15:48:27  wntrmute
+	remove unused code
+	
+	Revision 1.8  2006/12/16 09:10:02  wntrmute
+	acknowledge interrupt before calling handler
+	
+	Revision 1.7  2006/04/26 05:11:31  wntrmute
+	rebase dtcm, take __irq_flags and __irq_vector from linker script
+	move arm7 irq vector & irq flags to actual locations
+	
+	Revision 1.6  2006/04/23 18:19:15  wntrmute
+	reworked interrupt code to allow dtcm moving
+	
+	Revision 1.5  2005/12/12 13:01:55  wntrmute
+	disable interrupts on return from user handler
+	
+	Revision 1.4  2005/10/21 22:43:42  wntrmute
+	restore REG_IME on exit from null handler
+	
+	Revision 1.3  2005/09/27 18:21:53  wntrmute
+	safer nested interrupt support
+	
+	Revision 1.2  2005/09/04 16:37:01  wntrmute
+	check for NULL handler
+	
+	Revision 1.1  2005/09/03 17:09:35  wntrmute
+	added interworking aware interrupt dispatcher
+	
+
+---------------------------------------------------------------------------------*/
+
+#ifdef ARM7
+	.text
+#endif
+
+#ifdef ARM9
+	.section	.itcm,"ax",%progbits
+#endif
+
+	.extern	irqTable
+	.code 32
+
+	.global	IntrMain
+@---------------------------------------------------------------------------------
+IntrMain:
+@---------------------------------------------------------------------------------
+	mov	r3, #0x4000000		@ REG_BASE
+
+	ldr	r1, [r3, #0x208]	@ r1 = IME
+	str	r3, [r3, #0x208]	@ disable IME
+	mrs	r0, spsr
+	stmfd	sp!, {r0-r1,r3,lr}	@ {spsr, IME, REG_BASE, lr_irq}
+
+	ldr	r1, [r3,#0x210]		@ REG_IE
+	ldr	r2, [r3,#0x214]		@ REG_IF
+	and	r1,r1,r2
+
+	ldr	r0,=__irq_flags		@ defined by linker script
+
+	ldr	r2,[r0]
+	orr	r2,r2,r1
+	str	r2,[r0]
+
+	ldr	r2,=irqTable
+@---------------------------------------------------------------------------------
+findIRQ:
+@---------------------------------------------------------------------------------
+	ldr r0, [r2, #4]
+	cmp	r0,#0
+	beq	no_handler
+	ands	r0, r0, r1
+	bne	jump_intr
+	add	r2, r2, #8
+	b	findIRQ
+
+@---------------------------------------------------------------------------------
+no_handler:
+@---------------------------------------------------------------------------------
+	str	r1, [r3, #0x0214]	@ IF Clear
+	ldmfd   sp!, {r0-r1,r3,lr}	@ {spsr, IME, REG_BASE, lr_irq}
+	str	r1, [r3, #0x208]	@ restore REG_IME
+	mov	pc,lr
+
+@---------------------------------------------------------------------------------
+jump_intr:
+@---------------------------------------------------------------------------------
+	ldr	r1, [r2]		@ user IRQ handler address
+	cmp	r1, #0
+	bne	got_handler
+	mov	r1, r0
+	b	no_handler
+@---------------------------------------------------------------------------------
+got_handler:
+@---------------------------------------------------------------------------------
+
+	mrs	r2, cpsr
+	bic	r2, r2, #0xdf		@ \__
+	orr	r2, r2, #0x1f		@ /  --> Enable IRQ & FIQ. Set CPU mode to System.
+	msr	cpsr,r2
+
+	str	r0, [r3, #0x0214]	@ IF Clear
+	
+	push	{lr}
+	adr	lr, IntrRet
+	bx	r1
+
+@---------------------------------------------------------------------------------
+IntrRet:
+@---------------------------------------------------------------------------------
+	mov	r3, #0x4000000		@ REG_BASE
+	str	r3, [r3, #0x208]	@ disable IME
+	pop	{lr}
+
+	mrs	r3, cpsr
+	bic	r3, r3, #0xdf		@ \__
+	orr	r3, r3, #0x92		@ /  --> Disable IRQ. Enable FIQ. Set CPU mode to IRQ.
+	msr	cpsr, r3
+
+	ldmfd   sp!, {r0-r1,r3,lr}	@ {spsr, IME, REG_BASE, lr_irq}
+	msr	spsr, r0		@ restore spsr
+	str	r1, [r3, #0x208]	@ restore REG_IME
+	mov	pc,lr
+
+	.pool
+	.end