Merged mcb30-realmode-redesign back to HEAD

This commit is contained in:
Michael Brown
2005-04-08 15:01:17 +00:00
parent de5d935135
commit 0ff80b477d
100 changed files with 4877 additions and 4263 deletions

View File

@@ -370,25 +370,6 @@ struct ring_desc {
};
#endif
/* Define the TX Descriptor */
static struct ring_desc tx_ring[NR_TX_DESC]
__attribute__ ((aligned(8)));
/* Create a static buffer of size REAL_RX_BUF_SIZE for each
TX Descriptor. All descriptors point to a
part of this buffer */
static unsigned char txb[NR_TX_DESC * REAL_RX_BUF_SIZE];
/* Define the TX Descriptor */
static struct ring_desc rx_ring[NR_RX_DESC]
__attribute__ ((aligned(8)));
/* Create a static buffer of size REAL_RX_BUF_SIZE for each
RX Descriptor All descriptors point to a
part of this buffer */
static unsigned char rxb[NR_RX_DESC * REAL_RX_BUF_SIZE]
__attribute__ ((aligned(8)));
/* Private Storage for the NIC */
struct ns83820_private {
u8 *base;
@@ -412,6 +393,25 @@ struct ns83820_private {
} nsx;
static struct ns83820_private *ns;
/* Define the TX Descriptor */
static struct ring_desc tx_ring[NR_TX_DESC]
__attribute__ ((aligned(8)));
/* Create a static buffer of size REAL_RX_BUF_SIZE for each
TX Descriptor. All descriptors point to a
part of this buffer */
static unsigned char txb[NR_TX_DESC * REAL_RX_BUF_SIZE];
/* Define the TX Descriptor */
static struct ring_desc rx_ring[NR_RX_DESC]
__attribute__ ((aligned(8)));
/* Create a static buffer of size REAL_RX_BUF_SIZE for each
RX Descriptor All descriptors point to a
part of this buffer */
static unsigned char rxb[NR_RX_DESC * REAL_RX_BUF_SIZE]
__attribute__ ((aligned(8)));
static void phy_intr(struct nic *nic __unused)
{
static char *speeds[] =