Properly wait for USB to close

Author: Zarithya

gc/bte/bte.h

@@ -141,7 +141,7 @@ typedef s32 (*btecallback)(s32 result,void *userdata);
 
 void BTE_Init(void);
 void BTE_Shutdown(void);
-void BTE_Stop(void);
+void BTE_Close(void);
 s32 BTE_InitCore(btecallback cb);
 s32 BTE_ApplyPatch(btecallback cb);
 s32 BTE_InitSub(btecallback cb);

lwbt/bte.c

@@ -399,7 +399,7 @@ void BTE_Init(void)
 	SYS_SetPeriodicAlarm(btstate.timer_svc,&tb,&tb,bt_alarmhandler, NULL);
 }
 
-void BTE_Stop(void)
+void BTE_Close(void)
 {
 	u32 level;
 
@@ -425,6 +425,7 @@ void BTE_Shutdown(void)
 	hci_cmd_complete(__bte_shutdown_finished);
 	hci_reset();
 	__bte_waitcmdfinish(&btstate);
+	LWP_CloseQueue(btstate.hci_cmdq);
 	_CPU_ISR_Restore(level);
 
 	physbusif_shutdown();

lwbt/physbusif.c

@@ -299,7 +299,9 @@ void physbusif_close(void)
 void physbusif_shutdown(void)
 {
 	if(__usbdev.openstate!=0x0004) return;
-	USB_CloseDeviceAsync(&__usbdev.fd,__usb_closeCB,NULL);
+	//USB_CloseDeviceAsync(&__usbdev.fd,__usb_closeCB,NULL);
+	USB_CloseDevice(&__usbdev.fd);
+	__usbdev.fd = -1;
 }
 
 void physbusif_reset_all(void)

wiiuse/io_wii.c

@@ -55,7 +55,7 @@ static s32 __wiiuse_disconnected(void *arg,struct bte_pcb *pcb,u8 err)
 
 	bte_free(wml->sock);
 	wml->sock = NULL;
-	
+
 	wml->wm = NULL;
 	return ERR_OK;
 }
@@ -131,25 +131,28 @@ int wiiuse_register(struct wiimote_listen_t *wml, struct bd_addr *bdaddr, struct
 	bd_addr_set(&(wml->bdaddr),bdaddr);
 	memset(wml->name, 0, sizeof(wml->name));
 	wml->assign_cb = assign_cb;
-	if(wml->sock==NULL)
+
+	if(wml->sock!=NULL)
 	{
-		printf("wml->sock was null\n");
-		wml->sock = bte_new();
+		printf("wiiuse_register: wml->sock was not NULL!\n");
+		return 0;
 	}
-	else
+
+	wml->sock = bte_new();
+	if (wml->sock==NULL)
 	{
-		printf("err: %d / state: %d / bdaddr: %02x:%02x:%02x:%02x:%02x:%02x\n", wml->sock->err, wml->sock->state, wml->sock->bdaddr.addr[5], wml->sock->bdaddr.addr[4], wml->sock->bdaddr.addr[3], wml->sock->bdaddr.addr[2], wml->sock->bdaddr.addr[1], wml->sock->bdaddr.addr[0]);
-		bte_free(wml->sock);
-		wml->sock = bte_new();
+		printf("wiiuse_register: bte_new failed to alloc new sock\n");
+		return 0;
 	}
-
+	
 	bte_arg(wml->sock,wml);
 	bte_received(wml->sock,__wiiuse_receive);
 	bte_disconnected(wml->sock,__wiiuse_disconnected);
 
 	err = bte_registerdeviceasync(wml->sock,bdaddr,__wiiuse_connected);
 	if(err==ERR_OK) return 1;
-
+	
+	printf("wiiuse_register: bte_registerdeviceasync failed(%d)\n", err);
 	return 0;
 }	
 
@@ -166,9 +169,20 @@ int wiiuse_connect(struct wiimote_listen_t *wml, struct bd_addr *bdaddr, u8 *nam
 	strncpy((char *)wml->name, (char *)name, sizeof(wml->name));
 	wml->name[sizeof(wml->name) - 1] = 0x00;
 	wml->assign_cb = assign_cb;
-	if(wml->sock==NULL)
-		wml->sock = bte_new();
 
+	if(wml->sock!=NULL)
+	{
+		printf("wiiuse_connect: wml->sock was not NULL!\n");
+		return 0;
+	}
+
+	wml->sock = bte_new();
+	if (wml->sock==NULL)
+	{
+		printf("wiiuse_connect: bte_new failed to alloc new sock\n");
+		return 0;
+	}
+	
 	bte_arg(wml->sock,wml);
 	bte_received(wml->sock,__wiiuse_receive);
 	bte_disconnected(wml->sock,__wiiuse_disconnected);
@@ -177,7 +191,8 @@ int wiiuse_connect(struct wiimote_listen_t *wml, struct bd_addr *bdaddr, u8 *nam
 
 	err = bte_connectdeviceasync(wml->sock,bdaddr,__wiiuse_connected);
 	if(err==ERR_OK) return 1;
-
+	
+	printf("wiiuse_connect: bte_registerdeviceasync failed(%d)\n", err);
 	return 0;
 }	
 

wiiuse/wpad.c

@@ -1695,7 +1695,7 @@ s32 WPAD_Shutdown(void)
 	printf("WPAD_Shutdown\n");
 
 	_CPU_ISR_Disable(level);
-	BTE_Stop();
+	BTE_Close();
 
 	CONF_SetPadDevices(&__wpad_devs);
 	CONF_SetPadGuestDevices(&__wpad_guests);
@@ -1708,17 +1708,11 @@ s32 WPAD_Shutdown(void)
 		SYS_RemoveAlarm(wpdcb->sound_alarm);
 		bte_free(__wpads_listen[i].sock);
 		__wpads_listen[i].sock = NULL;
-		//__wpad_disconnect(wpdcb);
 	}
 
 	__wiiuse_sensorbar_enable(0);
 	_CPU_ISR_Restore(level);
 
-	/*while(__wpads_used) {
-		usleep(50);
-		if(++cnt > 3000) break;
-	}*/
-
 	BTE_Shutdown();
 
 	return err;