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.

1 files changed, 73 insertions, 73 deletions

diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/touch.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/touch.h
index 059a5de173..9bf7a71556 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/touch.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/touch.h
@@ -1,73 +1,73 @@
-/*---------------------------------------------------------------------------------

-	$Id$

-

-	Microphone control for the ARM7

-

-	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.

-

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

-#ifndef ARM7_TOUCH_INCLUDE

-#define ARM7_TOUCH_INCLUDE

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

-

-

-#ifndef ARM7

-#error Touch screen is only available on the ARM7

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#include <nds/arm7/serial.h>

-

-

-#define SCREEN_WIDTH	256

-#define SCREEN_HEIGHT	192

-

-

-#define TSC_MEASURE_TEMP1    0x84

-#define TSC_MEASURE_Y        0x90

-#define TSC_MEASURE_BATTERY  0xA4

-#define TSC_MEASURE_Z1       0xB4

-#define TSC_MEASURE_Z2       0xC4

-#define TSC_MEASURE_X        0xD0

-#define TSC_MEASURE_AUX      0xE4

-#define TSC_MEASURE_TEMP2    0xF4

-

-

-

-touchPosition touchReadXY();

-

-uint16 touchRead(uint32 command);

-uint32 touchReadTemperature(int * t1, int * t2);

-

-#ifdef __cplusplus

-}

-#endif

-

-

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

-#endif	// ARM7_TOUCH_INCLUDE

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

-

+/*---------------------------------------------------------------------------------
+	$Id$
+
+	Microphone control for the ARM7
+
+	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.
+
+---------------------------------------------------------------------------------*/
+#ifndef ARM7_TOUCH_INCLUDE
+#define ARM7_TOUCH_INCLUDE
+//---------------------------------------------------------------------------------
+
+
+#ifndef ARM7
+#error Touch screen is only available on the ARM7
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <nds/arm7/serial.h>
+
+
+#define SCREEN_WIDTH	256
+#define SCREEN_HEIGHT	192
+
+
+#define TSC_MEASURE_TEMP1    0x84
+#define TSC_MEASURE_Y        0x90
+#define TSC_MEASURE_BATTERY  0xA4
+#define TSC_MEASURE_Z1       0xB4
+#define TSC_MEASURE_Z2       0xC4
+#define TSC_MEASURE_X        0xD0
+#define TSC_MEASURE_AUX      0xE4
+#define TSC_MEASURE_TEMP2    0xF4
+
+
+
+touchPosition touchReadXY();
+
+uint16 touchRead(uint32 command);
+uint32 touchReadTemperature(int * t1, int * t2);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+//---------------------------------------------------------------------------------
+#endif	// ARM7_TOUCH_INCLUDE
+//---------------------------------------------------------------------------------
+