svn commit: r266770 - head/sys/dev/iwn

[Gavin Atkinson]

Oops, you are correct. I shall remove the debugging printf it in an hour or
so.

As far as treating this card like a 2030, that is also exactly what Linux
does.

Thanks,

Gavin
On 27 May 2014 20:47, "Adrian Chadd" <adrian at freebsd.org> wrote:

> woo!
>
> There's some debugging printf left in. Maybe turn it into
> device_printf() and hide it behind bootverbose?
>
> Is this all the linux driver did? Are the 2030 parameters okay?
>
>
> -a
>
>
> On 27 May 2014 12:39, Gavin Atkinson <gavin at freebsd.org> wrote:
> > Author: gavin
> > Date: Tue May 27 19:39:57 2014
> > New Revision: 266770
> > URL: http://svnweb.freebsd.org/changeset/base/266770
> >
> > Log:
> >   Add support for the Intel Centrino Wireless-N 105 chipset.
> >
> >   MFC after:    2 weeks
> >   Relnotes:     yes
> >
> > Modified:
> >   head/sys/dev/iwn/if_iwn.c
> >   head/sys/dev/iwn/if_iwn_devid.h
> >
> > Modified: head/sys/dev/iwn/if_iwn.c
> >
> ==============================================================================
> > --- head/sys/dev/iwn/if_iwn.c   Tue May 27 19:37:18 2014        (r266769)
> > +++ head/sys/dev/iwn/if_iwn.c   Tue May 27 19:39:57 2014        (r266770)
> > @@ -109,6 +109,8 @@ static const struct iwn_ident iwn_ident_
> >         { 0x8086, IWN_DID_130_2, "Intel Centrino Wireless-N 130"
>        },
> >         { 0x8086, IWN_DID_100_1, "Intel Centrino Wireless-N 100"
>        },
> >         { 0x8086, IWN_DID_100_2, "Intel Centrino Wireless-N 100"
>        },
> > +       { 0x8086, IWN_DID_105_1, "Intel Centrino Wireless-N 105"
>        },
> > +       { 0x8086, IWN_DID_105_2, "Intel Centrino Wireless-N 105"
>        },
> >         { 0x8086, IWN_DID_135_1, "Intel Centrino Wireless-N 135"
>        },
> >         { 0x8086, IWN_DID_135_2, "Intel Centrino Wireless-N 135"
>        },
> >         { 0x8086, IWN_DID_4965_1, "Intel Wireless WiFi Link 4965"
>         },
> > @@ -458,7 +460,7 @@ iwn_attach(device_t dev)
> >         sc->hw_type = (IWN_READ(sc, IWN_HW_REV) >> IWN_HW_REV_TYPE_SHIFT)
> >             & IWN_HW_REV_TYPE_MASK;
> >         sc->subdevice_id = pci_get_subdevice(dev);
> > -
> > +printf("hw %d sdid %x\n", sc->hw_type, sc->subdevice_id);
> >         /*
> >          * 4965 versus 5000 and later have different methods.
> >          * Let's set those up first.
> > @@ -986,6 +988,31 @@ iwn_config_specific(struct iwn_softc *sc
> >                 }
> >                 break;
> >
> > +/* 105 Series */
> > +/* XXX: This series will need adjustment for rate.
> > + * see rx_with_siso_diversity in linux kernel
> > + */
> > +       case IWN_DID_105_1:
> > +       case IWN_DID_105_2:
> > +               switch(sc->subdevice_id) {
> > +                       case IWN_SDID_105_1:
> > +                       case IWN_SDID_105_2:
> > +                       case IWN_SDID_105_3:
> > +                       //iwl105_bgn_cfg
> > +                       case IWN_SDID_105_4:
> > +                       //iwl105_bgn_d_cfg
> > +                               sc->limits = &iwn2030_sensitivity_limits;
> > +                               sc->base_params = &iwn2000_base_params;
> > +                               sc->fwname = "iwn105fw";
> > +                               break;
> > +                       default:
> > +                               device_printf(sc->sc_dev, "adapter type
> id : 0x%04x sub id :"
> > +                                   "0x%04x rev %d not supported
> (subdevice)\n", pid,
> > +                                   sc->subdevice_id,sc->hw_type);
> > +                               return ENOTSUP;
> > +               }
> > +               break;
> > +
> >  /* 135 Series */
> >  /* XXX: This series will need adjustment for rate.
> >   * see rx_with_siso_diversity in linux kernel
> >
> > Modified: head/sys/dev/iwn/if_iwn_devid.h
> >
> ==============================================================================
> > --- head/sys/dev/iwn/if_iwn_devid.h     Tue May 27 19:37:18 2014
>  (r266769)
> > +++ head/sys/dev/iwn/if_iwn_devid.h     Tue May 27 19:39:57 2014
>  (r266770)
> > @@ -228,6 +228,19 @@
> >
> >  /*
> >   *
> --------------------------------------------------------------------------
> > + * Device ID for 105 Series
> > + *
> --------------------------------------------------------------------------
> > + */
> > +#define        IWN_DID_105_1           0x0894
> > +#define        IWN_DID_105_2           0x0895
> > +/* SubDevice ID */
> > +#define        IWN_SDID_105_1          0x0022
> > +#define        IWN_SDID_105_2          0x0222
> > +#define        IWN_SDID_105_3          0x0422
> > +#define        IWN_SDID_105_4          0x0822
> > +
> > +/*
> > + *
> --------------------------------------------------------------------------
> >   * Device ID for 135 Series
> >   *
> --------------------------------------------------------------------------
> >   */
> >
>