diff options
author | Jason Wright <jason@cvs.openbsd.org> | 2001-08-09 21:12:52 +0000 |
---|---|---|
committer | Jason Wright <jason@cvs.openbsd.org> | 2001-08-09 21:12:52 +0000 |
commit | 9dfada6aaa5bbdeae95706bad70116b9ea08fa7a (patch) | |
tree | ee61f716b53c057465f0c4ecda2d35cb5d6f7b1d /sys/dev/ic/fxpreg.h | |
parent | 7d8a2e7ebed1af876ebeb527861bf6c4fe108ba3 (diff) |
- scb_wait() is now time based (not cpu speed based)
- rearrange multicast setup to be part of init
- convert cu operations to bus_dma(9) (still have to do RFA ops).
Diffstat (limited to 'sys/dev/ic/fxpreg.h')
-rw-r--r-- | sys/dev/ic/fxpreg.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/dev/ic/fxpreg.h b/sys/dev/ic/fxpreg.h index 586c1878c1c..c9b1fab9a11 100644 --- a/sys/dev/ic/fxpreg.h +++ b/sys/dev/ic/fxpreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fxpreg.h,v 1.2 2000/04/26 19:12:08 chris Exp $ */ +/* $OpenBSD: fxpreg.h,v 1.3 2001/08/09 21:12:51 jason Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -106,7 +106,6 @@ struct fxp_cb_nop { volatile u_int32_t link_addr; }; struct fxp_cb_ias { - void *fill[2]; volatile u_int16_t cb_status; volatile u_int16_t cb_command; volatile u_int32_t link_addr; @@ -114,7 +113,6 @@ struct fxp_cb_ias { }; /* I hate bit-fields :-( */ struct fxp_cb_config { - void *fill[2]; volatile u_int16_t cb_status; volatile u_int16_t cb_command; volatile u_int32_t link_addr; @@ -176,8 +174,6 @@ struct fxp_cb_config { #define MAXMCADDR 80 struct fxp_cb_mcs { - struct fxp_cb_tx *next; - struct mbuf *mb_head; volatile u_int16_t cb_status; volatile u_int16_t cb_command; volatile u_int32_t link_addr; @@ -193,9 +189,9 @@ struct fxp_cb_mcs { * */ #ifdef __alpha__ /* XXX - should be conditional on pointer size */ -#define FXP_NTXSEG 28 +#define FXP_NTXSEG 30 #else -#define FXP_NTXSEG 29 +#define FXP_NTXSEG 31 #endif struct fxp_tbd { @@ -203,8 +199,6 @@ struct fxp_tbd { volatile u_int32_t tb_size; }; struct fxp_cb_tx { - struct fxp_cb_tx *next; - struct mbuf *mb_head; volatile u_int16_t cb_status; volatile u_int16_t cb_command; volatile u_int32_t link_addr; |