Deleted Added
full compact
ubsec.c (109623) ubsec.c (110522)
1/* $FreeBSD: head/sys/dev/ubsec/ubsec.c 109623 2003-01-21 08:56:16Z alfred $ */
1/* $FreeBSD: head/sys/dev/ubsec/ubsec.c 110522 2003-02-07 23:02:02Z sam $ */
2/* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */
3
4/*
5 * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
6 * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
7 * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
8 *
9 * All rights reserved.

--- 201 unchanged lines hidden (view full) ---

211 if (pci_get_vendor(dev) == PCI_VENDOR_BLUESTEEL &&
212 (pci_get_device(dev) == PCI_PRODUCT_BLUESTEEL_5501 ||
213 pci_get_device(dev) == PCI_PRODUCT_BLUESTEEL_5601))
214 return (0);
215 if (pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
216 (pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5805 ||
217 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5820 ||
218 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 ||
2/* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */
3
4/*
5 * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
6 * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
7 * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
8 *
9 * All rights reserved.

--- 201 unchanged lines hidden (view full) ---

211 if (pci_get_vendor(dev) == PCI_VENDOR_BLUESTEEL &&
212 (pci_get_device(dev) == PCI_PRODUCT_BLUESTEEL_5501 ||
213 pci_get_device(dev) == PCI_PRODUCT_BLUESTEEL_5601))
214 return (0);
215 if (pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
216 (pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5805 ||
217 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5820 ||
218 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 ||
219 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822))
219 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 ||
220 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823
221 ))
220 return (0);
221 return (ENXIO);
222}
223
224static const char*
225ubsec_partname(struct ubsec_softc *sc)
226{
227 /* XXX sprintf numbers when not decoded */
228 switch (pci_get_vendor(sc->sc_dev)) {
229 case PCI_VENDOR_BROADCOM:
230 switch (pci_get_device(sc->sc_dev)) {
231 case PCI_PRODUCT_BROADCOM_5805: return "Broadcom 5805";
232 case PCI_PRODUCT_BROADCOM_5820: return "Broadcom 5820";
233 case PCI_PRODUCT_BROADCOM_5821: return "Broadcom 5821";
234 case PCI_PRODUCT_BROADCOM_5822: return "Broadcom 5822";
222 return (0);
223 return (ENXIO);
224}
225
226static const char*
227ubsec_partname(struct ubsec_softc *sc)
228{
229 /* XXX sprintf numbers when not decoded */
230 switch (pci_get_vendor(sc->sc_dev)) {
231 case PCI_VENDOR_BROADCOM:
232 switch (pci_get_device(sc->sc_dev)) {
233 case PCI_PRODUCT_BROADCOM_5805: return "Broadcom 5805";
234 case PCI_PRODUCT_BROADCOM_5820: return "Broadcom 5820";
235 case PCI_PRODUCT_BROADCOM_5821: return "Broadcom 5821";
236 case PCI_PRODUCT_BROADCOM_5822: return "Broadcom 5822";
237 case PCI_PRODUCT_BROADCOM_5823: return "Broadcom 5823";
235 }
236 return "Broadcom unknown-part";
237 case PCI_VENDOR_BLUESTEEL:
238 switch (pci_get_device(sc->sc_dev)) {
239 case PCI_PRODUCT_BLUESTEEL_5601: return "Bluesteel 5601";
240 }
241 return "Bluesteel unknown-part";
242 }

--- 34 unchanged lines hidden (view full) ---

277
278 if (pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
279 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5820)
280 sc->sc_flags |= UBS_FLAGS_KEY | UBS_FLAGS_RNG |
281 UBS_FLAGS_LONGCTX | UBS_FLAGS_HWNORM | UBS_FLAGS_BIGKEY;
282
283 if (pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
284 (pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 ||
238 }
239 return "Broadcom unknown-part";
240 case PCI_VENDOR_BLUESTEEL:
241 switch (pci_get_device(sc->sc_dev)) {
242 case PCI_PRODUCT_BLUESTEEL_5601: return "Bluesteel 5601";
243 }
244 return "Bluesteel unknown-part";
245 }

--- 34 unchanged lines hidden (view full) ---

280
281 if (pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
282 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5820)
283 sc->sc_flags |= UBS_FLAGS_KEY | UBS_FLAGS_RNG |
284 UBS_FLAGS_LONGCTX | UBS_FLAGS_HWNORM | UBS_FLAGS_BIGKEY;
285
286 if (pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
287 (pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 ||
285 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822)) {
288 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 ||
289 pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823 )) {
286 /* NB: the 5821/5822 defines some additional status bits */
287 sc->sc_statmask |= BS_STAT_MCR1_ALLEMPTY |
288 BS_STAT_MCR2_ALLEMPTY;
289 sc->sc_flags |= UBS_FLAGS_KEY | UBS_FLAGS_RNG |
290 UBS_FLAGS_LONGCTX | UBS_FLAGS_HWNORM | UBS_FLAGS_BIGKEY;
291 }
292
293 cmd = pci_read_config(dev, PCIR_COMMAND, 4);

--- 2556 unchanged lines hidden ---
290 /* NB: the 5821/5822 defines some additional status bits */
291 sc->sc_statmask |= BS_STAT_MCR1_ALLEMPTY |
292 BS_STAT_MCR2_ALLEMPTY;
293 sc->sc_flags |= UBS_FLAGS_KEY | UBS_FLAGS_RNG |
294 UBS_FLAGS_LONGCTX | UBS_FLAGS_HWNORM | UBS_FLAGS_BIGKEY;
295 }
296
297 cmd = pci_read_config(dev, PCIR_COMMAND, 4);

--- 2556 unchanged lines hidden ---