Update for new pnp includes

This commit is contained in:
Peter Wemm 1999-09-02 05:37:25 +00:00
parent 6970268ef9
commit 6c233a7138
2 changed files with 6 additions and 8 deletions

View File

@ -44,8 +44,7 @@
#include <machine/tss.h> #include <machine/tss.h>
#include <machine/vmparam.h> #include <machine/vmparam.h>
#include <machine/pc/bios.h> #include <machine/pc/bios.h>
#include <i386/isa/isa_device.h> #include <isa/pnpreg.h>
#include <i386/isa/pnp.h>
#define BIOS_START 0xe0000 #define BIOS_START 0xe0000
#define BIOS_SIZE 0x20000 #define BIOS_SIZE 0x20000
@ -556,12 +555,12 @@ pnpbios_scan(void)
if (PNP_RES_TYPE(tag) == 0) { if (PNP_RES_TYPE(tag) == 0) {
/* Small resource */ /* Small resource */
switch (PNP_SRES_NUM(tag)) { switch (PNP_SRES_NUM(tag)) {
case COMP_DEVICE_ID: case PNP_TAG_COMPAT_DEVICE:
compid = (u_int32_t *)(pd->devdata + idx); compid = (u_int32_t *)(pd->devdata + idx);
if (bootverbose) if (bootverbose)
printf("pnpbios: node %d compat ID 0x%08x\n", pd->handle, *compid); printf("pnpbios: node %d compat ID 0x%08x\n", pd->handle, *compid);
/* FALLTHROUGH */ /* FALLTHROUGH */
case END_TAG: case PNP_TAG_END:
idx = left; idx = left;
break; break;
default: default:

View File

@ -44,8 +44,7 @@
#include <machine/tss.h> #include <machine/tss.h>
#include <machine/vmparam.h> #include <machine/vmparam.h>
#include <machine/pc/bios.h> #include <machine/pc/bios.h>
#include <i386/isa/isa_device.h> #include <isa/pnpreg.h>
#include <i386/isa/pnp.h>
#define BIOS_START 0xe0000 #define BIOS_START 0xe0000
#define BIOS_SIZE 0x20000 #define BIOS_SIZE 0x20000
@ -556,12 +555,12 @@ pnpbios_scan(void)
if (PNP_RES_TYPE(tag) == 0) { if (PNP_RES_TYPE(tag) == 0) {
/* Small resource */ /* Small resource */
switch (PNP_SRES_NUM(tag)) { switch (PNP_SRES_NUM(tag)) {
case COMP_DEVICE_ID: case PNP_TAG_COMPAT_DEVICE:
compid = (u_int32_t *)(pd->devdata + idx); compid = (u_int32_t *)(pd->devdata + idx);
if (bootverbose) if (bootverbose)
printf("pnpbios: node %d compat ID 0x%08x\n", pd->handle, *compid); printf("pnpbios: node %d compat ID 0x%08x\n", pd->handle, *compid);
/* FALLTHROUGH */ /* FALLTHROUGH */
case END_TAG: case PNP_TAG_END:
idx = left; idx = left;
break; break;
default: default: