rename EAP_EN() to the more descriptive EAP_DAC_EN(), and

use it everywhere.
This commit is contained in:
pooka 2002-11-11 22:17:47 +00:00
parent 08a7b34528
commit 36e8081d49
2 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: eap.c,v 1.55 2002/11/07 06:54:25 thorpej Exp $ */ /* $NetBSD: eap.c,v 1.56 2002/11/11 22:17:47 pooka Exp $ */
/* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */ /* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */
/* /*
@ -57,7 +57,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.55 2002/11/07 06:54:25 thorpej Exp $"); __KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.56 2002/11/11 22:17:47 pooka Exp $");
#include "midi.h" #include "midi.h"
@ -1210,7 +1210,7 @@ eap_trigger_output(
EWRITE4(sc, E1371_SRC, 0); EWRITE4(sc, E1371_SRC, 0);
icsc = EREAD4(sc, EAP_ICSC); icsc = EREAD4(sc, EAP_ICSC);
icsc |= EAP_EN(ei->index); icsc |= EAP_DAC_EN(ei->index);
EWRITE4(sc, EAP_ICSC, icsc); EWRITE4(sc, EAP_ICSC, icsc);
DPRINTFN(1, ("eap_trigger_output: set ICSC = 0x%08x\n", icsc)); DPRINTFN(1, ("eap_trigger_output: set ICSC = 0x%08x\n", icsc));
@ -1297,7 +1297,7 @@ eap_halt_output(void *addr)
DPRINTF(("eap: eap_halt_output\n")); DPRINTF(("eap: eap_halt_output\n"));
icsc = EREAD4(sc, EAP_ICSC); icsc = EREAD4(sc, EAP_ICSC);
EWRITE4(sc, EAP_ICSC, icsc & ~(EAP_DAC2_EN << ei->index)); EWRITE4(sc, EAP_ICSC, icsc & ~(EAP_DAC_EN(ei->index)));
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
ei->ei_prun = 0; ei->ei_prun = 0;
#endif #endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: eapreg.h,v 1.3 2002/11/04 16:34:25 pooka Exp $ */ /* $NetBSD: eapreg.h,v 1.4 2002/11/11 22:17:47 pooka Exp $ */
/* /*
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -61,7 +61,7 @@
#define EAP_M_SBB 0x00004000 #define EAP_M_SBB 0x00004000
#define E1371_SYNC_RES 0x00004000 #define E1371_SYNC_RES 0x00004000
#define EAP_MSFMTSEL 0x00008000 #define EAP_MSFMTSEL 0x00008000
#define EAP_EN(i) (EAP_DAC2_EN << (i)) #define EAP_DAC_EN(i) (EAP_DAC2_EN << (i))
#define EAP_SET_PCLKDIV(n) (((n)&0x1fff)<<16) #define EAP_SET_PCLKDIV(n) (((n)&0x1fff)<<16)
#define EAP_GET_PCLKDIV(n) (((n)>>16)&0x1fff) #define EAP_GET_PCLKDIV(n) (((n)>>16)&0x1fff)
#define EAP_PCLKBITS 0x1fff0000 #define EAP_PCLKBITS 0x1fff0000