Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include locators.h and use symbolic name comes from it.

This commit is contained in:
enami 1997-10-19 14:07:19 +00:00
parent 66f7b9fd72
commit 5c1050e68f
2 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/dev/ic/i82365.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365.c,v 1.4 1997/10/17 09:37:12 enami Exp $ */ /* $NetBSD: i82365.c,v 1.5 1997/10/19 14:07:19 enami Exp $ */
#define PCICDEBUG #define PCICDEBUG
@ -49,6 +49,8 @@
#include <dev/ic/i82365reg.h> #include <dev/ic/i82365reg.h>
#include <dev/ic/i82365var.h> #include <dev/ic/i82365var.h>
#include "locators.h"
#ifdef PCICDEBUG #ifdef PCICDEBUG
int pcic_debug = 0; int pcic_debug = 0;
#define DPRINTF(arg) if (pcic_debug) printf arg; #define DPRINTF(arg) if (pcic_debug) printf arg;
@ -383,30 +385,42 @@ pcic_submatch(parent, cf, aux)
switch (h->sock) { switch (h->sock) {
case C0SA: case C0SA:
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != 0) if (cf->cf_loc[PCICCF_CONTROLLER] !=
PCICCF_CONTROLLER_DEFAULT &&
cf->cf_loc[PCICCF_CONTROLLER] != 0)
return 0; return 0;
if (cf->cf_loc[1] != -1 && cf->cf_loc[1] != 0) if (cf->cf_loc[PCICCF_SOCKET] != PCICCF_SOCKET_DEFAULT &&
cf->cf_loc[PCICCF_SOCKET] != 0)
return 0; return 0;
break; break;
case C0SB: case C0SB:
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != 0) if (cf->cf_loc[PCICCF_CONTROLLER] !=
PCICCF_CONTROLLER_DEFAULT &&
cf->cf_loc[PCICCF_CONTROLLER] != 0)
return 0; return 0;
if (cf->cf_loc[1] != -1 && cf->cf_loc[1] != 1) if (cf->cf_loc[PCICCF_SOCKET] != PCICCF_SOCKET_DEFAULT &&
cf->cf_loc[PCICCF_SOCKET] != 1)
return 0; return 0;
break; break;
case C1SA: case C1SA:
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != 1) if (cf->cf_loc[PCICCF_CONTROLLER] !=
PCICCF_CONTROLLER_DEFAULT &&
cf->cf_loc[PCICCF_CONTROLLER] != 1)
return 0; return 0;
if (cf->cf_loc[1] != -1 && cf->cf_loc[1] != 0) if (cf->cf_loc[PCICCF_SOCKET] != PCICCF_SOCKET_DEFAULT &&
cf->cf_loc[PCICCF_SOCKET] != 0)
return 0; return 0;
break; break;
case C1SB: case C1SB:
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != 1) if (cf->cf_loc[PCICCF_CONTROLLER] !=
PCICCF_CONTROLLER_DEFAULT &&
cf->cf_loc[PCICCF_CONTROLLER] != 1)
return 0; return 0;
if (cf->cf_loc[1] != -1 && cf->cf_loc[1] != 1) if (cf->cf_loc[PCICCF_SOCKET] != PCICCF_SOCKET_DEFAULT &&
cf->cf_loc[PCICCF_SOCKET] != 1)
return 0; return 0;
break; break;

32
sys/dev/isa/i82365.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365.c,v 1.4 1997/10/17 09:37:12 enami Exp $ */ /* $NetBSD: i82365.c,v 1.5 1997/10/19 14:07:19 enami Exp $ */
#define PCICDEBUG #define PCICDEBUG
@ -49,6 +49,8 @@
#include <dev/ic/i82365reg.h> #include <dev/ic/i82365reg.h>
#include <dev/ic/i82365var.h> #include <dev/ic/i82365var.h>
#include "locators.h"
#ifdef PCICDEBUG #ifdef PCICDEBUG
int pcic_debug = 0; int pcic_debug = 0;
#define DPRINTF(arg) if (pcic_debug) printf arg; #define DPRINTF(arg) if (pcic_debug) printf arg;
@ -383,30 +385,42 @@ pcic_submatch(parent, cf, aux)
switch (h->sock) { switch (h->sock) {
case C0SA: case C0SA:
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != 0) if (cf->cf_loc[PCICCF_CONTROLLER] !=
PCICCF_CONTROLLER_DEFAULT &&
cf->cf_loc[PCICCF_CONTROLLER] != 0)
return 0; return 0;
if (cf->cf_loc[1] != -1 && cf->cf_loc[1] != 0) if (cf->cf_loc[PCICCF_SOCKET] != PCICCF_SOCKET_DEFAULT &&
cf->cf_loc[PCICCF_SOCKET] != 0)
return 0; return 0;
break; break;
case C0SB: case C0SB:
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != 0) if (cf->cf_loc[PCICCF_CONTROLLER] !=
PCICCF_CONTROLLER_DEFAULT &&
cf->cf_loc[PCICCF_CONTROLLER] != 0)
return 0; return 0;
if (cf->cf_loc[1] != -1 && cf->cf_loc[1] != 1) if (cf->cf_loc[PCICCF_SOCKET] != PCICCF_SOCKET_DEFAULT &&
cf->cf_loc[PCICCF_SOCKET] != 1)
return 0; return 0;
break; break;
case C1SA: case C1SA:
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != 1) if (cf->cf_loc[PCICCF_CONTROLLER] !=
PCICCF_CONTROLLER_DEFAULT &&
cf->cf_loc[PCICCF_CONTROLLER] != 1)
return 0; return 0;
if (cf->cf_loc[1] != -1 && cf->cf_loc[1] != 0) if (cf->cf_loc[PCICCF_SOCKET] != PCICCF_SOCKET_DEFAULT &&
cf->cf_loc[PCICCF_SOCKET] != 0)
return 0; return 0;
break; break;
case C1SB: case C1SB:
if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != 1) if (cf->cf_loc[PCICCF_CONTROLLER] !=
PCICCF_CONTROLLER_DEFAULT &&
cf->cf_loc[PCICCF_CONTROLLER] != 1)
return 0; return 0;
if (cf->cf_loc[1] != -1 && cf->cf_loc[1] != 1) if (cf->cf_loc[PCICCF_SOCKET] != PCICCF_SOCKET_DEFAULT &&
cf->cf_loc[PCICCF_SOCKET] != 1)
return 0; return 0;
break; break;