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

remove old *_UNK style default defines, use standard names from locators.h

Browse Source
This commit is contained in:
jtk 1997-07-18 03:38:33 +00:00
parent c8f37f7d88
commit 7be59a897b
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/hp300/dev/dio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dio.c,v 1.7 1997/05/05 21:00:32 thorpej Exp $ */
/* $NetBSD: dio.c,v 1.8 1997/07/18 03:38:33 jtk Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -176,7 +176,7 @@ diosubmatch(parent, cf, aux)
{
struct dio_attach_args *da = aux;
if (cf->diocf_scode != DIO_UNKNOWN_SCODE &&
if (cf->diocf_scode != DIOCF_SCODE_DEFAULT &&
cf->diocf_scode != da->da_scode)
return (0);

4
sys/arch/hp300/dev/diovar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: diovar.h,v 1.4 1997/07/17 01:59:12 jtk Exp $ */
/* $NetBSD: diovar.h,v 1.5 1997/07/18 03:38:34 jtk Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -73,8 +73,6 @@ struct dio_devdesc {
#include "locators.h"
#define diocf_scode cf_loc[DIOCF_SCODE]
#define DIO_UNKNOWN_SCODE DIOCF_SCODE_DEFAULT
#ifdef _KERNEL
void *dio_scodetopa __P((int));
void *dio_intr_establish __P((int (*)(void *), void *, int, int));

6
sys/arch/hp300/dev/hpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpib.c,v 1.16 1997/04/27 20:58:57 thorpej Exp $ */
/* $NetBSD: hpib.c,v 1.17 1997/07/18 03:38:35 jtk Exp $ */
/*
* Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved.
@ -199,10 +199,10 @@ hpibbussearch(parent, cf, aux)
* the punit information. Make sure the configuration
* allows for this slave/punit combination.
*/
if (cf->hpibbuscf_slave != HPIBBUS_SLAVE_UNK &&
if (cf->hpibbuscf_slave != HPIBBUSCF_SLAVE_DEFAULT &&
cf->hpibbuscf_slave != ha->ha_slave)
goto out;
if (cf->hpibbuscf_punit != HPIBBUS_PUNIT_UNK &&
if (cf->hpibbuscf_punit != HPIBBUSCF_PUNIT_DEFAULT &&
cf->hpibbuscf_punit != ha->ha_punit)
goto out;

5
sys/arch/hp300/dev/hpibvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpibvar.h,v 1.11 1997/07/17 01:59:12 jtk Exp $ */
/* $NetBSD: hpibvar.h,v 1.12 1997/07/18 03:38:36 jtk Exp $ */
/*
* Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved.
@ -114,9 +114,6 @@ struct hpibbus_attach_args {
#define hpibbuscf_slave cf_loc[HPIBBUSCF_SLAVE]
#define hpibbuscf_punit cf_loc[HPIBBUSCF_PUNIT]
#define HPIBBUS_SLAVE_UNK HPIBBUSCF_SLAVE_DEFAULT
#define HPIBBUS_PUNIT_UNK HPIBBUSCF_PUNIT_DEFAULT
#define HPIB_NSLAVES 8 /* number of slaves on a bus */
#define HPIB_NPUNITS 2 /* number of punits per slave */

6
sys/arch/hp300/dev/ppi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ppi.c,v 1.13 1997/04/02 22:37:33 scottr Exp $ */
/* $NetBSD: ppi.c,v 1.14 1997/07/18 03:38:37 jtk Exp $ */
/*
* Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved.
@ -123,8 +123,8 @@ ppimatch(parent, match, aux)
* To prevent matching all unused slots on the bus, we
* don't allow wildcarded locators.
*/
if (match->hpibbuscf_slave == HPIBBUS_SLAVE_UNK ||
match->hpibbuscf_punit == HPIBBUS_PUNIT_UNK)
if (match->hpibbuscf_slave == HPIBBUSCF_SLAVE_DEFAULT ||
match->hpibbuscf_punit == HPIBBUSCF_PUNIT_DEFAULT)
return (0);
return (1);