Skip to content

L
linux
Commit 3f8597f4 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6655: device.h use change __device_info to vnt_private 

Coverting all functions to struct vnt_private in device.h and device_main.c
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 965d017f
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 84 deletions
drivers/staging/vt6655/device.h
View file @ 3f8597f4
...@@ -337,9 +337,10 @@ typedef struct __device_opt { ...@@ -337,9 +337,10 @@ typedef struct __device_opt {
u32 flags; u32 flags;
} OPTIONS, *POPTIONS; } OPTIONS, *POPTIONS;
typedef struct __device_info { /* TODO Convert all functions to struct vnt_private and remove typedef */
struct __device_info *next; typedef struct vnt_private {
struct __device_info *prev; struct vnt_private *next;
struct vnt_private *prev;
struct pci_dev *pcid; struct pci_dev *pcid;
...@@ -744,7 +745,8 @@ typedef struct __device_info { ...@@ -744,7 +745,8 @@ typedef struct __device_info {
bool bCommit; bool bCommit;
} DEVICE_INFO, *PSDevice; } DEVICE_INFO, *PSDevice;
static inline bool device_get_ip(PSDevice pInfo) { static inline bool device_get_ip(struct vnt_private *pInfo)
{
struct in_device *in_dev = (struct in_device *)pInfo->dev->ip_ptr; struct in_device *in_dev = (struct in_device *)pInfo->dev->ip_ptr;
struct in_ifaddr *ifa; struct in_ifaddr *ifa;
...@@ -770,7 +772,10 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) ...@@ -770,7 +772,10 @@ static inline PDEVICE_TD_INFO alloc_td_info(void)
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex); bool device_dma0_xmit(struct vnt_private *pDevice,
bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); struct sk_buff *skb, unsigned int uNodeIndex);
int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter); bool device_alloc_frag_buf(struct vnt_private *pDevice,
PSDeFragControlBlock pDeF);
int Config_FileOperation(struct vnt_private *pDevice,
bool fwrite, unsigned char *Parameter);
#endif #endif
drivers/staging/vt6655/device_main.c
View file @ 3f8597f4
...@@ -249,7 +249,7 @@ DEVICE_PARAM(bDiversityANTEnable, "ANT diversity mode"); ...@@ -249,7 +249,7 @@ DEVICE_PARAM(bDiversityANTEnable, "ANT diversity mode");
// //
static int device_nics = 0; static int device_nics = 0;
static PSDevice pDevice_Infos = NULL; static struct vnt_private *pDevice_Infos = NULL;
static struct net_device *root_device_dev = NULL; static struct net_device *root_device_dev = NULL;
static CHIP_INFO chip_info_table[] = { static CHIP_INFO chip_info_table[] = {
...@@ -266,12 +266,13 @@ static const struct pci_device_id vt6655_pci_id_table[] = { ...@@ -266,12 +266,13 @@ static const struct pci_device_id vt6655_pci_id_table[] = {
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent); static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent);
static void vt6655_init_info(struct pci_dev *pcid, PSDevice *ppDevice, PCHIP_INFO); static void vt6655_init_info(struct pci_dev *pcid,
static void device_free_info(PSDevice pDevice); struct vnt_private **ppDevice, PCHIP_INFO);
static bool device_get_pci_info(PSDevice, struct pci_dev *pcid); static void device_free_info(struct vnt_private *pDevice);
static void device_print_info(PSDevice pDevice); static bool device_get_pci_info(struct vnt_private *, struct pci_dev *pcid);
static void device_print_info(struct vnt_private *pDevice);
static struct net_device_stats *device_get_stats(struct net_device *dev); static struct net_device_stats *device_get_stats(struct net_device *dev);
static void device_init_diversity_timer(PSDevice pDevice); static void device_init_diversity_timer(struct vnt_private *pDevice);
static int device_open(struct net_device *dev); static int device_open(struct net_device *dev);
static int device_xmit(struct sk_buff *skb, struct net_device *dev); static int device_xmit(struct sk_buff *skb, struct net_device *dev);
static irqreturn_t device_intr(int irq, void *dev_instance); static irqreturn_t device_intr(int irq, void *dev_instance);
...@@ -290,28 +291,28 @@ static struct notifier_block device_notifier = { ...@@ -290,28 +291,28 @@ static struct notifier_block device_notifier = {
}; };
#endif #endif
static void device_init_rd0_ring(PSDevice pDevice); static void device_init_rd0_ring(struct vnt_private *pDevice);
static void device_init_rd1_ring(PSDevice pDevice); static void device_init_rd1_ring(struct vnt_private *pDevice);
static void device_init_defrag_cb(PSDevice pDevice); static void device_init_defrag_cb(struct vnt_private *pDevice);
static void device_init_td0_ring(PSDevice pDevice); static void device_init_td0_ring(struct vnt_private *pDevice);
static void device_init_td1_ring(PSDevice pDevice); static void device_init_td1_ring(struct vnt_private *pDevice);
static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev); static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev);
//2008-0714<Add>by Mike Liu //2008-0714<Add>by Mike Liu
static bool device_release_WPADEV(PSDevice pDevice); static bool device_release_WPADEV(struct vnt_private *pDevice);
static int ethtool_ioctl(struct net_device *dev, void __user *useraddr); static int ethtool_ioctl(struct net_device *dev, void __user *useraddr);
static int device_rx_srv(PSDevice pDevice, unsigned int uIdx); static int device_rx_srv(struct vnt_private *pDevice, unsigned int uIdx);
static int device_tx_srv(PSDevice pDevice, unsigned int uIdx); static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx);
static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pDesc); static bool device_alloc_rx_buf(struct vnt_private *pDevice, PSRxDesc pDesc);
static void device_init_registers(PSDevice pDevice); static void device_init_registers(struct vnt_private *pDevice);
static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc); static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc);
static void device_free_td0_ring(PSDevice pDevice); static void device_free_td0_ring(struct vnt_private *pDevice);
static void device_free_td1_ring(PSDevice pDevice); static void device_free_td1_ring(struct vnt_private *pDevice);
static void device_free_rd0_ring(PSDevice pDevice); static void device_free_rd0_ring(struct vnt_private *pDevice);
static void device_free_rd1_ring(PSDevice pDevice); static void device_free_rd1_ring(struct vnt_private *pDevice);
static void device_free_rings(PSDevice pDevice); static void device_free_rings(struct vnt_private *pDevice);
static void device_free_frag_buf(PSDevice pDevice); static void device_free_frag_buf(struct vnt_private *pDevice);
static int Config_FileGetParameter(unsigned char *string, static int Config_FileGetParameter(unsigned char *string,
unsigned char *dest, unsigned char *source); unsigned char *dest, unsigned char *source);
...@@ -331,14 +332,15 @@ static char *get_chip_name(int chip_id) ...@@ -331,14 +332,15 @@ static char *get_chip_name(int chip_id)
static void vt6655_remove(struct pci_dev *pcid) static void vt6655_remove(struct pci_dev *pcid)
{ {
PSDevice pDevice = pci_get_drvdata(pcid); struct vnt_private *pDevice = pci_get_drvdata(pcid);
if (pDevice == NULL) if (pDevice == NULL)
return; return;
device_free_info(pDevice); device_free_info(pDevice);
} }
static void device_get_options(PSDevice pDevice, int index, char *devname) static void device_get_options(struct vnt_private *pDevice,
int index, char *devname)
{ {
POPTIONS pOpts = &(pDevice->sOpts); POPTIONS pOpts = &(pDevice->sOpts);
...@@ -363,7 +365,8 @@ static void device_get_options(PSDevice pDevice, int index, char *devname) ...@@ -363,7 +365,8 @@ static void device_get_options(PSDevice pDevice, int index, char *devname)
} }
static void static void
device_set_options(PSDevice pDevice) { device_set_options(struct vnt_private *pDevice)
{
unsigned char abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; unsigned char abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
unsigned char abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00}; unsigned char abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00};
unsigned char abySNAP_Bridgetunnel[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8}; unsigned char abySNAP_Bridgetunnel[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8};
...@@ -411,7 +414,8 @@ device_set_options(PSDevice pDevice) { ...@@ -411,7 +414,8 @@ device_set_options(PSDevice pDevice) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " pDevice->bDiversityRegCtlON= %d\n", (int)pDevice->bDiversityRegCtlON); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " pDevice->bDiversityRegCtlON= %d\n", (int)pDevice->bDiversityRegCtlON);
} }
static void s_vCompleteCurrentMeasure(PSDevice pDevice, unsigned char byResult) static void s_vCompleteCurrentMeasure(struct vnt_private *pDevice,
unsigned char byResult)
{ {
unsigned int ii; unsigned int ii;
unsigned long dwDuration = 0; unsigned long dwDuration = 0;
...@@ -453,7 +457,7 @@ static void s_vCompleteCurrentMeasure(PSDevice pDevice, unsigned char byResult) ...@@ -453,7 +457,7 @@ static void s_vCompleteCurrentMeasure(PSDevice pDevice, unsigned char byResult)
// Initialisation of MAC & BBP registers // Initialisation of MAC & BBP registers
// //
static void device_init_registers(PSDevice pDevice) static void device_init_registers(struct vnt_private *pDevice)
{ {
unsigned int ii; unsigned int ii;
unsigned char byValue; unsigned char byValue;
...@@ -763,7 +767,7 @@ static void device_init_registers(PSDevice pDevice) ...@@ -763,7 +767,7 @@ static void device_init_registers(PSDevice pDevice)
netif_stop_queue(pDevice->dev); netif_stop_queue(pDevice->dev);
} }
static void device_init_diversity_timer(PSDevice pDevice) static void device_init_diversity_timer(struct vnt_private *pDevice)
{ {
init_timer(&pDevice->TimerSQ3Tmax1); init_timer(&pDevice->TimerSQ3Tmax1);
pDevice->TimerSQ3Tmax1.data = (unsigned long) pDevice; pDevice->TimerSQ3Tmax1.data = (unsigned long) pDevice;
...@@ -781,7 +785,7 @@ static void device_init_diversity_timer(PSDevice pDevice) ...@@ -781,7 +785,7 @@ static void device_init_diversity_timer(PSDevice pDevice)
pDevice->TimerSQ3Tmax3.expires = RUN_AT(HZ); pDevice->TimerSQ3Tmax3.expires = RUN_AT(HZ);
} }
static bool device_release_WPADEV(PSDevice pDevice) static bool device_release_WPADEV(struct vnt_private *pDevice)
{ {
viawget_wpa_header *wpahdr; viawget_wpa_header *wpahdr;
int ii = 0; int ii = 0;
...@@ -827,7 +831,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) ...@@ -827,7 +831,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
static bool bFirst = true; static bool bFirst = true;
struct net_device *dev = NULL; struct net_device *dev = NULL;
PCHIP_INFO pChip_info = (PCHIP_INFO)ent->driver_data; PCHIP_INFO pChip_info = (PCHIP_INFO)ent->driver_data;
PSDevice pDevice; struct vnt_private *pDevice;
int rc; int rc;
if (device_nics++ >= MAX_UINTS) { if (device_nics++ >= MAX_UINTS) {
...@@ -837,7 +841,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) ...@@ -837,7 +841,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
dev = alloc_etherdev(sizeof(DEVICE_INFO)); dev = alloc_etherdev(sizeof(DEVICE_INFO));
pDevice = (PSDevice) netdev_priv(dev); pDevice = netdev_priv(dev);
if (dev == NULL) { if (dev == NULL) {
pr_err(DEVICE_NAME ": allocate net device failed\n"); pr_err(DEVICE_NAME ": allocate net device failed\n");
...@@ -977,7 +981,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) ...@@ -977,7 +981,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
return 0; return 0;
} }
static void device_print_info(PSDevice pDevice) static void device_print_info(struct vnt_private *pDevice)
{ {
struct net_device *dev = pDevice->dev; struct net_device *dev = pDevice->dev;
...@@ -989,9 +993,11 @@ static void device_print_info(PSDevice pDevice) ...@@ -989,9 +993,11 @@ static void device_print_info(PSDevice pDevice)
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " IRQ=%d\n", pDevice->dev->irq); DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " IRQ=%d\n", pDevice->dev->irq);
} }
static void vt6655_init_info(struct pci_dev *pcid, PSDevice *ppDevice, static void vt6655_init_info(struct pci_dev *pcid,
PCHIP_INFO pChip_info) { struct vnt_private **ppDevice,
PSDevice p; PCHIP_INFO pChip_info)
{
struct vnt_private *p;
memset(*ppDevice, 0, sizeof(DEVICE_INFO)); memset(*ppDevice, 0, sizeof(DEVICE_INFO));
...@@ -1013,7 +1019,8 @@ static void vt6655_init_info(struct pci_dev *pcid, PSDevice *ppDevice, ...@@ -1013,7 +1019,8 @@ static void vt6655_init_info(struct pci_dev *pcid, PSDevice *ppDevice,
spin_lock_init(&((*ppDevice)->lock)); spin_lock_init(&((*ppDevice)->lock));
} }
static bool device_get_pci_info(PSDevice pDevice, struct pci_dev *pcid) static bool device_get_pci_info(struct vnt_private *pDevice,
struct pci_dev *pcid)
{ {
u16 pci_cmd; u16 pci_cmd;
u8 b; u8 b;
...@@ -1061,9 +1068,9 @@ static bool device_get_pci_info(PSDevice pDevice, struct pci_dev *pcid) ...@@ -1061,9 +1068,9 @@ static bool device_get_pci_info(PSDevice pDevice, struct pci_dev *pcid)
return true; return true;
} }
static void device_free_info(PSDevice pDevice) static void device_free_info(struct vnt_private *pDevice)
{ {
PSDevice ptr; struct vnt_private *ptr;
struct net_device *dev = pDevice->dev; struct net_device *dev = pDevice->dev;
ASSERT(pDevice); ASSERT(pDevice);
...@@ -1106,7 +1113,7 @@ static void device_free_info(PSDevice pDevice) ...@@ -1106,7 +1113,7 @@ static void device_free_info(PSDevice pDevice)
free_netdev(dev); free_netdev(dev);
} }
static bool device_init_rings(PSDevice pDevice) static bool device_init_rings(struct vnt_private *pDevice)
{ {
void *vir_pool; void *vir_pool;
...@@ -1182,7 +1189,7 @@ static bool device_init_rings(PSDevice pDevice) ...@@ -1182,7 +1189,7 @@ static bool device_init_rings(PSDevice pDevice)
return true; return true;
} }
static void device_free_rings(PSDevice pDevice) static void device_free_rings(struct vnt_private *pDevice)
{ {
pci_free_consistent(pDevice->pcid, pci_free_consistent(pDevice->pcid,
pDevice->sOpts.nRxDescs0 * sizeof(SRxDesc) + pDevice->sOpts.nRxDescs0 * sizeof(SRxDesc) +
...@@ -1203,7 +1210,7 @@ static void device_free_rings(PSDevice pDevice) ...@@ -1203,7 +1210,7 @@ static void device_free_rings(PSDevice pDevice)
); );
} }
static void device_init_rd0_ring(PSDevice pDevice) static void device_init_rd0_ring(struct vnt_private *pDevice)
{ {
int i; int i;
dma_addr_t curr = pDevice->rd0_pool_dma; dma_addr_t curr = pDevice->rd0_pool_dma;
...@@ -1228,7 +1235,7 @@ static void device_init_rd0_ring(PSDevice pDevice) ...@@ -1228,7 +1235,7 @@ static void device_init_rd0_ring(PSDevice pDevice)
pDevice->pCurrRD[0] = &(pDevice->aRD0Ring[0]); pDevice->pCurrRD[0] = &(pDevice->aRD0Ring[0]);
} }
static void device_init_rd1_ring(PSDevice pDevice) static void device_init_rd1_ring(struct vnt_private *pDevice)
{ {
int i; int i;
dma_addr_t curr = pDevice->rd1_pool_dma; dma_addr_t curr = pDevice->rd1_pool_dma;
...@@ -1253,7 +1260,7 @@ static void device_init_rd1_ring(PSDevice pDevice) ...@@ -1253,7 +1260,7 @@ static void device_init_rd1_ring(PSDevice pDevice)
pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]); pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]);
} }
static void device_init_defrag_cb(PSDevice pDevice) static void device_init_defrag_cb(struct vnt_private *pDevice)
{ {
int i; int i;
PSDeFragControlBlock pDeF; PSDeFragControlBlock pDeF;
...@@ -1270,7 +1277,7 @@ static void device_init_defrag_cb(PSDevice pDevice) ...@@ -1270,7 +1277,7 @@ static void device_init_defrag_cb(PSDevice pDevice)
pDevice->cbFreeDFCB = pDevice->cbDFCB; pDevice->cbFreeDFCB = pDevice->cbDFCB;
} }
static void device_free_rd0_ring(PSDevice pDevice) static void device_free_rd0_ring(struct vnt_private *pDevice)
{ {
int i; int i;
...@@ -1287,7 +1294,7 @@ static void device_free_rd0_ring(PSDevice pDevice) ...@@ -1287,7 +1294,7 @@ static void device_free_rd0_ring(PSDevice pDevice)
} }
} }
static void device_free_rd1_ring(PSDevice pDevice) static void device_free_rd1_ring(struct vnt_private *pDevice)
{ {
int i; int i;
...@@ -1304,7 +1311,7 @@ static void device_free_rd1_ring(PSDevice pDevice) ...@@ -1304,7 +1311,7 @@ static void device_free_rd1_ring(PSDevice pDevice)
} }
} }
static void device_free_frag_buf(PSDevice pDevice) static void device_free_frag_buf(struct vnt_private *pDevice)
{ {
PSDeFragControlBlock pDeF; PSDeFragControlBlock pDeF;
int i; int i;
...@@ -1318,7 +1325,7 @@ static void device_free_frag_buf(PSDevice pDevice) ...@@ -1318,7 +1325,7 @@ static void device_free_frag_buf(PSDevice pDevice)
} }
} }
static void device_init_td0_ring(PSDevice pDevice) static void device_init_td0_ring(struct vnt_private *pDevice)
{ {
int i; int i;
dma_addr_t curr; dma_addr_t curr;
...@@ -1343,7 +1350,7 @@ static void device_init_td0_ring(PSDevice pDevice) ...@@ -1343,7 +1350,7 @@ static void device_init_td0_ring(PSDevice pDevice)
pDevice->apTailTD[0] = pDevice->apCurrTD[0] = &(pDevice->apTD0Rings[0]); pDevice->apTailTD[0] = pDevice->apCurrTD[0] = &(pDevice->apTD0Rings[0]);
} }
static void device_init_td1_ring(PSDevice pDevice) static void device_init_td1_ring(struct vnt_private *pDevice)
{ {
int i; int i;
dma_addr_t curr; dma_addr_t curr;
...@@ -1369,7 +1376,7 @@ static void device_init_td1_ring(PSDevice pDevice) ...@@ -1369,7 +1376,7 @@ static void device_init_td1_ring(PSDevice pDevice)
pDevice->apTailTD[1] = pDevice->apCurrTD[1] = &(pDevice->apTD1Rings[0]); pDevice->apTailTD[1] = pDevice->apCurrTD[1] = &(pDevice->apTD1Rings[0]);
} }
static void device_free_td0_ring(PSDevice pDevice) static void device_free_td0_ring(struct vnt_private *pDevice)
{ {
int i; int i;
...@@ -1388,7 +1395,7 @@ static void device_free_td0_ring(PSDevice pDevice) ...@@ -1388,7 +1395,7 @@ static void device_free_td0_ring(PSDevice pDevice)
} }
} }
static void device_free_td1_ring(PSDevice pDevice) static void device_free_td1_ring(struct vnt_private *pDevice)
{ {
int i; int i;
...@@ -1409,7 +1416,7 @@ static void device_free_td1_ring(PSDevice pDevice) ...@@ -1409,7 +1416,7 @@ static void device_free_td1_ring(PSDevice pDevice)
/*-----------------------------------------------------------------*/ /*-----------------------------------------------------------------*/
static int device_rx_srv(PSDevice pDevice, unsigned int uIdx) static int device_rx_srv(struct vnt_private *pDevice, unsigned int uIdx)
{ {
PSRxDesc pRD; PSRxDesc pRD;
int works = 0; int works = 0;
...@@ -1435,7 +1442,7 @@ static int device_rx_srv(PSDevice pDevice, unsigned int uIdx) ...@@ -1435,7 +1442,7 @@ static int device_rx_srv(PSDevice pDevice, unsigned int uIdx)
return works; return works;
} }
static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) static bool device_alloc_rx_buf(struct vnt_private *pDevice, PSRxDesc pRD)
{ {
PDEVICE_RD_INFO pRDInfo = pRD->pRDInfo; PDEVICE_RD_INFO pRDInfo = pRD->pRDInfo;
...@@ -1456,7 +1463,8 @@ static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) ...@@ -1456,7 +1463,8 @@ static bool device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD)
return true; return true;
} }
bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) bool device_alloc_frag_buf(struct vnt_private *pDevice,
PSDeFragControlBlock pDeF)
{ {
pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
if (pDeF->skb == NULL) if (pDeF->skb == NULL)
...@@ -1467,7 +1475,7 @@ bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) ...@@ -1467,7 +1475,7 @@ bool device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF)
return true; return true;
} }
static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx)
{ {
PSTxDesc pTD; PSTxDesc pTD;
bool bFull = false; bool bFull = false;
...@@ -1591,7 +1599,7 @@ static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) ...@@ -1591,7 +1599,7 @@ static int device_tx_srv(PSDevice pDevice, unsigned int uIdx)
return works; return works;
} }
static void device_error(PSDevice pDevice, unsigned short status) static void device_error(struct vnt_private *pDevice, unsigned short status)
{ {
if (status & ISR_FETALERR) { if (status & ISR_FETALERR) {
DBG_PRT(MSG_LEVEL_ERR, KERN_ERR DBG_PRT(MSG_LEVEL_ERR, KERN_ERR
...@@ -1606,7 +1614,7 @@ static void device_error(PSDevice pDevice, unsigned short status) ...@@ -1606,7 +1614,7 @@ static void device_error(PSDevice pDevice, unsigned short status)
} }
} }
static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc) static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc)
{ {
PDEVICE_TD_INFO pTDInfo = pDesc->pTDInfo; PDEVICE_TD_INFO pTDInfo = pDesc->pTDInfo;
struct sk_buff *skb = pTDInfo->skb; struct sk_buff *skb = pTDInfo->skb;
...@@ -1627,7 +1635,7 @@ static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc) ...@@ -1627,7 +1635,7 @@ static void device_free_tx_buf(PSDevice pDevice, PSTxDesc pDesc)
static int device_open(struct net_device *dev) static int device_open(struct net_device *dev)
{ {
PSDevice pDevice = (PSDevice)netdev_priv(dev); struct vnt_private *pDevice = netdev_priv(dev);
int i; int i;
#ifdef WPA_SM_Transtatus #ifdef WPA_SM_Transtatus
extern SWPAResult wpa_Result; extern SWPAResult wpa_Result;
...@@ -1711,7 +1719,7 @@ static int device_open(struct net_device *dev) ...@@ -1711,7 +1719,7 @@ static int device_open(struct net_device *dev)
static int device_close(struct net_device *dev) static int device_close(struct net_device *dev)
{ {
PSDevice pDevice = (PSDevice)netdev_priv(dev); struct vnt_private *pDevice = netdev_priv(dev);
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
//PLICE_DEBUG-> //PLICE_DEBUG->
//PLICE_DEBUG<- //PLICE_DEBUG<-
...@@ -1757,7 +1765,7 @@ static int device_close(struct net_device *dev) ...@@ -1757,7 +1765,7 @@ static int device_close(struct net_device *dev)
static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev)
{ {
PSDevice pDevice = netdev_priv(dev); struct vnt_private *pDevice = netdev_priv(dev);
unsigned char *pbMPDU; unsigned char *pbMPDU;
unsigned int cbMPDULen = 0; unsigned int cbMPDULen = 0;
...@@ -1787,7 +1795,8 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) ...@@ -1787,7 +1795,8 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev)
return 0; return 0;
} }
bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeIndex) bool device_dma0_xmit(struct vnt_private *pDevice,
struct sk_buff *skb, unsigned int uNodeIndex)
{ {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxDesc pHeadTD, pLastTD; PSTxDesc pHeadTD, pLastTD;
...@@ -1927,10 +1936,8 @@ bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI ...@@ -1927,10 +1936,8 @@ bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI
} }
//TYPE_AC0DMA data tx //TYPE_AC0DMA data tx
static int device_xmit(struct sk_buff *skb, struct net_device *dev) static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
{ struct vnt_private *pDevice = netdev_priv(dev);
PSDevice pDevice = netdev_priv(dev);
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxDesc pHeadTD, pLastTD; PSTxDesc pHeadTD, pLastTD;
unsigned int uNodeIndex = 0; unsigned int uNodeIndex = 0;
...@@ -2282,8 +2289,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -2282,8 +2289,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev)
static irqreturn_t device_intr(int irq, void *dev_instance) static irqreturn_t device_intr(int irq, void *dev_instance)
{ {
struct net_device *dev = dev_instance; struct net_device *dev = dev_instance;
PSDevice pDevice = (PSDevice)netdev_priv(dev); struct vnt_private *pDevice = netdev_priv(dev);
int max_count = 0; int max_count = 0;
unsigned long dwMIBCounter = 0; unsigned long dwMIBCounter = 0;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
...@@ -2575,7 +2581,8 @@ static int Config_FileGetParameter(unsigned char *string, ...@@ -2575,7 +2581,8 @@ static int Config_FileGetParameter(unsigned char *string,
return true; return true;
} }
int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter) int Config_FileOperation(struct vnt_private *pDevice,
bool fwrite, unsigned char *Parameter)
{ {
unsigned char *buffer = kmalloc(1024, GFP_KERNEL); unsigned char *buffer = kmalloc(1024, GFP_KERNEL);
unsigned char tmpbuffer[20]; unsigned char tmpbuffer[20];
...@@ -2622,10 +2629,8 @@ int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter ...@@ -2622,10 +2629,8 @@ int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter
return result; return result;
} }
static void device_set_multi(struct net_device *dev) static void device_set_multi(struct net_device *dev) {
{ struct vnt_private *pDevice = netdev_priv(dev);
PSDevice pDevice = (PSDevice)netdev_priv(dev);
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
u32 mc_filter[2]; u32 mc_filter[2];
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
...@@ -2670,15 +2675,14 @@ static void device_set_multi(struct net_device *dev) ...@@ -2670,15 +2675,14 @@ static void device_set_multi(struct net_device *dev)
static struct net_device_stats *device_get_stats(struct net_device *dev) static struct net_device_stats *device_get_stats(struct net_device *dev)
{ {
PSDevice pDevice = (PSDevice)netdev_priv(dev); struct vnt_private *pDevice = netdev_priv(dev);
return &pDevice->stats; return &pDevice->stats;
} }
static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
PSDevice pDevice = (PSDevice)netdev_priv(dev); struct vnt_private *pDevice = netdev_priv(dev);
struct iwreq *wrq = (struct iwreq *)rq; struct iwreq *wrq = (struct iwreq *)rq;
int rc = 0; int rc = 0;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
...@@ -3175,7 +3179,7 @@ viawget_suspend(struct pci_dev *pcid, pm_message_t state) ...@@ -3175,7 +3179,7 @@ viawget_suspend(struct pci_dev *pcid, pm_message_t state)
{ {
int power_status; // to silence the compiler int power_status; // to silence the compiler
PSDevice pDevice = pci_get_drvdata(pcid); struct vnt_private *pDevice = pci_get_drvdata(pcid);
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
netif_stop_queue(pDevice->dev); netif_stop_queue(pDevice->dev);
...@@ -3201,7 +3205,7 @@ viawget_suspend(struct pci_dev *pcid, pm_message_t state) ...@@ -3201,7 +3205,7 @@ viawget_suspend(struct pci_dev *pcid, pm_message_t state)
static int static int
viawget_resume(struct pci_dev *pcid) viawget_resume(struct pci_dev *pcid)
{ {
PSDevice pDevice = pci_get_drvdata(pcid); struct vnt_private *pDevice = pci_get_drvdata(pcid);
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
int power_status; // to silence the compiler int power_status; // to silence the compiler
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7