.. | .. |
---|
239 | 239 | } \ |
---|
240 | 240 | } while (0) |
---|
241 | 241 | |
---|
| 242 | +typedef struct wifi_adapter_info { |
---|
| 243 | + const char *name; |
---|
| 244 | + uint irq_num; |
---|
| 245 | + uint intr_flags; |
---|
| 246 | + const char *fw_path; |
---|
| 247 | + const char *nv_path; |
---|
| 248 | + void *wifi_plat_data; /* wifi ctrl func, for backward compatibility */ |
---|
| 249 | + uint bus_type; |
---|
| 250 | + int index; |
---|
| 251 | + uint bus_num; |
---|
| 252 | + uint slot_num; |
---|
| 253 | + int gpio_wl_reg_on; |
---|
| 254 | + int gpio_wl_host_wake; |
---|
| 255 | +#if defined(BT_OVER_SDIO) |
---|
| 256 | + const char *btfw_path; |
---|
| 257 | +#endif /* defined (BT_OVER_SDIO) */ |
---|
| 258 | +} wifi_adapter_info_t; |
---|
| 259 | + |
---|
242 | 260 | #if !defined(CONFIG_WIFI_CONTROL_FUNC) |
---|
243 | 261 | #define WLAN_PLAT_NODFS_FLAG 0x01 |
---|
244 | 262 | #define WLAN_PLAT_AP_FLAG 0x02 |
---|
245 | 263 | struct wifi_platform_data { |
---|
246 | | - int (*set_power)(int val); |
---|
| 264 | + int (*set_power)(int val, wifi_adapter_info_t *adapter); |
---|
247 | 265 | int (*set_reset)(int val); |
---|
248 | 266 | int (*set_carddetect)(int val); |
---|
249 | 267 | void *(*mem_prealloc)(int section, unsigned long size); |
---|
.. | .. |
---|
261 | 279 | |
---|
262 | 280 | #define DHD_REGISTRATION_TIMEOUT 12000 /* msec : allowed time to finished dhd registration */ |
---|
263 | 281 | |
---|
264 | | -typedef struct wifi_adapter_info { |
---|
265 | | - const char *name; |
---|
266 | | - uint irq_num; |
---|
267 | | - uint intr_flags; |
---|
268 | | - const char *fw_path; |
---|
269 | | - const char *nv_path; |
---|
270 | | - void *wifi_plat_data; /* wifi ctrl func, for backward compatibility */ |
---|
271 | | - uint bus_type; |
---|
272 | | - uint bus_num; |
---|
273 | | - uint slot_num; |
---|
274 | | -#if defined(BT_OVER_SDIO) |
---|
275 | | - const char *btfw_path; |
---|
276 | | -#endif /* defined (BT_OVER_SDIO) */ |
---|
277 | | -} wifi_adapter_info_t; |
---|
278 | 282 | |
---|
279 | 283 | typedef struct bcmdhd_wifi_platdata { |
---|
280 | 284 | uint num_adapters; |
---|