sort #includes

[gem5.git] / dev / ns_gige_reg.h

diff --git a/dev/ns_gige_reg.h b/dev/ns_gige_reg.h
index 5b0f961c098b895275c8629f745f6d18d0ca2c2b..01577fa398438a86a4bbd615a24769c1feb81089 100644 (file)
--- a/dev/ns_gige_reg.h
+++ b/dev/ns_gige_reg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,17 +55,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
-
-
-
 /* @file
  * Ethernet device register definitions for the National
  * Semiconductor DP83820 Ethernet controller
  */
 
-#ifndef _NS_GIGE_H
-#define _NS_GIGE_H_
+#ifndef __DEV_NS_GIGE_REG_H__
+#define __DEV_NS_GIGE_REG_H__
 
 /*
  * Configuration Register Map
@@ -109,6 +105,8 @@
 #define BRDR            0x54
 #define SRR            0x58
 #define MIBC            0x5c
+#define MIB_START       0x60
+#define MIB_END         0x88
 #define VRCR           0xbc
 #define VTCR           0xc0
 #define VDR            0xc4
@@ -182,6 +180,7 @@
 #define PTSCR_RBIST_DONE        0x00000200
 #define PTSCR_RBIST_EN          0x00000400
 #define PTSCR_RBIST_RST         0x00002000
+#define PTSCR_RBIST_RDONLY      0x000003f9
 
 /* interrupt status register */
 #define ISR_RESERVE     0x80000000
@@ -216,6 +215,10 @@
 #define ISR_RXERR      0x00000004
 #define ISR_RXDESC     0x00000002
 #define ISR_RXOK       0x00000001
+#define ISR_ALL         0x7FFFFFFF
+#define ISR_NODELAY    (ISR_ALL & ~(ISR_RXOK|ISR_RXDESC|ISR_TXOK|ISR_TXDESC))
+#define ISR_NOIMPL     (~(ISR_SWI|ISR_TXIDLE|ISR_TXDESC|ISR_TXOK|ISR_RXORN| \
+                           ISR_RXIDLE|ISR_RXDESC|ISR_RXOK))
 
 /* transmit configuration register */
 #define TXCFG_CSI      0x80000000
@@ -232,6 +235,7 @@
 #define TXCFG_MXDMA32  0x00300000
 #define TXCFG_MXDMA16  0x00200000
 #define TXCFG_MXDMA8   0x00100000
+#define TXCFG_MXDMA     0x00700000
 
 #define TXCFG_FLTH_MASK 0x0000ff00
 #define TXCFG_DRTH_MASK 0x000000ff
@@ -253,6 +257,7 @@
 #define RXCFG_ALP      0x08000000
 #define RXCFG_AIRL     0x04000000
 #define RXCFG_MXDMA512 0x00700000
+#define RXCFG_MXDMA     0x00700000
 #define RXCFG_DRTH     0x0000003e
 #define RXCFG_DRTH0    0x00000002
 
@@ -339,12 +344,6 @@ struct ns_desc {
   uint32_t extsts;  /* extended status field for VLAN and IP info */
 };
 
-/* ASSUME32 in bytes, how big the desc fields are */
-#define LINK_LEN 4
-#define BUFPTR_LEN 4
-#define CMDSTS_LEN 4
-#define EXTSTS_LEN 4
-
 /* cmdsts flags for descriptors */
 #define CMDSTS_OWN     0x80000000
 #define CMDSTS_MORE    0x40000000
@@ -369,4 +368,4 @@ struct ns_desc {
 /* speed status */
 #define SPDSTS_POLARITY        (CFG_SPDSTS1 | CFG_SPDSTS0 | CFG_DUPSTS | (lnksts ? CFG_LNKSTS : 0))
 
-#endif /* _NS_GIGE_H_ */
+#endif /* __DEV_NS_GIGE_REG_H__ */