Merge pull request #21 from olerem/buildfixes

Buildfixes, final pull
qca · Apr 25, 2013 · 2a38076 · 2a38076
2 parents e4907d7 + a5ae540
commit 2a38076
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/target_firmware/magpie_fw_dev/target/hif/k2_fw_usb_api.c b/target_firmware/magpie_fw_dev/target/hif/k2_fw_usb_api.c
@@ -622,7 +622,7 @@ void vUsb_Status_In_patch(void)
         evntbuf = usbFifoConf.get_event_buf();
         if ( evntbuf != NULL )
         {
-            regaddr = VBUF_GET_DATA_ADDR(evntbuf);
+	    regaddr = (u32_t *)VBUF_GET_DATA_ADDR(evntbuf);
             mBufLen = evntbuf->buf_length;
         }
         else
@@ -712,7 +712,7 @@ BOOLEAN bGet_descriptor_patch(void)
         uint8_t *p = (uint8_t *)u8ConfigDescriptorEX;
 
         /* Copy ConfigDescriptor */
-        memcpy(ConfigDescriptorPatch, p, sizeof(ConfigDescriptorPatch));
+	ath_hal_memcpy(ConfigDescriptorPatch, p, sizeof(ConfigDescriptorPatch));
 
         p = (uint8_t *)ConfigDescriptorPatch;
 

diff --git a/target_firmware/magpie_fw_dev/target/rompatch/usb_api_patch.c b/target_firmware/magpie_fw_dev/target/rompatch/usb_api_patch.c
@@ -791,7 +791,7 @@ BOOLEAN bGet_descriptor_patch(void)
 		uint8_t *p = (uint8_t *)u8UsbDeviceDescriptor;
 		uint32_t u32Tmp=0;
 		/* Copy Usb Device Descriptor */
-		memcpy(UsbDeviceDescriptorPatch, p, sizeof(UsbDeviceDescriptorPatch));
+		ath_hal_memcpy(UsbDeviceDescriptorPatch, p, sizeof(UsbDeviceDescriptorPatch));
 
 		A_SFLASH_READ_4B(u32Tmp, FLASH_SIZE - EE_DATA_RESERVED_LEN + FLASH_USB_VENDOR_ID_OFFSET*2);
 		UsbDeviceDescriptorPatch[VENDOR_ID_OFFSET] = mSWAP_BYTE(mLOW_WORD0(u32Tmp));
@@ -812,7 +812,7 @@ BOOLEAN bGet_descriptor_patch(void)
 		uint8_t *p = (uint8_t *)u8ConfigDescriptorEX;
 
 		/* Copy ConfigDescriptor */
-		memcpy(ConfigDescriptorPatch, p, sizeof(ConfigDescriptorPatch));
+		ath_hal_memcpy(ConfigDescriptorPatch, p, sizeof(ConfigDescriptorPatch));
 
 		p = (uint8_t *)ConfigDescriptorPatch;
 

diff --git a/target_firmware/wlan/ieee80211_output.c b/target_firmware/wlan/ieee80211_output.c
@@ -132,7 +132,4 @@ ieee80211_tgt_crypto_encap(struct ieee80211_frame *wh,
 #undef CRYPTO_KEY_TYPE_WAPI
 #undef IEEE80211_WLAN_HDR_LEN
 }
-
-adf_os_export_symbol(ieee80211_tgt_crypto_encap);
-
 #undef  IEEE80211_ADDR_LEN