Wiimote: Add wireless controller syncing functionality

gc/bte/bd_addr.h

@@ -39,12 +39,12 @@
    extern "C" {
 #endif /* __cplusplus */
 
+#define BD_ADDR_LEN	6
+
 struct bd_addr {
-  u8 addr[6];
+  u8 addr[BD_ADDR_LEN];
 };
 
-#define BD_ADDR_LEN			6
-
 #define BD_ADDR_ANY			(&(struct bd_addr){{0,0,0,0,0,0}})
 #define BD_ADDR_LOCAL		(&(struct bd_addr){{0,0,0,0xff,0xff,0xff}})
 

gc/bte/bte.h

@@ -66,6 +66,7 @@
 #define HIDP_PROTO_BOOT				0x00
 #define HIDP_PROTO_REPORT			0x01
 
+#define BD_LINK_KEY_LEN     		16
 #define BD_NAME_LEN     			248
 #define BD_MAX_INQUIRY_DEVS			255
 
@@ -105,7 +106,7 @@ struct inquiry_res
 struct linkkey_info
 {
 	struct bd_addr bdaddr;
-	u8 key[16];
+	u8 key[BD_LINK_KEY_LEN];
 };
 
 struct pad_name_info
@@ -172,12 +173,8 @@ void bte_disconnected(struct bte_pcb *pcb,s32 (disconn_cfm)(void *arg,struct bte
 
 s32 bte_disconnect(struct bte_pcb *pcb);
 
-//s32 bte_listen(struct bte_pcb *pcb,struct bd_addr *bdaddr,u8 psm);
-//s32 bte_accept(struct bte_pcb *pcb,s32 (*recv)(void *arg,void *buffer,u16 len));
 s32 bte_listenasync(struct bte_pcb *pcb,struct bd_addr *bdaddr,s32 (*conn_cfm)(void *arg,struct bte_pcb *pcb,u8 err));
 s32 bte_listenasync_step2(struct bte_pcb *pcb,s32 (*conn_cfm)(void *arg,struct bte_pcb *pcb,u8 err));
-//s32 bte_connect(struct bte_pcb *pcb,struct bd_addr *bdaddr,u8 psm,s32 (*recv)(void *arg,void *buffer,u16 len));
-//s32 bte_connect_ex(struct bte_pcb *pcb,struct inquiry_info_ex *info,u8 psm,s32 (*recv)(void *arg,void *buffer,u16 len));
 s32 bte_connectasync(struct bte_pcb *pcb,struct bd_addr *bdaddr,s32 (*conn_cfm)(void *arg,struct bte_pcb *pcb,u8 err));
 s32 bte_connectasync_step2(struct bte_pcb *pcb,s32 (*conn_cfm)(void *arg,struct bte_pcb *pcb,u8 err));
 s32 bte_senddata(struct bte_pcb *pcb,void *message,u16 len);

gc/ogc/conf.h

@@ -165,6 +165,7 @@ struct _conf_pad_guests {
 } ATTRIBUTE_PACKED;
 
 s32 CONF_Init(void);
+s32 CONF_SaveChanges(void);
 s32 CONF_GetLength(const char *name);
 s32 CONF_GetType(const char *name);
 s32 CONF_Get(const char *name, void *buffer, u32 length);
@@ -182,7 +183,9 @@ s32 CONF_GetCounterBias(u32 *bias);
 s32 CONF_GetScreenSaverMode(void);
 s32 CONF_GetDisplayOffsetH(s8 *offset);
 s32 CONF_GetPadDevices(conf_pads *pads);
+s32 CONF_SetPadDevices(const conf_pads *pads);
 s32 CONF_GetPadGuestDevices(conf_pad_guests *pads);
+s32 CONF_SetPadGuestDevices(const conf_pad_guests *pads);
 s32 CONF_GetNickName(u8 *nickname);
 s32 CONF_GetAspectRatio(void);
 s32 CONF_GetEULA(void);
@@ -193,10 +196,6 @@ s32 CONF_GetRegion(void);
 s32 CONF_GetArea(void);
 s32 CONF_GetVideo(void);
 
-s32 CONF_SetPadDevices(const conf_pads *pads);
-s32 CONF_SetPadGuestDevices(const conf_pad_guests *pads);
-s32 CONF_SaveChanges(void);
-
 #ifdef __cplusplus
    }
 #endif /* __cplusplus */

gc/wiiuse/wiiuse.h

@@ -724,7 +724,6 @@ WIIUSE_EXPORT extern int wiiuse_write_streamdata(struct wiimote_t *wm,ubyte *dat
 
 /* connect.c */
 WIIUSE_EXPORT extern int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int timeout);
-//WIIUSE_EXPORT extern int wiiuse_connect(struct wiimote_t** wm, int wiimotes);
 WIIUSE_EXPORT extern void wiiuse_disconnect(struct wiimote_t* wm);
 
 /* events.c */

libogc/conf.c

@@ -1,9 +1,11 @@
 /*-------------------------------------------------------------
 
-conf.c -- SYSCONF support
+conf.c -- SYSCONF & setting.txt support
 
-Copyright (C) 2008
+Copyright (C) 2008-2025
 Hector Martin (marcan)
+tona
+Zarithya
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any
@@ -31,17 +33,18 @@ distribution.
 #include <stdio.h>
 #include <string.h>
 #include <malloc.h>
-#include <gcbool.h>
 #include "ipc.h"
 #include "asm.h"
 #include "processor.h"
 #include "conf.h"
 
+#define CONF_FILE_SIZE 0x4000
+#define CONF_TXT_FILE_SIZE 0x100
 
 static int __conf_inited = 0;
-static u8 __conf_buffer[0x4000] ATTRIBUTE_ALIGN(32);
-static char __conf_txt_buffer[0x101] ATTRIBUTE_ALIGN(32);
-static int __conf_buffer_dirty = FALSE;
+static u8 __conf_buffer[CONF_FILE_SIZE] ATTRIBUTE_ALIGN(32);
+static char __conf_txt_buffer[CONF_TXT_FILE_SIZE + 1] ATTRIBUTE_ALIGN(32);
+static int __conf_buffer_dirty = false;
 
 static const char __conf_file[] ATTRIBUTE_ALIGN(32) = "/shared2/sys/SYSCONF";
 static const char __conf_txt_file[] ATTRIBUTE_ALIGN(32) = "/title/00000001/00000002/data/setting.txt";
@@ -51,7 +54,7 @@ void __CONF_DecryptTextBuffer(void)
 	u32 key = 0x73B5DBFA;
 	int i;
 
-	for(i=0; i<0x100; i++) {
+	for(i=0; i<CONF_TXT_FILE_SIZE; i++) {
 		__conf_txt_buffer[i] ^= key & 0xff;
 		key = (key<<1) | (key>>31);
 	}
@@ -67,19 +70,19 @@ s32 CONF_Init(void)
 	fd = IOS_Open(__conf_file,1);
 	if(fd < 0) return fd;
 
-	memset(__conf_buffer,0,0x4000);
-	memset(__conf_txt_buffer,0,0x101);
+	memset(__conf_buffer,0,CONF_FILE_SIZE);
+	memset(__conf_txt_buffer,0,CONF_TXT_FILE_SIZE + 1);
 
-	ret = IOS_Read(fd, __conf_buffer, 0x4000);
+	ret = IOS_Read(fd, __conf_buffer, CONF_FILE_SIZE);
 	IOS_Close(fd);
-	if(ret != 0x4000) return CONF_EBADFILE;
+	if(ret != CONF_FILE_SIZE) return CONF_EBADFILE;
 
 	fd = IOS_Open(__conf_txt_file,1);
 	if(fd < 0) return fd;
 
-	ret = IOS_Read(fd, __conf_txt_buffer, 0x100);
+	ret = IOS_Read(fd, __conf_txt_buffer, CONF_TXT_FILE_SIZE);
 	IOS_Close(fd);
-	if(ret != 0x100) return CONF_EBADFILE;
+	if(ret != CONF_TXT_FILE_SIZE) return CONF_EBADFILE;
 
 	if(memcmp(__conf_buffer, "SCv0", 4)) return CONF_EBADFILE;
 
@@ -98,7 +101,7 @@ int __CONF_GetTxt(const char *name, char *buf, int length)
 
 	if(!__conf_inited) return CONF_ENOTINIT;
 
-	while(line < (__conf_txt_buffer+0x100) ) {
+	while(line < (__conf_txt_buffer+CONF_TXT_FILE_SIZE) ) {
 		delim = strchr(line, '=');
 		if(delim && ((delim - line) == nlen) && !memcmp(name, line, nlen)) {
 			delim++;
@@ -117,7 +120,7 @@ int __CONF_GetTxt(const char *name, char *buf, int length)
 		}
 
 		// skip to line end
-		while(line < (__conf_txt_buffer+0x100) && *line++ != '\n');
+		while(line < (__conf_txt_buffer+CONF_TXT_FILE_SIZE) && *line++ != '\n');
 	}
 	return CONF_ENOENT;
 }
@@ -238,7 +241,7 @@ s32 CONF_Set(const char *name, const void *buffer, u32 length)
 		default:
 			return CONF_ENOTIMPL;
 	}
-	__conf_buffer_dirty = TRUE;
+	__conf_buffer_dirty = true;
 	return len;
 }
 
@@ -256,12 +259,12 @@ int __CONF_WriteBuffer(void)
 	if (fd < 0)
 		return fd;
 
-	ret = IOS_Write(fd, __conf_buffer, 0x4000);
+	ret = IOS_Write(fd, __conf_buffer, CONF_FILE_SIZE);
 	IOS_Close(fd);
-	if (ret != 0x4000)
+	if (ret != CONF_FILE_SIZE)
 		return CONF_EBADFILE;
 
-	__conf_buffer_dirty = FALSE;
+	__conf_buffer_dirty = false;
 	return 0;
 }
 
@@ -274,10 +277,6 @@ s32 CONF_SaveChanges(void)
 	if (ret < 0)
 		return ret;
 
-	/*ret = __CONF_WriteTxtBuffer();
-	if (ret < 0)
-		return ret;*/
-
 	return CONF_ERR_OK;
 }