diff options
author | Larry Finger | 2011-04-09 03:33:25 +0200 |
---|---|---|
committer | Larry Finger | 2011-04-09 03:33:25 +0200 |
commit | fefecc6989b4b24276797270c0e229c07be02ad3 (patch) | |
tree | 7c03f0f798ab84e5cf0c14a6648c991efd37c160 /drivers/staging/rt2860/iface | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
download | kernel-qcow2-linux-fefecc6989b4b24276797270c0e229c07be02ad3.tar.gz kernel-qcow2-linux-fefecc6989b4b24276797270c0e229c07be02ad3.tar.xz kernel-qcow2-linux-fefecc6989b4b24276797270c0e229c07be02ad3.zip |
staging: rt2860sta and rt2870sta: Remove drivers replaced in net/wireless
The staging driver rt2860sta is replaced by mainline driver rt2800pci, and
rt2870sta is replaced by rt2800usb. As a result, the staging drivers are
deleted.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
Diffstat (limited to 'drivers/staging/rt2860/iface')
-rw-r--r-- | drivers/staging/rt2860/iface/rtmp_pci.h | 80 | ||||
-rw-r--r-- | drivers/staging/rt2860/iface/rtmp_usb.h | 196 |
2 files changed, 0 insertions, 276 deletions
diff --git a/drivers/staging/rt2860/iface/rtmp_pci.h b/drivers/staging/rt2860/iface/rtmp_pci.h deleted file mode 100644 index 3d66e386bd8a..000000000000 --- a/drivers/staging/rt2860/iface/rtmp_pci.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - ************************************************************************* - * Ralink Tech Inc. - * 5F., No.36, Taiyuan St., Jhubei City, - * Hsinchu County 302, - * Taiwan, R.O.C. - * - * (c) Copyright 2002-2007, Ralink Technology, Inc. - * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * * - ************************************************************************* -*/ - -#ifndef __RTMP_PCI_H__ -#define __RTMP_PCI_H__ - -#define RT28XX_HANDLE_DEV_ASSIGN(handle, dev_p) \ - ((struct os_cookie *)handle)->pci_dev = dev_p; - -#ifdef LINUX -/* set driver data */ -#define RT28XX_DRVDATA_SET(_a) pci_set_drvdata(_a, net_dev); - -#define RT28XX_PUT_DEVICE(dev_p) - -#define SA_SHIRQ IRQF_SHARED - -#ifdef PCI_MSI_SUPPORT -#define RTMP_MSI_ENABLE(_pAd) \ - { struct os_cookie *_pObj = (struct os_cookie *)(_pAd->OS_Cookie); \ - (_pAd)->HaveMsi = pci_enable_msi(_pObj->pci_dev) \ - == 0 ? TRUE : FALSE; \ - } - -#define RTMP_MSI_DISABLE(_pAd) \ - { struct os_cookie *_pObj = (struct os_cookie *)(_pAd->OS_Cookie); \ - if (_pAd->HaveMsi == TRUE) \ - pci_disable_msi(_pObj->pci_dev); \ - _pAd->HaveMsi = FALSE; \ - } -#else -#define RTMP_MSI_ENABLE(_pAd) do {} while (0) -#define RTMP_MSI_DISABLE(_pAd) do {} while (0) -#endif /* PCI_MSI_SUPPORT */ - -#define RTMP_PCI_DEV_UNMAP() \ -{ if (net_dev->base_addr) { \ - iounmap((void *)(net_dev->base_addr)); \ - release_mem_region(pci_resource_start(dev_p, 0), \ - pci_resource_len(dev_p, 0)); } \ - if (net_dev->irq) \ - pci_release_regions(dev_p); } - -#define PCI_REG_READ_WORD(pci_dev, offset, Configuration) {\ - if (pci_read_config_word(pci_dev, offset, ®16) == 0) \ - Configuration = le2cpu16(reg16); \ - else \ - Configuration = 0; } - -#define PCI_REG_WIRTE_WORD(pci_dev, offset, Configuration) {\ - reg16 = cpu2le16(Configuration); \ - pci_write_config_word(pci_dev, offset, reg16); } - -#endif /* LINUX */ - -#endif /* __RTMP_PCI_H__ */ diff --git a/drivers/staging/rt2860/iface/rtmp_usb.h b/drivers/staging/rt2860/iface/rtmp_usb.h deleted file mode 100644 index 571289637973..000000000000 --- a/drivers/staging/rt2860/iface/rtmp_usb.h +++ /dev/null @@ -1,196 +0,0 @@ -/* - ************************************************************************* - * Ralink Tech Inc. - * 5F., No.36, Taiyuan St., Jhubei City, - * Hsinchu County 302, - * Taiwan, R.O.C. - * - * (c) Copyright 2002-2007, Ralink Technology, Inc. - * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * * - ************************************************************************* -*/ - -#ifndef __RTMP_USB_H__ -#define __RTMP_USB_H__ - -#include "../rtusb_io.h" - -#ifdef LINUX -#include <linux/usb.h> -#endif /* LINUX */ - -extern u8 EpToQueue[6]; - -#define RXBULKAGGRE_ZISE 12 -#define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1)) -#define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE) -#define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE) -#define MAX_MLME_HANDLER_MEMORY 20 - -/* Flags for Bulkflags control for bulk out data */ -#define fRTUSB_BULK_OUT_DATA_NULL 0x00000001 -#define fRTUSB_BULK_OUT_RTS 0x00000002 -#define fRTUSB_BULK_OUT_MLME 0x00000004 - -#define fRTUSB_BULK_OUT_PSPOLL 0x00000010 -#define fRTUSB_BULK_OUT_DATA_FRAG 0x00000020 -#define fRTUSB_BULK_OUT_DATA_FRAG_2 0x00000040 -#define fRTUSB_BULK_OUT_DATA_FRAG_3 0x00000080 -#define fRTUSB_BULK_OUT_DATA_FRAG_4 0x00000100 - -#define fRTUSB_BULK_OUT_DATA_NORMAL 0x00010000 -#define fRTUSB_BULK_OUT_DATA_NORMAL_2 0x00020000 -#define fRTUSB_BULK_OUT_DATA_NORMAL_3 0x00040000 -#define fRTUSB_BULK_OUT_DATA_NORMAL_4 0x00080000 - -/* TODO:move to ./ate/include/iface/ate_usb.h */ - -#define FREE_HTTX_RING(_pCookie, _pipeId, _txContext) \ -{ \ - if ((_txContext)->ENextBulkOutPosition == \ - (_txContext)->CurWritePosition) {\ - (_txContext)->bRingEmpty = TRUE; \ - } \ - /*NdisInterlockedDecrement(&(_p)->TxCount); */\ -} - -/****************************************************************************** - - USB Bulk operation related definitions - -******************************************************************************/ - -#ifdef LINUX -#define BULKAGGRE_ZISE 100 -#define RT28XX_PUT_DEVICE usb_put_dev -#define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) -#define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, \ - GFP_ATOMIC) -#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, \ - BufSize, \ - pDma_addr) \ - usb_alloc_coherent(\ - pUsb_Dev, \ - BufSize, \ - GFP_ATOMIC, \ - pDma_addr) -#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, \ - BufSize, \ - pTransferBuf, \ - Dma_addr) \ - usb_free_coherent( \ - pUsb_Dev, \ - BufSize, \ - pTransferBuf, \ - Dma_addr) - -#define RTUSB_FREE_URB(pUrb) usb_free_urb(pUrb) - -/* unlink urb */ -#define RTUSB_UNLINK_URB(pUrb) usb_kill_urb(pUrb) - -extern void dump_urb(struct urb *purb); - -#define InterlockedIncrement atomic_inc -#define NdisInterlockedIncrement atomic_inc -#define InterlockedDecrement atomic_dec -#define NdisInterlockedDecrement atomic_dec -#define InterlockedExchange atomic_set - -#endif /* LINUX */ - -#define NT_SUCCESS(status) (((status) >= 0) ? (TRUE) : (FALSE)) - -#define USBD_TRANSFER_DIRECTION_OUT 0 -#define USBD_TRANSFER_DIRECTION_IN 0 -#define USBD_SHORT_TRANSFER_OK 0 -#define PURB struct urb * - -#define PIRP void * -#define NDIS_OID u32 -#ifndef USB_ST_NOERROR -#define USB_ST_NOERROR 0 -#endif - -/* vendor-specific control operations */ -#define CONTROL_TIMEOUT_JIFFIES ((100 * OS_HZ) / 1000) -#define UNLINK_TIMEOUT_MS 3 - -void RTUSBBulkOutDataPacketComplete(struct urb *purb, struct pt_regs *pt_regs); -void RTUSBBulkOutMLMEPacketComplete(struct urb *pUrb, struct pt_regs *pt_regs); -void RTUSBBulkOutNullFrameComplete(struct urb *pUrb, struct pt_regs *pt_regs); -void RTUSBBulkOutRTSFrameComplete(struct urb *pUrb, struct pt_regs *pt_regs); -void RTUSBBulkOutPsPollComplete(struct urb *pUrb, struct pt_regs *pt_regs); -void RTUSBBulkRxComplete(struct urb *pUrb, struct pt_regs *pt_regs); - -#ifdef KTHREAD_SUPPORT -#define RTUSBMlmeUp(pAd) \ - do { \ - struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\ - if (_pTask->kthread_task) {\ - _pTask->kthread_running = TRUE; \ - wake_up(&_pTask->kthread_q); \ - } \ - } while (0) -#else -#define RTUSBMlmeUp(pAd) \ - do { \ - struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\ - CHECK_PID_LEGALITY(_pTask->taskPID) \ - { \ - RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \ - } \ - } while (0) -#endif - -#ifdef KTHREAD_SUPPORT -#define RTUSBCMDUp(pAd) \ - do { \ - struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \ - { \ - _pTask->kthread_running = TRUE; \ - wake_up(&_pTask->kthread_q); \ - } \ - } while (0) - -#else -#define RTUSBCMDUp(pAd) \ - do { \ - struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \ - CHECK_PID_LEGALITY(_pTask->taskPID) \ - {\ - RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \ - } \ - } while (0) -#endif - -#define DEVICE_VENDOR_REQUEST_OUT 0x40 -#define DEVICE_VENDOR_REQUEST_IN 0xc0 -/*#define INTERFACE_VENDOR_REQUEST_OUT 0x41*/ -/*#define INTERFACE_VENDOR_REQUEST_IN 0xc1*/ - -#define BULKOUT_MGMT_RESET_FLAG 0x80 - -#define RTUSB_SET_BULK_FLAG(_M, _F) ((_M)->BulkFlags |= (_F)) -#define RTUSB_CLEAR_BULK_FLAG(_M, _F) ((_M)->BulkFlags &= ~(_F)) -#define RTUSB_TEST_BULK_FLAG(_M, _F) (((_M)->BulkFlags & (_F)) != 0) - -#define RTMP_IRQ_REQUEST(net_dev) do {} while (0) -#define RTMP_IRQ_RELEASE(net_dev) do {} while (0) - -#endif /* __RTMP_USB_H__ */ |