diff --git a/src/DSi_NWifi.cpp b/src/DSi_NWifi.cpp
index 73cf4b40..54719cf7 100644
--- a/src/DSi_NWifi.cpp
+++ b/src/DSi_NWifi.cpp
@@ -165,6 +165,36 @@ void DSi_NWifi::Reset()
     printf("NWifi MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
            mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
+    u8 type = SPI_Firmware::GetNWifiVersion();
+    switch (type)
+    {
+    case 1: // AR6002
+        ROMID = 0x20000188;
+        ChipID = 0x02000001;
+        HostIntAddr = 0x00500400;
+        break;
+
+    case 2: // AR6013
+        ROMID = 0x23000024;
+        ChipID = 0x0D000000;
+        HostIntAddr = 0x00520000;
+        break;
+
+    case 3: // AR6014 (3DS)
+        ROMID = 0x2300006F;
+        ChipID = 0x0D000001;
+        HostIntAddr = 0x00520000;
+        printf("NWifi: hardware is 3DS type, unchecked\n");
+        break;
+
+    default:
+        printf("NWifi: unknown hardware type %02X, assuming AR6002\n");
+        ROMID = 0x20000188;
+        ChipID = 0x02000001;
+        HostIntAddr = 0x00500400;
+        break;
+    }
+
     memset(EEPROM, 0, 0x400);
 
     *(u32*)&EEPROM[0x000] = 0x300;
@@ -755,8 +785,7 @@ void DSi_NWifi::BMI_Command()
     case 0x08: // BMI_GET_TARGET_ID
         MB_Write32(4, 0xFFFFFFFF);
         MB_Write32(4, 0x0000000C);
-        //MB_Write32(4, 0x20000118);
-        MB_Write32(4, 0x23000024); // ROM version (TODO: how to determine correct one?)
+        MB_Write32(4, ROMID);
         MB_Write32(4, 0x00000002);
         return;
 
@@ -1436,7 +1465,7 @@ u32 DSi_NWifi::WindowRead(u32 addr)
 {
     printf("NWifi: window read %08X\n", addr);
 
-    if ((addr & 0xFFFF00) == 0x520000)
+    if ((addr & 0xFFFF00) == HostIntAddr)
     {
         // RAM host interest area
         // TODO: different base based on hardware version
@@ -1462,9 +1491,7 @@ u32 DSi_NWifi::WindowRead(u32 addr)
     switch (addr)
     {
     case 0x40EC: // chip ID
-        // 0D000000 / 0D000001 == AR6013
-        // TODO: check firmware.bin to determine the correct value
-        return 0x0D000001;
+        return ChipID;
 
     // SOC_RESET_CAUSE
     case 0x40C0: return 2;
diff --git a/src/DSi_NWifi.h b/src/DSi_NWifi.h
index a72d54d5..7efd40c7 100644
--- a/src/DSi_NWifi.h
+++ b/src/DSi_NWifi.h
@@ -127,6 +127,10 @@ private:
 
     u32 WindowData, WindowReadAddr, WindowWriteAddr;
 
+    u32 ROMID;
+    u32 ChipID;
+    u32 HostIntAddr;
+
     u8 EEPROM[0x400];
     u32 EEPROMReady;
 
diff --git a/src/SPI.cpp b/src/SPI.cpp
index eff0a054..1c88b587 100644
--- a/src/SPI.cpp
+++ b/src/SPI.cpp
@@ -241,6 +241,7 @@ void SetupDirectBoot()
 
 u8 GetConsoleType() { return Firmware[0x1D]; }
 u8 GetWifiVersion() { return Firmware[0x2F]; }
+u8 GetNWifiVersion() { return Firmware[0x1FD]; } // for DSi; will return 0xFF on a DS
 u8 GetRFVersion() { return Firmware[0x40]; }
 u8* GetWifiMAC() { return &Firmware[0x36]; }
 
diff --git a/src/SPI.h b/src/SPI.h
index 21734c4d..0e0eb5ae 100644
--- a/src/SPI.h
+++ b/src/SPI.h
@@ -28,6 +28,7 @@ void SetupDirectBoot();
 
 u8 GetConsoleType();
 u8 GetWifiVersion();
+u8 GetNWifiVersion();
 u8 GetRFVersion();
 u8* GetWifiMAC();