SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2025-01-24 00:53:19 +00:00
parent c170139b8d
commit 614315d09f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
26 changed files with 269 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sys/arch/amd64/include/pci_machdep.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: pci_machdep.h,v 1.31 2024/01/19 18:38:16 kettenis Exp $ */
/* $OpenBSD: pci_machdep.h,v 1.32 2025/01/23 11:24:34 kettenis Exp $ */
/* $NetBSD: pci_machdep.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */
/*
@ -103,7 +103,7 @@ pcireg_t pci_min_powerstate(pci_chipset_tag_t, pcitag_t);
void pci_set_powerstate_md(pci_chipset_tag_t, pcitag_t, int, int);
void pci_mcfg_init(bus_space_tag_t, bus_addr_t, int, int, int);
pci_chipset_tag_t pci_lookup_segment(int);
pci_chipset_tag_t pci_lookup_segment(int, int);
#define __HAVE_PCI_MSIX

4
sys/arch/amd64/pci/pci_machdep.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: pci_machdep.c,v 1.80 2024/05/13 10:01:53 kettenis Exp $ */
/* $OpenBSD: pci_machdep.c,v 1.81 2025/01/23 11:24:34 kettenis Exp $ */
/* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */
/*-
@ -160,7 +160,7 @@ pci_mcfg_init(bus_space_tag_t iot, bus_addr_t addr, int segment,
}
pci_chipset_tag_t
pci_lookup_segment(int segment)
pci_lookup_segment(int segment, int bus)
{
KASSERT(segment == 0);
return NULL;