On Tuesday 05 September 2006 00:01, Larry Finger wrote:
> Michael Buesch wrote:
> >
> > Thanks. This is
> > Acked-by: Michael Buesch <[EMAIL PROTECTED]>
> >
> > Larry, please push upstream.
> > Martin, can you also rediff this against wireless-dev?
> >
>
> Michael - I will push wireless-2.6 upstream.
>
> Martin - your original patch had some fuzz and trailing whitespace. A version
> that applies cleanly
> to wireless-dev follows:
Thanks, John please apply this to wireless-dev.
From: Martin Langer <[EMAIL PROTECTED]>
Signed-off-by: Michael Buesch <[EMAIL PROTECTED]>
>
> Index: wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx.h
> ===================================================================
> --- wireless-dev.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx.h
> +++ wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx.h
> @@ -190,6 +190,12 @@
> #define BCM43xx_SBF_TIME_UPDATE 0x10000000
> #define BCM43xx_SBF_80000000 0x80000000 /*FIXME: fix name*/
>
> +/* Microcode */
> +#define BCM43xx_UCODE_REVISION 0x0000
> +#define BCM43xx_UCODE_PATCHLEVEL 0x0002
> +#define BCM43xx_UCODE_DATE 0x0004
> +#define BCM43xx_UCODE_TIME 0x0006
> +
> /* MicrocodeFlagsBitfield (addr + lo-word values?)*/
> #define BCM43xx_UCODEFLAGS_OFFSET 0x005E
>
> Index: wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> ===================================================================
> --- wireless-dev.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> +++ wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> @@ -2179,6 +2179,33 @@ static int bcm43xx_chip_init(struct bcm4
> }
> bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */
>
> + value16 = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
> + BCM43xx_UCODE_REVISION);
> +
> + dprintk(KERN_INFO PFX "Microcode rev 0x%x, pl 0x%x "
> + "(20%.2i-%.2i-%.2i %.2i:%.2i:%.2i)\n", value16,
> + bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
> + BCM43xx_UCODE_PATCHLEVEL),
> + (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
> + BCM43xx_UCODE_DATE) >> 12) & 0xf,
> + (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
> + BCM43xx_UCODE_DATE) >> 8) & 0xf,
> + bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
> + BCM43xx_UCODE_DATE) & 0xff,
> + (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
> + BCM43xx_UCODE_TIME) >> 11) & 0x1f,
> + (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
> + BCM43xx_UCODE_TIME) >> 5) & 0x3f,
> + bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED,
> + BCM43xx_UCODE_TIME) & 0x1f);
> +
> + if ( value16 > 0x128 ) {
> + dprintk(KERN_ERR PFX
> + "Firmware: no support for microcode rev > 0x128\n");
> + err = -1;
> + goto err_release_fw;
> + }
> +
> err = bcm43xx_gpio_init(bcm);
> if (err)
> goto err_release_fw;
>
>
--
Greetings Michael.
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
