ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added the 3 WFC profiles with their CRC16's, now Mario Kart boots a bit more (the next problem for it seems to be a DMA timing problem).

This commit is contained in:
luigi__ 2008-12-19 18:10:03 +00:00
parent 7a64ad3286
commit 6e39973723
3 changed files with 105 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
desmume/src/NDSSystem.cpp
View File

@ -779,12 +779,12 @@ int NDS_CreateDummyFirmware( struct NDS_fw_config_data *user_settings)
/* /*
* User settings (at 0x3FE00 and 0x3FE00) * User settings (at 0x3FE00 and 0x3FF00)
*/ */
fill_user_data_area( user_settings, &MMU.fw.data[ 0x3FE00], 0); fill_user_data_area( user_settings, &MMU.fw.data[ 0x3FE00], 0);
fill_user_data_area( user_settings, &MMU.fw.data[ 0x3FF00], 1); fill_user_data_area( user_settings, &MMU.fw.data[ 0x3FF00], 1);
/* Config length */ /* Wifi config length */
MMU.fw.data[0x2C] = 0x38; MMU.fw.data[0x2C] = 0x38;
MMU.fw.data[0x2D] = 0x01; MMU.fw.data[0x2D] = 0x01;
@ -824,16 +824,20 @@ int NDS_CreateDummyFirmware( struct NDS_fw_config_data *user_settings)
memcpy((MMU.fw.data + 0x146), FW_BBChannel, sizeof(FW_BBChannel)); memcpy((MMU.fw.data + 0x146), FW_BBChannel, sizeof(FW_BBChannel));
memset((MMU.fw.data + 0x154), 0x10, 0xE); memset((MMU.fw.data + 0x154), 0x10, 0xE);
/* WFC profile */ /* WFC profiles */
memcpy((MMU.fw.data + 0x3FA40), FW_WFCProfile, sizeof(FW_WFCProfile)); memcpy((MMU.fw.data + 0x3FA40), &FW_WFCProfile1, sizeof(FW_WFCProfile));
memcpy((MMU.fw.data + 0x3FB40), &FW_WFCProfile2, sizeof(FW_WFCProfile));
memcpy((MMU.fw.data + 0x3FC40), &FW_WFCProfile3, sizeof(FW_WFCProfile));
(*(u16*)(MMU.fw.data + 0x3FAFE)) = (u16)calc_CRC16(0, (MMU.fw.data + 0x3FA00), 0xFE);
(*(u16*)(MMU.fw.data + 0x3FBFE)) = (u16)calc_CRC16(0, (MMU.fw.data + 0x3FB00), 0xFE);
(*(u16*)(MMU.fw.data + 0x3FCFE)) = (u16)calc_CRC16(0, (MMU.fw.data + 0x3FC00), 0xFE);
MMU.fw.data[0x162] = 0x19; MMU.fw.data[0x162] = 0x19;
memset((MMU.fw.data + 0x163), 0xFF, 0x9D); memset((MMU.fw.data + 0x163), 0xFF, 0x9D);
/* Wifi settings CRC16 */ /* Wifi settings CRC16 */
u16 wifi_crc16 = calc_CRC16(0, (MMU.fw.data + 0x2C), 0x138); (*(u16*)(MMU.fw.data + 0x2A)) = calc_CRC16(0, (MMU.fw.data + 0x2C), 0x138);
MMU.fw.data[0x2A] = (wifi_crc16 & 0xFF);
MMU.fw.data[0x2B] = (wifi_crc16 >> 8);
return TRUE ; return TRUE ;
} }

86
desmume/src/wifi.cpp
View File

@ -125,28 +125,70 @@ u8 FW_BBChannel[14] = { 0xb3, 0xb3, 0xb3, 0xb3, 0xb3, /* channel 1- 6 */
0xb6, 0xb6 /* channel 13-14 */ 0xb6, 0xb6 /* channel 13-14 */
} ; } ;
u8 FW_WFCProfile[0xC0] = { 'D','e','S','m','u','m','E',' ','S','o','f','t','A','P', /* Note : the values are inspired from what I found in a firmware image from my DS */
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', /* ssid */
'D','e','S','m','u','m','E',' ','S','o','f','t','A','P', FW_WFCProfile FW_WFCProfile1 = {"DeSmuME Soft AP",
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', /* ssid */ "",
'W','E','P','K','E','Y',' ','P','A','R','T',' ','1',' ',' ',' ', "",
'W','E','P','K','E','Y',' ','P','A','R','T',' ','2',' ',' ',' ', "",
'W','E','P','K','E','Y',' ','P','A','R','T',' ','3',' ',' ',' ', "",
'W','E','P','K','E','Y',' ','P','A','R','T',' ','4',' ',' ',' ', "",
127,0,0,1, /* IP address */ {0, 0, 0, 0},
127,0,0,1, /* Gateway */ {0, 0, 0, 0},
127,0,0,1, /* DNS 1 */ {0, 0, 0, 0},
127,0,0,1, /* DNS 2 */ {0, 0, 0, 0},
24, /* subnet/node seperating bit (n*'1' | (32-n)*'0' = subnet mask) */ 0,
0,0,0,0,0,0,0, "",
0,0,0,0,0,0,0,0, 0,
0,0,0,0,0,0, 0,
0, /* WEP: disabled */ 0,
0, /* This entry is: normal (1= AOSS, FF = deleted)*/ {0, 0, 0, 0, 0, 0, 0},
0,0,0,0,0,0,0,0, 0,
'W','F','C',' ','U','S','E','R',' ','I','D',' ',' ',' ', /* user id */ {0xBA, 0xA0, 0x35, 0xE7, 0x01, 0xD0, 0x05, 0xAD, 0x39, 0x0F, 0x40, 0x1C, 0x2B, 0x2C},
0,0 /* CRC */ {0, 0}
} ; } ;
FW_WFCProfile FW_WFCProfile2 = {"",
"",
"",
"",
"",
"",
{0, 0, 0, 0},
{0, 0, 0, 0},
{0, 0, 0, 0},
{0, 0, 0, 0},
0,
"",
0,
0,
0xFF,
{0, 0, 0, 0, 0, 0, 0},
0,
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 0}
} ;
FW_WFCProfile FW_WFCProfile3 = {"DeSmuME Soft AP 3",
"DeSmuME Soft AP 3",
"WEP KEY PART 1",
"WEP KEY PART 2",
"WEP KEY PART 3",
"WEP KEY PART 4",
{127, 0, 0, 1},
{127, 0, 0, 1},
{127, 0, 0, 1},
{127, 0, 0, 1},
24,
"AOSS WEP KEY",
0,
0,
0xFF,
{0, 0, 0, 0, 0, 0, 0},
0,
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 0}
} ;
#ifdef EXPERIMENTAL_WIFI #ifdef EXPERIMENTAL_WIFI

31
desmume/src/wifi.h
View File

@ -448,6 +448,33 @@ void WIFI_usTrigger(wifimac_t *wifi) ;
#endif #endif
/* DS WFC profile data documented here : */
/* http://dsdev.bigredpimp.com/2006/07/31/aoss-wfc-profile-data/ */
/* Note : we use bytes to avoid endianness issues */
typedef struct _FW_WFCProfile
{
char SSID[32];
char SSID_WEP64[32];
char WEPKEY_PART1[16];
char WEPKEY_PART2[16];
char WEPKEY_PART3[16];
char WEPKEY_PART4[16];
u8 IP_ADDRESS[4];
u8 GATEWAY[4];
u8 PRIM_DNS[4];
u8 SEC_DNS[4];
u8 SUBNET_MASK;
u8 WEP64_KEY_AOSS[20];
u8 UNK1;
u8 WEP_MODE;
u8 STATUS;
u8 UNK2[7];
u8 UNK3;
u8 UNK4[14];
u8 CRC16[2];
} FW_WFCProfile;
/* wifi data to be stored in firmware, when no firmware image was loaded */ /* wifi data to be stored in firmware, when no firmware image was loaded */
extern u8 FW_Mac[6]; extern u8 FW_Mac[6];
extern u8 FW_WIFIInit[32] ; extern u8 FW_WIFIInit[32] ;
@ -455,6 +482,8 @@ extern u8 FW_BBInit[105] ;
extern u8 FW_RFInit[36] ; extern u8 FW_RFInit[36] ;
extern u8 FW_RFChannel[6*14] ; extern u8 FW_RFChannel[6*14] ;
extern u8 FW_BBChannel[14] ; extern u8 FW_BBChannel[14] ;
extern u8 FW_WFCProfile[0xC0] ; extern FW_WFCProfile FW_WFCProfile1;
extern FW_WFCProfile FW_WFCProfile2;
extern FW_WFCProfile FW_WFCProfile3;
#endif #endif