d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix whitespace and comments.

Browse Source
This commit is contained in:
Bruce M Simpson 2004-07-04 22:19:50 +00:00
parent 284fcee0c0
commit 16a649385e
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/pci/if_xlreg.h
View File

@ -237,7 +237,7 @@
#define XL_W2_STATION_ADDR_MID 0x02
#define XL_W2_STATION_ADDR_LO 0x00
#define XL_RESETOPT_FEATUREMASK 0x0001|0x0002|0x004
#define XL_RESETOPT_FEATUREMASK (0x0001 | 0x0002 | 0x004)
#define XL_RESETOPT_D3RESETDIS 0x0008
#define XL_RESETOPT_DISADVFD 0x0010
#define XL_RESETOPT_DISADV100 0x0020
@ -292,9 +292,9 @@
#define XL_MACCTRL_DEFER_3 0x0010
#define XL_MACCTRL_DUPLEX 0x0020
#define XL_MACCTRL_ALLOW_LARGE_PACK 0x0040
#define XL_MACCTRL_EXTEND_AFTER_COL 0x0080 (3c905B only)
#define XL_MACCTRL_FLOW_CONTROL_ENB 0x0100 (3c905B only)
#define XL_MACCTRL_VLT_END 0x0200 (3c905B only)
#define XL_MACCTRL_EXTEND_AFTER_COL 0x0080 /* 3c905B only */
#define XL_MACCTRL_FLOW_CONTROL_ENB 0x0100 /* 3c905B only */
#define XL_MACCTRL_VLT_END 0x0200 /* 3c905B only */
/*
* The 'reset options' register contains power-on reset values
@ -352,7 +352,8 @@
#define XL_MEDIASTAT_AUIDIS 0x8000
#define XL_NETDIAG_TEST_LOWVOLT 0x0001
#define XL_NETDIAG_ASIC_REVMASK (0x0002|0x0004|0x0008|0x0010|0x0020)
#define XL_NETDIAG_ASIC_REVMASK \
(0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020)
#define XL_NETDIAG_UPPER_BYTES_ENABLE 0x0040
#define XL_NETDIAG_STATS_ENABLED 0x0080
#define XL_NETDIAG_TX_FATALERR 0x0100
@ -424,8 +425,10 @@
#define XL_MAXFRAGS 63
#define XL_RX_LIST_CNT 128
#define XL_TX_LIST_CNT 256
#define XL_RX_LIST_SZ XL_RX_LIST_CNT * sizeof(struct xl_list_onefrag)
#define XL_TX_LIST_SZ XL_TX_LIST_CNT * sizeof(struct xl_list)
#define XL_RX_LIST_SZ \
(XL_RX_LIST_CNT * sizeof(struct xl_list_onefrag))
#define XL_TX_LIST_SZ \
(XL_TX_LIST_CNT * sizeof(struct xl_list))
#define XL_MIN_FRAMELEN 60
#define ETHER_ALIGN 2
#define XL_INC(x, y) (x) = (x + 1) % y
@ -606,8 +609,11 @@ struct xl_softc {
struct mtx xl_mtx;
};
/*
* XXX: The driver still tries to sleep with locks held, so disable
* locking for the time being.
*/
#if 0
/* These are a bit premature. The driver still tries to sleep with locks. */
#define XL_LOCK(_sc) mtx_lock(&(_sc)->xl_mtx)
#define XL_UNLOCK(_sc) mtx_unlock(&(_sc)->xl_mtx)
#define XL_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->xl_mtx, MA_OWNED)
@ -703,7 +709,6 @@ struct xl_stats {
* other PCI registers. Note: some are only available on
* the 3c905B, in particular those that related to power management.
*/
#define XL_PCI_VENDOR_ID 0x00
#define XL_PCI_DEVICE_ID 0x02
#define XL_PCI_COMMAND 0x04