Public firmware release.

1 files changed, 10 insertions, 14 deletions

diff --git a/Libraries/WiShield/g2100.c b/Libraries/WiShield/g2100.c
index a721d87..e420f1c 100644
--- a/Libraries/WiShield/g2100.c
+++ b/Libraries/WiShield/g2100.c
@@ -77,9 +77,6 @@ void zg_init()
 	zg_interrupt2_reg();
 	zg_interrupt_reg(0xff, 0);
 	zg_interrupt_reg(0x80|0x40, 1);
-
-	ssid_len = (U8)strlen_P(ssid);
-	security_passphrase_len = (U8)strlen_P(security_passphrase);
 }
 
 void spi_transfer(volatile U8* buf, U16 len, U8 toggle_cs)
@@ -339,10 +336,10 @@ void zg_write_wep_key(U8* cmd_buf)
 	cmd->slot = 3;		// WEP key slot
 	cmd->keyLen = 13;	// Key length: 5 bytes (64-bit WEP); 13 bytes (128-bit WEP)
 	cmd->defID = 0;		// Default key ID: Key 0, 1, 2, 3
-	cmd->ssidLen = ssid_len;
 	memset(cmd->ssid, 0x00, 32);
-	memcpy_P(cmd->ssid, ssid, ssid_len);
-	memcpy_P(cmd->key, wep_keys, ZG_MAX_ENCRYPTION_KEYS * ZG_MAX_ENCRYPTION_KEY_SIZE);
+
+   return_ssid(cmd->ssid, &cmd->ssidLen);
+   return_wepkeys(cmd->key);
 
 	return;
 }
@@ -352,13 +349,13 @@ static void zg_calc_psk_key(U8* cmd_buf)
 	zg_psk_calc_req_t* cmd = (zg_psk_calc_req_t*)cmd_buf;
 
 	cmd->configBits = 0;
-	cmd->phraseLen = security_passphrase_len;
-	cmd->ssidLen = ssid_len;
 	cmd->reserved = 0;
+
 	memset(cmd->ssid, 0x00, 32);
-	memcpy_P(cmd->ssid, ssid, ssid_len);
 	memset(cmd->passPhrase, 0x00, 64);
-	memcpy_P(cmd->passPhrase, security_passphrase, security_passphrase_len);
+
+   return_ssid(cmd->ssid, &cmd->ssidLen);
+   return_passphrase(cmd->passPhrase, &cmd->phraseLen);
 
 	return;
 }
@@ -368,9 +365,9 @@ static void zg_write_psk_key(U8* cmd_buf)
 	zg_pmk_key_req_t* cmd = (zg_pmk_key_req_t*)cmd_buf;
 
 	cmd->slot = 0;	// WPA/WPA2 PSK slot
-	cmd->ssidLen = ssid_len;
 	memset(cmd->ssid, 0x00, 32);
-	memcpy_P(cmd->ssid, ssid, cmd->ssidLen);
+   return_ssid(cmd->ssid, &cmd->ssidLen);
+
 	memcpy(cmd->keyData, wpa_psk_key, ZG_MAX_PMK_LEN);
 
 	return;
@@ -563,9 +560,8 @@ void zg_drv_process()
 
 		cmd->secType = security_type;
 
-		cmd->ssidLen = ssid_len;
 		memset(cmd->ssid, 0, 32);
-		memcpy_P(cmd->ssid, ssid, ssid_len);
+      return_ssid(cmd->ssid, &cmd->ssidLen);
 
 		// units of 100 milliseconds
 		cmd->sleepDuration = 0;