Module Name: src
Committed By: thorpej
Date: Wed Jul 20 14:19:39 UTC 2022
Modified Files:
src/sys/dev/tc: zs_ioasic.c
Log Message:
No need to test for __alpha__ || alpha ... just one will suffice.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/tc/zs_ioasic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/tc/zs_ioasic.c
diff -u src/sys/dev/tc/zs_ioasic.c:1.45 src/sys/dev/tc/zs_ioasic.c:1.46
--- src/sys/dev/tc/zs_ioasic.c:1.45 Sat May 28 10:36:23 2022
+++ src/sys/dev/tc/zs_ioasic.c Wed Jul 20 14:19:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ioasic.c,v 1.45 2022/05/28 10:36:23 andvar Exp $ */
+/* $NetBSD: zs_ioasic.c,v 1.46 2022/07/20 14:19:38 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.45 2022/05/28 10:36:23 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.46 2022/07/20 14:19:38 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,
#include <dev/tc/zs_ioasicvar.h>
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
#include <machine/rpb.h>
#endif
#if defined(pmax)
@@ -113,7 +113,7 @@ int zs_def_cflag = (TTYDEF_CFLAG & ~(CSI
/* The layout of this is hardware-dependent (padding, order). */
struct zshan {
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
volatile u_int zc_csr; /* ctrl,status, and indirect access */
u_int zc_pad0;
volatile u_int zc_data; /* data */
@@ -158,7 +158,7 @@ zs_ioasic_get_chan_addr(tc_addr_t zsaddr
struct zsdevice *addr;
struct zshan *zc;
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
addr = (struct zsdevice *)TC_DENSE_TO_SPARSE(zsaddr);
#endif
#if defined(pmax)
@@ -343,7 +343,7 @@ zs_ioasic_attach(device_t parent, device
/* master interrupt control (enable) */
zs_write_reg(zs->zsc_cs[0], 9, zs_ioasic_init_reg[9]);
zs_write_reg(zs->zsc_cs[1], 9, zs_ioasic_init_reg[9]);
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
/* ioasic interrupt enable */
*(volatile u_int *)(ioasic_base + IOASIC_IMSK) |=
IOASIC_INTR_SCC_1 | IOASIC_INTR_SCC_0;
@@ -394,7 +394,7 @@ zs_ioasic_submatch(device_t parent, cfda
else if (systype == DS_MAXINE)
return (0);
#endif
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
else if (cputype == ST_DEC_3000_300)
return (0);
#endif
@@ -719,7 +719,7 @@ zs_ioasic_cninit(tc_addr_t ioasic_addr,
* Compute the physical address of the chip, "map" it via
* K0SEG, and then get the address of the actual channel.
*/
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
zs_addr = ALPHA_PHYS_TO_K0SEG(ioasic_addr + zs_offset);
#endif
#if defined(pmax)
