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

	* block/block.c, console/console.c, dswifi/arm9/source/sgIP.h,
	dswifi/arm9/source/sgIP_ARP.h, dswifi/arm9/source/sgIP_Config.h,
	dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.h,
	dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.h,
	dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.h,
	dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.h,
	dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
	dswifi/include/dswifi7.h, dswifi/include/dswifi9.h, fb/fb.c,
	include/my_ipc.h, libfat/source/disc_io/disc_io.h,
	libfat/source/disc_io/io_nmmc.c,
	libnds/include/nds/arm9/exceptions.h,
	libnds/include/nds/arm9/input.h, libnds/include/nds/arm9/ndsmotion.h,
	libnds/include/nds/arm9/videoGL.h, libnds/source/arm9/console.c,
	libnds/source/arm9/gurumeditation.c, libnds/source/arm9/ndsmotion.c,
	libnds/source/common/card.c, libnds/source/common/interrupts.c,
	sound/sound.c, startup/start.c, touchscreen/reco.h, wifi/compat.c,
	wifi/compat.h: Fix most warnings.

5 files changed, 158 insertions, 20 deletions

diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c
index 47ff72df27..f9ae38de45 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c
@@ -278,7 +278,6 @@ int con_write(struct _reent *r,int fd,const char *ptr,int len) {
 
 const devoptab_t dotab_stdout = {
 	"con",
-	0,
 	NULL,
 	NULL,
 	con_write,
@@ -401,7 +400,7 @@ void consoleInitDefault(u16* map, u16* charBase, u8 bitDepth) {
 //}
 
 //---------------------------------------------------------------------------------
-static void newRow() {
+static void newRow(void) {
 //---------------------------------------------------------------------------------
 	int i;
 	row++;
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c
index 8209be6fa1..5f0bc15786 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c
@@ -32,6 +32,7 @@
 #include <nds/arm9/background.h>
 
 #include <stdio.h>
+#include <inttypes.h>
 
 //---------------------------------------------------------------------------------
 unsigned long ARMShift(unsigned long value,unsigned char shift) {
@@ -206,7 +207,7 @@ static const char *registerNames[] =
 
 extern const char __itcm_start[];
 //---------------------------------------------------------------------------------
-static void defaultHandler() {
+static void defaultHandler(void) {
 //---------------------------------------------------------------------------------
 	videoSetMode(0);
 	videoSetModeSub(MODE_0_2D | DISPLAY_BG0_ACTIVE);
@@ -246,18 +247,18 @@ static void defaultHandler() {
 		exceptionAddress = codeAddress;
 	}
 
-	iprintf("  pc: %08X addr: %08X\n\n",codeAddress,exceptionAddress);
+	iprintf("  pc: %08" PRIX32 " addr: %08" PRIX32 "\n\n",codeAddress,exceptionAddress);
 
 	int i;
 	for ( i=0; i < 8; i++ ) {
-		iprintf(	"  %s: %08X   %s: %08X\n",
+		iprintf(	"  %s: %08" PRIX32 "   %s: %08" PRIX32 "\n",
 					registerNames[i], exceptionRegisters[i],
 					registerNames[i+8],exceptionRegisters[i+8]);
 	}
 	iprintf("\n");
 	u32 *stack = (u32 *)exceptionRegisters[13];
 	for ( i=0; i<10; i++ ) {
-		iprintf( "\x1b[%d;2H%08X: %08X %08X", i + 14, (u32)&stack[i*2],stack[i*2], stack[(i*2)+1] );
+		iprintf( "\x1b[%d;2H%08" PRIX32 ": %08" PRIX32 " %08" PRIX32 "", i + 14, (u32)&stack[i*2],stack[i*2], stack[(i*2)+1] );
 	}
 	while(1);
 
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c
index 830329fe11..bd41e7cf5f 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c
@@ -64,7 +64,7 @@ unsigned char motion_spi(unsigned char in_byte){
 }
 
 
-void motion_MK6_sensor_mode() {
+void motion_MK6_sensor_mode(void) {
 	// send some commands on the SPI bus
 	SPI_On()
 	motion_spi(0xFE);
@@ -80,7 +80,7 @@ void motion_MK6_sensor_mode() {
 	SPI_Off()
 }
 
-void motion_MK6_EEPROM_mode() {
+void motion_MK6_EEPROM_mode(void) {
 	// send some commands on the SPI bus
 	SPI_On()
 	motion_spi(0xFE);
@@ -97,7 +97,7 @@ void motion_MK6_EEPROM_mode() {
 }
 
 // checks whether a DS Motion Pak is plugged in
-int motion_pak_is_inserted(){
+int motion_pak_is_inserted(void){
     int motion_pak = 0;
 	unsigned char return_byte = V_SRAM[10]; // read first byte of DS Motion Pak check
 	swiDelay(WAIT_CYCLES);
@@ -116,7 +116,7 @@ int motion_pak_is_inserted(){
 // checks whether a DS Motion Card is plugged in
 // this only works after motion_init()
 // it will return false if it is run before motion_init()
-int motion_card_is_inserted(){
+int motion_card_is_inserted(void){
 	// send 0x03 to read from DS Motion Card control register
 	SPI_On()
 	motion_spi(0x03); // command to read from control register
@@ -167,7 +167,7 @@ int motion_enable(int card_type) {
 // Determines which DS Motion Sensor is present
 // Turns it on
 // Does not require knowing which type is present
-int motion_init() {
+int motion_init(void) {
 	sysSetBusOwners(true, true);
 	// first, check for the DS Motion Pak - type 1
 	if( motion_pak_is_inserted() == 1 )
@@ -195,7 +195,7 @@ int motion_init() {
 // In the case of a DS Motion Pak, do nothing - there is nothing to de-init
 // In the case of a DS Motion Card, turns off the accelerometer
 // In the case of an MK6, turns off accelerometer and switches out of sensor mode into EEPROM mode
-void motion_deinit() {
+void motion_deinit(void) {
 	// DS Motion Card - turn off accelerometer
 	SPI_On()
 	motion_spi(0x04); // command to write to control register
@@ -245,7 +245,7 @@ signed int motion_read_x(void) {
 }
 
 // read the Y acceleration
-signed int motion_read_y() {
+signed int motion_read_y(void) {
 	unsigned char High_byte = 0;
 	unsigned char Low_byte = 0;
 	signed int output = 0;
@@ -432,7 +432,7 @@ void motion_set_offs_gyro(void){
 	calibration.goff = motion_read_gyro();
 }
 
-MotionCalibration* motion_get_calibration(){
+MotionCalibration* motion_get_calibration(void){
 	return &calibration;
 }
 
@@ -448,21 +448,21 @@ void motion_set_calibration(MotionCalibration* cal){
 }
 
 // enable analog input number 1 (ain_1)
-void motion_enable_ain_1(){
+void motion_enable_ain_1(void){
 	unsigned char return_byte;
     return_byte = V_SRAM[16];
 	swiDelay(WAIT_CYCLES);
 }
 
 // enable analog input number 2 (ain_2)
-void motion_enable_ain_2(){
+void motion_enable_ain_2(void){
 	unsigned char return_byte;
     return_byte = V_SRAM[18];
 	swiDelay(WAIT_CYCLES);
 }
 
 // read from the analog input number 1 - requires enabling ain_1 first
-int motion_read_ain_1(){
+int motion_read_ain_1(void){
 	unsigned char High_byte = V_SRAM[12]; // Command to load AIN_1 High onto bus
 	swiDelay(WAIT_CYCLES); // wait for data ready
 	High_byte = V_SRAM[0]; // get the high byte
@@ -474,7 +474,7 @@ int motion_read_ain_1(){
 }
 
 // read from the analog input number 2 - requires enabling ain_2 first
-int motion_read_ain_2(){
+int motion_read_ain_2(void){
 	unsigned char High_byte = V_SRAM[14]; // Command to load AIN_1 High onto bus
 	swiDelay(WAIT_CYCLES); // wait for data ready
 	High_byte = V_SRAM[0]; // get the high byte
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 6990380471..a0932a3a4e 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
@@ -118,7 +118,7 @@ int cardReadID(uint32 flags) {
 
 
 //---------------------------------------------------------------------------------
-static inline void EepromWaitBusy()	{
+static inline void EepromWaitBusy(void)	{
 //---------------------------------------------------------------------------------
 	while (CARD_CR1 & /*BUSY*/0x80);
 }
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c b/c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c
index 6d49e6f89f..2c30b91bac 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c
@@ -22,6 +22,144 @@
 		distribution.
 
 	$Log$
+	Revision 1.1  2008/04/16 18:37:33  joel
+	2008-04-16	Matthieu Bucchianeri <mbucchia@gmail.com>
+	
+		* ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+		mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+		clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+		coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+		dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+		dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+		dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+		dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+		dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+		dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+		dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+		dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+		dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+		dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+		dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+		dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+		dswifi/arm9/source/sgIP_memblock.h,
+		dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+		dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+		dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+		dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+		dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+		dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+		dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+		fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+		include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+		libfat/gba/include/fat.h, libfat/include/fat.h,
+		libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+		libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+		libfat/source/directory.c, libfat/source/directory.h,
+		libfat/source/fatdir.c, libfat/source/fatdir.h,
+		libfat/source/fatfile.c, libfat/source/fatfile.h,
+		libfat/source/file_allocation_table.c,
+		libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+		libfat/source/filetime.h, libfat/source/libfat.c,
+		libfat/source/mem_allocate.h, libfat/source/partition.c,
+		libfat/source/partition.h, libfat/source/disc_io/disc.c,
+		libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+		libfat/source/disc_io/io_cf_common.c,
+		libfat/source/disc_io/io_cf_common.h,
+		libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+		libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+		libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+		libfat/source/disc_io/io_m3_common.c,
+		libfat/source/disc_io/io_m3_common.h,
+		libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+		libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+		libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+		libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+		libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+		libfat/source/disc_io/io_sc_common.c,
+		libfat/source/disc_io/io_sc_common.h,
+		libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+		libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+		libfat/source/disc_io/io_scsd_s.s,
+		libfat/source/disc_io/io_sd_common.c,
+		libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+		libnds/Makefile.arm9, libnds/libnds_license.txt,
+		libnds/basicARM7/source/defaultARM7.c,
+		libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+		libnds/include/nds.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/memory.h,
+		libnds/include/nds/registers_alt.h, libnds/include/nds/reload.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/background.h,
+		libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+		libnds/include/nds/arm9/console.h,
+		libnds/include/nds/arm9/exceptions.h,
+		libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+		libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+		libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+		libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+		libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.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/spi.c,
+		libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+		libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+		libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+		libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+		libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+		libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+		libnds/source/arm9/default_font.s,
+		libnds/source/arm9/exceptionHandler.S,
+		libnds/source/arm9/exceptionHandler.s,
+		libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+		libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+		libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+		libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+		libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+		libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+		libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+		libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+		libnds/source/common/gbfs.c,
+		libnds/source/common/interruptDispatcher.s,
+		libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+		sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+		timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+		tools/configure.ac, tools/runtest,
+		tools/ndstool/include/arm7_sha1_homebrew.h,
+		tools/ndstool/include/arm7_sha1_nintendo.h,
+		tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+		tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+		tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+		tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+		tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+		tools/ndstool/include/ndscreate.h,
+		tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+		tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+		tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+		tools/ndstool/include/passme_vhd1.h,
+		tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+		tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+		tools/ndstool/source/arm7_sha1_homebrew.c,
+		tools/ndstool/source/arm7_sha1_nintendo.c,
+		tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+		tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+		tools/ndstool/source/default_icon.c,
+		tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+		tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+		tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+		tools/ndstool/source/ndscreate.cpp,
+		tools/ndstool/source/ndsextract.cpp,
+		tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+		tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+		tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+		touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+		touchscreen/reco.h, touchscreen/touchscreen.c,
+		touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+		New files.
+	
 	Revision 1.10  2007/02/06 12:00:32  wntrmute
 	use uint32 for irqEnable
 	
@@ -55,7 +193,7 @@
 #include <nds/interrupts.h>
 #include <nds/system.h>
 
-void IntrMain();	// Prototype for assembly interrupt dispatcher
+void IntrMain(void);	// Prototype for assembly interrupt dispatcher
 
 //---------------------------------------------------------------------------------
 void irqDummy(void) {}