Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:00:17 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: pci.h
src/sys/external/bsd/drm2/linux: linux_pci.c
Log Message:
linux: pci_name
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/external/bsd/drm2/include/linux/pci.h
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/linux/linux_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.49 src/sys/external/bsd/drm2/include/linux/pci.h:1.50
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.49 Sun Dec 19 11:38:04 2021
+++ src/sys/external/bsd/drm2/include/linux/pci.h Sun Dec 19 12:00:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.49 2021/12/19 11:38:04 riastradh Exp $ */
+/* $NetBSD: pci.h,v 1.50 2021/12/19 12:00:16 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -218,6 +218,7 @@ enum pci_bus_speed {
#define pci_is_root_bus linux_pci_is_root_bus
#define pci_is_thunderbolt_attached linux_pci_is_thunderbolt_attached
#define pci_map_rom linux_pci_map_rom
+#define pci_name linux_pci_name
#define pci_platform_rom linux_pci_platform_rom
#define pci_read_config_byte linux_pci_read_config_byte
#define pci_read_config_dword linux_pci_read_config_dword
@@ -251,6 +252,7 @@ int pci_domain_nr(struct pci_bus *);
device_t pci_dev_dev(struct pci_dev *);
void pci_set_drvdata(struct pci_dev *, void *);
void * pci_get_drvdata(struct pci_dev *);
+const char * pci_name(struct pci_dev *);
int pci_find_capability(struct pci_dev *, int);
bool pci_is_pcie(struct pci_dev *);
Index: src/sys/external/bsd/drm2/linux/linux_pci.c
diff -u src/sys/external/bsd/drm2/linux/linux_pci.c:1.19 src/sys/external/bsd/drm2/linux/linux_pci.c:1.20
--- src/sys/external/bsd/drm2/linux/linux_pci.c:1.19 Sun Dec 19 11:38:04 2021
+++ src/sys/external/bsd/drm2/linux/linux_pci.c Sun Dec 19 12:00:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_pci.c,v 1.19 2021/12/19 11:38:04 riastradh Exp $ */
+/* $NetBSD: linux_pci.c,v 1.20 2021/12/19 12:00:16 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.19 2021/12/19 11:38:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.20 2021/12/19 12:00:16 riastradh Exp $");
#if NACPICA > 0
#include <dev/acpi/acpivar.h>
@@ -65,6 +65,14 @@ pci_get_drvdata(struct pci_dev *pdev)
return pdev->pd_drvdata;
}
+const char *
+pci_name(struct pci_dev *pdev)
+{
+
+ /* XXX not sure this has the right format */
+ return device_xname(pci_dev_dev(pdev));
+}
+
void
linux_pci_dev_init(struct pci_dev *pdev, device_t dev, device_t parent,
const struct pci_attach_args *pa, int kludges)
