sync with OpenBSD -current
This commit is contained in:
parent
b478f6b854
commit
2debf29dc6
14 changed files with 87 additions and 57 deletions
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: mbg.c,v 1.35 2023/09/25 15:38:46 deraadt Exp $ */
|
||||
/* $OpenBSD: mbg.c,v 1.36 2024/03/23 10:38:02 sthen Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006, 2007 Marc Balmer <mbalmer@openbsd.org>
|
||||
|
@ -159,6 +159,7 @@ const struct pci_matchid mbg_devices[] = {
|
|||
{ PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_GPS170PCI },
|
||||
{ PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PCI32 },
|
||||
{ PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PCI509 },
|
||||
{ PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PCI510 },
|
||||
{ PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PCI511 },
|
||||
{ PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PEX511 },
|
||||
{ PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PZF180PEX }
|
||||
|
@ -241,6 +242,7 @@ mbg_attach(struct device *parent, struct device *self, void *aux)
|
|||
sc->sc_read = mbg_read_amcc_s5920;
|
||||
sensor_task_register(sc, mbg_task, 10);
|
||||
break;
|
||||
case PCI_PRODUCT_MEINBERG_PCI510:
|
||||
case PCI_PRODUCT_MEINBERG_PCI511:
|
||||
case PCI_PRODUCT_MEINBERG_PEX511:
|
||||
sc->sc_read = mbg_read_asic;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2068 2024/03/06 07:01:24 jsg Exp $
|
||||
$OpenBSD: pcidevs,v 1.2069 2024/03/23 10:35:50 sthen Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
@ -7538,6 +7538,7 @@ product MEDIATEK MT7921 0x7961 MT7921
|
|||
/* Meinberg Funkuhren */
|
||||
product MEINBERG PCI32 0x0101 PCI32
|
||||
product MEINBERG PCI509 0x0102 PCI509
|
||||
product MEINBERG PCI510 0x0103 PCI510
|
||||
product MEINBERG PCI511 0x0104 PCI511
|
||||
product MEINBERG PEX511 0x0105 PEX511
|
||||
product MEINBERG PZF180PEX 0x0106 PZF180PEX
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2068 2024/03/06 07:01:24 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2069 2024/03/23 10:35:50 sthen Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
@ -7543,6 +7543,7 @@
|
|||
/* Meinberg Funkuhren */
|
||||
#define PCI_PRODUCT_MEINBERG_PCI32 0x0101 /* PCI32 */
|
||||
#define PCI_PRODUCT_MEINBERG_PCI509 0x0102 /* PCI509 */
|
||||
#define PCI_PRODUCT_MEINBERG_PCI510 0x0103 /* PCI510 */
|
||||
#define PCI_PRODUCT_MEINBERG_PCI511 0x0104 /* PCI511 */
|
||||
#define PCI_PRODUCT_MEINBERG_PEX511 0x0105 /* PEX511 */
|
||||
#define PCI_PRODUCT_MEINBERG_PZF180PEX 0x0106 /* PZF180PEX */
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2068 2024/03/06 07:01:24 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2069 2024/03/23 10:35:50 sthen Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
@ -27287,6 +27287,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PCI509,
|
||||
"PCI509",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PCI510,
|
||||
"PCI510",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_MEINBERG, PCI_PRODUCT_MEINBERG_PCI511,
|
||||
"PCI511",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue