From: "Roland Vossen" <rvossen@broadcom.com>
To: gregkh@suse.de
Cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org
Subject: [PATCH 12/21] staging: brcm80211: use __BIG_ENDIAN macro in dma.c
Date: Thu, 9 Jun 2011 16:44:52 +0200 [thread overview]
Message-ID: <1307630701-9170-13-git-send-email-rvossen@broadcom.com> (raw)
In-Reply-To: <1307630701-9170-1-git-send-email-rvossen@broadcom.com>
From: Arend van Spriel <arend@broadcom.com>
The source file dma.c used a macro definition that indicated a big endian
platform. The linux tree has its own macro determined by architecture and/or
kernel configuration. This byteorder macro is __BIG_ENDIAN. This is now used
in dma.c.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
---
drivers/staging/brcm80211/brcmsmac/dma.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c
index adf364c..9a9f0e7 100644
--- a/drivers/staging/brcm80211/brcmsmac/dma.c
+++ b/drivers/staging/brcm80211/brcmsmac/dma.c
@@ -507,9 +507,9 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,
di->dataoffsetlow = di->ddoffsetlow;
di->dataoffsethigh = di->ddoffsethigh;
}
-#if defined(__mips__) && defined(IL_BIGENDIAN)
+#if defined(__mips__) && defined(__BIG_ENDIAN)
di->dataoffsetlow = di->dataoffsetlow + SI_SDRAM_SWAPPED;
-#endif /* defined(__mips__) && defined(IL_BIGENDIAN) */
+#endif /* defined(__mips__) && defined(__BIG_ENDIAN) */
/* WAR64450 : DMACtl.Addr ext fields are not supported in SDIOD core. */
if ((ai_coreid(sih) == SDIOD_CORE_ID)
&& ((ai_corerev(sih) > 0) && (ai_corerev(sih) <= 2)))
@@ -624,12 +624,12 @@ dma64_dd_upd(dma_info_t *di, dma64dd_t *ddring, dmaaddr_t pa, uint outidx,
u32 ctrl2 = bufcount & D64_CTRL2_BC_MASK;
/* PCI bus with big(>1G) physical address, use address extension */
-#if defined(__mips__) && defined(IL_BIGENDIAN)
+#if defined(__mips__) && defined(__BIG_ENDIAN)
if ((di->dataoffsetlow == SI_SDRAM_SWAPPED)
|| !(PHYSADDRLO(pa) & PCI32ADDR_HIGH)) {
#else
if ((di->dataoffsetlow == 0) || !(PHYSADDRLO(pa) & PCI32ADDR_HIGH)) {
-#endif /* defined(__mips__) && defined(IL_BIGENDIAN) */
+#endif /* defined(__mips__) && defined(__BIG_ENDIAN) */
W_SM(&ddring[outidx].addrlow,
BUS_SWAP32(PHYSADDRLO(pa) + di->dataoffsetlow));
--
1.7.4.1
next prev parent reply other threads:[~2011-06-09 14:45 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-09 14:44 [PATCH 00/21] staging: brcm80211: code cleanup and fullmac bugfix Roland Vossen
2011-06-09 14:44 ` [PATCH 01/21] staging: brcm80211: moved typedefs to decrease header file dependencies Roland Vossen
2011-06-09 14:44 ` [PATCH 02/21] staging: brcm80211: cleaned brcmu_utils.h Roland Vossen
2011-06-09 14:44 ` [PATCH 03/21] staging: brcm80211: #include reduction Roland Vossen
2011-06-09 14:44 ` [PATCH 04/21] staging: brcm80211: Remove flags from wl_is_nonetwork Roland Vossen
2011-06-09 14:44 ` [PATCH 05/21] staging: brcm80211: remove 'used' keyword from function ai_ispcie() Roland Vossen
2011-06-09 14:44 ` [PATCH 06/21] staging: brcm80211: remove regs variable from brcms_ioctl function Roland Vossen
2011-06-09 14:44 ` [PATCH 07/21] staging: brcm80211: remove d11regs_t parameter from wlc_tbtt function Roland Vossen
2011-06-09 14:44 ` [PATCH 08/21] staging: brcm80211: remove device id parameter from ai_attach() Roland Vossen
2011-06-09 14:44 ` [PATCH 09/21] staging: brcm80211: remove unused fields from struct si_info Roland Vossen
2011-06-09 14:44 ` [PATCH 10/21] staging: brcm80211: fixed double #include problem Roland Vossen
2011-06-09 14:44 ` [PATCH 11/21] staging: brcm80211: Fix for suspend issue in brcmfmac driver Roland Vossen
2011-06-09 14:44 ` Roland Vossen [this message]
2011-06-09 23:53 ` [PATCH 12/21] staging: brcm80211: use __BIG_ENDIAN macro in dma.c Jonas Gorski
2011-06-10 9:52 ` Arend van Spriel
2011-06-10 11:17 ` Jonas Gorski
2011-06-14 17:52 ` Henry Ptasinski
2011-06-28 20:01 ` Greg KH
2011-06-09 14:44 ` [PATCH 13/21] staging: brcm80211: replaced bmac acronym by brcms_b_ Roland Vossen
2011-06-09 14:44 ` [PATCH 14/21] staging: brcm80211: replaced wlc_ by brcms_c_ Roland Vossen
2011-06-09 14:44 ` [PATCH 15/21] staging: brcm80211: removed superfluous forward struct declarations Roland Vossen
2011-06-09 14:44 ` [PATCH 16/21] staging: brcm80211: further replaced wlc_ by brcmsmac_c_ Roland Vossen
2011-06-09 14:44 ` [PATCH 17/21] staging: brcm80211: replaced wlc_ by brcms_c_, part 2 Roland Vossen
2011-06-09 14:44 ` [PATCH 18/21] staging: brcm80211: remove checkpatch errors found in fullmac Roland Vossen
2011-06-09 14:44 ` [PATCH 19/21] staging: brcm80211: fix checkpatch errors from main.c Roland Vossen
2011-06-09 14:45 ` [PATCH 20/21] staging: brcm80211: fix checkpatch errors in brcmsmac driver Roland Vossen
2011-06-09 14:45 ` [PATCH 21/21] staging: brcm80211: change wl_cfg80211_suspend corresponding to cfg80211 Roland Vossen
2011-06-09 18:54 ` [PATCH 00/21] staging: brcm80211: code cleanup and fullmac bugfix Dan Carpenter
2011-06-09 21:30 ` julie Sullivan
2011-06-10 8:07 ` Roland Vossen
2011-06-12 18:23 ` julie Sullivan
2011-06-12 19:00 ` Dan Carpenter
2011-06-12 21:04 ` julie Sullivan
2011-06-14 17:50 ` Henry Ptasinski
2011-06-24 22:38 ` Henry Ptasinski
2011-06-09 23:02 ` Julian Calaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1307630701-9170-13-git-send-email-rvossen@broadcom.com \
--to=rvossen@broadcom.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).