]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/staging/wlan-ng/hfa384x.h
staging: wlang-ng: avoid new typedef: hfa384x_pdr_hfa3861_chcalsp_t
[karo-tx-linux.git] / drivers / staging / wlan-ng / hfa384x.h
index affdeef3f94e5abaaa2154181255d5efe06f3766..7d63dd8d122881aa57b673b838bb32efb9d080b5 100644 (file)
@@ -822,130 +822,126 @@ struct hfa384x_usb_cmdreq {
        u8 pad[54];
 } __packed;
 
-typedef struct hfa384x_usb_wridreq {
+struct hfa384x_usb_wridreq {
        u16 type;
        u16 frmlen;
        u16 rid;
        u8 data[HFA384x_RIDDATA_MAXLEN];
-} __packed hfa384x_usb_wridreq_t;
+} __packed;
 
-typedef struct hfa384x_usb_rridreq {
+struct hfa384x_usb_rridreq {
        u16 type;
        u16 frmlen;
        u16 rid;
        u8 pad[58];
-} __packed hfa384x_usb_rridreq_t;
+} __packed;
 
-typedef struct hfa384x_usb_wmemreq {
+struct hfa384x_usb_wmemreq {
        u16 type;
        u16 frmlen;
        u16 offset;
        u16 page;
        u8 data[HFA384x_USB_RWMEM_MAXLEN];
-} __packed hfa384x_usb_wmemreq_t;
+} __packed;
 
-typedef struct hfa384x_usb_rmemreq {
+struct hfa384x_usb_rmemreq {
        u16 type;
        u16 frmlen;
        u16 offset;
        u16 page;
        u8 pad[56];
-} __packed hfa384x_usb_rmemreq_t;
+} __packed;
 
 /*------------------------------------*/
 /* Response (bulk IN) packet contents */
 
-typedef struct hfa384x_usb_rxfrm {
+struct hfa384x_usb_rxfrm {
        struct hfa384x_rx_frame desc;
        u8 data[WLAN_DATA_MAXLEN];
-} __packed hfa384x_usb_rxfrm_t;
+} __packed;
 
-typedef struct hfa384x_usb_infofrm {
+struct hfa384x_usb_infofrm {
        u16 type;
        struct hfa384x_InfFrame info;
-} __packed hfa384x_usb_infofrm_t;
+} __packed;
 
-typedef struct hfa384x_usb_statusresp {
+struct hfa384x_usb_statusresp {
        u16 type;
        u16 status;
        u16 resp0;
        u16 resp1;
        u16 resp2;
-} __packed hfa384x_usb_cmdresp_t;
-
-typedef hfa384x_usb_cmdresp_t hfa384x_usb_wridresp_t;
+} __packed;
 
-typedef struct hfa384x_usb_rridresp {
+struct hfa384x_usb_rridresp {
        u16 type;
        u16 frmlen;
        u16 rid;
        u8 data[HFA384x_RIDDATA_MAXLEN];
-} __packed hfa384x_usb_rridresp_t;
-
-typedef hfa384x_usb_cmdresp_t hfa384x_usb_wmemresp_t;
+} __packed;
 
-typedef struct hfa384x_usb_rmemresp {
+struct hfa384x_usb_rmemresp {
        u16 type;
        u16 frmlen;
        u8 data[HFA384x_USB_RWMEM_MAXLEN];
-} __packed hfa384x_usb_rmemresp_t;
+} __packed;
 
-typedef struct hfa384x_usb_bufavail {
+struct hfa384x_usb_bufavail {
        u16 type;
        u16 frmlen;
-} __packed hfa384x_usb_bufavail_t;
+} __packed;
 
-typedef struct hfa384x_usb_error {
+struct hfa384x_usb_error {
        u16 type;
        u16 errortype;
-} __packed hfa384x_usb_error_t;
+} __packed;
 
 /*----------------------------------------------------------*/
 /* Unions for packaging all the known packet types together */
 
-typedef union hfa384x_usbout {
+union hfa384x_usbout {
        __le16 type;
        struct hfa384x_usb_txfrm txfrm;
        struct hfa384x_usb_cmdreq cmdreq;
-       hfa384x_usb_wridreq_t wridreq;
-       hfa384x_usb_rridreq_t rridreq;
-       hfa384x_usb_wmemreq_t wmemreq;
-       hfa384x_usb_rmemreq_t rmemreq;
-} __packed hfa384x_usbout_t;
+       struct hfa384x_usb_wridreq wridreq;
+       struct hfa384x_usb_rridreq rridreq;
+       struct hfa384x_usb_wmemreq wmemreq;
+       struct hfa384x_usb_rmemreq rmemreq;
+} __packed;
 
-typedef union hfa384x_usbin {
+union hfa384x_usbin {
        __le16 type;
-       hfa384x_usb_rxfrm_t rxfrm;
+       struct hfa384x_usb_rxfrm rxfrm;
        struct hfa384x_usb_txfrm txfrm;
-       hfa384x_usb_infofrm_t infofrm;
-       hfa384x_usb_cmdresp_t cmdresp;
-       hfa384x_usb_wridresp_t wridresp;
-       hfa384x_usb_rridresp_t rridresp;
-       hfa384x_usb_wmemresp_t wmemresp;
-       hfa384x_usb_rmemresp_t rmemresp;
-       hfa384x_usb_bufavail_t bufavail;
-       hfa384x_usb_error_t usberror;
+       struct hfa384x_usb_infofrm infofrm;
+       struct hfa384x_usb_statusresp cmdresp;
+       struct hfa384x_usb_statusresp wridresp;
+       struct hfa384x_usb_rridresp rridresp;
+       struct hfa384x_usb_statusresp wmemresp;
+       struct hfa384x_usb_rmemresp rmemresp;
+       struct hfa384x_usb_bufavail bufavail;
+       struct hfa384x_usb_error usberror;
        u8 boguspad[3000];
-} __packed hfa384x_usbin_t;
+} __packed;
 
 /*--------------------------------------------------------------------
  * PD record structures.
  *--------------------------------------------------------------------
  */
 
-typedef struct hfa384x_pdr_pcb_partnum {
+struct hfa384x_pdr_pcb_partnum {
        u8 num[8];
-} __packed hfa384x_pdr_pcb_partnum_t;
+} __packed;
 
-typedef struct hfa384x_pdr_pcb_tracenum {
+struct hfa384x_pdr_pcb_tracenum {
        u8 num[8];
-} __packed hfa384x_pdr_pcb_tracenum_t;
+} __packed;
 
-typedef struct hfa384x_pdr_nic_serial {
+struct hfa384x_pdr_nic_serial {
        u8 num[12];
-} __packed hfa384x_pdr_nic_serial_t;
+} __packed;
 
-typedef struct hfa384x_pdr_mkk_measurements {
+struct hfa384x_pdr_mkk_measurements {
        double carrier_freq;
        double occupied_band;
        double power_density;
@@ -961,114 +957,114 @@ typedef struct hfa384x_pdr_mkk_measurements {
        double rx_spur_f2;
        double rx_spur_l1;
        double rx_spur_l2;
-} __packed hfa384x_pdr_mkk_measurements_t;
+} __packed;
 
-typedef struct hfa384x_pdr_nic_ramsize {
+struct hfa384x_pdr_nic_ramsize {
        u8 size[12];            /* units of KB */
-} __packed hfa384x_pdr_nic_ramsize_t;
+} __packed;
 
-typedef struct hfa384x_pdr_mfisuprange {
+struct hfa384x_pdr_mfisuprange {
        u16 id;
        u16 variant;
        u16 bottom;
        u16 top;
-} __packed hfa384x_pdr_mfisuprange_t;
+} __packed;
 
-typedef struct hfa384x_pdr_cfisuprange {
+struct hfa384x_pdr_cfisuprange {
        u16 id;
        u16 variant;
        u16 bottom;
        u16 top;
-} __packed hfa384x_pdr_cfisuprange_t;
+} __packed;
 
-typedef struct hfa384x_pdr_nicid {
+struct hfa384x_pdr_nicid {
        u16 id;
        u16 variant;
        u16 major;
        u16 minor;
-} __packed hfa384x_pdr_nicid_t;
+} __packed;
 
-typedef struct hfa384x_pdr_refdac_measurements {
+struct hfa384x_pdr_refdac_measurements {
        u16 value[0];
-} __packed hfa384x_pdr_refdac_measurements_t;
+} __packed;
 
-typedef struct hfa384x_pdr_vgdac_measurements {
+struct hfa384x_pdr_vgdac_measurements {
        u16 value[0];
-} __packed hfa384x_pdr_vgdac_measurements_t;
+} __packed;
 
-typedef struct hfa384x_pdr_level_comp_measurements {
+struct hfa384x_pdr_level_comp_measurements {
        u16 value[0];
-} __packed hfa384x_pdr_level_compc_measurements_t;
+} __packed;
 
-typedef struct hfa384x_pdr_mac_address {
+struct hfa384x_pdr_mac_address {
        u8 addr[6];
-} __packed hfa384x_pdr_mac_address_t;
+} __packed;
 
-typedef struct hfa384x_pdr_mkk_callname {
+struct hfa384x_pdr_mkk_callname {
        u8 callname[8];
-} __packed hfa384x_pdr_mkk_callname_t;
+} __packed;
 
-typedef struct hfa384x_pdr_regdomain {
+struct hfa384x_pdr_regdomain {
        u16 numdomains;
        u16 domain[5];
-} __packed hfa384x_pdr_regdomain_t;
+} __packed;
 
-typedef struct hfa384x_pdr_allowed_channel {
+struct hfa384x_pdr_allowed_channel {
        u16 ch_bitmap;
-} __packed hfa384x_pdr_allowed_channel_t;
+} __packed;
 
-typedef struct hfa384x_pdr_default_channel {
+struct hfa384x_pdr_default_channel {
        u16 channel;
-} __packed hfa384x_pdr_default_channel_t;
+} __packed;
 
-typedef struct hfa384x_pdr_privacy_option {
+struct hfa384x_pdr_privacy_option {
        u16 available;
-} __packed hfa384x_pdr_privacy_option_t;
+} __packed;
 
-typedef struct hfa384x_pdr_temptype {
+struct hfa384x_pdr_temptype {
        u16 type;
-} __packed hfa384x_pdr_temptype_t;
+} __packed;
 
-typedef struct hfa384x_pdr_refdac_setup {
+struct hfa384x_pdr_refdac_setup {
        u16 ch_value[14];
-} __packed hfa384x_pdr_refdac_setup_t;
+} __packed;
 
-typedef struct hfa384x_pdr_vgdac_setup {
+struct hfa384x_pdr_vgdac_setup {
        u16 ch_value[14];
-} __packed hfa384x_pdr_vgdac_setup_t;
+} __packed;
 
-typedef struct hfa384x_pdr_level_comp_setup {
+struct hfa384x_pdr_level_comp_setup {
        u16 ch_value[14];
-} __packed hfa384x_pdr_level_comp_setup_t;
+} __packed;
 
-typedef struct hfa384x_pdr_trimdac_setup {
+struct hfa384x_pdr_trimdac_setup {
        u16 trimidac;
        u16 trimqdac;
-} __packed hfa384x_pdr_trimdac_setup_t;
+} __packed;
 
-typedef struct hfa384x_pdr_ifr_setting {
+struct hfa384x_pdr_ifr_setting {
        u16 value[3];
-} __packed hfa384x_pdr_ifr_setting_t;
+} __packed;
 
-typedef struct hfa384x_pdr_rfr_setting {
+struct hfa384x_pdr_rfr_setting {
        u16 value[3];
-} __packed hfa384x_pdr_rfr_setting_t;
+} __packed;
 
-typedef struct hfa384x_pdr_hfa3861_baseline {
+struct hfa384x_pdr_hfa3861_baseline {
        u16 value[50];
-} __packed hfa384x_pdr_hfa3861_baseline_t;
+} __packed;
 
-typedef struct hfa384x_pdr_hfa3861_shadow {
+struct hfa384x_pdr_hfa3861_shadow {
        u32 value[32];
-} __packed hfa384x_pdr_hfa3861_shadow_t;
+} __packed;
 
-typedef struct hfa384x_pdr_hfa3861_ifrf {
+struct hfa384x_pdr_hfa3861_ifrf {
        u32 value[20];
-} __packed hfa384x_pdr_hfa3861_ifrf_t;
+} __packed;
 
-typedef struct hfa384x_pdr_hfa3861_chcalsp {
+struct hfa384x_pdr_hfa3861_chcalsp {
        u16 value[14];
-} __packed hfa384x_pdr_hfa3861_chcalsp_t;
+} __packed;
 
 typedef struct hfa384x_pdr_hfa3861_chcali {
        u16 value[17];
@@ -1098,34 +1094,34 @@ typedef struct hfa384x_pdrec {
        u16 len;                /* in words */
        u16 code;
        union pdr {
-               hfa384x_pdr_pcb_partnum_t pcb_partnum;
-               hfa384x_pdr_pcb_tracenum_t pcb_tracenum;
-               hfa384x_pdr_nic_serial_t nic_serial;
-               hfa384x_pdr_mkk_measurements_t mkk_measurements;
-               hfa384x_pdr_nic_ramsize_t nic_ramsize;
-               hfa384x_pdr_mfisuprange_t mfisuprange;
-               hfa384x_pdr_cfisuprange_t cfisuprange;
-               hfa384x_pdr_nicid_t nicid;
-               hfa384x_pdr_refdac_measurements_t refdac_measurements;
-               hfa384x_pdr_vgdac_measurements_t vgdac_measurements;
-               hfa384x_pdr_level_compc_measurements_t level_compc_measurements;
-               hfa384x_pdr_mac_address_t mac_address;
-               hfa384x_pdr_mkk_callname_t mkk_callname;
-               hfa384x_pdr_regdomain_t regdomain;
-               hfa384x_pdr_allowed_channel_t allowed_channel;
-               hfa384x_pdr_default_channel_t default_channel;
-               hfa384x_pdr_privacy_option_t privacy_option;
-               hfa384x_pdr_temptype_t temptype;
-               hfa384x_pdr_refdac_setup_t refdac_setup;
-               hfa384x_pdr_vgdac_setup_t vgdac_setup;
-               hfa384x_pdr_level_comp_setup_t level_comp_setup;
-               hfa384x_pdr_trimdac_setup_t trimdac_setup;
-               hfa384x_pdr_ifr_setting_t ifr_setting;
-               hfa384x_pdr_rfr_setting_t rfr_setting;
-               hfa384x_pdr_hfa3861_baseline_t hfa3861_baseline;
-               hfa384x_pdr_hfa3861_shadow_t hfa3861_shadow;
-               hfa384x_pdr_hfa3861_ifrf_t hfa3861_ifrf;
-               hfa384x_pdr_hfa3861_chcalsp_t hfa3861_chcalsp;
+               struct hfa384x_pdr_pcb_partnum pcb_partnum;
+               struct hfa384x_pdr_pcb_tracenum pcb_tracenum;
+               struct hfa384x_pdr_nic_serial nic_serial;
+               struct hfa384x_pdr_mkk_measurements mkk_measurements;
+               struct hfa384x_pdr_nic_ramsize nic_ramsize;
+               struct hfa384x_pdr_mfisuprange mfisuprange;
+               struct hfa384x_pdr_cfisuprange cfisuprange;
+               struct hfa384x_pdr_nicid nicid;
+               struct hfa384x_pdr_refdac_measurements refdac_measurements;
+               struct hfa384x_pdr_vgdac_measurements vgdac_measurements;
+               struct hfa384x_pdr_level_comp_measurements level_compc_measurements;
+               struct hfa384x_pdr_mac_address mac_address;
+               struct hfa384x_pdr_mkk_callname mkk_callname;
+               struct hfa384x_pdr_regdomain regdomain;
+               struct hfa384x_pdr_allowed_channel allowed_channel;
+               struct hfa384x_pdr_default_channel default_channel;
+               struct hfa384x_pdr_privacy_option privacy_option;
+               struct hfa384x_pdr_temptype temptype;
+               struct hfa384x_pdr_refdac_setup refdac_setup;
+               struct hfa384x_pdr_vgdac_setup vgdac_setup;
+               struct hfa384x_pdr_level_comp_setup level_comp_setup;
+               struct hfa384x_pdr_trimdac_setup trimdac_setup;
+               struct hfa384x_pdr_ifr_setting ifr_setting;
+               struct hfa384x_pdr_rfr_setting rfr_setting;
+               struct hfa384x_pdr_hfa3861_baseline hfa3861_baseline;
+               struct hfa384x_pdr_hfa3861_shadow hfa3861_shadow;
+               struct hfa384x_pdr_hfa3861_ifrf hfa3861_ifrf;
+               struct hfa384x_pdr_hfa3861_chcalsp hfa3861_chcalsp;
                hfa384x_pdr_hfa3861_chcali_t hfa3861_chcali;
                hfa384x_pdr_nic_config_t nic_config;
                hfa384x_hfo_delay_t hfo_delay;
@@ -1187,8 +1183,8 @@ typedef struct hfa384x_usbctlx {
        struct list_head list;
 
        size_t outbufsize;
-       hfa384x_usbout_t outbuf;        /* pkt buf for OUT */
-       hfa384x_usbin_t inbuf;  /* pkt buf for IN(a copy) */
+       union hfa384x_usbout outbuf;    /* pkt buf for OUT */
+       union hfa384x_usbin inbuf;      /* pkt buf for IN(a copy) */
 
        CTLX_STATE state;       /* Tracks running state */
 
@@ -1252,7 +1248,7 @@ typedef struct hfa384x {
        struct sk_buff *rx_urb_skb;
        struct urb tx_urb;
        struct urb ctlx_urb;
-       hfa384x_usbout_t txbuff;
+       union hfa384x_usbout txbuff;
        hfa384x_usbctlxq_t ctlxq;
        struct timer_list reqtimer;
        struct timer_list resptimer;