From b7526848079e4b6a69dcf5749edb26d05a385166 Mon Sep 17 00:00:00 2001
From: dborth <dborth@d154fe42-be53-0410-aac0-356034171556>
Date: Thu, 21 May 2009 05:58:19 +0000
Subject: [PATCH] minor fixes

---
 readme.txt                | 10 ++--------
 source/ngc/dvd.cpp        |  2 --
 source/ngc/input.cpp      |  4 ++--
 source/ngc/s9xsupport.cpp |  8 +-------
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/readme.txt b/readme.txt
index 606f789..11a3c6b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -7,7 +7,7 @@
 ::::::::::::::::/   /::--/_______\::.________/::::/   /:­::\   _  \::::::×:::
 :::::::°:::::::/___\:::::::::::::::::::::::::::::/   /::::/__/   \--::­::::::
 °:::::::::::::::::×:::::::::::::::°::::×:::::::::\--/::::::::::::::::::×:::::
-­———————————————————————————————————————————————————————————————————————•ßrK•
+­————————————————————————————————————————————————————————————————————————————
 
 ×—–­—–­—–­—–­ –­—–­—–­—–­—–­—–­—–­—–­—–­—–­— ­—–­—–­—–­—–­—–­—–­—–­—-­—–­-–•¬
 |0O×øo·                      Snes9x GX 4.0.4                          ·oø×O0|
@@ -23,9 +23,7 @@ currently being maintained by Tantric and michniewski.
 
 Snes9x GX is a "homebrew application" which means you will need a way to run
 unsigned code on your Nintendo Wii. The best website for getting started with
-Wii homebrew is WiiBrew (www.wiibrew.org). Also check out TehSkeen
-(www.tehskeen.com) for its support forums. Each site has information and 
-guides on how to install and get homebrew working on your Nintendo Wii.
+Wii homebrew is WiiBrew (www.wiibrew.org).
 
 •˜———–—––-- - —————————––––– ———–—––-- - —————————––––– ———–—––-- - ————————•
 |                                                                FEATURES  |
@@ -649,7 +647,6 @@ changes to the emulator settings again and save them.
                       Snes9x 1.51				Snes9x Team
                       libogc/devkitPPC			shagkur & wintermute
                       FreeTypeGX				Armin Tamzarian
-                      Documentation             brakken
 
 •˜———–—––-- - —————————––––– ———–—––-- - —————————––––– ———–—––-- - ————————•
 |                                                                   LINKS  |
@@ -660,9 +657,6 @@ changes to the emulator settings again and save them.
 							           
 											       Wii Homebrew Community
 											              www.wiibrew.org
-											             											
-											       SNES9X GX Support Site
-											             www.tehskeen.com
 
 											    Free (Public Domain) ROMs
 											                www.pdroms.de
diff --git a/source/ngc/dvd.cpp b/source/ngc/dvd.cpp
index fe877e3..d469c08 100644
--- a/source/ngc/dvd.cpp
+++ b/source/ngc/dvd.cpp
@@ -18,9 +18,7 @@
 #include <malloc.h>
 
 #ifdef HW_RVL
-extern "C" {
 #include <di/di.h>
-}
 #endif
 
 #include "snes9xGX.h"
diff --git a/source/ngc/input.cpp b/source/ngc/input.cpp
index 6643fd3..48d3dde 100644
--- a/source/ngc/input.cpp
+++ b/source/ngc/input.cpp
@@ -578,8 +578,8 @@ void NGCReportButtons ()
 			userInput[i].pad.btns_h & PAD_BUTTON_X &&
 			userInput[i].pad.btns_h & PAD_BUTTON_Y
 			) ||
-			(userInput[i].wpad.btns_d & WPAD_BUTTON_HOME) ||
-			(userInput[i].wpad.btns_d & WPAD_CLASSIC_BUTTON_HOME)
+			(userInput[i].wpad.btns_h & WPAD_BUTTON_HOME) ||
+			(userInput[i].wpad.btns_h & WPAD_CLASSIC_BUTTON_HOME)
 		)
 		{
 			ConfigRequested = 1; // go to the menu
diff --git a/source/ngc/s9xsupport.cpp b/source/ngc/s9xsupport.cpp
index 0a2a9ba..0a0e663 100644
--- a/source/ngc/s9xsupport.cpp
+++ b/source/ngc/s9xsupport.cpp
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <ogc/lwp_watchdog.h>
 
 #include "snes9x.h"
 #include "memmap.h"
@@ -41,13 +42,6 @@ extern u32 FrameTimer;
 long long prev;
 long long now;
 
-extern "C" {
-
-long long gettime();
-u32 diff_usec(long long start,long long end);
-
-}
-
 /*** Miscellaneous Functions ***/
 void
 S9xMessage (int /*type */ , int /*number */ , const char *message)