Commit d8c92107 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville

p54: Modify p54 files for new organization

Modify the remaining p54 files to account for the new file organization.
Signed-off-by: default avatarChristian Lamparter <chunkeey@web.de>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0a5fb84f
p54common-objs := eeprom.o fwio.o txrx.o main.o
p54common-$(CONFIG_P54_LEDS) += led.o
obj-$(CONFIG_P54_COMMON) += p54common.o obj-$(CONFIG_P54_COMMON) += p54common.o
obj-$(CONFIG_P54_USB) += p54usb.o obj-$(CONFIG_P54_USB) += p54usb.o
obj-$(CONFIG_P54_PCI) += p54pci.o obj-$(CONFIG_P54_PCI) += p54pci.o
......
#ifndef P54_H
#define P54_H
/* /*
* Shared defines for all mac80211 Prism54 code * Shared defines for all mac80211 Prism54 code
* *
...@@ -14,39 +11,78 @@ ...@@ -14,39 +11,78 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef P54_H
#define P54_H
#ifdef CONFIG_P54_LEDS #ifdef CONFIG_P54_LEDS
#include <linux/leds.h> #include <linux/leds.h>
#endif /* CONFIG_P54_LEDS */ #endif /* CONFIG_P54_LEDS */
enum p54_control_frame_types { #define ISL38XX_DEV_FIRMWARE_ADDR 0x20000
P54_CONTROL_TYPE_SETUP = 0,
P54_CONTROL_TYPE_SCAN, #define BR_CODE_MIN 0x80000000
P54_CONTROL_TYPE_TRAP, #define BR_CODE_COMPONENT_ID 0x80000001
P54_CONTROL_TYPE_DCFINIT, #define BR_CODE_COMPONENT_VERSION 0x80000002
P54_CONTROL_TYPE_RX_KEYCACHE, #define BR_CODE_DEPENDENT_IF 0x80000003
P54_CONTROL_TYPE_TIM, #define BR_CODE_EXPOSED_IF 0x80000004
P54_CONTROL_TYPE_PSM, #define BR_CODE_DESCR 0x80000101
P54_CONTROL_TYPE_TXCANCEL, #define BR_CODE_MAX 0x8FFFFFFF
P54_CONTROL_TYPE_TXDONE, #define BR_CODE_END_OF_BRA 0xFF0000FF
P54_CONTROL_TYPE_BURST, #define LEGACY_BR_CODE_END_OF_BRA 0xFFFFFFFF
P54_CONTROL_TYPE_STAT_READBACK,
P54_CONTROL_TYPE_BBP, struct bootrec {
P54_CONTROL_TYPE_EEPROM_READBACK, __le32 code;
P54_CONTROL_TYPE_LED, __le32 len;
P54_CONTROL_TYPE_GPIO, u32 data[10];
P54_CONTROL_TYPE_TIMER, } __packed;
P54_CONTROL_TYPE_MODULATION,
P54_CONTROL_TYPE_SYNTH_CONFIG, /* Interface role definitions */
P54_CONTROL_TYPE_DETECTOR_VALUE, #define BR_INTERFACE_ROLE_SERVER 0x0000
P54_CONTROL_TYPE_XBOW_SYNTH_CFG, #define BR_INTERFACE_ROLE_CLIENT 0x8000
P54_CONTROL_TYPE_CCE_QUIET,
P54_CONTROL_TYPE_PSM_STA_UNLOCK, #define BR_DESC_PRIV_CAP_WEP BIT(0)
P54_CONTROL_TYPE_PCS, #define BR_DESC_PRIV_CAP_TKIP BIT(1)
P54_CONTROL_TYPE_BT_BALANCER = 28, #define BR_DESC_PRIV_CAP_MICHAEL BIT(2)
P54_CONTROL_TYPE_GROUP_ADDRESS_TABLE = 30, #define BR_DESC_PRIV_CAP_CCX_CP BIT(3)
P54_CONTROL_TYPE_ARPTABLE = 31, #define BR_DESC_PRIV_CAP_CCX_MIC BIT(4)
P54_CONTROL_TYPE_BT_OPTIONS = 35 #define BR_DESC_PRIV_CAP_AESCCMP BIT(5)
};
struct bootrec_desc {
__le16 modes;
__le16 flags;
__le32 rx_start;
__le32 rx_end;
u8 headroom;
u8 tailroom;
u8 tx_queues;
u8 tx_depth;
u8 privacy_caps;
u8 rx_keycache_size;
u8 time_size;
u8 padding;
u8 rates[16];
u8 padding2[4];
__le16 rx_mtu;
} __packed;
#define FW_FMAC 0x464d4143
#define FW_LM86 0x4c4d3836
#define FW_LM87 0x4c4d3837
#define FW_LM20 0x4c4d3230
struct bootrec_comp_id {
__le32 fw_variant;
} __packed;
struct bootrec_comp_ver {
char fw_version[24];
} __packed;
struct bootrec_end {
__le16 crc;
u8 padding[2];
u8 md5[16];
} __packed;
/* provide 16 bytes for the transport back-end */ /* provide 16 bytes for the transport back-end */
#define P54_TX_INFO_DATA_SIZE 16 #define P54_TX_INFO_DATA_SIZE 16
...@@ -55,34 +91,30 @@ enum p54_control_frame_types { ...@@ -55,34 +91,30 @@ enum p54_control_frame_types {
struct p54_tx_info { struct p54_tx_info {
u32 start_addr; u32 start_addr;
u32 end_addr; u32 end_addr;
void *data[P54_TX_INFO_DATA_SIZE / sizeof(void *)]; union {
void *data[P54_TX_INFO_DATA_SIZE / sizeof(void *)];
struct {
u32 extra_len;
};
};
}; };
#define P54_MAX_CTRL_FRAME_LEN 0x1000 #define P54_MAX_CTRL_FRAME_LEN 0x1000
#define P54_HDR_FLAG_CONTROL BIT(15) #define P54_SET_QUEUE(queue, ai_fs, cw_min, cw_max, _txop) \
#define P54_HDR_FLAG_CONTROL_OPSET (BIT(15) + BIT(0)) do { \
queue.aifs = cpu_to_le16(ai_fs); \
struct p54_hdr { queue.cwmin = cpu_to_le16(cw_min); \
__le16 flags; queue.cwmax = cpu_to_le16(cw_max); \
__le16 len; queue.txop = cpu_to_le16(_txop); \
__le32 req_id; } while (0)
__le16 type; /* enum p54_control_frame_types */
u8 rts_tries;
u8 tries;
u8 data[0];
} __attribute__ ((packed));
#define FREE_AFTER_TX(skb) \
((((struct p54_hdr *) ((struct sk_buff *) skb)->data)-> \
flags) == cpu_to_le16(P54_HDR_FLAG_CONTROL_OPSET))
struct p54_edcf_queue_param { struct p54_edcf_queue_param {
__le16 aifs; __le16 aifs;
__le16 cwmin; __le16 cwmin;
__le16 cwmax; __le16 cwmax;
__le16 txop; __le16 txop;
} __attribute__ ((packed)); } __packed;
struct p54_rssi_linear_approximation { struct p54_rssi_linear_approximation {
s16 mul; s16 mul;
...@@ -101,13 +133,6 @@ struct p54_cal_database { ...@@ -101,13 +133,6 @@ struct p54_cal_database {
#define EEPROM_READBACK_LEN 0x3fc #define EEPROM_READBACK_LEN 0x3fc
#define ISL38XX_DEV_FIRMWARE_ADDR 0x20000
#define FW_FMAC 0x464d4143
#define FW_LM86 0x4c4d3836
#define FW_LM87 0x4c4d3837
#define FW_LM20 0x4c4d3230
enum fw_state { enum fw_state {
FW_STATE_OFF, FW_STATE_OFF,
FW_STATE_BOOTING, FW_STATE_BOOTING,
...@@ -138,6 +163,7 @@ struct p54_common { ...@@ -138,6 +163,7 @@ struct p54_common {
void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb); void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb);
int (*open)(struct ieee80211_hw *dev); int (*open)(struct ieee80211_hw *dev);
void (*stop)(struct ieee80211_hw *dev); void (*stop)(struct ieee80211_hw *dev);
struct sk_buff_head tx_pending;
struct sk_buff_head tx_queue; struct sk_buff_head tx_queue;
struct mutex conf_mutex; struct mutex conf_mutex;
...@@ -156,6 +182,7 @@ struct p54_common { ...@@ -156,6 +182,7 @@ struct p54_common {
/* (e)DCF / QOS state */ /* (e)DCF / QOS state */
bool use_short_slot; bool use_short_slot;
spinlock_t tx_stats_lock;
struct ieee80211_tx_queue_stats tx_stats[8]; struct ieee80211_tx_queue_stats tx_stats[8];
struct p54_edcf_queue_param qos_params[8]; struct p54_edcf_queue_param qos_params[8];
...@@ -181,7 +208,7 @@ struct p54_common { ...@@ -181,7 +208,7 @@ struct p54_common {
u32 tsf_low32, tsf_high32; u32 tsf_low32, tsf_high32;
u32 basic_rate_mask; u32 basic_rate_mask;
u16 aid; u16 aid;
struct sk_buff *cached_beacon; __le32 beacon_req_id;
/* cryptographic engine information */ /* cryptographic engine information */
u8 privacy_caps; u8 privacy_caps;
...@@ -202,15 +229,20 @@ struct p54_common { ...@@ -202,15 +229,20 @@ struct p54_common {
/* eeprom handling */ /* eeprom handling */
void *eeprom; void *eeprom;
struct completion eeprom_comp; struct completion eeprom_comp;
struct mutex eeprom_mutex;
}; };
/* interfaces for the drivers */
int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb); int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb);
void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb); void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb);
int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw); int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw);
int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len); int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len);
int p54_read_eeprom(struct ieee80211_hw *dev); int p54_read_eeprom(struct ieee80211_hw *dev);
struct ieee80211_hw *p54_init_common(size_t priv_data_len); struct ieee80211_hw *p54_init_common(size_t priv_data_len);
int p54_register_common(struct ieee80211_hw *dev, struct device *pdev); int p54_register_common(struct ieee80211_hw *dev, struct device *pdev);
void p54_free_common(struct ieee80211_hw *dev); void p54_free_common(struct ieee80211_hw *dev);
void p54_unregister_common(struct ieee80211_hw *dev);
#endif /* P54_H */ #endif /* P54_H */
This diff is collapsed.
This diff is collapsed.
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <net/mac80211.h> #include <net/mac80211.h>
#include "p54.h" #include "p54.h"
#include "lmac.h"
#include "p54pci.h" #include "p54pci.h"
MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
...@@ -564,7 +565,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev, ...@@ -564,7 +565,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
err_free_common: err_free_common:
release_firmware(priv->firmware); release_firmware(priv->firmware);
p54_free_common(dev);
pci_free_consistent(pdev, sizeof(*priv->ring_control), pci_free_consistent(pdev, sizeof(*priv->ring_control),
priv->ring_control, priv->ring_control_dma); priv->ring_control, priv->ring_control_dma);
...@@ -573,7 +573,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev, ...@@ -573,7 +573,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
err_free_dev: err_free_dev:
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
ieee80211_free_hw(dev); p54_free_common(dev);
err_free_reg: err_free_reg:
pci_release_regions(pdev); pci_release_regions(pdev);
...@@ -590,16 +590,15 @@ static void __devexit p54p_remove(struct pci_dev *pdev) ...@@ -590,16 +590,15 @@ static void __devexit p54p_remove(struct pci_dev *pdev)
if (!dev) if (!dev)
return; return;
ieee80211_unregister_hw(dev); p54_unregister_common(dev);
priv = dev->priv; priv = dev->priv;
release_firmware(priv->firmware); release_firmware(priv->firmware);
pci_free_consistent(pdev, sizeof(*priv->ring_control), pci_free_consistent(pdev, sizeof(*priv->ring_control),
priv->ring_control, priv->ring_control_dma); priv->ring_control, priv->ring_control_dma);
p54_free_common(dev);
iounmap(priv->map); iounmap(priv->map);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
ieee80211_free_hw(dev); p54_free_common(dev);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "p54spi_eeprom.h" #include "p54spi_eeprom.h"
#include "p54.h" #include "p54.h"
#include "p54common.h" #include "lmac.h"
MODULE_FIRMWARE("3826.arm"); MODULE_FIRMWARE("3826.arm");
MODULE_ALIAS("stlc45xx"); MODULE_ALIAS("stlc45xx");
...@@ -713,7 +713,7 @@ static int __devexit p54spi_remove(struct spi_device *spi) ...@@ -713,7 +713,7 @@ static int __devexit p54spi_remove(struct spi_device *spi)
{ {
struct p54s_priv *priv = dev_get_drvdata(&spi->dev); struct p54s_priv *priv = dev_get_drvdata(&spi->dev);
ieee80211_unregister_hw(priv->hw); p54_unregister_common(priv->hw);
free_irq(gpio_to_irq(p54spi_gpio_irq), spi); free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
...@@ -724,7 +724,6 @@ static int __devexit p54spi_remove(struct spi_device *spi) ...@@ -724,7 +724,6 @@ static int __devexit p54spi_remove(struct spi_device *spi)
mutex_destroy(&priv->mutex); mutex_destroy(&priv->mutex);
p54_free_common(priv->hw); p54_free_common(priv->hw);
ieee80211_free_hw(priv->hw);
return 0; return 0;
} }
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <net/mac80211.h> #include <net/mac80211.h>
#include "p54.h" #include "p54.h"
#include "lmac.h"
#include "p54usb.h" #include "p54usb.h"
MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
...@@ -961,7 +962,7 @@ static int __devinit p54u_probe(struct usb_interface *intf, ...@@ -961,7 +962,7 @@ static int __devinit p54u_probe(struct usb_interface *intf,
release_firmware(priv->fw); release_firmware(priv->fw);
err_free_dev: err_free_dev:
ieee80211_free_hw(dev); p54_free_common(dev);
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
usb_put_dev(udev); usb_put_dev(udev);
return err; return err;
...@@ -975,13 +976,12 @@ static void __devexit p54u_disconnect(struct usb_interface *intf) ...@@ -975,13 +976,12 @@ static void __devexit p54u_disconnect(struct usb_interface *intf)
if (!dev) if (!dev)
return; return;
ieee80211_unregister_hw(dev); p54_unregister_common(dev);
priv = dev->priv; priv = dev->priv;
usb_put_dev(interface_to_usbdev(intf)); usb_put_dev(interface_to_usbdev(intf));
release_firmware(priv->fw); release_firmware(priv->fw);
p54_free_common(dev); p54_free_common(dev);
ieee80211_free_hw(dev);
} }
static int p54u_pre_reset(struct usb_interface *intf) static int p54u_pre_reset(struct usb_interface *intf)
......
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