aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1998-06-13 19:36:22 +0000
committerSteve Price <steve@FreeBSD.org>1998-06-13 19:36:22 +0000
commit396ffb2e6b066b6dc2724620446e4fbe7b579b82 (patch)
tree98b54496edb2391b3f30e45269b20ad59ffea9f6 /sys/dev
parent8c0b8289ef24f87d6bc74b8a34975bb29941f153 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/si/si.c6
-rw-r--r--sys/dev/si/si.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 2d5d6a3398035..96c555b3bc892 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
- * $Id: si.c,v 1.71 1998/06/07 17:10:56 dfr Exp $
+ * $Id: si.c,v 1.72 1998/06/10 12:49:54 phk Exp $
*/
#ifndef lint
@@ -793,7 +793,7 @@ siattach(id)
/* OK, now lets download the download code */
- if ((sc->sc_type == SIJETISA) || (sc->sc_type == SIJETPCI)) {
+ if (SI_ISJET(sc->sc_type)) {
DPRINT((0, DBG_DOWNLOAD, "si%d: jet_download: nbytes %d\n",
id->id_unit, si3_t225_dsize));
si_bcopy(si3_t225_download, maddr + si3_t225_downloadaddr,
@@ -889,7 +889,7 @@ siattach(id)
sc->sc_type = SIEMPTY;
return 0;
case 1:
- if ((sc->sc_type == SIJETISA) || (sc->sc_type == SIJETPCI)) {
+ if (SI_ISJET(sc->sc_type)) {
/* set throttle to 100 times per second */
regp->int_count = JET_INT_COUNT;
/* rx_intr_count is a NOP in Jet */
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index cf0aeb723243f..416486c039b01 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
- * $Id: si.h,v 1.11 1998/03/21 06:17:14 peter Exp $
+ * $Id: si.h,v 1.12 1998/03/23 16:27:43 peter Exp $
*/
#include <sys/callout.h>
@@ -95,6 +95,7 @@
#define SIJETPCI 6
#define SIJETISA 7
+#define SI_ISJET(x) (((x) == SIJETPCI) || ((x) == SIJETISA))
/* Buffer parameters */
#define SI_BUFFERSIZE 256