Sorry, my fault.. you had already reported me the iowrite16 vs iowrite8 for anaparam3 issue, but I forgot to fix it :( If you are reasonably sure that a 16bits-wide write is OK on the rtl8187b hardware (In reference code I have here only 8bits are written), then I agree applying your fix, and I will leave unchanged my modifications. Otherwise, if you are unsure, I will revert thing in the common rtl818x struct (switching back to 8bit type) and I simply make a cast on rtl8187se, or I will use an union if possible, so the rtl8187b driver remains unchanged. On the other hand, for the remaining issues with changed names for bitfield (the XXXX_SHIFT), I wil vote to fix the rtl8187 driver: That names IMHO are wrong (misleading) and while fixing them should help avoid future confusion, the fix is trivial enough that I'm really confident not to broke anything. I had already sent a patch for it: http://marc.info/?l=linux-wireless&m=139033180125824&w=2 Whit this mail I intend to try to push it once more. If it could be applied I prefer by far, otherwise, if it is too hassle to handle it for the trivial thing it actually does, then I will change back in rtl8180 driver.. Thank you Andrea On Tue, Feb 4, 2014 at 6:57 PM, Larry Finger <Larry.Finger@xxxxxxxxxxxx> wrote: > Andrea, > > After applying the latest patch, I get the following warning and errors when > building the USB driver rtl8187: > > CC drivers/video/fbmon.o > drivers/net/wireless/rtl818x/rtl8187/dev.c: In function > 'rtl8187_set_anaparam': > drivers/net/wireless/rtl818x/rtl8187/dev.c:595:3: warning: passing argument > 2 of 'rtl818x_iowrite8' from incompatible pointer type [enabled by default] > rtl818x_iowrite8(priv, &priv->map->ANAPARAM3, anaparam3); > ^ > In file included from drivers/net/wireless/rtl818x/rtl8187/dev.c:31:0: > drivers/net/wireless/rtl818x/rtl8187/rtl8187.h:237:20: note: expected 'u8 *' > but argument is of type '__le16 *' > static inline void rtl818x_iowrite8(struct rtl8187_priv *priv, u8 *addr, u8 > val) > ^ > drivers/net/wireless/rtl818x/rtl8187/dev.c: In function 'rtl8187b_init_hw': > drivers/net/wireless/rtl818x/rtl8187/dev.c:788:9: error: > 'RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT' undeclared (first use in this > function) > reg |= RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT; > ^ > drivers/net/wireless/rtl818x/rtl8187/dev.c:788:9: note: each undeclared > identifier is reported only once for each function it appears in > drivers/net/wireless/rtl818x/rtl8187/dev.c: In function 'rtl8187_start': > drivers/net/wireless/rtl818x/rtl8187/dev.c:946:11: error: > 'RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT' undeclared (first use in this > function) > reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT; > ^ > drivers/net/wireless/rtl818x/rtl8187/dev.c:947:11: error: > 'RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT' undeclared (first use in this > function) > reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT; > ^ > drivers/net/wireless/rtl818x/rtl8187/dev.c:952:7: error: > 'RTL818X_TX_CONF_HW_SEQNUM' undeclared (first use in this function) > RTL818X_TX_CONF_HW_SEQNUM | > ^ > drivers/net/wireless/rtl818x/rtl8187/dev.c:989:10: error: > 'RTL818X_CW_CONF_PERPACKET_CW_SHIFT' undeclared (first use in this function) > reg &= ~RTL818X_CW_CONF_PERPACKET_CW_SHIFT; > ^ > drivers/net/wireless/rtl818x/rtl8187/dev.c:990:9: error: > 'RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT' undeclared (first use in this > function) > reg |= RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT; > > The warning is fixed by > > Index: wireless-testing/drivers/net/wireless/rtl818x/rtl8187/dev.c > =================================================================== > --- wireless-testing.orig/drivers/net/wireless/rtl818x/rtl8187/dev.c > +++ wireless-testing/drivers/net/wireless/rtl818x/rtl8187/dev.c > @@ -593,7 +593,7 @@ static void rtl8187_set_anaparam(struct > rtl818x_iowrite32(priv, &priv->map->ANAPARAM, anaparam); > rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, anaparam2); > if (priv->is_rtl8187b) > - rtl818x_iowrite8(priv, &priv->map->ANAPARAM3, anaparam3); > + rtl818x_iowrite16(priv, &priv->map->ANAPARAM3, anaparam3); > reg &= ~RTL818X_CONFIG3_ANAPARAM_WRITE; > rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg); > rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, > > For testing purposes, I have turned on the build for rtl8187. > > Larry > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
