From: Greg Kroah-Hartman <[EMAIL PROTECTED]> Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
--- zd_chip.h | 14 +++++++------- zd_def.h | 2 +- zd_ieee80211.h | 4 ++-- zd_mac.h | 2 +- zd_usb.h | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) 9cfb1fe4e4e1c0feba61dd9be2bcb3f4b217842b diff --git a/zd_chip.h b/zd_chip.h index 22846bd..b686eb3 100644 --- a/zd_chip.h +++ b/zd_chip.h @@ -1,5 +1,5 @@ /* zd_chip.h - * + * * 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 @@ -277,7 +277,7 @@ #define CR236 CTL_REG(0x03B0) #define CR240 CTL_REG(0x03C0) -// bit 7: host-controlled RF register writes +// bit 7: host-controlled RF register writes // CR241-CR245: for hardware controlled writing of RF bits, not needed for // USB #define CR241 CTL_REG(0x03C4) @@ -312,7 +312,7 @@ #define CR_ENABLE_PS_MANUAL_AGC CTL_REG(0x043C) #define CR_CONFIG_PHILIPS CTL_REG(0x0440) #define CR_SA2400_SER_AP CTL_REG(0x0444) -#define CR_I2C_WRITE CTL_REG(0x0444) +#define CR_I2C_WRITE CTL_REG(0x0444) #define CR_SA2400_SER_RP CTL_REG(0x0448) #define CR_RADIO_PE CTL_REG(0x0458) #define CR_RST_BUS_MASTER CTL_REG(0x045C) @@ -416,9 +416,9 @@ /* Seems to indicate that the configuration is over. */ #define CR_AFTER_PNP CTL_REG(0x0648) -#define CR_ACK_TIME_80211 CTL_REG(0x0658) +#define CR_ACK_TIME_80211 CTL_REG(0x0658) -#define CR_RX_OFFSET CTL_REG(0x065c) +#define CR_RX_OFFSET CTL_REG(0x065c) #define CR_PHY_DELAY CTL_REG(0x066C) #define CR_BCN_FIFO CTL_REG(0x0670) @@ -559,9 +559,9 @@ * also only 11 channels. */ #define E2P_ALLOWED_CHANNEL E2P_REG(0x18) -#define E2P_PHY_REG E2P_REG(0x1a) +#define E2P_PHY_REG E2P_REG(0x1a) #define E2P_DEVICE_VER E2P_REG(0x20) -#define E2P_36M_CAL_VALUE1 E2P_REG(0x28) +#define E2P_36M_CAL_VALUE1 E2P_REG(0x28) #define E2P_36M_CAL_VALUE2 E2P_REG(0x2a) #define E2P_36M_CAL_VALUE3 E2P_REG(0x2c) #define E2P_36M_CAL_VALUE4 E2P_REG(0x2e) diff --git a/zd_def.h b/zd_def.h index 3a1b511..4dabbe2 100644 --- a/zd_def.h +++ b/zd_def.h @@ -27,7 +27,7 @@ #ifdef ZD1211_DEBUG # define PDEBUG(fmt, args...) PRINT(KERN_DEBUG, fmt, ## args) -#else +#else # define PDEBUG(fmt, args...) /* nothing */ #endif diff --git a/zd_ieee80211.h b/zd_ieee80211.h index 047c97c..f71b47a 100644 --- a/zd_ieee80211.h +++ b/zd_ieee80211.h @@ -45,7 +45,7 @@ struct ofdm_plcp_header { } __attribute__((packed)); static inline u8 zd_ofdm_plcp_header_rate( - const struct ofdm_plcp_header *header) + const struct ofdm_plcp_header *header) { return header->prefix[0] & 0xf; } @@ -63,7 +63,7 @@ struct cck_plcp_header { u8 signal; u8 service; __le16 length; - __le16 crc16; + __le16 crc16; } __attribute__((packed)); #define ZD_CCK_SIGNAL_1M 0x0a diff --git a/zd_mac.h b/zd_mac.h index 4be6c92..57ef85b 100644 --- a/zd_mac.h +++ b/zd_mac.h @@ -96,7 +96,7 @@ struct rx_status { /* rx_status field decryption_type */ #define ZD_RX_NO_WEP 0 #define ZD_RX_WEP64 1 -#define ZD_RX_TKIP 2 +#define ZD_RX_TKIP 2 #define ZD_RX_AES 4 #define ZD_RX_WEP128 5 #define ZD_RX_WEP256 6 diff --git a/zd_usb.h b/zd_usb.h index 59cfeb9..926d3dc 100644 --- a/zd_usb.h +++ b/zd_usb.h @@ -46,7 +46,7 @@ enum { * whether we will see ever such a large USB RX transaction. */ USB_MAX_RX_SIZE = 4800, // bytes - USB_MAX_IOWRITE16_COUNT = 15, + USB_MAX_IOWRITE16_COUNT = 15, USB_MAX_IOWRITE32_COUNT = USB_MAX_IOWRITE16_COUNT/2, USB_MAX_IOREAD16_COUNT = 15, USB_MAX_IOREAD32_COUNT = USB_MAX_IOREAD16_COUNT/2, @@ -84,7 +84,7 @@ struct usb_req_write_regs { } __attribute__((packed)); enum { - RF_IF_LE = 0x02, + RF_IF_LE = 0x02, RF_CLK = 0x04, RF_DATA = 0x08, }; @@ -97,7 +97,7 @@ struct usb_req_rfwrite { __le16 bits; // RF2595: 24 __le16 bit_values[0]; - // (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) + // (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) } __attribute__((packed)); /* USB interrupt */ -- 1.2.6 ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Zd1211-devs mailing list - http://zd1211.ath.cx/ Unsubscribe: https://lists.sourceforge.net/lists/listinfo/zd1211-devs