Staging: w35und: move source files to one directory
As we're trying to get rid of the "compatability layer" in the driver, move everything under one directory. Keeping some of the files under drivers/staging/winbond/linux is a major pain in the ass whenever you're cleaning up the driver. Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
8421513d9a
commit
9ce922fde7
|
@ -1,14 +1,16 @@
|
|||
DRIVER_DIR=./linux
|
||||
|
||||
w35und-objs := $(DRIVER_DIR)/wbusb.o $(DRIVER_DIR)/wb35reg.o $(DRIVER_DIR)/wb35rx.o $(DRIVER_DIR)/wb35tx.o \
|
||||
mds.o \
|
||||
mlmetxrx.o \
|
||||
mto.o \
|
||||
w35und-objs := \
|
||||
mds.o \
|
||||
mlmetxrx.o \
|
||||
mto.o \
|
||||
phy_calibration.o \
|
||||
reg.o \
|
||||
rxisr.o \
|
||||
wb35reg.o \
|
||||
wb35rx.o \
|
||||
wb35tx.o \
|
||||
wbhal.o \
|
||||
wblinux.o \
|
||||
wbusb.o \
|
||||
|
||||
|
||||
obj-$(CONFIG_W35UND) += w35und.o
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
#include "linux/sysdef.h"
|
||||
#include "sysdef.h"
|
||||
|
||||
|
|
|
@ -511,12 +511,12 @@ Wb35Reg_destroy(phw_data_t pHwData)
|
|||
|
||||
// Wait for Reg operation completed
|
||||
do {
|
||||
msleep(10); // Delay for waiting function enter 940623.1.a
|
||||
msleep(10); // Delay for waiting function enter 940623.1.a
|
||||
} while (reg->EP0vm_state != VM_STOP);
|
||||
msleep(10); // Delay for waiting function enter 940623.1.b
|
||||
msleep(10); // Delay for waiting function enter 940623.1.b
|
||||
|
||||
// Release all the data in RegQueue
|
||||
spin_lock_irq(®->EP0VM_spin_lock);
|
||||
spin_lock_irq( ®->EP0VM_spin_lock );
|
||||
reg_queue = reg->reg_first;
|
||||
while (reg_queue) {
|
||||
if (reg_queue == reg->reg_last)
|
||||
|
@ -524,7 +524,7 @@ Wb35Reg_destroy(phw_data_t pHwData)
|
|||
reg->reg_first = reg->reg_first->Next;
|
||||
|
||||
urb = reg_queue->urb;
|
||||
spin_unlock_irq(®->EP0VM_spin_lock);
|
||||
spin_unlock_irq( ®->EP0VM_spin_lock );
|
||||
if (urb) {
|
||||
usb_free_urb(urb);
|
||||
kfree(reg_queue);
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __WINBOND_WB35REG_F_H
|
||||
#define __WINBOND_WB35REG_F_H
|
||||
|
||||
#include "../wbhal_s.h"
|
||||
#include "wbhal_s.h"
|
||||
|
||||
//====================================
|
||||
// Interface function declare
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __WINBOND_WB35RX_F_H
|
||||
#define __WINBOND_WB35RX_F_H
|
||||
|
||||
#include "../wbhal_s.h"
|
||||
#include "wbhal_s.h"
|
||||
|
||||
//====================================
|
||||
// Interface function declare
|
|
@ -11,7 +11,7 @@
|
|||
#include <linux/usb.h>
|
||||
|
||||
#include "wb35tx_f.h"
|
||||
#include "../mds_f.h"
|
||||
#include "mds_f.h"
|
||||
#include "sysdef.h"
|
||||
|
||||
unsigned char
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __WINBOND_WB35TX_F_H
|
||||
#define __WINBOND_WB35TX_F_H
|
||||
|
||||
#include "../wbhal_f.h"
|
||||
#include "wbhal_f.h"
|
||||
|
||||
//====================================
|
||||
// Interface function declare
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __WINBOND_WB35_TX_S_H
|
||||
#define __WINBOND_WB35_TX_S_H
|
||||
|
||||
#include "../mds_s.h"
|
||||
#include "mds_s.h"
|
||||
|
||||
//====================================
|
||||
// IS89C35 Tx related definition
|
|
@ -1,9 +1,9 @@
|
|||
//=====================================================================
|
||||
// Device related include
|
||||
//=====================================================================
|
||||
#include "linux/wb35reg_f.h"
|
||||
#include "linux/wb35tx_f.h"
|
||||
#include "linux/wb35rx_f.h"
|
||||
#include "wb35reg_f.h"
|
||||
#include "wb35tx_f.h"
|
||||
#include "wb35rx_f.h"
|
||||
|
||||
#include "adapter.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
|
||||
#include "linux/common.h"
|
||||
#include "common.h"
|
||||
|
||||
//[20040722 WK]
|
||||
#define HAL_LED_SET_MASK 0x001c //20060901 Extend
|
||||
|
@ -422,10 +422,10 @@ typedef struct _TXVGA_FOR_50 {
|
|||
// Device related include
|
||||
//=====================================================================
|
||||
|
||||
#include "linux/wbusb_s.h"
|
||||
#include "linux/wb35reg_s.h"
|
||||
#include "linux/wb35tx_s.h"
|
||||
#include "linux/wb35rx_s.h"
|
||||
#include "wbusb_s.h"
|
||||
#include "wb35reg_s.h"
|
||||
#include "wb35tx_s.h"
|
||||
#include "wb35rx_s.h"
|
||||
|
||||
|
||||
// For Hal using ==================================================================
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#include <net/mac80211.h>
|
||||
#include <linux/usb.h>
|
||||
|
||||
#include "../mlmetxrx_f.h"
|
||||
#include "../wbhal_f.h"
|
||||
#include "../wblinux_f.h"
|
||||
#include "mlmetxrx_f.h"
|
||||
#include "wbhal_f.h"
|
||||
#include "wblinux_f.h"
|
||||
|
||||
MODULE_AUTHOR(DRIVER_AUTHOR);
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
|
@ -252,7 +252,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
|
|||
SET_IEEE80211_DEV(dev, &udev->dev);
|
||||
{
|
||||
phw_data_t pHwData = &adapter->sHwData;
|
||||
unsigned char dev_addr[MAX_ADDR_LEN];
|
||||
unsigned char dev_addr[MAX_ADDR_LEN];
|
||||
hal_get_permanent_address(pHwData, dev_addr);
|
||||
SET_IEEE80211_PERM_ADDR(dev, dev_addr);
|
||||
}
|
Loading…
Reference in a new issue