narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct symbol violations reported by "make symcheck"

pull/1/head
Michael Brown 2005-05-02 15:22:32 +00:00
parent 35ab3bf808
commit a1f50f27b0
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/drivers/net/sundance.c
View File

@ -48,6 +48,7 @@
#include "pci.h" #include "pci.h"
#include "timer.h" #include "timer.h"
#include "mii.h" #include "mii.h"
#include "shared.h"
#define drv_version "v1.12" #define drv_version "v1.12"
#define drv_date "2004-03-21" #define drv_date "2004-03-21"
@ -248,16 +249,17 @@ enum desc_status_bits {
/* Define the TX Descriptor */ /* Define the TX Descriptor */
static struct netdev_desc tx_ring[TX_RING_SIZE]; static struct netdev_desc tx_ring[TX_RING_SIZE];
/* Create a static buffer of size PKT_BUF_SZ for each TX Descriptor.
All descriptors point to a part of this buffer */
static unsigned char txb[PKT_BUF_SZ * TX_RING_SIZE];
/* Define the RX Descriptor */ /* Define the RX Descriptor */
static struct netdev_desc rx_ring[RX_RING_SIZE]; static struct netdev_desc rx_ring[RX_RING_SIZE];
/* Create a static buffer of size PKT_BUF_SZ for each RX Descriptor. /* Create a static buffer of size PKT_BUF_SZ for each RX and TX descriptor.
All descriptors point to a part of this buffer */ All descriptors point to a part of this buffer */
static unsigned char rxb[RX_RING_SIZE * PKT_BUF_SZ]; struct {
unsigned char txb[PKT_BUF_SZ * TX_RING_SIZE];
unsigned char rxb[RX_RING_SIZE * PKT_BUF_SZ];
} rx_tx_buf __shared;
#define rxb rx_tx_buf.rxb
#define txb rx_tx_buf.txb
/* FIXME: Move BASE to the private structure */ /* FIXME: Move BASE to the private structure */
static u32 BASE; static u32 BASE;
@ -273,7 +275,7 @@ enum chip_capability_flags { CanHaveMII = 1, KendinPktDropBug = 2, };
#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_IO | PCI_ADDR0) #define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_IO | PCI_ADDR0)
#define MII_CNT 4 #define MII_CNT 4
struct sundance_private { static struct sundance_private {
const char *nic_name; const char *nic_name;
/* Frequently used values */ /* Frequently used values */
@ -440,7 +442,7 @@ static void sundance_reset(struct nic *nic)
/************************************************************************** /**************************************************************************
IRQ - Wait for a frame IRQ - Wait for a frame
***************************************************************************/ ***************************************************************************/
void sundance_irq ( struct nic *nic, irq_action_t action ) { static void sundance_irq ( struct nic *nic, irq_action_t action ) {
unsigned int intr_status; unsigned int intr_status;
switch ( action ) { switch ( action ) {

30
src/drivers/net/tg3.c
View File

@ -16,6 +16,7 @@
#include "pci.h" #include "pci.h"
#include "timer.h" #include "timer.h"
#include "string.h" #include "string.h"
#include "shared.h"
#include "tg3.h" #include "tg3.h"
#define SUPPORT_COPPER_PHY 1 #define SUPPORT_COPPER_PHY 1
@ -24,7 +25,7 @@
#define SUPPORT_PARTNO_STR 1 #define SUPPORT_PARTNO_STR 1
#define SUPPORT_PHY_STR 1 #define SUPPORT_PHY_STR 1
struct tg3 tg3; static struct tg3 tg3;
/* Dummy defines for error handling */ /* Dummy defines for error handling */
#define EBUSY 1 #define EBUSY 1
@ -55,15 +56,22 @@ struct tg3 tg3;
#define RX_PKT_BUF_SZ (1536 + 2 + 64) #define RX_PKT_BUF_SZ (1536 + 2 + 64)
struct eth_frame {
uint8_t dst_addr[ETH_ALEN];
uint8_t src_addr[ETH_ALEN];
uint16_t type;
uint8_t data [ETH_FRAME_LEN - ETH_HLEN];
};
static struct bss { struct bss {
struct tg3_rx_buffer_desc rx_std[TG3_RX_RING_SIZE]; struct tg3_rx_buffer_desc rx_std[TG3_RX_RING_SIZE];
struct tg3_rx_buffer_desc rx_rcb[TG3_RX_RCB_RING_SIZE]; struct tg3_rx_buffer_desc rx_rcb[TG3_RX_RCB_RING_SIZE];
struct tg3_tx_buffer_desc tx_ring[TG3_TX_RING_SIZE]; struct tg3_tx_buffer_desc tx_ring[TG3_TX_RING_SIZE];
struct tg3_hw_status hw_status; struct tg3_hw_status hw_status;
struct tg3_hw_stats hw_stats; struct tg3_hw_stats hw_stats;
unsigned char rx_bufs[TG3_DEF_RX_RING_PENDING][RX_PKT_BUF_SZ]; unsigned char rx_bufs[TG3_DEF_RX_RING_PENDING][RX_PKT_BUF_SZ];
} tg3_bss; struct eth_frame tx_frame[2];
} tg3_bss __shared;
/** /**
* pci_save_state - save the PCI configuration space of a device before suspending * pci_save_state - save the PCI configuration space of a device before suspending
@ -3126,13 +3134,8 @@ static void tg3_set_txd(struct tg3 *tp, int entry,
static void tg3_transmit(struct nic *nic, const char *dst_addr, static void tg3_transmit(struct nic *nic, const char *dst_addr,
unsigned int type, unsigned int size, const char *packet) unsigned int type, unsigned int size, const char *packet)
{ {
static struct eth_frame {
uint8_t dst_addr[ETH_ALEN];
uint8_t src_addr[ETH_ALEN];
uint16_t type;
uint8_t data [ETH_FRAME_LEN - ETH_HLEN];
} frame[2];
static int frame_idx; static int frame_idx;
struct eth_frame *frame;
/* send the packet to destination */ /* send the packet to destination */
struct tg3_tx_buffer_desc *txd; struct tg3_tx_buffer_desc *txd;
@ -3160,11 +3163,12 @@ static void tg3_transmit(struct nic *nic, const char *dst_addr,
} }
/* Copy the packet to the our local buffer */ /* Copy the packet to the our local buffer */
memcpy(&frame[frame_idx].dst_addr, dst_addr, ETH_ALEN); frame = &tg3_bss.tx_frame[frame_idx];
memcpy(&frame[frame_idx].src_addr, nic->node_addr, ETH_ALEN); memcpy(frame[frame_idx].dst_addr, dst_addr, ETH_ALEN);
memcpy(frame[frame_idx].src_addr, nic->node_addr, ETH_ALEN);
frame[frame_idx].type = htons(type); frame[frame_idx].type = htons(type);
memset(&frame[frame_idx].data, 0, sizeof(frame[frame_idx].data)); memset(frame[frame_idx].data, 0, sizeof(frame[frame_idx].data));
memcpy(&frame[frame_idx].data, packet, size); memcpy(frame[frame_idx].data, packet, size);
/* Setup the ring buffer entry to transmit */ /* Setup the ring buffer entry to transmit */
txd = &tp->tx_ring[entry]; txd = &tp->tx_ring[entry];