aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-09-02 05:37:25 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-09-02 05:37:25 +0000
commit6c233a7138f01d7977b2bec6db4a7fc74a263d9d (patch)
tree70f811f2135918ce7973ed9f7f1e33f2e3c277f0 /sys
parent6970268ef93d614d9f6bd6ca9df784157a58e492 (diff)
downloadsrc-6c233a7138f01d7977b2bec6db4a7fc74a263d9d.tar.gz
src-6c233a7138f01d7977b2bec6db4a7fc74a263d9d.zip
Update for new pnp includes
Notes
Notes: svn path=/head/; revision=50788
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/bios.c7
-rw-r--r--sys/i386/i386/bios.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 5fc0a4296738..4b422f5c6f17 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -44,8 +44,7 @@
#include <machine/tss.h>
#include <machine/vmparam.h>
#include <machine/pc/bios.h>
-#include <i386/isa/isa_device.h>
-#include <i386/isa/pnp.h>
+#include <isa/pnpreg.h>
#define BIOS_START 0xe0000
#define BIOS_SIZE 0x20000
@@ -556,12 +555,12 @@ pnpbios_scan(void)
if (PNP_RES_TYPE(tag) == 0) {
/* Small resource */
switch (PNP_SRES_NUM(tag)) {
- case COMP_DEVICE_ID:
+ case PNP_TAG_COMPAT_DEVICE:
compid = (u_int32_t *)(pd->devdata + idx);
if (bootverbose)
printf("pnpbios: node %d compat ID 0x%08x\n", pd->handle, *compid);
/* FALLTHROUGH */
- case END_TAG:
+ case PNP_TAG_END:
idx = left;
break;
default:
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 5fc0a4296738..4b422f5c6f17 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -44,8 +44,7 @@
#include <machine/tss.h>
#include <machine/vmparam.h>
#include <machine/pc/bios.h>
-#include <i386/isa/isa_device.h>
-#include <i386/isa/pnp.h>
+#include <isa/pnpreg.h>
#define BIOS_START 0xe0000
#define BIOS_SIZE 0x20000
@@ -556,12 +555,12 @@ pnpbios_scan(void)
if (PNP_RES_TYPE(tag) == 0) {
/* Small resource */
switch (PNP_SRES_NUM(tag)) {
- case COMP_DEVICE_ID:
+ case PNP_TAG_COMPAT_DEVICE:
compid = (u_int32_t *)(pd->devdata + idx);
if (bootverbose)
printf("pnpbios: node %d compat ID 0x%08x\n", pd->handle, *compid);
/* FALLTHROUGH */
- case END_TAG:
+ case PNP_TAG_END:
idx = left;
break;
default: