From c1bf728baad0b199e6100b7f08da19c20118507b Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Wed, 24 Apr 2013 19:14:06 +0200 Subject: [PATCH 1/3] build fix: adf_os_export_symbol is a dead end macro adf_os_export_symbol points to __adf_os_export_symbol but __adf_os_export_symbol is not defined. Signed-off-by: Oleksij Rempel --- target_firmware/wlan/ieee80211_output.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/target_firmware/wlan/ieee80211_output.c b/target_firmware/wlan/ieee80211_output.c index a6b360a..562edba 100755 --- 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 From 1798274027a5393c91efeb7e23ae0493b7e75ba3 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Wed, 24 Apr 2013 19:20:02 +0200 Subject: [PATCH 2/3] build fix: convert type for VBUF_GET_DATA_ADDR Signed-off-by: Oleksij Rempel --- target_firmware/magpie_fw_dev/target/hif/k2_fw_usb_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 82756fa..a297c23 100755 --- 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 From a5ae540857f75501e8bbf2159a7948004c008f2d Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Wed, 24 Apr 2013 22:46:41 +0200 Subject: [PATCH 3/3] build fix: use ath_hal_memcpy instead of memcpy Signed-off-by: Oleksij Rempel --- target_firmware/magpie_fw_dev/target/hif/k2_fw_usb_api.c | 2 +- target_firmware/magpie_fw_dev/target/rompatch/usb_api_patch.c | 4 ++-- 2 files changed, 3 insertions(+), 3 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 index a297c23..47aa380 100755 --- 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 @@ -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 index df00a4b..d9a394d 100755 --- 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;