Wii-Linux · ThatsItForTheOtherOne · Oct 10, 2023 · Oct 10, 2023 · Oct 10, 2023 · Oct 10, 2023
diff --git a/arch/powerpc/configs/wii_defconfig b/arch/powerpc/configs/wii_defconfig
@@ -1,3 +1,4 @@
+CONFIG_PANIC_TIMEOUT=10
 CONFIG_LOCALVERSION="-wii"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
@@ -15,11 +16,12 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_EMBEDDED6xx=y
 CONFIG_GAMECUBE_UDBG=y
 CONFIG_WII=y
+CONFIG_STARLET_MINI=y
 # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
 CONFIG_PREEMPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyUSB0,115200 root=/dev/sda1 force_keyboard_port=4 loader=ios nobats rootwait video=gcnfb:progressive,60Hz,TV=NTSC"
+CONFIG_CMDLINE="console=ttyUSB0,115200 root=/dev/sda1 force_keyboard_portconsole=ttyUSB0,115200 root=/dev/sda1 force_keyboard_port=4 loader=ios video=gcnfb:progressive,60Hz,TV=NTSC loglevel=5 rootwait nobats"
 CONFIG_CMDLINE_FORCE=y
 # CONFIG_SECCOMP is not set
 CONFIG_ADVANCED_OPTIONS=y
@@ -48,11 +50,12 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_GAMECUBE_SD=y
 CONFIG_WII_MEM2=y
-CONFIG_WII_SD=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_NBD=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
 CONFIG_NETDEVICES=y
 CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=y
@@ -63,7 +66,6 @@ CONFIG_B43=y
 CONFIG_B43_SDIO=y
 # CONFIG_B43_PHY_LP is not set
 CONFIG_B43_DEBUG=y
-CONFIG_INPUT_FF_MEMLESS=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
@@ -76,19 +78,17 @@ CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_SERPORT is not set
-CONFIG_GAMECUBE_SI=y
 CONFIG_LEGACY_PTY_COUNT=64
 # CONFIG_DEVKMEM is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_NVRAM=y
-CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_GPIO=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
 CONFIG_SSB_DEBUG=y
 CONFIG_FB=y
+CONFIG_FB_GAMECUBE=y
 CONFIG_FB_SIMPLE=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -104,13 +104,11 @@ CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_GAMECUBE=y
 CONFIG_SND_GAMECUBE_MIC=y
 # CONFIG_SND_USB is not set
-CONFIG_SOUND_PRIME=y
-CONFIG_HID_APPLE=m
 CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_WII_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_UAS=y
 CONFIG_USB_SERIAL=y

diff --git a/arch/powerpc/include/asm/starlet-ios.h b/arch/powerpc/include/asm/starlet-ios.h
@@ -28,6 +28,8 @@
 #define STARLET_TITLE_HBC_HAXX	0x0001000148415858ULL
 #define STARLET_TITLE_HBC_JODI	0x000100014A4F4449ULL
 #define STARLET_TITLE_HBC_V107	0x00010001AF1BF516ULL	/* HBC v1.0.7+ */
+#define STARLET_TITLE_HBC_LULZ	0x000100014C554C5AULL	/* LULZ */
+#define STARLET_TITLE_HBC_OHBC	0x000100014F484243ULL	/* Open HBC */
 
 #define STARLET_EINVAL	-4
 

diff --git a/arch/powerpc/platforms/embedded6xx/starlet-es.c b/arch/powerpc/platforms/embedded6xx/starlet-es.c
@@ -133,6 +133,7 @@ EXPORT_SYMBOL_GPL(starlet_es_get_device);
 
 /*
  *
+ */
 static int starlet_es_get_title_count(unsigned long *count)
 {
 	struct starlet_es_device *es_dev = starlet_es_get_device();
@@ -188,7 +189,7 @@ static int starlet_es_get_titles(u64 *titles, unsigned long count)
 	es_small_buf_put(count_buf);
 
 	return error;
-}*/
+}
 
 /*
  * This call may be used in a non-sleeping context
@@ -396,7 +397,7 @@ static int starlet_es_reload_ios(struct starlet_es_device *es_dev)
 		error = starlet_es_reopen(es_dev);
 
 	if (error)
-		DBG("%s: error=%d (%08x)\n", __func__, error, error);
+		drv_printk(KERN_ERR, "%s: error=%d (%08x)\n", __func__, error, error);
 	return error;
 }
 
@@ -449,7 +450,7 @@ int starlet_es_reload_ios_and_launch(u64 title)
 }
 EXPORT_SYMBOL_GPL(starlet_es_reload_ios_and_launch);
 
-/*static int starlet_es_find_newest_title(struct starlet_es_device *es_dev,
+static int starlet_es_find_newest_title(struct starlet_es_device *es_dev,
 					u64 *title,
 					u64 title_min, u64 title_max)
 {
@@ -513,7 +514,7 @@ static int starlet_es_load_preferred_ios(struct starlet_es_device *es_dev,
 	}
 
 	return error;
-}*/
+}
 
 static int starlet_nwc24_stop_scheduler(void)
 {
@@ -552,11 +553,11 @@ static int starlet_es_init(struct starlet_es_device *es_dev)
 		ios_min = 0x100000000ULL | STARLET_ES_IOS_MIN;
 		ios_max = 0x100000000ULL | STARLET_ES_IOS_MAX;
 
-		// error = starlet_es_load_preferred_ios(es_dev, ios_min, ios_max);
-		// if (error)
-		//	drv_printk(KERN_WARNING, "unable to load preferred"
-		//		   " IOS version (min %llx, max %llx)\n",
-		//		   ios_min, ios_max);
+		error = starlet_es_load_preferred_ios(es_dev, ios_min, ios_max);
+		if (error) {
+			drv_printk(KERN_EMERG, "unable to load preferred IOS version (min %llx, max %llx)\n", ios_min, ios_max);
+			panic("starlet-es: Failed to load IOS version between %llx and %llx", ios_min, ios_max);
+		}
 	}
 
 	/*

diff --git a/arch/powerpc/platforms/embedded6xx/starlet-ipc.c b/arch/powerpc/platforms/embedded6xx/starlet-ipc.c
@@ -16,6 +16,7 @@
 
 /*#define DBG(fmt, arg...)	pr_debug(fmt, ##arg)*/
 #define DBG(fmt, arg...)	drv_printk(KERN_INFO, fmt, ##arg)
+#define ERR(fmt, arg...)	drv_printk(KERN_ERR, fmt, ##arg)
 
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -553,7 +554,7 @@ static int _starlet_open(const char *pathname, int flags,
 		starlet_ipc_free_request(req);
 	}
 	if (error < 0)
-		DBG("%s: %s: error=%d (%x)\n", __func__, pathname,
+		ERR("%s: %s: error=%d (%x)\n", __func__, pathname,
 		    error, error);
 	return error;
 }
@@ -1388,6 +1389,9 @@ static void starlet_fixups(void)
 		starlet_ioctlv(fd, 0, 6, in, 1, io);
 		starlet_close(fd);
 	}
+	else {
+		drv_printk(KERN_ERR, "failed to disconnect wiimotes");
+	}
 
 	/*
 	 * Try to turn off the front led and sensor bar.

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -183,6 +183,8 @@ static void wii_restart(char *cmd)
 	local_irq_disable();
 
 	/* try first to launch The Homebrew Channel... */
+	starlet_es_reload_ios_and_launch(STARLET_TITLE_HBC_OHBC);
+	starlet_es_reload_ios_and_launch(STARLET_TITLE_HBC_LULZ);
 	starlet_es_reload_ios_and_launch(STARLET_TITLE_HBC_V107);
 	starlet_es_reload_ios_and_launch(STARLET_TITLE_HBC_JODI);
 	starlet_es_reload_ios_and_launch(STARLET_TITLE_HBC_HAXX);

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
@@ -236,7 +236,7 @@ config USB_EHCI_HCD_PPC_OF
 
 config USB_EHCI_HCD_HLWD
 	bool "Nintendo Wii (Hollywood) EHCI USB controller support"
-	depends on USB_EHCI_HCD && STARLET_MINI
+	depends on USB_EHCI_HCD && WII
 	default y
 	---help---
 	  Say Y here to support the EHCI USB controller found in the
@@ -509,7 +509,7 @@ config USB_OHCI_HCD_PPC_OF
 
 config USB_OHCI_HCD_HLWD
 	bool "Nintendo Wii (Hollywood) OHCI USB controller support"
-	depends on USB_OHCI_HCD && STARLET_MINI
+	depends on USB_OHCI_HCD && WII
 	select USB_OHCI_LITTLE_ENDIAN
 	default y
 	---help---

diff --git a/drivers/usb/host/ehci-hlwd.c b/drivers/usb/host/ehci-hlwd.c
@@ -49,6 +49,10 @@ static int ehci_hlwd_reset(struct usb_hcd *hcd)
 	dbg_hcs_params(ehci, "reset");
 	dbg_hcc_params(ehci, "reset");
 
+
+
+	spin_lock_init(&ehci->lock);
+
 	error = ehci_halt(ehci);
 	if (error)
 		goto out;