diff --git a/arch/arm/mach-msm/board-8064-camera.c b/arch/arm/mach-msm/board-8064-camera.c index 93e2a332bbe..7b4df7904d2 100644 --- a/arch/arm/mach-msm/board-8064-camera.c +++ b/arch/arm/mach-msm/board-8064-camera.c @@ -375,8 +375,6 @@ static int get_system_rev(void) static void cam_ldo_power_on(void) { int ret = 0; - int cam_type = 0; - printk(KERN_DEBUG "[JC] %s: In\n", __func__); printk(KERN_DEBUG "[JC] %s: system_rev=%d\n", __func__, system_rev); @@ -421,22 +419,9 @@ static void cam_ldo_power_on(void) __func__); } - cam_type = gpio_get_value(GPIO_CAM_SENSOR_DET); - - printk(KERN_DEBUG "[JC] %s: SENSOR TYPE = %d\n", __func__, cam_type); - /* CAM_DVDD1.1V_1.2V*/ l28 = regulator_get(NULL, "8921_l28"); - - if (cam_type == 1) { - printk(KERN_DEBUG "[JC] %s: Sony Sensor 1.1V", __func__); - regulator_set_voltage(l28, 1100000, 1100000); - } - else { - printk(KERN_DEBUG "[JC] %s: LSI Sensor 1.2V", __func__); - regulator_set_voltage(l28, 1200000, 1200000); - } - + regulator_set_voltage(l28, 1100000, 1100000); ret = regulator_enable(l28); if (ret) printk(KERN_DEBUG "error enabling regulator 8921_l28\n"); @@ -1549,17 +1534,6 @@ struct pm_gpio cam_init_in_cfg = { .output_value = 0, }; -struct pm_gpio cam_rear_det = { - .direction = PM_GPIO_DIR_IN, - .pull = PM_GPIO_PULL_NO, - .out_strength = PM_GPIO_STRENGTH_LOW, - .function = PM_GPIO_FUNC_NORMAL, - .inv_int_pol = 0, - .vin_sel = PM_GPIO_VIN_S4, - .output_buffer = PM_GPIO_OUT_BUF_CMOS, - .output_value = 0, -}; - void __init apq8064_init_cam(void) { printk(KERN_DEBUG "[JC] %s: In\n", __func__); @@ -1579,7 +1553,6 @@ void __init apq8064_init_cam(void) #endif pm8xxx_gpio_config(GPIO_CAM_A_EN2, &cam_init_out_cfg); - pm8xxx_gpio_config(GPIO_CAM_SENSOR_DET, &cam_rear_det); /* temp: need to set low because bootloader make high signal. */ pmic_gpio_ctrl(GPIO_CAM_VT_EN, 0); diff --git a/arch/arm/mach-msm/board-8064-wifi.c b/arch/arm/mach-msm/board-8064-wifi.c index 5c585297363..b1f219c5f75 100755 --- a/arch/arm/mach-msm/board-8064-wifi.c +++ b/arch/arm/mach-msm/board-8064-wifi.c @@ -51,13 +51,6 @@ void *wlan_static_scan_buf0; void *wlan_static_scan_buf1; void *wlan_static_dhd_info_buf; -#define ENABLE_4335BT_WAR - -#ifdef ENABLE_4335BT_WAR -static int bt_off = 0; -extern int bt_is_running; -#endif /* ENABLE_4335BT_WAR */ - static void *brcm_wlan_mem_prealloc(int section, unsigned long size) { if (section == PREALLOC_WLAN_SEC_NUM) @@ -206,30 +199,13 @@ int __init brcm_wifi_init_gpio(void) return 0; } -#ifdef ENABLE_4335BT_WAR -static int brcm_wlan_power(int onoff,bool b0rev) -#else static int brcm_wlan_power(int onoff) -#endif { printk(KERN_INFO"------------------------------------------------"); printk(KERN_INFO"------------------------------------------------\n"); printk(KERN_INFO"%s Enter: power %s\n", __func__, onoff ? "on" : "off"); if (onoff) { -#ifdef ENABLE_4335BT_WAR - if(b0rev == true && ice_gpiox_get(FPGA_GPIO_BT_EN) == 0) - { - bt_off = 1; - ice_gpiox_set(FPGA_GPIO_BT_EN, 1); - printk("[brcm_wlan_power] Bluetooth Power On.\n"); - msleep(50); - } - else { - bt_off = 0; - } -#endif /* ENABLE_4335BT_WAR */ - /* if (gpio_request(GPIO_WL_REG_ON, "WL_REG_ON")) { @@ -255,13 +231,6 @@ static int brcm_wlan_power(int onoff) return -EIO; } } -#ifdef ENABLE_4335BT_WAR - if(onoff && (bt_off == 1) && (bt_is_running == 0)) { - msleep(100); - ice_gpiox_set(FPGA_GPIO_BT_EN, 0); - printk("[brcm_wlan_power] BT_REG_OFF.\n"); - } -#endif return 0; } @@ -312,7 +281,6 @@ static int brcm_wlan_set_carddetect(int val) /* msleep(200); wait for carddetect */ - return 0; } diff --git a/arch/arm/mach-msm/board-bluetooth-bcm4335.c b/arch/arm/mach-msm/board-bluetooth-bcm4335.c index 205a02d4c39..8bdc4c601e2 100644 --- a/arch/arm/mach-msm/board-bluetooth-bcm4335.c +++ b/arch/arm/mach-msm/board-bluetooth-bcm4335.c @@ -60,8 +60,6 @@ #define GPIO_BT_UART_TXD BT_UART_TXD #define GPIO_BT_HOST_WAKE BT_HOST_WAKE -int bt_is_running=0; -EXPORT_SYMBOL(bt_is_running); static struct rfkill *bt_rfkill; @@ -176,8 +174,6 @@ static int bcm4335_bt_rfkill_set_power(void *data, bool blocked) ret = ice_gpiox_set(FPGA_GPIO_BT_EN, 1); if (ret) pr_err("[BT] failed to set BT_EN.\n"); - else - bt_is_running = 1; } else { #ifdef BT_UART_CFG for (pin = 0; pin < ARRAY_SIZE(bt_uart_off_table); pin++) { @@ -193,8 +189,6 @@ static int bcm4335_bt_rfkill_set_power(void *data, bool blocked) ret = ice_gpiox_set(FPGA_GPIO_BT_EN, 0); if (ret) pr_err("[BT] failed to set BT_EN.\n"); - else - bt_is_running = 0; } return 0; } @@ -232,7 +226,6 @@ static int bcm4335_bluetooth_probe(struct platform_device *pdev) int pin = 0; #endif - bt_is_running = 0; /* temporailiy set HOST_WAKE OUT direction until FPGA work finishs */ /* if setting HOST_WAKE to NO PULL, BT would not be turned on. */ /* By guideline of BRCM, it is needed to determine pull status */ diff --git a/drivers/bluetooth/bluesleep.c b/drivers/bluetooth/bluesleep.c index 7225d4f72fe..207ec5f4ca7 100644 --- a/drivers/bluetooth/bluesleep.c +++ b/drivers/bluetooth/bluesleep.c @@ -96,7 +96,6 @@ static void bluesleep_ext_wake_set_wq(struct work_struct *work); static void bluesleep_sleep_wakeup_wq(struct work_struct *work); static void bluesleep_start_wq(struct work_struct *work); static void bluesleep_stop_wq(struct work_struct *work); -static void bluesleep_abnormal_stop_wq(struct work_struct *work); /* work queue */ @@ -105,7 +104,6 @@ DECLARE_DELAYED_WORK(tx_timer_expired_workqueue, bluesleep_ext_wake_set_wq); DECLARE_DELAYED_WORK(tx_data_wakeup_workqueue, bluesleep_sleep_wakeup_wq); DECLARE_DELAYED_WORK(bluesleep_start_workqueue, bluesleep_start_wq); DECLARE_DELAYED_WORK(bluesleep_stop_workqueue, bluesleep_stop_wq); -DECLARE_DELAYED_WORK(bluesleep_abnormal_stop_workqueue, bluesleep_abnormal_stop_wq); /* Macros for handling sleep work */ @@ -119,7 +117,6 @@ DECLARE_DELAYED_WORK(bluesleep_abnormal_stop_workqueue, bluesleep_abnormal_stop_ #define bluesleep_start() schedule_delayed_work(&bluesleep_start_workqueue, 0) #define bluesleep_stop() schedule_delayed_work(&bluesleep_stop_workqueue, 0) -#define bluesleep_abnormal_stop() schedule_delayed_work(&bluesleep_abnormal_stop_workqueue, 0) /* 10 second timeout */ @@ -370,7 +367,7 @@ static int bluesleep_read_proc_lpm(char *page, char **start, off_t offset, int count, int *eof, void *data) { *eof = 1; - return snprintf(page, count, "lpm: %u\n", has_lpm_enabled?1:0 ); + return snprintf(page, count, "unsupported to read\n"); } static int bluesleep_write_proc_lpm(struct file *file, const char *buffer, @@ -390,7 +387,7 @@ static int bluesleep_write_proc_lpm(struct file *file, const char *buffer, bluesleep_stop(); has_lpm_enabled = false; //bsi->uport = NULL; - } else if (b == '1') { + } else { BT_ERR("(bluesleep_write_proc_lpm) Reg HCI notifier."); /* HCI_DEV_REG */ if (!has_lpm_enabled) { @@ -399,12 +396,6 @@ static int bluesleep_write_proc_lpm(struct file *file, const char *buffer, /* if bluetooth started, start bluesleep*/ bluesleep_start(); } - } else if (b == '2') { - BT_ERR("(bluesleep_write_proc_lpm) don`t control ext_wake & uart clk"); - if(has_lpm_enabled) { - has_lpm_enabled = false; - bluesleep_abnormal_stop(); - } } return count; @@ -597,42 +588,6 @@ static void bluesleep_stop_wq(struct work_struct *work) bsi->uport = NULL; } - -/** - * Stops the Sleep-Mode Protocol on the Host when abnormal. - */ -static void bluesleep_abnormal_stop_wq(struct work_struct *work) -{ - int ret; - - BT_ERR("bluesleep_abnormal_stop_wq"); - - /* assert BT_WAKE */ - if (bsi->has_ext_wake == 1) { - ret = ice_gpiox_set(bsi->ext_wake, 1); - if (ret) - BT_ERR("(bluesleep_abnormal_stop_wq) failed to set ext_wake 1."); - } - set_bit(BT_EXT_WAKE, &flags); - del_timer(&tx_timer); - clear_bit(BT_PROTO, &flags); - - if (test_bit(BT_ASLEEP, &flags)) { - clear_bit(BT_ASLEEP, &flags); - hsuart_power(1); - } - - atomic_inc(&open_count); - -#if BT_ENABLE_IRQ_WAKE - if (disable_irq_wake(bsi->host_wake_irq)) - BT_ERR("Couldn't disable hostwake IRQ wakeup mode\n"); -#endif - wake_lock_timeout(&bsi->wake_lock, HZ / 2); - - bsi->uport = NULL; -} - /** * Read the BT_WAKE GPIO pin value via the proc interface. * When this function returns, page will contain a 1 if the diff --git a/drivers/media/video/msm-jf/jpeg_10/msm_jpeg_sync.c b/drivers/media/video/msm-jf/jpeg_10/msm_jpeg_sync.c index 6ac4a5edf75..74e80247715 100644 --- a/drivers/media/video/msm-jf/jpeg_10/msm_jpeg_sync.c +++ b/drivers/media/video/msm-jf/jpeg_10/msm_jpeg_sync.c @@ -218,7 +218,7 @@ int msm_jpeg_evt_get(struct msm_jpeg_device *pgmn_dev, JPEG_DBG("%s:%d] no buffer\n", __func__, __LINE__); return -EAGAIN; } - + memset(&ctrl_cmd, 0, sizeof(ctrl_cmd)); ctrl_cmd.type = buf_p->vbuf.type; kfree(buf_p); diff --git a/drivers/media/video/msm-jf/mercury/msm_mercury_sync.c b/drivers/media/video/msm-jf/mercury/msm_mercury_sync.c index 9293aad34b0..860dcc80238 100644 --- a/drivers/media/video/msm-jf/mercury/msm_mercury_sync.c +++ b/drivers/media/video/msm-jf/mercury/msm_mercury_sync.c @@ -196,6 +196,7 @@ int msm_mercury_evt_get(struct msm_mercury_device *pmercury_dev, int rc = 0; MCR_DBG("(%d)%s() Enter\n", __LINE__, __func__); + memset(&ctrl_cmd, 0, sizeof(ctrl_cmd)); ctrl_cmd.type = (uint32_t)msm_mercury_q_wait(&pmercury_dev->evt_q); rc = copy_to_user(arg, &ctrl_cmd, sizeof(ctrl_cmd)); diff --git a/drivers/media/video/msm-jf/msm.c b/drivers/media/video/msm-jf/msm.c index 636dc43c7eb..df9ce6b4b24 100644 --- a/drivers/media/video/msm-jf/msm.c +++ b/drivers/media/video/msm-jf/msm.c @@ -827,7 +827,7 @@ static long msm_camera_v4l2_private_ioctl(struct file *file, void *fh, mutex_unlock(&pcam->event_lock); break; } - if (ioctl_ptr->len > 0) { + if (ioctl_ptr->len > 0 && ioctl_ptr->len <= MAX_SERVER_PAYLOAD_LENGTH) { if (copy_to_user(ioctl_ptr->ioctl_ptr, payload, ioctl_ptr->len)) { pr_err("%s Copy to user failed for cmd %d", diff --git a/drivers/media/video/msm-jf/msm_mctl_buf.c b/drivers/media/video/msm-jf/msm_mctl_buf.c index 0f4e919a6bd..3e85a9a6ca8 100644 --- a/drivers/media/video/msm-jf/msm_mctl_buf.c +++ b/drivers/media/video/msm-jf/msm_mctl_buf.c @@ -1021,14 +1021,13 @@ static int __msm_mctl_map_user_frame(struct msm_cam_meta_frame *meta_frame, static int __msm_mctl_unmap_user_frame(struct msm_cam_meta_frame *meta_frame, struct ion_client *client, int domain_num) { - int i = 0; + int i = 0, rc = 0; for (i = 0; i < meta_frame->frame.num_planes; i++) { D("%s Plane %d handle %p", __func__, i, meta_frame->map[i].handle); put_pmem_file(meta_frame->map[i].file); } - return 0; } /* Map using PMEM APIs */ @@ -1039,7 +1038,7 @@ static int __msm_mctl_map_user_frame(struct msm_cam_meta_frame *meta_frame, unsigned long paddr = 0; struct file *file = NULL; unsigned long len; - int i = 0, j = 0, rc=0; + int i = 0, j = 0; for (i = 0; i < meta_frame->frame.num_planes; i++) { rc = get_pmem_file(meta_frame->frame.mp[i].fd, @@ -1052,7 +1051,7 @@ static int __msm_mctl_map_user_frame(struct msm_cam_meta_frame *meta_frame, if (meta_frame->map[j].file) put_pmem_file(meta_frame->map[j].file); - return rc; + return -EACCES; } D("%s Got pmem file for fd %d plane %d as %p", __func__, meta_frame->frame.mp[i].fd, i, file); diff --git a/drivers/media/video/msm-jf/sensors/jc_v4l2.c b/drivers/media/video/msm-jf/sensors/jc_v4l2.c index ce3063b0de8..1a8f367f7f5 100644 --- a/drivers/media/video/msm-jf/sensors/jc_v4l2.c +++ b/drivers/media/video/msm-jf/sensors/jc_v4l2.c @@ -147,6 +147,8 @@ struct jc_ctrl_t { bool samsung_app; bool factory_bin; int fw_retry_cnt; + int fps_mode; + int max_fps; }; static struct jc_ctrl_t *jc_ctrl; @@ -1992,7 +1994,6 @@ static int jc_set_snapshot_mode(int mode) jc_writeb(JC_CATEGORY_CAPCTRL, JC_CAPCTRL_START_DUALCAP, 0x07); } else { - usleep(10*1000); jc_writeb(JC_CATEGORY_CAPCTRL, JC_CAPCTRL_START_DUALCAP, 0x01); } @@ -2046,7 +2047,7 @@ static int jc_set_af_mode(int status) cam_info("Entered, af mode %d\n", status); - if (status < 1 || status > 6) { + if (status < 1 || status > 7) { cam_err("invalid value, %d\n", status); return rc; } @@ -2105,6 +2106,10 @@ static int jc_set_af_mode(int status) jc_writeb(JC_CATEGORY_LENS, 0x02, 0x01); } + } else if (status == 7) { + cam_info("Infinity\n"); + jc_writeb(JC_CATEGORY_LENS, + 0x02, 0x02); } return rc; @@ -2445,14 +2450,15 @@ static int jc_set_movie_mode(int mode) jc_ctrl->movie_mode = false; jc_writeb(JC_CATEGORY_PARM, JC_PARM_MON_MOVIE_SELECT, 0x00); - cam_info("Zsl mode\n"); - jc_writeb(0x02, 0xCF, 0x01); /*zsl mode*/ + jc_writeb(0x02, 0xCF, 0x01); /*zsl mode*/ } else if (mode == 1) { cam_info("Movie mode\n"); jc_ctrl->movie_mode = true; jc_writeb(JC_CATEGORY_PARM, JC_PARM_MON_MOVIE_SELECT, 0x01); + cam_info("Non zsl mode\n"); + jc_writeb(0x02, 0xCF, 0x00); /*non-zsl mode*/ } return rc; } @@ -2526,6 +2532,178 @@ static int jc_set_shot_mode(int mode) return rc; } +static int jc_set_fps(int mode, int min, int max) +{ + int32_t rc = 0; + + cam_info("Entered, fps mode : %d, min : %d, max : %d\n", + mode, min, max); + + jc_ctrl->fps_mode = mode; + jc_ctrl->max_fps = max; + + if (mode == 0) { + cam_info("Auto fps mode\n"); + jc_writeb(0x02, 0xCF, 0x01); /*zsl mode*/ + + if (min == 10000 && max == 30000) { /*LLS*/ + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x15); + } else if (max == 24000) { + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x0C); + } else { + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x00); + } + } else if (mode == 1) { + cam_info("Fixed fps mode\n"); + jc_writeb(0x02, 0xCF, 0x00); /*non-zsl mode*/ + + if (max == 7000) { + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x09); + } else if (max == 15000) { + if (jc_ctrl->shot_mode == 0x0F) {/*CinePic*/ + cam_info("CinePic FPS\n"); + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x17); + } else { + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x04); + } + } else if (max == 24000) { + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x05); + } else if (max == 30000) { + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x02); + } else if (max == 60000) { + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x07); + } else if (max == 90000) { + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x0B); + } else if (max == 120) { /*120fps*/ + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x08); + } + } else if (mode == 2) { + cam_info("Drama shot mode\n"); + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x16); + } + return rc; +} + +static int jc_set_scene_mode(int mode) +{ + int32_t rc = 0; + u32 isp_mode; + + jc_readb(JC_CATEGORY_SYS, JC_SYS_MODE, &isp_mode); + + cam_info("Entered, scene mode %d / %d\n", mode, isp_mode); + cam_info("fps info %d / %d\n", jc_ctrl->fps_mode, jc_ctrl->max_fps); + + if (isp_mode == JC_MONITOR_MODE) { + cam_info("monitor mode\n"); + + jc_set_mode(JC_PARMSET_MODE); + + if (mode == 0) { + cam_info("auto scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x01); + jc_set_fps(jc_ctrl->fps_mode, 0, jc_ctrl->max_fps); + } else if (mode == 5) { + cam_info("party scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x15); + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x20); + } else if (mode == 7) { + cam_info("sunset scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x16); + jc_set_fps(jc_ctrl->fps_mode, 0, jc_ctrl->max_fps); + } else if (mode == 10) { + cam_info("night scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x17); + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x21); + } else if (mode == 20) { + cam_info("action scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x11); + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x11); + } else { + cam_info("etc scene\n"); + jc_set_fps(jc_ctrl->fps_mode, 0, jc_ctrl->max_fps); + } + + jc_set_mode(JC_MONITOR_MODE); + + cam_info("Restart auto focus\n"); + if (jc_ctrl->af_mode == 3) { + cam_info("start CAF\n"); + jc_writeb(JC_CATEGORY_LENS, + 0x01, 0x03); + jc_writeb(JC_CATEGORY_LENS, + 0x02, 0x01); + } else if (jc_ctrl->af_mode == 4) { + cam_info("start macro CAF\n"); + jc_writeb(JC_CATEGORY_LENS, + 0x01, 0x07); + jc_writeb(JC_CATEGORY_LENS, + 0x02, 0x01); + } else if (jc_ctrl->af_mode == 5) { + msleep(50); + cam_info("start Movie CAF\n"); + jc_writeb(JC_CATEGORY_LENS, + 0x01, 0x04); + jc_writeb(JC_CATEGORY_LENS, + 0x02, 0x01); + } else if (jc_ctrl->af_mode == 6) { + msleep(50); + cam_info("FD CAF\n"); + jc_writeb(JC_CATEGORY_LENS, + 0x01, 0x05); + jc_writeb(JC_CATEGORY_LENS, + 0x02, 0x01); + } + } else { + cam_info("parameter mode\n"); + + if (mode == 0) { + cam_info("auto scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x01); + jc_set_fps(jc_ctrl->fps_mode, 0, jc_ctrl->max_fps); + } else if (mode == 5) { + cam_info("party scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x15); + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x20); + } else if (mode == 7) { + cam_info("sunset scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x16); + jc_set_fps(jc_ctrl->fps_mode, 0, jc_ctrl->max_fps); + } else if (mode == 10) { + cam_info("night scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x17); + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x21); + } else if (mode == 20) { + cam_info("action scene\n"); + jc_writeb(JC_CATEGORY_PARM, 0x0E, 0x11); + jc_writeb(JC_CATEGORY_AE, + JC_AE_EP_MODE_CAP, 0x11); + } else { + cam_info("etc scene\n"); + jc_set_fps(jc_ctrl->fps_mode, 0, jc_ctrl->max_fps); + } + } + + return rc; +} + static int jc_set_ocr_focus_mode(int mode) { int32_t rc = 0; @@ -2587,67 +2765,6 @@ static int jc_set_softlanding(void) return rc; } -static int jc_set_fps(int mode, int min, int max) -{ - int32_t rc = 0; - - cam_info("Entered, fps mode : %d, min : %d, max : %d\n", - mode, min, max); - - if (mode == 0) { - cam_info("Auto fps mode\n"); - jc_writeb(0x02, 0xCF, 0x01); /*zsl mode*/ - - if (min == 10000 && max == 30000) { /*LLS*/ - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x15); - } else if (max == 24000) { - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x0C); - } else { - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x00); - } - } else if (mode == 1) { - cam_info("Fixed fps mode\n"); - jc_writeb(0x02, 0xCF, 0x00); /*non-zsl mode*/ - - if (max == 7000) { - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x09); - } else if (max == 15000) { - if (jc_ctrl->shot_mode == 0x0F) {/*CinePic*/ - cam_info("CinePic FPS\n"); - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x17); - } else { - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x04); - } - } else if (max == 24000) { - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x05); - } else if (max == 30000) { - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x02); - } else if (max == 60000) { - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x07); - } else if (max == 90000) { - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x0B); - } else if (max == 120) { /*120fps*/ - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x08); - } - } else if (mode == 2) { - cam_info("Drama shot mode\n"); - jc_writeb(JC_CATEGORY_AE, - JC_AE_EP_MODE_CAP, 0x16); - } - return rc; -} - static int jc_set_flash(int mode, int mode2) { int32_t rc = 0; @@ -2962,14 +3079,8 @@ void sensor_native_control(void __user *arg) jc_ctrl->factory_bin = false; break; - case EXT_CAM_START_GOLF_SHOT: - cam_info("Golf shot start, 1/1000 shutter speed"); - jc_writeb(0x03, 0x0B, 0x18); - break; - - case EXT_CAM_STOP_GOLF_SHOT: - cam_info("Golf shot stop, return normal shutter speed"); - jc_writeb(0x03, 0x0B, 0x08); + case EXT_CAM_SCENEMODE: + jc_set_scene_mode(ctrl_info.value_1); break; default: @@ -3116,6 +3227,8 @@ static int jc_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl) jc_ctrl->isp_null_read_sensor_fw = false; jc_ctrl->touch_af_mode = false; jc_ctrl->fw_retry_cnt = 0; + jc_ctrl->fps_mode = 0; + jc_ctrl->max_fps = 0; rc = msm_camera_request_gpio_table(data, 1); if (rc < 0) @@ -3169,7 +3282,8 @@ static int jc_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl) cam_info("isp_ret: %d, samsung app: %d, factory bin: %d\n", isp_ret, jc_ctrl->samsung_app, jc_ctrl->factory_bin); -#if 0 + +#if 0 //remove for ged if (isp_ret == 0 && jc_ctrl->samsung_app == false && jc_ctrl->factory_bin == false) { cam_err("3rd party app. skip ISP FW update\n"); goto start; @@ -3262,12 +3376,17 @@ static int jc_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl) return -ENOSYS; } } - -//start: +#if 0 //remove for ged +start: +#endif cam_info("nv12 output setting\n"); err = jc_writeb(JC_CATEGORY_CAPCTRL, 0x0, 0x0f); + cam_info("GED camera setting\n"); + err = jc_writeb(JC_CATEGORY_PARM, + 0xf, 0x01); + if (jc_ctrl->samsung_app != 1) { cam_info("Set different ratio capture mode\n"); jc_set_different_ratio_capture(1); @@ -3308,8 +3427,6 @@ static int jc_sensor_power_down(struct msm_sensor_ctrl_t *s_ctrl) /* AF off */ data->sensor_platform_info->sensor_af_power_off(); - usleep(10*1000); /* Add 1ms delay for off timing */ - /* MCLK */ rc = msm_cam_clk_enable(&s_ctrl->sensor_i2c_client->client->dev, cam_clk_info, s_ctrl->cam_clk, ARRAY_SIZE(cam_clk_info), 0); diff --git a/drivers/media/video/msm-jf/sensors/s5k6b2yx.c b/drivers/media/video/msm-jf/sensors/s5k6b2yx.c index 5acc8839511..4961d2043af 100644 --- a/drivers/media/video/msm-jf/sensors/s5k6b2yx.c +++ b/drivers/media/video/msm-jf/sensors/s5k6b2yx.c @@ -18,15 +18,15 @@ #define PLATFORM_DRIVER_NAME "msm_camera_s5k6b2yx" #define s5k6b2yx_obj s5k6b2yx_##obj -#define VISION_MODE_TEST_PATTERN 0 +#define VISION_MODE_TEST_PATTERN 0 #define VISION_MODE_AE_REG_ADDR 0x600a -#define VISION_MODE_AE_BACKLIGHT 0x9a +#define VISION_MODE_AE_BACKLIGHT 0x7a #define VISION_MODE_AE_NORMAL 0x2a #define VISION_MODE_SET_FPS_ADDR 0x6027 #define VISION_MODE_SET_FPS_5 0x1 -#define VISION_MODE_SET_FPS_10 0X2 +#define VISION_MODE_SET_FPS_10 0X2 #define VISION_MODE_FPS_5_VAL 0xD0 #define VISION_MODE_FPS_10_VAL 0x68 @@ -48,11 +48,8 @@ static struct msm_camera_i2c_reg_conf s5k6b2yx_vision_settings[] = { {0x6026, 0x00}, /* 5fps */ // {0x6027, 0xD0}, /* 5fps */ /* number of pixel : 176*104*24/64=6864 */ - {0x5030, 0x11}, - {0x5031, 0xE0}, - /* AE max shutter */ - {0x5014, 0x11}, - {0x5015, 0x00}, + {0x5030, 0x1A}, + {0x5031, 0xD0}, /* 8bit mode */ {0x7030, 0x0E}, {0x7031, 0x2F}, @@ -69,14 +66,14 @@ static struct msm_camera_i2c_reg_conf s5k6b2yx_vision_settings[] = { {0x7433, 0x32}, {0x7075, 0x3D}, {0x7066, 0x09}, - {0x6000, 0x11}, - {0x6001, 0x11}, - {0x6002, 0x11}, - {0x6003, 0x11}, - {0x6004, 0x11}, - {0x6005, 0x11}, - {0x6006, 0x11}, - {0x6007, 0x11}, + {0x6000, 0x01}, + {0x6001, 0x10}, + {0x6002, 0x14}, + {0x6003, 0x41}, + {0x6004, 0x14}, + {0x6005, 0x41}, + {0x6006, 0x01}, + {0x6007, 0x10}, /* Target */ {0x600A, 0x2A}, /* Speed */ @@ -688,7 +685,6 @@ int s5k6b2yx_sensor_set_vision_ae_control( } return 0; } -#if !defined(CONFIG_MACH_MELIUS) static ssize_t s5k6b2yx_camera_type_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -701,19 +697,14 @@ static ssize_t s5k6b2yx_camera_fw_show(struct device *dev, { return sprintf(buf, "%s %s\n", "S5K6B2YX", "S5K6B2YX"); } -#endif - -#if !defined(CONFIG_MACH_MELIUS) static DEVICE_ATTR(front_camtype, S_IRUGO, s5k6b2yx_camera_type_show, NULL); static DEVICE_ATTR(front_camfw, S_IRUGO, s5k6b2yx_camera_fw_show, NULL); -#endif - static int __init s5k6b2yx_sensor_init_module(void) { -#if !defined(CONFIG_MACH_MELIUS) struct device *cam_dev_front = NULL; + cam_dev_front = device_create(camera_class, NULL, 0, NULL, "front"); if (IS_ERR(cam_dev_front)) { @@ -732,7 +723,7 @@ static int __init s5k6b2yx_sensor_init_module(void) cam_err("failed to create device file, %s\n", dev_attr_front_camfw.attr.name); } -#endif + return i2c_add_driver(&s5k6b2yx_i2c_driver); } diff --git a/drivers/media/video/msm-jf/server/msm_cam_server.c b/drivers/media/video/msm-jf/server/msm_cam_server.c index 86cf3f804c9..79f9aee8319 100644 --- a/drivers/media/video/msm-jf/server/msm_cam_server.c +++ b/drivers/media/video/msm-jf/server/msm_cam_server.c @@ -311,6 +311,13 @@ static int msm_ctrl_cmd_done(void *arg) goto ctrl_cmd_done_error; } + if(command->queue_idx < 0 || + command->queue_idx >= MAX_NUM_ACTIVE_CAMERA) { + pr_err("%s: Invalid value OR index %d\n", __func__, + command->queue_idx); + goto ctrl_cmd_done_error; + } + if (!g_server_dev.server_queue[command->queue_idx].queue_active) { pr_err("%s: Invalid queue\n", __func__); goto ctrl_cmd_done_error; @@ -339,7 +346,8 @@ static int msm_ctrl_cmd_done(void *arg) max_control_command_size); goto ctrl_cmd_done_error; } - if (copy_from_user(command->value, uptr, command->length)) { + if (copy_from_user(command->value, (void __user *)uptr, + command->length)) { pr_err("%s: copy_from_user failed, size=%d\n", __func__, sizeof(struct msm_ctrl_cmd)); goto ctrl_cmd_done_error; @@ -1412,9 +1420,7 @@ static long msm_ioctl_server(struct file *file, void *fh, case MSM_CAM_IOCTL_V4L2_EVT_NATIVE_CMD: pr_err("%s: MSM_CAM_IOCTL_V4L2_EVT_NATIVE_CMD : %d\n", __func__, _IOC_NR(cmd)); -#if !defined(CONFIG_MACH_MELIUS) sensor_native_control(arg); -#endif rc = 0; break; case MSM_CAM_IOCTL_V4L2_EVT_NATIVE_FRONT_CMD: @@ -2633,13 +2639,17 @@ int msm_server_send_ctrl(struct msm_ctrl_cmd *out, struct msm_queue_cmd *event_qcmd; struct msm_ctrl_cmd *ctrlcmd; struct msm_cam_server_dev *server_dev = &g_server_dev; - struct msm_device_queue *queue = - &server_dev->server_queue[out->queue_idx].ctrl_q; - + struct msm_device_queue *queue; struct v4l2_event v4l2_evt; struct msm_isp_event_ctrl *isp_event; void *ctrlcmd_data; + if(out->queue_idx < 0 || out->queue_idx >= MAX_NUM_ACTIVE_CAMERA) { + pr_err("%s: Invalid index %d\n", __func__, out->queue_idx); + return -EINVAL; + } + queue = &server_dev->server_queue[out->queue_idx].ctrl_q; + event_qcmd = kzalloc(sizeof(struct msm_queue_cmd), GFP_KERNEL); if (!event_qcmd) { pr_err("%s Insufficient memory. return", __func__); diff --git a/drivers/net/wireless/bcmdhd/aiutils.c b/drivers/net/wireless/bcmdhd/aiutils.c index 1ebc2284c22..ea941516042 100644 --- a/drivers/net/wireless/bcmdhd/aiutils.c +++ b/drivers/net/wireless/bcmdhd/aiutils.c @@ -3,7 +3,7 @@ * of the SiliconBackplane-based Broadcom chips. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -233,7 +233,7 @@ ai_scan(si_t *sih, void *regs, uint devid) asd = get_asd(sih, &eromptr, 0, 0, AD_ST_SLAVE, &addrl, &addrh, &sizel, &sizeh); if (asd == 0) { do { - + asd = get_asd(sih, &eromptr, 0, 0, AD_ST_BRIDGE, &addrl, &addrh, &sizel, &sizeh); if (asd != 0) @@ -256,7 +256,7 @@ ai_scan(si_t *sih, void *regs, uint devid) } sii->coresba[idx] = addrl; sii->coresba_size[idx] = sizel; - + j = 1; do { asd = get_asd(sih, &eromptr, 0, j, AD_ST_SLAVE, &addrl, &addrh, diff --git a/drivers/net/wireless/bcmdhd/bcmevent.c b/drivers/net/wireless/bcmdhd/bcmevent.c index 573933735c5..776c3bd8bd9 100644 --- a/drivers/net/wireless/bcmdhd/bcmevent.c +++ b/drivers/net/wireless/bcmdhd/bcmevent.c @@ -2,7 +2,7 @@ * bcmevent read-only data shared by kernel or app layers * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -110,7 +110,7 @@ const bcmevent_name_t bcmevent_names[] = { { WLC_E_ACTION_FRAME_RX_NDIS, "WLC_E_ACTION_FRAME_RX_NDIS" }, { WLC_E_AUTH_REQ, "WLC_E_AUTH_REQ" }, { WLC_E_IBSS_COALESCE, "IBSS COALESCE" }, -#endif +#endif #ifdef BCMWAPI_WAI { WLC_E_WAI_STA_EVENT, "WAI_STA_EVENT" }, { WLC_E_WAI_MSG, "WAI_MSG" }, diff --git a/drivers/net/wireless/bcmdhd/bcmsdh.c b/drivers/net/wireless/bcmdhd/bcmsdh.c index 21209436802..d3cdd740397 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh.c @@ -3,7 +3,7 @@ * implement bcmsdh API for SDIOH driver * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -636,7 +636,7 @@ bcmsdh_waitlockfree(void *sdh) } -#ifdef BCMSPI /* 4329 gSPI won't have CIS reads. */ +#ifdef BCMSPI /* 4329 gSPI won't have CIS reads. */ int bcmsdh_query_device(void *sdh) { diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_linux.c b/drivers/net/wireless/bcmdhd/bcmsdh_linux.c index bba81fa3f6e..2bfb2e46215 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_linux.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_linux.c @@ -2,7 +2,7 @@ * SDIO access interface for drivers - linux specific (pci only) * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c index 695124dddbe..93bb4cd28d7 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c @@ -2,7 +2,7 @@ * BCMSDH Function Driver for the native SDIO/MMC driver in the Linux Kernel * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c index dfef579a24d..523837544a5 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c @@ -2,7 +2,7 @@ * BCMSDH Function Driver for the native SDIO/MMC driver in the Linux Kernel * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/bcmutils.c b/drivers/net/wireless/bcmdhd/bcmutils.c index afece5360e8..03940289eb3 100644 --- a/drivers/net/wireless/bcmdhd/bcmutils.c +++ b/drivers/net/wireless/bcmdhd/bcmutils.c @@ -2,7 +2,7 @@ * Driver O/S-independent utility routines * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -20,7 +20,7 @@ * Notwithstanding the above, under no circumstances may you combine this * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. - * $Id: bcmutils.c 440953 2013-12-04 13:39:58Z $ + * $Id: bcmutils.c 427979 2013-10-07 08:35:57Z $ */ #include @@ -2313,7 +2313,7 @@ bcm_uint64_divide(uint32* r, uint32 a_high, uint32 a_low, uint32 b) *r = r0; } -#ifndef setbit /* As in the header file */ +#ifndef setbit /* As in the header file */ #ifdef BCMUTILS_BIT_MACROS_USE_FUNCS /* Set bit in byte array. */ void diff --git a/drivers/net/wireless/bcmdhd/bcmwifi_channels.c b/drivers/net/wireless/bcmdhd/bcmwifi_channels.c index 1c7b51340df..97c1b6f764e 100644 --- a/drivers/net/wireless/bcmdhd/bcmwifi_channels.c +++ b/drivers/net/wireless/bcmdhd/bcmwifi_channels.c @@ -4,7 +4,7 @@ * software that might want wifi things as it grows. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -439,12 +439,12 @@ wf_chspec_aton(const char *a) if (!read_uint(&a, &num)) return 0; - + c = tolower((int)a[0]); if (c == 'g') { - a ++; - + a ++; + if (num == 2) chspec_band = WL_CHANSPEC_BAND_2G; else if (num == 5) @@ -459,7 +459,7 @@ wf_chspec_aton(const char *a) c = tolower((int)a[0]); } else { - + ctl_ch = num; chspec_band = ((ctl_ch <= CH_MAX_2G_CHANNEL) ? WL_CHANSPEC_BAND_2G : WL_CHANSPEC_BAND_5G); @@ -501,11 +501,11 @@ wf_chspec_aton(const char *a) return 0; } - + c = tolower((int)a[0]); - + if (chspec_band == WL_CHANSPEC_BAND_2G && bw == 40) { if (c == 'u' || c == 'l') { a ++; @@ -762,7 +762,7 @@ wf_chspec_valid(chanspec_t chanspec) } if (i == num_ch) { - + if (chspec_ch == 165) i = 0; @@ -887,7 +887,7 @@ wf_channel2chspec(uint ctl_ch, uint bw) } } - + if (sb < 0) { return 0; } @@ -895,7 +895,7 @@ wf_channel2chspec(uint ctl_ch, uint bw) return chspec; } -#endif +#endif extern chanspec_t wf_chspec_primary40_chspec(chanspec_t chspec) @@ -990,10 +990,10 @@ wf_channel2mhz(uint ch, uint start_factor) static const struct chan_info { - uint16 chan; - uint16 freq; + uint16 chan; + uint16 freq; } chan_info[] = { - + {1, 2412}, {2, 2417}, {3, 2422}, @@ -1056,7 +1056,7 @@ static const struct chan_info { {208, 5040}, {212, 5060}, {216, 5080} -#endif +#endif }; diff --git a/drivers/net/wireless/bcmdhd/bcmwifi_channels.h b/drivers/net/wireless/bcmdhd/bcmwifi_channels.h index 667d70ba105..eeb09203297 100644 --- a/drivers/net/wireless/bcmdhd/bcmwifi_channels.h +++ b/drivers/net/wireless/bcmdhd/bcmwifi_channels.h @@ -4,7 +4,7 @@ * both the wl driver, tools & Apps. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -42,8 +42,8 @@ typedef uint16 chanspec_t; #define CH_20MHZ_APART 4 #define CH_10MHZ_APART 2 #define CH_5MHZ_APART 1 -#define CH_MAX_2G_CHANNEL 14 -#define MAXCHANNEL 224 +#define CH_MAX_2G_CHANNEL 14 +#define MAXCHANNEL 224 #define CHSPEC_CTLOVLP(sp1, sp2, sep) (ABS(wf_chspec_ctlchan(sp1) - wf_chspec_ctlchan(sp2)) < \ (sep)) @@ -311,7 +311,7 @@ typedef uint16 chanspec_t; WL_LCHANSPEC_CTL_SB_NONE | (((channel) <= CH_MAX_2G_CHANNEL) ? \ WL_LCHANSPEC_BAND_2G : WL_LCHANSPEC_BAND_5G)) -#endif +#endif @@ -322,9 +322,9 @@ typedef uint16 chanspec_t; #define WF_CHAN_FACTOR_5_G 10000 -#define WF_CHAN_FACTOR_4_G 8000 +#define WF_CHAN_FACTOR_4_G 8000 -#define WLC_2G_25MHZ_OFFSET 5 +#define WLC_2G_25MHZ_OFFSET 5 extern char * wf_chspec_ntoa(chanspec_t chspec, char *buf); @@ -360,4 +360,4 @@ extern uint wf_channel2freq(uint channel); extern uint wf_freq2channel(uint freq); -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/bcmwifi_rates.h b/drivers/net/wireless/bcmdhd/bcmwifi_rates.h index 43539d2a95a..42b9b9e211a 100644 --- a/drivers/net/wireless/bcmdhd/bcmwifi_rates.h +++ b/drivers/net/wireless/bcmdhd/bcmwifi_rates.h @@ -2,7 +2,7 @@ * Indices for 802.11 a/b/g/n/ac 1-3 chain symmetric transmit rates * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -195,9 +195,9 @@ typedef enum clm_rates { WL_RATE_2X2_VHT8SS2 = 62, WL_RATE_2X2_VHT9SS2 = 63, + - - + WL_RATE_1X3_DSSS_1 = 64, WL_RATE_1X3_DSSS_2 = 65, WL_RATE_1X3_DSSS_5_5 = 66, @@ -295,9 +295,9 @@ typedef enum clm_rates { WL_RATE_3X3_VHT9SS3 = 115, + - - + WL_RATE_1X2_TXBF_OFDM_6 = 116, WL_RATE_1X2_TXBF_OFDM_9 = 117, @@ -328,7 +328,7 @@ typedef enum clm_rates { WL_RATE_1X2_TXBF_VHT8SS1 = 132, WL_RATE_1X2_TXBF_VHT9SS1 = 133, - + WL_RATE_2X2_TXBF_SDM_MCS8 = 134, WL_RATE_2X2_TXBF_SDM_MCS9 = 135, @@ -349,9 +349,9 @@ typedef enum clm_rates { WL_RATE_2X2_TXBF_VHT7SS2 = 141, + - - + WL_RATE_1X3_TXBF_OFDM_6 = 142, WL_RATE_1X3_TXBF_OFDM_9 = 143, @@ -382,7 +382,7 @@ typedef enum clm_rates { WL_RATE_1X3_TXBF_VHT8SS1 = 158, WL_RATE_1X3_TXBF_VHT9SS1 = 159, - + WL_RATE_2X3_TXBF_SDM_MCS8 = 160, WL_RATE_2X3_TXBF_SDM_MCS9 = 161, @@ -404,7 +404,7 @@ typedef enum clm_rates { WL_RATE_2X3_TXBF_VHT8SS2 = 168, WL_RATE_2X3_TXBF_VHT9SS2 = 169, - + WL_RATE_3X3_TXBF_SDM_MCS16 = 170, WL_RATE_3X3_TXBF_SDM_MCS17 = 171, @@ -430,6 +430,6 @@ typedef enum clm_rates { #ifdef __cplusplus } -#endif +#endif #endif diff --git a/drivers/net/wireless/bcmdhd/dhd.h b/drivers/net/wireless/bcmdhd/dhd.h index 12f0c96ff20..b9cb27f9cd9 100644 --- a/drivers/net/wireless/bcmdhd/dhd.h +++ b/drivers/net/wireless/bcmdhd/dhd.h @@ -5,7 +5,7 @@ * DHD OS, bus, and protocol modules. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -301,7 +301,7 @@ typedef struct dhd_pub { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) && 1 struct mutex wl_start_stop_lock; /* lock/unlock for Android start/stop */ struct mutex wl_softap_lock; /* lock/unlock for any SoftAP/STA settings */ -#endif +#endif #ifdef WLBTAMP uint16 maxdatablks; @@ -1077,6 +1077,7 @@ concate_revision(struct dhd_bus *bus, char *fwpath, int fw_path_len, char *nvpat extern int wifi_get_fw_nv_path(char *fw, char *nv); #endif #endif /* SUPPORT_MULTIPLE_REVISION */ +void dhd_bus_update_fw_nv_path(struct dhd_bus *bus, char *pfw_path, char *pnv_path); void dhd_set_bus_state(void *bus, uint32 state); /* Remove proper pkts(either one no-frag pkt or whole fragmented pkts) */ diff --git a/drivers/net/wireless/bcmdhd/dhd_bta.c b/drivers/net/wireless/bcmdhd/dhd_bta.c index f3df04b5be6..c7dd6574e1d 100644 --- a/drivers/net/wireless/bcmdhd/dhd_bta.c +++ b/drivers/net/wireless/bcmdhd/dhd_bta.c @@ -2,7 +2,7 @@ * BT-AMP support routines * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dhd_bta.h b/drivers/net/wireless/bcmdhd/dhd_bta.h index 78669cf1c91..73ccea1683f 100644 --- a/drivers/net/wireless/bcmdhd/dhd_bta.h +++ b/drivers/net/wireless/bcmdhd/dhd_bta.h @@ -2,7 +2,7 @@ * BT-AMP support routines * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dhd_bus.h b/drivers/net/wireless/bcmdhd/dhd_bus.h index ea4d8c1e68f..5b922ef0c37 100644 --- a/drivers/net/wireless/bcmdhd/dhd_bus.h +++ b/drivers/net/wireless/bcmdhd/dhd_bus.h @@ -5,7 +5,7 @@ * DHD OS, bus, and protocol modules. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dhd_cdc.c b/drivers/net/wireless/bcmdhd/dhd_cdc.c index 5403ee71032..aedcc39ac8b 100644 --- a/drivers/net/wireless/bcmdhd/dhd_cdc.c +++ b/drivers/net/wireless/bcmdhd/dhd_cdc.c @@ -2,7 +2,7 @@ * DHD Protocol Module for CDC and BDC. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -582,10 +582,7 @@ dhd_prot_init(dhd_pub_t *dhd) goto done; -#if defined(WL_CFG80211) - if (dhd_download_fw_on_driverload) -#endif /* defined(WL_CFG80211) */ - ret = dhd_preinit_ioctls(dhd); + ret = dhd_preinit_ioctls(dhd); /* Always assumes wl for now */ dhd->iswl = TRUE; diff --git a/drivers/net/wireless/bcmdhd/dhd_cfg80211.c b/drivers/net/wireless/bcmdhd/dhd_cfg80211.c index 45f72deeeb0..e4984c6a6e3 100644 --- a/drivers/net/wireless/bcmdhd/dhd_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/dhd_cfg80211.c @@ -2,7 +2,7 @@ * Linux cfg80211 driver - Dongle Host Driver (DHD) related * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -695,4 +695,4 @@ int wl_cfg80211_set_btcoex_dhcp(struct net_device *dev, char *command) return (strlen("OK")); } -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/dhd_cfg80211.h b/drivers/net/wireless/bcmdhd/dhd_cfg80211.h index e727fce4c09..c5c8c215f99 100644 --- a/drivers/net/wireless/bcmdhd/dhd_cfg80211.h +++ b/drivers/net/wireless/bcmdhd/dhd_cfg80211.h @@ -2,7 +2,7 @@ * Linux cfg80211 driver - Dongle Host Driver (DHD) related * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c index 6203bad00f0..f2274a301e5 100644 --- a/drivers/net/wireless/bcmdhd/dhd_common.c +++ b/drivers/net/wireless/bcmdhd/dhd_common.c @@ -2,7 +2,7 @@ * Broadcom Dongle Host Driver (DHD), common DHD core. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dhd_custom_gpio.c b/drivers/net/wireless/bcmdhd/dhd_custom_gpio.c index fe9d965c084..7235cb0b9aa 100644 --- a/drivers/net/wireless/bcmdhd/dhd_custom_gpio.c +++ b/drivers/net/wireless/bcmdhd/dhd_custom_gpio.c @@ -1,7 +1,7 @@ /* * Customer code to add GPIO control during WLAN start/stop * Copyright (C) 1999-2013, Broadcom Corporation -* +* * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -54,7 +54,7 @@ int wifi_get_irq_number(unsigned long *irq_flags_ptr) { return -1; } int wifi_get_mac_addr(unsigned char *buf) { return -1; } void *wifi_get_country_code(char *ccode) { return NULL; } #endif /* CONFIG_WIFI_CONTROL_FUNC */ -#endif +#endif #if defined(OOB_INTR_ONLY) || defined(BCMSPI_ANDROID) @@ -110,8 +110,8 @@ int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr) gpio_request(dhd_oob_gpio_num, "oob irq"); host_oob_irq = gpio_to_irq(dhd_oob_gpio_num); gpio_direction_input(dhd_oob_gpio_num); -#endif -#endif +#endif +#endif return (host_oob_irq); } @@ -275,6 +275,6 @@ void get_customized_country_code(char *country_iso_code, wl_country_t *cspec) cspec->rev = translate_custom_table[0].custom_locale_rev; #endif /* EXMAPLE_TABLE */ return; -#endif +#endif } #endif /* CUSTOMER_HW4 */ diff --git a/drivers/net/wireless/bcmdhd/dhd_dbg.h b/drivers/net/wireless/bcmdhd/dhd_dbg.h index 29541b7034b..9e73ef05be5 100644 --- a/drivers/net/wireless/bcmdhd/dhd_dbg.h +++ b/drivers/net/wireless/bcmdhd/dhd_dbg.h @@ -2,7 +2,7 @@ * Debug/trace/assert driver definitions for Dongle Host Driver. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -120,7 +120,7 @@ #define DHD_NOCHECKDIED_ON() 0 #define DHD_PNO_ON() 0 -#endif +#endif #define DHD_LOG(args) diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index ab8c60c6d98..b6a81de362e 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -3,7 +3,7 @@ * Basically selected code segments from usb-cdc.c and usb-rndis.c * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -174,7 +175,7 @@ extern void dhd_enable_oob_intr(struct dhd_bus *bus, bool enable); #endif /* defined(OOB_INTR_ONLY) || defined(BCMSPI_ANDROID) */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && (1) static void dhd_hang_process(struct work_struct *work); -#endif +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)) MODULE_LICENSE("GPL v2"); #endif /* LinuxVer */ @@ -632,6 +633,7 @@ static char dhd_version[] = "Dongle Host Driver, version " EPI_VERSION_STR "\nCompiled in " SRCBASE " on " __DATE__ " at " __TIME__ #endif ; +int dhd_dev_reset(struct net_device *dev, uint8 flag); static void dhd_net_if_lock_local(dhd_info_t *dhd); static void dhd_net_if_unlock_local(dhd_info_t *dhd); static void dhd_suspend_lock(dhd_pub_t *dhdp); @@ -2223,7 +2225,7 @@ dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt, uint8 chan) PKTFREE(dhdp->osh, pktbuf, TRUE); continue; } -#endif +#endif } else { tout_rx = DHD_PACKET_TIMEOUT_MS; } @@ -3320,7 +3322,7 @@ exit: } } #endif /* SUPPORT_DEEP_SLEEP */ -#endif +#endif dhd->pub.rxcnt_timeout = 0; dhd->pub.txcnt_timeout = 0; @@ -3391,18 +3393,6 @@ dhd_open(struct net_device *net) } #endif /* CUSTOMER_HW4 */ -#if defined(SUPPORT_MULTIPLE_REVISION) - /* dhd_open() can be call several times when loading failed */ - if (strlen(firmware_path) != 0) { - ret = concate_revision(dhd->pub.bus, fw_path, MOD_PARAM_PATHLEN, - nv_path, MOD_PARAM_PATHLEN); - if (ret != 0) { - DHD_ERROR(("%s: fail to concatnate revison \n", __FUNCTION__)); - goto exit; - } - } -#endif /* SUPPORT_MULTIPLE_REVISION */ - #ifdef CUSTOMER_HW4 #ifdef FIX_CPU_MIN_CLOCK if (strstr(fw_path, "_apsta")) { @@ -3427,7 +3417,7 @@ dhd_open(struct net_device *net) goto exit; } -#endif +#endif ifidx = dhd_net2idx(dhd, net); DHD_TRACE(("%s: ifidx %d\n", __FUNCTION__, ifidx)); @@ -3449,6 +3439,8 @@ dhd_open(struct net_device *net) #if defined(WL_CFG80211) DHD_ERROR(("\n%s\n", dhd_version)); if (!dhd_download_fw_on_driverload) { + /* update firmware and nvram path to SDIO bus */ + dhd_bus_update_fw_nv_path(dhd->pub.bus, fw_path, nv_path); ret = wl_android_wifi_on(net); if (ret != 0) { DHD_ERROR(("%s : wl_android_wifi_on failed (%d)\n", @@ -3479,7 +3471,7 @@ dhd_open(struct net_device *net) } } #endif /* SUPPORT_DEEP_SLEEP */ -#endif +#endif if (dhd->pub.busstate != DHD_BUS_DATA) { @@ -3710,14 +3702,6 @@ dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen) bzero(nv_path, MOD_PARAM_PATHLEN); strncpy(nv_path, nvram_path, sizeof(nv_path) -1); } -#if defined(SUPPORT_MULTIPLE_REVISION) - if (strlen(fw_path) != 0 && - concate_revision(bus, fw_path, MOD_PARAM_PATHLEN, - nv_path, MOD_PARAM_PATHLEN) != 0) { - DHD_ERROR(("%s: fail to concatnate revison \n", __FUNCTION__)); - goto fail; - } -#endif /* SUPPORT_MULTIPLE_REVISION */ /* Allocate etherdev, including space for private structure */ if (!(net = alloc_etherdev(sizeof(dhd)))) { @@ -4472,7 +4456,7 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) } #else (void)concurrent_mode; -#endif +#endif } DHD_ERROR(("Firmware up: op_mode=0x%04x, " @@ -4598,7 +4582,7 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) #if defined(SOFTAP) if (ap_fw_loaded == FALSE) -#endif +#endif if (!(dhd->op_mode & DHD_FLAG_HOSTAP_MODE)) { if ((res = dhd_keep_alive_onoff(dhd)) < 0) DHD_ERROR(("%s set keeplive failed %d\n", @@ -4835,7 +4819,7 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) #if defined(PROP_TXSTATUS) && defined(PROP_TXSTATUS_VSDB) bcm_mkiovar("ampdu_hostreorder", (char *)&hostreorder, 4, buf, sizeof(buf)); dhd_wl_ioctl_cmd(dhd, WLC_SET_VAR, buf, sizeof(buf), TRUE, 0); -#endif +#endif #endif /* DISABLE_11N */ #if defined(VSDB) && defined(CUSTOMER_HW4) @@ -5259,10 +5243,14 @@ dhd_net_attach(dhd_pub_t *dhdp, int ifidx) #if 1 && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) if (ifidx == 0) { + if (!dhd_download_fw_on_driverload) { + dhd_dev_reset(net, TRUE); + sdioh_stop(NULL); + } dhd_registration_check = TRUE; up(&dhd_registration_sem); } -#endif +#endif return 0; fail: @@ -5550,7 +5538,7 @@ dhd_module_init(void) DHD_ERROR(("Invalid module parameters.\n")); error = -EINVAL; } while (0); -#endif +#endif if (error) goto fail_0; @@ -5596,7 +5584,7 @@ dhd_module_init(void) goto fail_1; #endif /* defined(CONFIG_WIFI_CONTROL_FUNC) */ -#endif +#endif #if defined(CONFIG_WIFI_CONTROL_FUNC) && defined(BCMLXSDMMC) /* If the wifi_set_power() is failed, @@ -5611,7 +5599,7 @@ dhd_module_init(void) #if 1 && (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) sema_init(&dhd_registration_sem, 0); -#endif +#endif error = dhd_bus_register(); @@ -6165,7 +6153,7 @@ void dhd_wait_for_event(dhd_pub_t *dhd, bool *lockvar) dhd_os_sdunlock(dhd); wait_event_timeout(dhdinfo->ctrl_wait, (*lockvar == FALSE), timeout); dhd_os_sdlock(dhd); -#endif +#endif return; } @@ -6347,7 +6335,7 @@ dhd_dev_init_ioctl(struct net_device *dev) dhd_process_cid_mac(&dhd->pub, TRUE); - if ((ret = dhd_preinit_ioctls(&dhd->pub)) < 0) + if ((ret = dhd_prot_init(&dhd->pub)) < 0) goto done; dhd_process_cid_mac(&dhd->pub, FALSE); diff --git a/drivers/net/wireless/bcmdhd/dhd_linux_sched.c b/drivers/net/wireless/bcmdhd/dhd_linux_sched.c index fccd0b59461..3486c7b215e 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux_sched.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux_sched.c @@ -2,7 +2,7 @@ * Expose some of the kernel scheduler routines * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dhd_proto.h b/drivers/net/wireless/bcmdhd/dhd_proto.h index e90d2120b32..9fb20528eb3 100644 --- a/drivers/net/wireless/bcmdhd/dhd_proto.h +++ b/drivers/net/wireless/bcmdhd/dhd_proto.h @@ -5,7 +5,7 @@ * DHD OS, bus, and protocol modules. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dhd_sdio.c b/drivers/net/wireless/bcmdhd/dhd_sdio.c index b36e70834f7..6778696a174 100644 --- a/drivers/net/wireless/bcmdhd/dhd_sdio.c +++ b/drivers/net/wireless/bcmdhd/dhd_sdio.c @@ -2,7 +2,7 @@ * DHD Bus Module for SDIO * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -174,7 +174,7 @@ extern int dhd_os_wlfc_unblock(dhd_pub_t *pub); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) DEFINE_MUTEX(_dhd_sdio_mutex_lock_); #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) */ -#endif +#endif #ifdef DHD_DEBUG /* Device console log buffer state */ @@ -1710,7 +1710,7 @@ dhd_tcpack_suppress(dhd_pub_t *dhdp, void *pkt) #if defined(DHD_DEBUG) uint32 tcp_seq_num = tcp_header[4] << 24 | tcp_header[5] << 16 | tcp_header[6] << 8 | tcp_header[7]; -#endif +#endif uint32 tcp_ack_num = tcp_header[8] << 24 | tcp_header[9] << 16 | tcp_header[10] << 8 | tcp_header[11]; uint16 ip_tcp_ttllen = (ip_header[3] & 0xff) + (ip_header[2] << 8); @@ -6677,7 +6677,7 @@ dhdsdio_isr(void *arg) bus->dpc_sched = TRUE; dhd_sched_dpc(bus->dhd); -#endif +#endif } @@ -7282,7 +7282,7 @@ dhdsdio_probe(uint16 venid, uint16 devid, uint16 bus_no, uint16 slot, } mutex_lock(&_dhd_sdio_mutex_lock_); #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) */ -#endif +#endif /* Init global variables at run-time, not as part of the declaration. * This is required to support init/de-init of the driver. Initialization @@ -7475,7 +7475,7 @@ dhdsdio_probe(uint16 venid, uint16 devid, uint16 bus_no, uint16 slot, mutex_unlock(&_dhd_sdio_mutex_lock_); DHD_ERROR(("%s : the lock is released.\n", __FUNCTION__)); #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */ -#endif +#endif return bus; @@ -7488,7 +7488,7 @@ forcereturn: mutex_unlock(&_dhd_sdio_mutex_lock_); DHD_ERROR(("%s : the lock is released.\n", __FUNCTION__)); #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */ -#endif +#endif return NULL; } @@ -7858,6 +7858,17 @@ dhdsdio_download_firmware(struct dhd_bus *bus, osl_t *osh, void *sdh) { bool ret; +#if defined(SUPPORT_MULTIPLE_REVISION) + if (concate_revision(bus, bus->fw_path, sizeof(bus->fw_path), + bus->nv_path, sizeof(bus->nv_path)) != 0) { + DHD_ERROR(("%s: fail to concatnate revison \n", + __FUNCTION__)); + return BCME_BADARG; + } +#endif /* SUPPORT_MULTIPLE_REVISION */ + + DHD_TRACE_HW4(("%s: firmware path=%s, nvram path=%s\n", + __FUNCTION__, bus->fw_path, bus->nv_path)); DHD_OS_WAKE_LOCK(bus->dhd); /* Download the firmware */ @@ -7990,7 +8001,7 @@ dhdsdio_disconnect(void *ptr) } mutex_lock(&_dhd_sdio_mutex_lock_); #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) */ -#endif +#endif if (bus) { @@ -8832,6 +8843,13 @@ concate_revision(dhd_bus_t *bus, char *fw_path, int fw_path_len, char *nv_path, } #endif /* SUPPORT_MULTIPLE_REVISION */ +void +dhd_bus_update_fw_nv_path(struct dhd_bus *bus, char *pfw_path, char *pnv_path) +{ + bus->fw_path = pfw_path; + bus->nv_path = pnv_path; +} + int dhd_enableOOB(dhd_pub_t *dhd, bool sleep) { diff --git a/drivers/net/wireless/bcmdhd/dhd_sec_feature.h b/drivers/net/wireless/bcmdhd/dhd_sec_feature.h index 616f2c0a9bd..a7ca336fd6e 100755 --- a/drivers/net/wireless/bcmdhd/dhd_sec_feature.h +++ b/drivers/net/wireless/bcmdhd/dhd_sec_feature.h @@ -141,8 +141,8 @@ #endif /* CONFIG_WLAN_REGION_CODE >= 300 && CONFIG_WLAN_REGION_CODE < 400 */ #if (CONFIG_WLAN_REGION_CODE == 402) /* TMO */ -#undef CUSTOM_SUSPEND_BCN_LI_DTIM -#define CUSTOM_SUSPEND_BCN_LI_DTIM 3 +#undef DCUSTOM_SUSPEND_BCN_LI_DTIM +#define DCUSTOM_SUSPEND_BCN_LI_DTIM 3 #endif /* CONFIG_WLAN_REGION_CODE == 402 */ #if !defined(READ_MACADDR) && !defined(WRITE_MACADDR) && !defined(RDWR_KORICS_MACADDR) \ diff --git a/drivers/net/wireless/bcmdhd/dhd_wlfc.h b/drivers/net/wireless/bcmdhd/dhd_wlfc.h index f7e53c8d75c..d073687cc06 100644 --- a/drivers/net/wireless/bcmdhd/dhd_wlfc.h +++ b/drivers/net/wireless/bcmdhd/dhd_wlfc.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation -* +* * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dngl_stats.h b/drivers/net/wireless/bcmdhd/dngl_stats.h index c1a1616a873..0bc3b53f29e 100644 --- a/drivers/net/wireless/bcmdhd/dngl_stats.h +++ b/drivers/net/wireless/bcmdhd/dngl_stats.h @@ -3,7 +3,7 @@ * ports * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/dngl_wlhdr.h b/drivers/net/wireless/bcmdhd/dngl_wlhdr.h index 1370b783cd8..d5eda8cb3ea 100644 --- a/drivers/net/wireless/bcmdhd/dngl_wlhdr.h +++ b/drivers/net/wireless/bcmdhd/dngl_wlhdr.h @@ -2,7 +2,7 @@ * Dongle WL Header definitions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/hndpmu.c b/drivers/net/wireless/bcmdhd/hndpmu.c index a14094a584c..e94fe802bdb 100644 --- a/drivers/net/wireless/bcmdhd/hndpmu.c +++ b/drivers/net/wireless/bcmdhd/hndpmu.c @@ -3,7 +3,7 @@ * of the SiliconBackplane-based Broadcom chips. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/aidmp.h b/drivers/net/wireless/bcmdhd/include/aidmp.h index 095e828c915..55d823e3fd3 100644 --- a/drivers/net/wireless/bcmdhd/include/aidmp.h +++ b/drivers/net/wireless/bcmdhd/include/aidmp.h @@ -2,7 +2,7 @@ * Broadcom AMBA Interconnect definitions. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -383,4 +383,4 @@ typedef volatile struct _aidmp { #define AI_OOBSEL_6_SHIFT 16 #define AI_OOBSEL_7_SHIFT 24 -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/include/bcm_cfg.h b/drivers/net/wireless/bcmdhd/include/bcm_cfg.h index a3c8cc8a5fc..9153cd977b3 100644 --- a/drivers/net/wireless/bcmdhd/include/bcm_cfg.h +++ b/drivers/net/wireless/bcmdhd/include/bcm_cfg.h @@ -2,7 +2,7 @@ * BCM common config options * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcm_mpool_pub.h b/drivers/net/wireless/bcmdhd/include/bcm_mpool_pub.h index bdc55b2c7aa..51a5de71254 100644 --- a/drivers/net/wireless/bcmdhd/include/bcm_mpool_pub.h +++ b/drivers/net/wireless/bcmdhd/include/bcm_mpool_pub.h @@ -36,7 +36,7 @@ * allocation implementation. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmcdc.h b/drivers/net/wireless/bcmdhd/include/bcmcdc.h index 21637a1c09f..999a0087946 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmcdc.h +++ b/drivers/net/wireless/bcmdhd/include/bcmcdc.h @@ -5,7 +5,7 @@ * Definitions subject to change without notice. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmdefs.h b/drivers/net/wireless/bcmdhd/include/bcmdefs.h index 073d6df5abb..c95209302a5 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmdefs.h +++ b/drivers/net/wireless/bcmdhd/include/bcmdefs.h @@ -2,7 +2,7 @@ * Misc system wide definitions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -64,7 +64,7 @@ #define BCMFASTPATH #define BCMFASTPATH_HOST #endif -#endif +#endif @@ -186,13 +186,13 @@ typedef struct { #if defined(BCM_RPC_NOCOPY) || defined(BCM_RCP_TXNOCOPY) #define BCMEXTRAHDROOM 260 -#else +#else #if defined(BCM47XX_CA9) #define BCMEXTRAHDROOM 224 #else #define BCMEXTRAHDROOM 204 -#endif -#endif +#endif +#endif #ifndef SDALIGN diff --git a/drivers/net/wireless/bcmdhd/include/bcmdevs.h b/drivers/net/wireless/bcmdhd/include/bcmdevs.h index af31396cf5e..923098f1464 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmdevs.h +++ b/drivers/net/wireless/bcmdhd/include/bcmdevs.h @@ -2,7 +2,7 @@ * Broadcom device-specific manifest constants. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -21,7 +21,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: bcmdevs.h 444038 2013-12-18 09:35:07Z $ + * $Id: bcmdevs.h 414368 2013-07-24 15:00:23Z $ */ #ifndef _BCMDEVS_H @@ -135,14 +135,14 @@ #define BCM4330_D11N_ID 0x4360 #define BCM4330_D11N2G_ID 0x4361 #define BCM4330_D11N5G_ID 0x4362 -#define BCM4336_D11N_ID 0x4343 -#define BCM6362_D11N_ID 0x435f -#define BCM6362_D11N2G_ID 0x433f -#define BCM6362_D11N5G_ID 0x434f -#define BCM4331_D11N_ID 0x4331 -#define BCM4331_D11N2G_ID 0x4332 -#define BCM4331_D11N5G_ID 0x4333 -#define BCM43237_D11N_ID 0x4355 +#define BCM4336_D11N_ID 0x4343 +#define BCM6362_D11N_ID 0x435f +#define BCM6362_D11N2G_ID 0x433f +#define BCM6362_D11N5G_ID 0x434f +#define BCM4331_D11N_ID 0x4331 +#define BCM4331_D11N2G_ID 0x4332 +#define BCM4331_D11N5G_ID 0x4333 +#define BCM43237_D11N_ID 0x4355 #define BCM43237_D11N5G_ID 0x4356 #define BCM43227_D11N2G_ID 0x4358 #define BCM43228_D11N_ID 0x4359 @@ -152,27 +152,27 @@ #define BCM4324_D11N_ID 0x4374 #define BCM43217_D11N2G_ID 0x43a9 #define BCM43131_D11N2G_ID 0x43aa -#define BCM4314_D11N2G_ID 0x4364 -#define BCM43142_D11N2G_ID 0x4365 -#define BCM43143_D11N2G_ID 0x4366 -#define BCM4334_D11N_ID 0x4380 -#define BCM4334_D11N2G_ID 0x4381 -#define BCM4334_D11N5G_ID 0x4382 -#define BCM43342_D11N_ID 0x4383 -#define BCM43342_D11N2G_ID 0x4384 -#define BCM43342_D11N5G_ID 0x4385 -#define BCM43341_D11N_ID 0x4386 -#define BCM43341_D11N2G_ID 0x4387 -#define BCM43341_D11N5G_ID 0x4388 +#define BCM4314_D11N2G_ID 0x4364 +#define BCM43142_D11N2G_ID 0x4365 +#define BCM43143_D11N2G_ID 0x4366 +#define BCM4334_D11N_ID 0x4380 +#define BCM4334_D11N2G_ID 0x4381 +#define BCM4334_D11N5G_ID 0x4382 +#define BCM43342_D11N_ID 0x4383 +#define BCM43342_D11N2G_ID 0x4384 +#define BCM43342_D11N5G_ID 0x4385 +#define BCM43341_D11N_ID 0x4386 +#define BCM43341_D11N2G_ID 0x4387 +#define BCM43341_D11N5G_ID 0x4388 #define BCM4360_D11AC_ID 0x43a0 #define BCM4360_D11AC2G_ID 0x43a1 #define BCM4360_D11AC5G_ID 0x43a2 #define BCM4335_D11AC_ID 0x43ae #define BCM4335_D11AC2G_ID 0x43af #define BCM4335_D11AC5G_ID 0x43b0 -#define BCM4352_D11AC_ID 0x43b1 -#define BCM4352_D11AC2G_ID 0x43b2 -#define BCM4352_D11AC5G_ID 0x43b3 +#define BCM4352_D11AC_ID 0x43b1 +#define BCM4352_D11AC2G_ID 0x43b2 +#define BCM4352_D11AC5G_ID 0x43b3 #define BCM943228HMB_SSID_VEN1 0x0607 @@ -180,20 +180,20 @@ #define BCM94313HMG_SSID_VEN1 0x0609 #define BCM943142HM_SSID_VEN1 0x0611 -#define BCM43143_D11N2G_ID 0x4366 +#define BCM43143_D11N2G_ID 0x4366 -#define BCM43242_D11N_ID 0x4367 -#define BCM43242_D11N2G_ID 0x4368 -#define BCM43242_D11N5G_ID 0x4369 +#define BCM43242_D11N_ID 0x4367 +#define BCM43242_D11N2G_ID 0x4368 +#define BCM43242_D11N5G_ID 0x4369 #define BCM4350_D11AC_ID 0x43a3 #define BCM4350_D11AC2G_ID 0x43a4 #define BCM4350_D11AC5G_ID 0x43a5 -#define BCMGPRS_UART_ID 0x4333 -#define BCMGPRS2_UART_ID 0x4344 -#define FPGA_JTAGM_ID 0x43f0 +#define BCMGPRS_UART_ID 0x4333 +#define BCMGPRS2_UART_ID 0x4344 +#define FPGA_JTAGM_ID 0x43f0 #define BCM_JTAGM_ID 0x43f1 #define SDIOH_FPGA_ID 0x43f2 #define BCM_SDIOH_ID 0x43f3 @@ -225,14 +225,14 @@ #define BCM47XX_ATA100_ID 0x471d #define BCM47XX_SATAXOR_ID 0x471e #define BCM47XX_GIGETH_ID 0x471f -#define BCM4712_MIPS_ID 0x4720 -#define BCM4716_DEVICE_ID 0x4722 -#define BCM47XX_USB30H_ID 0x472a -#define BCM47XX_USB30D_ID 0x472b -#define BCM47XX_SMBUS_EMU_ID 0x47fe -#define BCM47XX_XOR_EMU_ID 0x47ff -#define EPI41210_DEVICE_ID 0xa0fa -#define EPI41230_DEVICE_ID 0xa10e +#define BCM4712_MIPS_ID 0x4720 +#define BCM4716_DEVICE_ID 0x4722 +#define BCM47XX_USB30H_ID 0x472a +#define BCM47XX_USB30D_ID 0x472b +#define BCM47XX_SMBUS_EMU_ID 0x47fe +#define BCM47XX_XOR_EMU_ID 0x47ff +#define EPI41210_DEVICE_ID 0xa0fa +#define EPI41230_DEVICE_ID 0xa10e #define JINVANI_SDIOH_ID 0x4743 #define BCM27XX_SDIOH_ID 0x2702 #define PCIXX21_FLASHMEDIA_ID 0x803b @@ -282,34 +282,34 @@ #define BCM43362_CHIP_ID 43362 #define BCM4330_CHIP_ID 0x4330 #define BCM6362_CHIP_ID 0x6362 -#define BCM4314_CHIP_ID 0x4314 -#define BCM43142_CHIP_ID 43142 -#define BCM43143_CHIP_ID 43143 -#define BCM4324_CHIP_ID 0x4324 -#define BCM43242_CHIP_ID 43242 -#define BCM43243_CHIP_ID 43243 -#define BCM4334_CHIP_ID 0x4334 -#define BCM4335_CHIP_ID 0x4335 -#define BCM4339_CHIP_ID 0x4339 -#define BCM4360_CHIP_ID 0x4360 -#define BCM4352_CHIP_ID 0x4352 +#define BCM4314_CHIP_ID 0x4314 +#define BCM43142_CHIP_ID 43142 +#define BCM43143_CHIP_ID 43143 +#define BCM4324_CHIP_ID 0x4324 +#define BCM43242_CHIP_ID 43242 +#define BCM43243_CHIP_ID 43243 +#define BCM4334_CHIP_ID 0x4334 +#define BCM4335_CHIP_ID 0x4335 +#define BCM4339_CHIP_ID 0x4339 +#define BCM4360_CHIP_ID 0x4360 +#define BCM4352_CHIP_ID 0x4352 #define BCM43526_CHIP_ID 0xAA06 -#define BCM43340_CHIP_ID 43340 -#define BCM43341_CHIP_ID 43341 -#define BCM43342_CHIP_ID 43342 -#define BCM4350_CHIP_ID 0x4350 +#define BCM43340_CHIP_ID 43340 +#define BCM43341_CHIP_ID 43341 +#define BCM43342_CHIP_ID 43342 +#define BCM4350_CHIP_ID 0x4350 -#define BCM4342_CHIP_ID 4342 -#define BCM4402_CHIP_ID 0x4402 -#define BCM4704_CHIP_ID 0x4704 -#define BCM4706_CHIP_ID 0x5300 -#define BCM4707_CHIP_ID 53010 -#define BCM53018_CHIP_ID 53018 +#define BCM4342_CHIP_ID 4342 +#define BCM4402_CHIP_ID 0x4402 +#define BCM4704_CHIP_ID 0x4704 +#define BCM4706_CHIP_ID 0x5300 +#define BCM4707_CHIP_ID 53010 +#define BCM53018_CHIP_ID 53018 #define BCM4707_CHIP(chipid) (((chipid) == BCM4707_CHIP_ID) || ((chipid) == BCM53018_CHIP_ID)) -#define BCM4710_CHIP_ID 0x4710 -#define BCM4712_CHIP_ID 0x4712 -#define BCM4716_CHIP_ID 0x4716 -#define BCM47162_CHIP_ID 47162 +#define BCM4710_CHIP_ID 0x4710 +#define BCM4712_CHIP_ID 0x4712 +#define BCM4716_CHIP_ID 0x4716 +#define BCM47162_CHIP_ID 47162 #define BCM4748_CHIP_ID 0x4748 #define BCM4749_CHIP_ID 0x4749 #define BCM4785_CHIP_ID 0x4785 @@ -365,61 +365,61 @@ #define BCM4314PCIE_PKG_ID (8 | 2) #define BCM4314SDIO_ARM_PKG_ID (8 | 3) #define BCM4314SDIO_FPBGA_PKG_ID (8 | 4) -#define BCM4314DEV_PKG_ID (8 | 6) +#define BCM4314DEV_PKG_ID (8 | 6) -#define BCM4707_PKG_ID 1 -#define BCM4708_PKG_ID 2 -#define BCM4709_PKG_ID 0 +#define BCM4707_PKG_ID 1 +#define BCM4708_PKG_ID 2 +#define BCM4709_PKG_ID 0 -#define PCIXX21_FLASHMEDIA0_ID 0x8033 -#define PCIXX21_SDIOH0_ID 0x8034 +#define PCIXX21_FLASHMEDIA0_ID 0x8033 +#define PCIXX21_SDIOH0_ID 0x8034 -#define BCM4335_WLCSP_PKG_ID (0x0) -#define BCM4335_FCBGA_PKG_ID (0x1) -#define BCM4335_WLBGA_PKG_ID (0x2) -#define BCM4335_FCBGAD_PKG_ID (0x3) +#define BCM4335_WLCSP_PKG_ID (0x0) +#define BCM4335_FCBGA_PKG_ID (0x1) +#define BCM4335_WLBGA_PKG_ID (0x2) +#define BCM4335_FCBGAD_PKG_ID (0x3) #define BCM4335_PKG_MASK (0x3) -#define BFL_BTC2WIRE 0x00000001 -#define BFL_BTCOEX 0x00000001 -#define BFL_PACTRL 0x00000002 -#define BFL_AIRLINEMODE 0x00000004 -#define BFL_ADCDIV 0x00000008 +#define BFL_BTC2WIRE 0x00000001 +#define BFL_BTCOEX 0x00000001 +#define BFL_PACTRL 0x00000002 +#define BFL_AIRLINEMODE 0x00000004 +#define BFL_ADCDIV 0x00000008 #define BFL_DIS_256QAM 0x00000008 -#define BFL_ENETROBO 0x00000010 -#define BFL_NOPLLDOWN 0x00000020 -#define BFL_CCKHIPWR 0x00000040 -#define BFL_ENETADM 0x00000080 -#define BFL_ENETVLAN 0x00000100 -#define BFL_LTECOEX 0x00000200 -#define BFL_NOPCI 0x00000400 -#define BFL_FEM 0x00000800 -#define BFL_EXTLNA 0x00001000 -#define BFL_HGPA 0x00002000 +#define BFL_ENETROBO 0x00000010 +#define BFL_NOPLLDOWN 0x00000020 +#define BFL_CCKHIPWR 0x00000040 +#define BFL_ENETADM 0x00000080 +#define BFL_ENETVLAN 0x00000100 +#define BFL_LTECOEX 0x00000200 +#define BFL_NOPCI 0x00000400 +#define BFL_FEM 0x00000800 +#define BFL_EXTLNA 0x00001000 +#define BFL_HGPA 0x00002000 #define BFL_BTC2WIRE_ALTGPIO 0x00004000 -#define BFL_ALTIQ 0x00008000 -#define BFL_NOPA 0x00010000 -#define BFL_RSSIINV 0x00020000 -#define BFL_PAREF 0x00040000 +#define BFL_ALTIQ 0x00008000 +#define BFL_NOPA 0x00010000 +#define BFL_RSSIINV 0x00020000 +#define BFL_PAREF 0x00040000 #define BFL_3TSWITCH 0x00080000 #define BFL_PHASESHIFT 0x00100000 -#define BFL_BUCKBOOST 0x00200000 -#define BFL_FEM_BT 0x00400000 -#define BFL_RXCHAIN_OFF_BT 0x00400000 -#define BFL_NOCBUCK 0x00800000 -#define BFL_CCKFAVOREVM 0x01000000 -#define BFL_PALDO 0x02000000 -#define BFL_LNLDO2_2P5 0x04000000 +#define BFL_BUCKBOOST 0x00200000 +#define BFL_FEM_BT 0x00400000 +#define BFL_RXCHAIN_OFF_BT 0x00400000 +#define BFL_NOCBUCK 0x00800000 +#define BFL_CCKFAVOREVM 0x01000000 +#define BFL_PALDO 0x02000000 +#define BFL_LNLDO2_2P5 0x04000000 #define BFL_FASTPWR 0x08000000 #define BFL_UCPWRCTL_MININDX 0x08000000 -#define BFL_EXTLNA_5GHz 0x10000000 -#define BFL_TRSW_1by2 0x20000000 -#define BFL_GAINBOOSTA01 0x20000000 -#define BFL_LO_TRSW_R_5GHz 0x40000000 -#define BFL_ELNA_GAINDEF 0x80000000 -#define BFL_EXTLNA_TX 0x20000000 +#define BFL_EXTLNA_5GHz 0x10000000 +#define BFL_TRSW_1by2 0x20000000 +#define BFL_GAINBOOSTA01 0x20000000 +#define BFL_LO_TRSW_R_5GHz 0x40000000 +#define BFL_ELNA_GAINDEF 0x80000000 +#define BFL_EXTLNA_TX 0x20000000 #define BFL2_RXBB_INT_REG_DIS 0x00000001 @@ -447,61 +447,61 @@ #define BFL2_ANAPACTRL_2G 0x00100000 -#define BFL2_ANAPACTRL_5G 0x00200000 -#define BFL2_ELNACTRL_TRSW_2G 0x00400000 -#define BFL2_BT_SHARE_ANT0 0x00800000 -#define BFL2_BT_SHARE_BM_BIT0 0x00800000 -#define BFL2_TEMPSENSE_HIGHER 0x01000000 -#define BFL2_BTC3WIREONLY 0x02000000 -#define BFL2_PWR_NOMINAL 0x04000000 -#define BFL2_EXTLNA_PWRSAVE 0x08000000 +#define BFL2_ANAPACTRL_5G 0x00200000 +#define BFL2_ELNACTRL_TRSW_2G 0x00400000 +#define BFL2_BT_SHARE_ANT0 0x00800000 +#define BFL2_BT_SHARE_BM_BIT0 0x00800000 +#define BFL2_TEMPSENSE_HIGHER 0x01000000 +#define BFL2_BTC3WIREONLY 0x02000000 +#define BFL2_PWR_NOMINAL 0x04000000 +#define BFL2_EXTLNA_PWRSAVE 0x08000000 #define BFL2_4313_RADIOREG 0x10000000 - -#define BFL2_DYNAMIC_VMID 0x10000000 -#define BFL2_SDR_EN 0x20000000 -#define BFL2_LNA1BYPFORTR2G 0x40000000 -#define BFL2_LNA1BYPFORTR5G 0x80000000 + +#define BFL2_DYNAMIC_VMID 0x10000000 +#define BFL2_SDR_EN 0x20000000 +#define BFL2_LNA1BYPFORTR2G 0x40000000 +#define BFL2_LNA1BYPFORTR5G 0x80000000 -#define BFL_SROM11_BTCOEX 0x00000001 -#define BFL_SROM11_WLAN_BT_SH_XTL 0x00000002 -#define BFL_SROM11_EXTLNA 0x00001000 -#define BFL_SROM11_EXTLNA_5GHz 0x10000000 -#define BFL_SROM11_GAINBOOSTA01 0x20000000 -#define BFL2_SROM11_APLL_WAR 0x00000002 -#define BFL2_SROM11_ANAPACTRL_2G 0x00100000 -#define BFL2_SROM11_ANAPACTRL_5G 0x00200000 +#define BFL_SROM11_BTCOEX 0x00000001 +#define BFL_SROM11_WLAN_BT_SH_XTL 0x00000002 +#define BFL_SROM11_EXTLNA 0x00001000 +#define BFL_SROM11_EXTLNA_5GHz 0x10000000 +#define BFL_SROM11_GAINBOOSTA01 0x20000000 +#define BFL2_SROM11_APLL_WAR 0x00000002 +#define BFL2_SROM11_ANAPACTRL_2G 0x00100000 +#define BFL2_SROM11_ANAPACTRL_5G 0x00200000 -#define BFL3_FEMCTRL_SUB 0x00000007 -#define BFL3_RCAL_WAR 0x00000008 -#define BFL3_TXGAINTBLID 0x00000070 -#define BFL3_TXGAINTBLID_SHIFT 0x4 -#define BFL3_TSSI_DIV_WAR 0x00000080 -#define BFL3_TSSI_DIV_WAR_SHIFT 0x7 -#define BFL3_FEMTBL_FROM_NVRAM 0x00000100 -#define BFL3_FEMTBL_FROM_NVRAM_SHIFT 0x8 -#define BFL3_AGC_CFG_2G 0x00000200 -#define BFL3_AGC_CFG_5G 0x00000400 -#define BFL3_PPR_BIT_EXT 0x00000800 -#define BFL3_PPR_BIT_EXT_SHIFT 11 -#define BFL3_BBPLL_SPR_MODE_DIS 0x00001000 -#define BFL3_RCAL_OTP_VAL_EN 0x00002000 -#define BFL3_2GTXGAINTBL_BLANK 0x00004000 -#define BFL3_2GTXGAINTBL_BLANK_SHIFT 14 -#define BFL3_5GTXGAINTBL_BLANK 0x00008000 -#define BFL3_5GTXGAINTBL_BLANK_SHIFT 15 -#define BFL3_BT_SHARE_BM_BIT1 0x40000000 -#define BFL3_PHASETRACK_MAX_ALPHABETA 0x00010000 -#define BFL3_PHASETRACK_MAX_ALPHABETA_SHIFT 16 -#define BFL3_BT_SHARE_BM_BIT1 0x40000000 -#define BFL3_EN_NONBRCM_TXBF 0x10000000 -#define BFL3_EN_P2PLINK_TXBF 0x20000000 +#define BFL3_FEMCTRL_SUB 0x00000007 +#define BFL3_RCAL_WAR 0x00000008 +#define BFL3_TXGAINTBLID 0x00000070 +#define BFL3_TXGAINTBLID_SHIFT 0x4 +#define BFL3_TSSI_DIV_WAR 0x00000080 +#define BFL3_TSSI_DIV_WAR_SHIFT 0x7 +#define BFL3_FEMTBL_FROM_NVRAM 0x00000100 +#define BFL3_FEMTBL_FROM_NVRAM_SHIFT 0x8 +#define BFL3_AGC_CFG_2G 0x00000200 +#define BFL3_AGC_CFG_5G 0x00000400 +#define BFL3_PPR_BIT_EXT 0x00000800 +#define BFL3_PPR_BIT_EXT_SHIFT 11 +#define BFL3_BBPLL_SPR_MODE_DIS 0x00001000 +#define BFL3_RCAL_OTP_VAL_EN 0x00002000 +#define BFL3_2GTXGAINTBL_BLANK 0x00004000 +#define BFL3_2GTXGAINTBL_BLANK_SHIFT 14 +#define BFL3_5GTXGAINTBL_BLANK 0x00008000 +#define BFL3_5GTXGAINTBL_BLANK_SHIFT 15 +#define BFL3_BT_SHARE_BM_BIT1 0x40000000 +#define BFL3_PHASETRACK_MAX_ALPHABETA 0x00010000 +#define BFL3_PHASETRACK_MAX_ALPHABETA_SHIFT 16 +#define BFL3_BT_SHARE_BM_BIT1 0x40000000 +#define BFL3_EN_NONBRCM_TXBF 0x10000000 +#define BFL3_EN_P2PLINK_TXBF 0x20000000 -#define BOARD_GPIO_BTC3W_IN 0x850 -#define BOARD_GPIO_BTC3W_OUT 0x020 +#define BOARD_GPIO_BTC3W_IN 0x850 +#define BOARD_GPIO_BTC3W_OUT 0x020 #define BOARD_GPIO_BTCMOD_IN 0x010 #define BOARD_GPIO_BTCMOD_OUT 0x020 #define BOARD_GPIO_BTC_IN 0x080 diff --git a/drivers/net/wireless/bcmdhd/include/bcmendian.h b/drivers/net/wireless/bcmdhd/include/bcmendian.h index 67b77b9f317..650969886d8 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmendian.h +++ b/drivers/net/wireless/bcmdhd/include/bcmendian.h @@ -2,7 +2,7 @@ * Byte order utilities * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmnvram.h b/drivers/net/wireless/bcmdhd/include/bcmnvram.h index 521da1c4272..dbfc3b4597c 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmnvram.h +++ b/drivers/net/wireless/bcmdhd/include/bcmnvram.h @@ -2,7 +2,7 @@ * NVRAM variable manipulation * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -115,7 +115,7 @@ uint8 nvram_calc_crc(struct nvram_header * nvh); extern int nvram_space; -#endif +#endif #define NVRAM_SOFTWARE_VERSION "1" @@ -132,7 +132,7 @@ extern int nvram_space; #endif #define MAX_NVRAM_SPACE NVRAM_SPACE #define ROM_ENVRAM_SPACE 0x1000 -#define NVRAM_LZMA_MAGIC 0x4c5a4d41 +#define NVRAM_LZMA_MAGIC 0x4c5a4d41 #define NVRAM_MAX_VALUE_LEN 255 #define NVRAM_MAX_PARAM_LEN 64 diff --git a/drivers/net/wireless/bcmdhd/include/bcmpcispi.h b/drivers/net/wireless/bcmdhd/include/bcmpcispi.h index ba1407953e3..53bd7fceaa1 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmpcispi.h +++ b/drivers/net/wireless/bcmdhd/include/bcmpcispi.h @@ -2,7 +2,7 @@ * Broadcom PCI-SPI Host Controller Register Definitions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmperf.h b/drivers/net/wireless/bcmdhd/include/bcmperf.h index a2aadbc4a33..fad33ffa245 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmperf.h +++ b/drivers/net/wireless/bcmdhd/include/bcmperf.h @@ -2,7 +2,7 @@ * Performance counters software interface. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmsdbus.h b/drivers/net/wireless/bcmdhd/include/bcmsdbus.h index 89ffc23ebd7..3abf49383dd 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmsdbus.h +++ b/drivers/net/wireless/bcmdhd/include/bcmsdbus.h @@ -3,7 +3,7 @@ * host controller drivers. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmsdh.h b/drivers/net/wireless/bcmdhd/include/bcmsdh.h index cd7fee7bb10..657a69ebaa3 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmsdh.h +++ b/drivers/net/wireless/bcmdhd/include/bcmsdh.h @@ -4,7 +4,7 @@ * abstract OS and BUS specific details of SDIO * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h b/drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h index 5bc5e60a6fa..9e059697309 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h +++ b/drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h @@ -2,7 +2,7 @@ * BCMSDH Function Driver for the native SDIO/MMC driver in the Linux Kernel * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmsdpcm.h b/drivers/net/wireless/bcmdhd/include/bcmsdpcm.h index 0ccd6705901..4ebe3d70929 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmsdpcm.h +++ b/drivers/net/wireless/bcmdhd/include/bcmsdpcm.h @@ -3,7 +3,7 @@ * Software-specific definitions shared between device and host side * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmsdspi.h b/drivers/net/wireless/bcmdhd/include/bcmsdspi.h index 0b7ab5c6f6f..21792abca73 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmsdspi.h +++ b/drivers/net/wireless/bcmdhd/include/bcmsdspi.h @@ -2,7 +2,7 @@ * SD-SPI Protocol Conversion - BCMSDH->SPI Translation Layer * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmsdstd.h b/drivers/net/wireless/bcmdhd/include/bcmsdstd.h index b24cb45396b..09628562957 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmsdstd.h +++ b/drivers/net/wireless/bcmdhd/include/bcmsdstd.h @@ -2,7 +2,7 @@ * 'Standard' SDIO HOST CONTROLLER driver * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmspi.h b/drivers/net/wireless/bcmdhd/include/bcmspi.h index 8444b6b8c92..e81ea62524b 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmspi.h +++ b/drivers/net/wireless/bcmdhd/include/bcmspi.h @@ -2,7 +2,7 @@ * Broadcom SPI Low-Level Hardware Driver API * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmspibrcm.h b/drivers/net/wireless/bcmdhd/include/bcmspibrcm.h index 7cb46e0d335..b014046d2ab 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmspibrcm.h +++ b/drivers/net/wireless/bcmdhd/include/bcmspibrcm.h @@ -2,13 +2,13 @@ * SD-SPI Protocol Conversion - BCMSDH->gSPI Translation Layer * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), * available at http://www.broadcom.com/licenses/GPLv2.php, with the * following added to such license: - * + * * As a special exception, the copyright holders of this software give you * permission to link this software with independent modules, and to copy and * distribute the resulting executable under terms of your choice, provided that @@ -16,7 +16,7 @@ * the license of that module. An independent module is a module which is not * derived from this software. The special exception does not apply to any * modifications of the software. - * + * * Notwithstanding the above, under no circumstances may you combine this * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. diff --git a/drivers/net/wireless/bcmdhd/include/bcmsrom_fmt.h b/drivers/net/wireless/bcmdhd/include/bcmsrom_fmt.h index 1b6257bc87c..aaf8a0a388b 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmsrom_fmt.h +++ b/drivers/net/wireless/bcmdhd/include/bcmsrom_fmt.h @@ -2,7 +2,7 @@ * SROM format definition. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/bcmsrom_tbl.h b/drivers/net/wireless/bcmdhd/include/bcmsrom_tbl.h index ef8bf50e19a..ad46257214a 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmsrom_tbl.h +++ b/drivers/net/wireless/bcmdhd/include/bcmsrom_tbl.h @@ -2,7 +2,7 @@ * Table that encodes the srom formats for PCI/PCIe NICs. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -69,7 +69,7 @@ static const sromvar_t pci_sromvars[] = { {"devid", 0xffffff00, SRFL_PRHEX, PCI_F0DEVID, 0xffff}, #else {"devid", 0xffffff00, SRFL_PRHEX|SRFL_NOVAR, PCI_F0DEVID, 0xffff}, -#endif +#endif {"boardrev", 0x0000000e, SRFL_PRHEX, SROM_AABREV, SROM_BR_MASK}, {"boardrev", 0x000000f0, SRFL_PRHEX, SROM4_BREV, 0xffff}, {"boardrev", 0xffffff00, SRFL_PRHEX, SROM8_BREV, 0xffff}, diff --git a/drivers/net/wireless/bcmdhd/include/bcmutils.h b/drivers/net/wireless/bcmdhd/include/bcmutils.h index bba9e9d4796..298ec19378a 100644 --- a/drivers/net/wireless/bcmdhd/include/bcmutils.h +++ b/drivers/net/wireless/bcmdhd/include/bcmutils.h @@ -2,7 +2,7 @@ * Misc useful os-independent macros and functions. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -119,12 +119,12 @@ typedef struct { uint32 ps_retry; uint32 retry_drop; uint32 max_avail; - uint32 max_used; - uint32 queue_capacity; - uint32 rtsfail; - uint32 acked; + uint32 max_used; + uint32 queue_capacity; + uint32 rtsfail; + uint32 acked; } pktq_counters_t; -#endif +#endif #define PKTQ_COMMON \ @@ -139,9 +139,9 @@ struct pktq { struct pktq_prec q[PKTQ_MAX_PREC]; #ifdef PKTQ_LOG - pktq_counters_t _prec_cnt[PKTQ_MAX_PREC]; - pktq_counters_t _prec_bytes[PKTQ_MAX_PREC]; - uint32 _logtime; + pktq_counters_t _prec_cnt[PKTQ_MAX_PREC]; + pktq_counters_t _prec_bytes[PKTQ_MAX_PREC]; + uint32 _logtime; #endif }; @@ -344,10 +344,10 @@ extern uint8 *pktdataoffset(osl_t *osh, void *p, uint offset); extern void *pktoffset(osl_t *osh, void *p, uint offset); -#define PKTPRIO_VDSCP 0x100 -#define PKTPRIO_VLAN 0x200 +#define PKTPRIO_VDSCP 0x100 +#define PKTPRIO_VLAN 0x200 #define PKTPRIO_UPD 0x400 -#define PKTPRIO_DSCP 0x800 +#define PKTPRIO_DSCP 0x800 @@ -527,12 +527,12 @@ extern int bcm_format_ssid(char* buf, const uchar ssid[], uint ssid_len); #define BCME_TXFAIL -38 #define BCME_RXFAIL -39 #define BCME_NODEVICE -40 -#define BCME_NMODE_DISABLED -41 -#define BCME_NONRESIDENT -42 -#define BCME_SCANREJECT -43 -#define BCME_USAGE_ERROR -44 -#define BCME_IOCTL_ERROR -45 -#define BCME_SERIAL_PORT_ERR -46 +#define BCME_NMODE_DISABLED -41 +#define BCME_NONRESIDENT -42 +#define BCME_SCANREJECT -43 +#define BCME_USAGE_ERROR -44 +#define BCME_IOCTL_ERROR -45 +#define BCME_SERIAL_PORT_ERR -46 #define BCME_LAST BCME_SERIAL_PORT_ERR @@ -596,25 +596,25 @@ extern int bcm_format_ssid(char* buf, const uchar ssid[], uint ssid_len); #ifndef MAX #define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#endif +#endif #ifndef LIMIT_TO_RANGE #define LIMIT_TO_RANGE(x, min, max) \ ((x) < (min) ? (min) : ((x) > (max) ? (max) : (x))) -#endif +#endif #ifndef LIMIT_TO_MAX #define LIMIT_TO_MAX(x, max) \ (((x) > (max) ? (max) : (x))) -#endif +#endif #ifndef LIMIT_TO_MIN #define LIMIT_TO_MIN(x, min) \ (((x) < (min) ? (min) : (x))) -#endif +#endif #define CEIL(x, y) (((x) + ((y) - 1)) / (y)) #define ROUNDUP(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) @@ -640,7 +640,7 @@ extern int bcm_format_ssid(char* buf, const uchar ssid[], uint ssid_len); #define ARRAYSIZE(a) (sizeof(a) / sizeof(a[0])) #endif -#ifndef ARRAYLAST +#ifndef ARRAYLAST #define ARRAYLAST(a) (&a[ARRAYSIZE(a)-1]) #endif @@ -650,9 +650,9 @@ extern void *_bcmutils_dummy_fn; #ifndef setbit -#ifndef NBBY -#define NBBY 8 -#endif +#ifndef NBBY +#define NBBY 8 +#endif #ifdef BCMUTILS_BIT_MACROS_USE_FUNCS extern void setbit(void *array, uint bit); extern void clrbit(void *array, uint bit); @@ -664,7 +664,7 @@ extern bool isclr(const void *array, uint bit); #define isset(a, i) (((const uint8 *)a)[(i) / NBBY] & (1 << ((i) % NBBY))) #define isclr(a, i) ((((const uint8 *)a)[(i) / NBBY] & (1 << ((i) % NBBY))) == 0) #endif -#endif +#endif #define isbitset(a, i) (((a) & (1 << (i))) != 0) @@ -724,7 +724,7 @@ extern bool isclr(const void *array, uint bit); #else #define MACDBG "%02x:%02x:%02x" #define MAC2STRDBG(ea) (ea)[0], (ea)[4], (ea)[5] -#endif +#endif typedef struct bcm_bit_desc { @@ -813,7 +813,7 @@ extern const char *bcmerrorstr(int bcmerror); typedef uint32 mbool; -#define mboolset(mb, bit) ((mb) |= (bit)) +#define mboolset(mb, bit) ((mb) |= (bit)) #define mboolclr(mb, bit) ((mb) &= ~(bit)) #define mboolisset(mb, bit) (((mb) & (bit)) != 0) #define mboolmaskset(mb, mask, val) ((mb) = (((mb) & ~(mask)) | (val))) diff --git a/drivers/net/wireless/bcmdhd/include/dbus.h b/drivers/net/wireless/bcmdhd/include/dbus.h index 5f5232d446d..4458e74faf7 100644 --- a/drivers/net/wireless/bcmdhd/include/dbus.h +++ b/drivers/net/wireless/bcmdhd/include/dbus.h @@ -3,7 +3,7 @@ * target serial buses like USB, SDIO, SPI, etc. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/dhdioctl.h b/drivers/net/wireless/bcmdhd/include/dhdioctl.h index 5d4a5a994d0..08758e1ffe8 100644 --- a/drivers/net/wireless/bcmdhd/include/dhdioctl.h +++ b/drivers/net/wireless/bcmdhd/include/dhdioctl.h @@ -6,7 +6,7 @@ * Definitions subject to change without notice. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/epivers.h b/drivers/net/wireless/bcmdhd/include/epivers.h index 2247f9a4edf..d548385857b 100644 --- a/drivers/net/wireless/bcmdhd/include/epivers.h +++ b/drivers/net/wireless/bcmdhd/include/epivers.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/hndpmu.h b/drivers/net/wireless/bcmdhd/include/hndpmu.h index e4bbc7ca2d8..9ed9de264da 100644 --- a/drivers/net/wireless/bcmdhd/include/hndpmu.h +++ b/drivers/net/wireless/bcmdhd/include/hndpmu.h @@ -2,7 +2,7 @@ * HND SiliconBackplane PMU support. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/hndrte_armtrap.h b/drivers/net/wireless/bcmdhd/include/hndrte_armtrap.h index a8abef90cb5..875a6935f22 100644 --- a/drivers/net/wireless/bcmdhd/include/hndrte_armtrap.h +++ b/drivers/net/wireless/bcmdhd/include/hndrte_armtrap.h @@ -2,7 +2,7 @@ * HNDRTE arm trap handling. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/hndrte_cons.h b/drivers/net/wireless/bcmdhd/include/hndrte_cons.h index f0c94e9c39f..4e4272087cc 100644 --- a/drivers/net/wireless/bcmdhd/include/hndrte_cons.h +++ b/drivers/net/wireless/bcmdhd/include/hndrte_cons.h @@ -2,7 +2,7 @@ * Console support for hndrte. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/hndsoc.h b/drivers/net/wireless/bcmdhd/include/hndsoc.h index 6369cbb96fb..e259cc6f1c0 100644 --- a/drivers/net/wireless/bcmdhd/include/hndsoc.h +++ b/drivers/net/wireless/bcmdhd/include/hndsoc.h @@ -2,7 +2,7 @@ * Broadcom HND chip & on-chip-interconnect-related definitions. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/linux_osl.h b/drivers/net/wireless/bcmdhd/include/linux_osl.h index 08f0320513a..9918f621c98 100644 --- a/drivers/net/wireless/bcmdhd/include/linux_osl.h +++ b/drivers/net/wireless/bcmdhd/include/linux_osl.h @@ -2,7 +2,7 @@ * Linux OS Independent Layer * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -95,9 +95,9 @@ extern struct pci_dev *osl_pci_device(osl_t *osh); typedef struct { bool pkttag; - bool mmbus; - pktfree_cb_fn_t tx_fn; - void *tx_ctx; + bool mmbus; + pktfree_cb_fn_t tx_fn; + void *tx_ctx; void *unused[3]; } osl_pubinfo_t; @@ -166,16 +166,16 @@ extern int osl_error(int bcmerror); #include -#include -#include +#include +#include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 29) #define OSL_SYSUPTIME() ((uint32)jiffies_to_msecs(jiffies)) #else #define OSL_SYSUPTIME() ((uint32)jiffies * (1000 / HZ)) -#endif +#endif #define printf(fmt, args...) printk(fmt , ## args) -#include -#include +#include +#include #define bcopy(src, dst, len) memcpy((dst), (src), (len)) #define bcmp(b1, b2, len) memcmp((b1), (b2), (len)) @@ -268,7 +268,7 @@ extern int osl_error(int bcmerror); #else #define PKTGET_STATIC PKTGET #define PKTFREE_STATIC PKTFREE -#endif +#endif #define PKTDATA(osh, skb) (((struct sk_buff*)(skb))->data) #define PKTLEN(osh, skb) (((struct sk_buff*)(skb))->len) #define PKTHEADROOM(osh, skb) (PKTDATA(osh, skb)-(((struct sk_buff*)(skb))->head)) @@ -317,7 +317,7 @@ typedef struct ctfpool { #define PKTCLRFAST(osh, skb) ((((struct sk_buff*)(skb))->__unused) &= (~FASTBUF)) #define PKTISFAST(osh, skb) ((((struct sk_buff*)(skb))->__unused) & FASTBUF) #define PKTFAST(osh, skb) (((struct sk_buff*)(skb))->__unused) -#endif +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) #define CTFPOOLPTR(osh, skb) (((struct sk_buff*)(skb))->ctfpool) @@ -332,11 +332,11 @@ extern void osl_ctfpool_replenish(osl_t *osh, uint thresh); extern int32 osl_ctfpool_init(osl_t *osh, uint numobj, uint size); extern void osl_ctfpool_cleanup(osl_t *osh); extern void osl_ctfpool_stats(osl_t *osh, void *b); -#else +#else #define PKTSETFAST(osh, skb) #define PKTCLRFAST(osh, skb) #define PKTISFAST(osh, skb) (FALSE) -#endif +#endif #define PKTSETCTF(osh, skb) #define PKTCLRCTF(osh, skb) @@ -362,7 +362,7 @@ extern void osl_ctfpool_stats(osl_t *osh, void *b); #define PKTSETCHAINED(osh, skb) (((struct sk_buff*)(skb))->mac_len |= CHAINED) #define PKTCLRCHAINED(osh, skb) (((struct sk_buff*)(skb))->mac_len &= (~CHAINED)) #define PKTISCHAINED(skb) (((struct sk_buff*)(skb))->mac_len & CHAINED) -#else +#else #define SKIPCT (1 << 2) #define CHAINED (1 << 3) #define PKTSETSKIPCT(osh, skb) (((struct sk_buff*)(skb))->__unused |= SKIPCT) @@ -371,17 +371,17 @@ extern void osl_ctfpool_stats(osl_t *osh, void *b); #define PKTSETCHAINED(osh, skb) (((struct sk_buff*)(skb))->__unused |= CHAINED) #define PKTCLRCHAINED(osh, skb) (((struct sk_buff*)(skb))->__unused &= (~CHAINED)) #define PKTISCHAINED(skb) (((struct sk_buff*)(skb))->__unused & CHAINED) -#endif +#endif typedef struct ctf_mark { uint32 value; } ctf_mark_t; #define CTF_MARK(m) (m.value) -#else +#else #define PKTSETSKIPCT(osh, skb) #define PKTCLRSKIPCT(osh, skb) #define PKTSKIPCT(osh, skb) #define CTF_MARK(m) 0 -#endif +#endif extern void osl_pktfree(osl_t *osh, void *skb, bool send); extern void *osl_pktget_static(osl_t *osh, uint len); @@ -409,14 +409,14 @@ extern struct sk_buff *osl_pkt_tonative(osl_t *osh, void *pkt); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)) #define PKTMARK(p) (((struct sk_buff *)(p))->mark) #define PKTSETMARK(p, m) ((struct sk_buff *)(p))->mark = (m) -#else +#else #define PKTMARK(p) (((struct sk_buff *)(p))->nfmark) #define PKTSETMARK(p, m) ((struct sk_buff *)(p))->nfmark = (m) -#endif -#else +#endif +#else #define PKTMARK(p) 0 #define PKTSETMARK(p, m) -#endif +#endif #define PKTALLOCED(osh) osl_pktalloced(osh) extern uint osl_pktalloced(osl_t *osh); @@ -477,9 +477,9 @@ do { \ (t) = (p); \ } \ } while (0) -#endif +#endif -#else +#else diff --git a/drivers/net/wireless/bcmdhd/include/linuxver.h b/drivers/net/wireless/bcmdhd/include/linuxver.h index 3462fdcd367..f0b29f6921a 100644 --- a/drivers/net/wireless/bcmdhd/include/linuxver.h +++ b/drivers/net/wireless/bcmdhd/include/linuxver.h @@ -3,7 +3,7 @@ * Pave over some 2.2 versus 2.4 versus 2.6 kernel differences. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -97,7 +97,7 @@ #ifndef flush_scheduled_work #define flush_scheduled_work() flush_scheduled_tasks() #endif -#endif +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) #define DAEMONIZE(a) @@ -106,14 +106,14 @@ #define DAEMONIZE(a) daemonize(a); \ allow_signal(SIGKILL); \ allow_signal(SIGTERM); -#else +#else #define RAISE_RX_SOFTIRQ() \ cpu_raise_softirq(smp_processor_id(), NET_RX_SOFTIRQ) #define DAEMONIZE(a) daemonize(); \ do { if (a) \ strncpy(current->comm, a, MIN(sizeof(current->comm), (strlen(a)))); \ } while (0); -#endif +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) #define MY_INIT_WORK(_work, _func) INIT_WORK(_work, _func) @@ -155,11 +155,11 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs *ptregs); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32) #include -#endif +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)) #include -#endif +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) #include @@ -474,7 +474,7 @@ pci_restore_state(struct pci_dev *dev, u32 *buffer) #ifndef HAVE_FREE_NETDEV #define free_netdev(dev) kfree(dev) #endif -#endif +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)) @@ -493,11 +493,11 @@ pci_restore_state(struct pci_dev *dev, u32 *buffer) #endif typedef struct { - void *parent; + void *parent; char *proc_name; struct task_struct *p_task; long thr_pid; - int prio; + int prio; struct semaphore sema; int terminated; struct completion completed; @@ -540,7 +540,7 @@ static inline bool binary_sema_up(tsk_ctl_t *tsk) tsk->up_cnt++; sem_up = TRUE; } else if (tsk->up_cnt == 1) { - + } else DBG_THR(("dhd_sched_dpc: unexpected up cnt %d!\n", tsk->up_cnt)); @@ -665,18 +665,18 @@ do { \ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)) #define netdev_priv(dev) dev->priv -#endif +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) #define RANDOM32 prandom_u32 #else #define RANDOM32 random32 -#endif +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) #define SRANDOM32(entropy) prandom_seed(entropy) #else #define SRANDOM32(entropy) srandom32(entropy) -#endif +#endif -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/include/miniopt.h b/drivers/net/wireless/bcmdhd/include/miniopt.h index 0ff43ee932c..ba48da04438 100644 --- a/drivers/net/wireless/bcmdhd/include/miniopt.h +++ b/drivers/net/wireless/bcmdhd/include/miniopt.h @@ -2,7 +2,7 @@ * Command line options parser. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/msgtrace.h b/drivers/net/wireless/bcmdhd/include/msgtrace.h index 7d49148178d..aa5261a1e69 100644 --- a/drivers/net/wireless/bcmdhd/include/msgtrace.h +++ b/drivers/net/wireless/bcmdhd/include/msgtrace.h @@ -2,7 +2,7 @@ * Trace messages sent over HBUS * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/osl.h b/drivers/net/wireless/bcmdhd/include/osl.h index 24ff76b88de..19f8274ada4 100644 --- a/drivers/net/wireless/bcmdhd/include/osl.h +++ b/drivers/net/wireless/bcmdhd/include/osl.h @@ -2,7 +2,7 @@ * OS Abstraction Layer * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -90,7 +90,7 @@ typedef void (*osl_wreg_fn_t)(void *ctx, volatile void *reg, unsigned int val, #define FOREACH_CHAINED_PKT(skb, nskb) \ for ((nskb) = NULL; (skb) != NULL; (skb) = (nskb)) #define PKTCFREE PKTFREE -#endif +#endif #ifndef HNDCTF #define PKTSETCHAINED(osh, skb) @@ -98,4 +98,4 @@ typedef void (*osl_wreg_fn_t)(void *ctx, volatile void *reg, unsigned int val, #define PKTISCHAINED(skb) (FALSE) #endif -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/include/packed_section_end.h b/drivers/net/wireless/bcmdhd/include/packed_section_end.h index 50bd5cc11b2..1b668376907 100644 --- a/drivers/net/wireless/bcmdhd/include/packed_section_end.h +++ b/drivers/net/wireless/bcmdhd/include/packed_section_end.h @@ -16,7 +16,7 @@ * * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/packed_section_start.h b/drivers/net/wireless/bcmdhd/include/packed_section_start.h index 9ffa22baf66..2b25925c22a 100644 --- a/drivers/net/wireless/bcmdhd/include/packed_section_start.h +++ b/drivers/net/wireless/bcmdhd/include/packed_section_start.h @@ -16,7 +16,7 @@ * * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/pcicfg.h b/drivers/net/wireless/bcmdhd/include/pcicfg.h index 29fb5e1c3f6..63f41582200 100644 --- a/drivers/net/wireless/bcmdhd/include/pcicfg.h +++ b/drivers/net/wireless/bcmdhd/include/pcicfg.h @@ -2,7 +2,7 @@ * pcicfg.h: PCI configuration constants and structures. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -56,10 +56,10 @@ #define PCI_CFG_MINGNT 0x3e #define PCI_CFG_MAXLAT 0x3f #define PCI_CFG_DEVCTRL 0xd8 -#define PCI_BAR0_WIN 0x80 -#define PCI_BAR1_WIN 0x84 -#define PCI_SPROM_CONTROL 0x88 -#define PCI_BAR1_CONTROL 0x8c +#define PCI_BAR0_WIN 0x80 +#define PCI_BAR1_WIN 0x84 +#define PCI_SPROM_CONTROL 0x88 +#define PCI_BAR1_CONTROL 0x8c #define PCI_INT_STATUS 0x90 #define PCI_INT_MASK 0x94 #define PCI_TO_SB_MB 0x98 diff --git a/drivers/net/wireless/bcmdhd/include/proto/802.11.h b/drivers/net/wireless/bcmdhd/include/proto/802.11.h index ec89738c438..c998214d995 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/802.11.h +++ b/drivers/net/wireless/bcmdhd/include/proto/802.11.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -418,28 +418,28 @@ BWL_PRE_PACKED_STRUCT struct dot11y_action_ext_csa { BWL_PRE_PACKED_STRUCT struct dot11_wide_bw_channel_switch { - uint8 id; - uint8 len; - uint8 channel_width; - uint8 center_frequency_segment_0; - uint8 center_frequency_segment_1; + uint8 id; + uint8 len; + uint8 channel_width; + uint8 center_frequency_segment_0; + uint8 center_frequency_segment_1; } BWL_POST_PACKED_STRUCT; typedef struct dot11_wide_bw_channel_switch dot11_wide_bw_chan_switch_ie_t; -#define DOT11_WIDE_BW_SWITCH_IE_LEN 3 +#define DOT11_WIDE_BW_SWITCH_IE_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_channel_switch_wrapper { - uint8 id; - uint8 len; + uint8 id; + uint8 len; dot11_wide_bw_chan_switch_ie_t wb_chan_switch_ie; } BWL_POST_PACKED_STRUCT; typedef struct dot11_channel_switch_wrapper dot11_chan_switch_wrapper_ie_t; BWL_PRE_PACKED_STRUCT struct dot11_vht_transmit_power_envelope { - uint8 id; - uint8 len; + uint8 id; + uint8 len; uint8 transmit_power_info; uint8 local_max_transmit_power_20; } BWL_POST_PACKED_STRUCT; @@ -501,15 +501,15 @@ BWL_PRE_PACKED_STRUCT struct dot11_extcap { typedef struct dot11_extcap dot11_extcap_t; -#define DOT11_TDLS_CAP_TDLS 37 -#define DOT11_TDLS_CAP_PU_BUFFER_STA 28 -#define DOT11_TDLS_CAP_PEER_PSM 20 -#define DOT11_TDLS_CAP_CH_SW 30 -#define DOT11_TDLS_CAP_PROH 38 -#define DOT11_TDLS_CAP_CH_SW_PROH 39 -#define DOT11_TDLS_CAP_TDLS_WIDER_BW 61 +#define DOT11_TDLS_CAP_TDLS 37 +#define DOT11_TDLS_CAP_PU_BUFFER_STA 28 +#define DOT11_TDLS_CAP_PEER_PSM 20 +#define DOT11_TDLS_CAP_CH_SW 30 +#define DOT11_TDLS_CAP_PROH 38 +#define DOT11_TDLS_CAP_CH_SW_PROH 39 +#define DOT11_TDLS_CAP_TDLS_WIDER_BW 61 -#define TDLS_CAP_MAX_BIT 39 +#define TDLS_CAP_MAX_BIT 39 @@ -518,12 +518,12 @@ typedef struct dot11_extcap dot11_extcap_t; #define DOT11_MEASURE_TYPE_RPI 2 #define DOT11_MEASURE_TYPE_CHLOAD 3 #define DOT11_MEASURE_TYPE_NOISE 4 -#define DOT11_MEASURE_TYPE_BEACON 5 -#define DOT11_MEASURE_TYPE_FRAME 6 -#define DOT11_MEASURE_TYPE_STAT 7 -#define DOT11_MEASURE_TYPE_LCI 8 -#define DOT11_MEASURE_TYPE_TXSTREAM 9 -#define DOT11_MEASURE_TYPE_PAUSE 255 +#define DOT11_MEASURE_TYPE_BEACON 5 +#define DOT11_MEASURE_TYPE_FRAME 6 +#define DOT11_MEASURE_TYPE_STAT 7 +#define DOT11_MEASURE_TYPE_LCI 8 +#define DOT11_MEASURE_TYPE_TXSTREAM 9 +#define DOT11_MEASURE_TYPE_PAUSE 255 #define DOT11_MEASURE_MODE_PARALLEL (1<<0) @@ -901,7 +901,7 @@ typedef struct ti_ie ti_ie_t; #define FC_SUBTYPE_ANY_PSPOLL(s) (((s) & 10) != 0) -#define FC_KIND_MASK (FC_TYPE_MASK | FC_SUBTYPE_MASK) +#define FC_KIND_MASK (FC_TYPE_MASK | FC_SUBTYPE_MASK) #define FC_KIND(t, s) (((t) << FC_TYPE_SHIFT) | ((s) << FC_SUBTYPE_SHIFT)) @@ -1040,41 +1040,41 @@ typedef struct ti_ie ti_ie_t; #define DOT11_SC_ASSOC_SPECTRUM_REQUIRED 22 #define DOT11_SC_ASSOC_BAD_POWER_CAP 23 #define DOT11_SC_ASSOC_BAD_SUP_CHANNELS 24 -#define DOT11_SC_ASSOC_SHORTSLOT_REQUIRED 25 -#define DOT11_SC_ASSOC_ERPBCC_REQUIRED 26 -#define DOT11_SC_ASSOC_DSSSOFDM_REQUIRED 27 -#define DOT11_SC_ASSOC_R0KH_UNREACHABLE 28 -#define DOT11_SC_ASSOC_TRY_LATER 30 -#define DOT11_SC_ASSOC_MFP_VIOLATION 31 -#define DOT11_SC_ASSOC_HT_REQUIRED 32 +#define DOT11_SC_ASSOC_SHORTSLOT_REQUIRED 25 +#define DOT11_SC_ASSOC_ERPBCC_REQUIRED 26 +#define DOT11_SC_ASSOC_DSSSOFDM_REQUIRED 27 +#define DOT11_SC_ASSOC_R0KH_UNREACHABLE 28 +#define DOT11_SC_ASSOC_TRY_LATER 30 +#define DOT11_SC_ASSOC_MFP_VIOLATION 31 +#define DOT11_SC_ASSOC_HT_REQUIRED 32 -#define DOT11_SC_DECLINED 37 -#define DOT11_SC_INVALID_PARAMS 38 -#define DOT11_SC_INVALID_PAIRWISE_CIPHER 42 +#define DOT11_SC_DECLINED 37 +#define DOT11_SC_INVALID_PARAMS 38 +#define DOT11_SC_INVALID_PAIRWISE_CIPHER 42 #define DOT11_SC_INVALID_AKMP 43 #define DOT11_SC_INVALID_RSNIE_CAP 45 #define DOT11_SC_DLS_NOT_ALLOWED 48 #define DOT11_SC_INVALID_PMKID 53 #define DOT11_SC_INVALID_MDID 54 -#define DOT11_SC_INVALID_FTIE 55 +#define DOT11_SC_INVALID_FTIE 55 -#define DOT11_SC_ADV_PROTO_NOT_SUPPORTED 59 -#define DOT11_SC_NO_OUTSTAND_REQ 60 -#define DOT11_SC_RSP_NOT_RX_FROM_SERVER 61 -#define DOT11_SC_TIMEOUT 62 -#define DOT11_SC_QUERY_RSP_TOO_LARGE 63 -#define DOT11_SC_SERVER_UNREACHABLE 65 +#define DOT11_SC_ADV_PROTO_NOT_SUPPORTED 59 +#define DOT11_SC_NO_OUTSTAND_REQ 60 +#define DOT11_SC_RSP_NOT_RX_FROM_SERVER 61 +#define DOT11_SC_TIMEOUT 62 +#define DOT11_SC_QUERY_RSP_TOO_LARGE 63 +#define DOT11_SC_SERVER_UNREACHABLE 65 -#define DOT11_SC_UNEXP_MSG 70 -#define DOT11_SC_INVALID_SNONCE 71 -#define DOT11_SC_INVALID_RSNIE 72 -#define DOT11_SC_ASSOC_VHT_REQUIRED 104 +#define DOT11_SC_UNEXP_MSG 70 +#define DOT11_SC_INVALID_SNONCE 71 +#define DOT11_SC_INVALID_RSNIE 72 +#define DOT11_SC_ASSOC_VHT_REQUIRED 104 -#define DOT11_SC_TRANSMIT_FAILURE 79 +#define DOT11_SC_TRANSMIT_FAILURE 79 -#define DOT11_MNG_DS_PARAM_LEN 1 -#define DOT11_MNG_IBSS_PARAM_LEN 2 +#define DOT11_MNG_DS_PARAM_LEN 1 +#define DOT11_MNG_IBSS_PARAM_LEN 2 #define DOT11_MNG_TIM_FIXED_LEN 3 @@ -1101,14 +1101,14 @@ typedef struct ti_ie ti_ie_t; #define DOT11_MNG_HOPPING_PARMS_ID 8 #define DOT11_MNG_HOPPING_TABLE_ID 9 #define DOT11_MNG_REQUEST_ID 10 -#define DOT11_MNG_QBSS_LOAD_ID 11 -#define DOT11_MNG_EDCA_PARAM_ID 12 -#define DOT11_MNG_TSPEC_ID 13 -#define DOT11_MNG_TCLAS_ID 14 -#define DOT11_MNG_CHALLENGE_ID 16 -#define DOT11_MNG_PWR_CONSTRAINT_ID 32 -#define DOT11_MNG_PWR_CAP_ID 33 -#define DOT11_MNG_TPC_REQUEST_ID 34 +#define DOT11_MNG_QBSS_LOAD_ID 11 +#define DOT11_MNG_EDCA_PARAM_ID 12 +#define DOT11_MNG_TSPEC_ID 13 +#define DOT11_MNG_TCLAS_ID 14 +#define DOT11_MNG_CHALLENGE_ID 16 +#define DOT11_MNG_PWR_CONSTRAINT_ID 32 +#define DOT11_MNG_PWR_CAP_ID 33 +#define DOT11_MNG_TPC_REQUEST_ID 34 #define DOT11_MNG_TPC_REPORT_ID 35 #define DOT11_MNG_SUPP_CHANNELS_ID 36 #define DOT11_MNG_CHANNEL_SWITCH_ID 37 @@ -1116,72 +1116,72 @@ typedef struct ti_ie ti_ie_t; #define DOT11_MNG_MEASURE_REPORT_ID 39 #define DOT11_MNG_QUIET_ID 40 #define DOT11_MNG_IBSS_DFS_ID 41 -#define DOT11_MNG_ERP_ID 42 -#define DOT11_MNG_TS_DELAY_ID 43 -#define DOT11_MNG_TCLAS_PROC_ID 44 -#define DOT11_MNG_HT_CAP 45 -#define DOT11_MNG_QOS_CAP_ID 46 -#define DOT11_MNG_NONERP_ID 47 -#define DOT11_MNG_RSN_ID 48 -#define DOT11_MNG_EXT_RATES_ID 50 -#define DOT11_MNG_AP_CHREP_ID 51 -#define DOT11_MNG_NEIGHBOR_REP_ID 52 -#define DOT11_MNG_RCPI_ID 53 -#define DOT11_MNG_MDIE_ID 54 -#define DOT11_MNG_FTIE_ID 55 -#define DOT11_MNG_FT_TI_ID 56 -#define DOT11_MNG_RDE_ID 57 -#define DOT11_MNG_REGCLASS_ID 59 -#define DOT11_MNG_EXT_CSA_ID 60 -#define DOT11_MNG_HT_ADD 61 -#define DOT11_MNG_EXT_CHANNEL_OFFSET 62 -#define DOT11_MNG_BSS_AVR_ACCESS_DELAY_ID 63 -#define DOT11_MNG_ANTENNA_ID 64 -#define DOT11_MNG_RSNI_ID 65 -#define DOT11_MNG_MEASUREMENT_PILOT_TX_ID 66 -#define DOT11_MNG_BSS_AVAL_ADMISSION_CAP_ID 67 -#define DOT11_MNG_BSS_AC_ACCESS_DELAY_ID 68 -#define DOT11_MNG_WAPI_ID 68 -#define DOT11_MNG_TIME_ADVERTISE_ID 69 -#define DOT11_MNG_RRM_CAP_ID 70 -#define DOT11_MNG_MULTIPLE_BSSID_ID 71 -#define DOT11_MNG_HT_BSS_COEXINFO_ID 72 -#define DOT11_MNG_HT_BSS_CHANNEL_REPORT_ID 73 -#define DOT11_MNG_HT_OBSS_ID 74 -#define DOT11_MNG_MMIE_ID 76 -#define DOT11_MNG_BSS_MAX_IDLE_PERIOD_ID 90 -#define DOT11_MNG_TFS_REQUEST_ID 91 -#define DOT11_MNG_TFS_RESPONSE_ID 92 -#define DOT11_MNG_WNM_SLEEP_MODE_ID 93 -#define DOT11_MNG_TIMBC_REQ_ID 94 -#define DOT11_MNG_TIMBC_RESP_ID 95 -#define DOT11_MNG_CHANNEL_USAGE 97 -#define DOT11_MNG_TIME_ZONE_ID 98 -#define DOT11_MNG_DMS_REQUEST_ID 99 -#define DOT11_MNG_DMS_RESPONSE_ID 100 -#define DOT11_MNG_LINK_IDENTIFIER_ID 101 -#define DOT11_MNG_WAKEUP_SCHEDULE_ID 102 -#define DOT11_MNG_CHANNEL_SWITCH_TIMING_ID 104 -#define DOT11_MNG_PTI_CONTROL_ID 105 -#define DOT11_MNG_PU_BUFFER_STATUS_ID 106 -#define DOT11_MNG_INTERWORKING_ID 107 -#define DOT11_MNG_ADVERTISEMENT_ID 108 +#define DOT11_MNG_ERP_ID 42 +#define DOT11_MNG_TS_DELAY_ID 43 +#define DOT11_MNG_TCLAS_PROC_ID 44 +#define DOT11_MNG_HT_CAP 45 +#define DOT11_MNG_QOS_CAP_ID 46 +#define DOT11_MNG_NONERP_ID 47 +#define DOT11_MNG_RSN_ID 48 +#define DOT11_MNG_EXT_RATES_ID 50 +#define DOT11_MNG_AP_CHREP_ID 51 +#define DOT11_MNG_NEIGHBOR_REP_ID 52 +#define DOT11_MNG_RCPI_ID 53 +#define DOT11_MNG_MDIE_ID 54 +#define DOT11_MNG_FTIE_ID 55 +#define DOT11_MNG_FT_TI_ID 56 +#define DOT11_MNG_RDE_ID 57 +#define DOT11_MNG_REGCLASS_ID 59 +#define DOT11_MNG_EXT_CSA_ID 60 +#define DOT11_MNG_HT_ADD 61 +#define DOT11_MNG_EXT_CHANNEL_OFFSET 62 +#define DOT11_MNG_BSS_AVR_ACCESS_DELAY_ID 63 +#define DOT11_MNG_ANTENNA_ID 64 +#define DOT11_MNG_RSNI_ID 65 +#define DOT11_MNG_MEASUREMENT_PILOT_TX_ID 66 +#define DOT11_MNG_BSS_AVAL_ADMISSION_CAP_ID 67 +#define DOT11_MNG_BSS_AC_ACCESS_DELAY_ID 68 +#define DOT11_MNG_WAPI_ID 68 +#define DOT11_MNG_TIME_ADVERTISE_ID 69 +#define DOT11_MNG_RRM_CAP_ID 70 +#define DOT11_MNG_MULTIPLE_BSSID_ID 71 +#define DOT11_MNG_HT_BSS_COEXINFO_ID 72 +#define DOT11_MNG_HT_BSS_CHANNEL_REPORT_ID 73 +#define DOT11_MNG_HT_OBSS_ID 74 +#define DOT11_MNG_MMIE_ID 76 +#define DOT11_MNG_BSS_MAX_IDLE_PERIOD_ID 90 +#define DOT11_MNG_TFS_REQUEST_ID 91 +#define DOT11_MNG_TFS_RESPONSE_ID 92 +#define DOT11_MNG_WNM_SLEEP_MODE_ID 93 +#define DOT11_MNG_TIMBC_REQ_ID 94 +#define DOT11_MNG_TIMBC_RESP_ID 95 +#define DOT11_MNG_CHANNEL_USAGE 97 +#define DOT11_MNG_TIME_ZONE_ID 98 +#define DOT11_MNG_DMS_REQUEST_ID 99 +#define DOT11_MNG_DMS_RESPONSE_ID 100 +#define DOT11_MNG_LINK_IDENTIFIER_ID 101 +#define DOT11_MNG_WAKEUP_SCHEDULE_ID 102 +#define DOT11_MNG_CHANNEL_SWITCH_TIMING_ID 104 +#define DOT11_MNG_PTI_CONTROL_ID 105 +#define DOT11_MNG_PU_BUFFER_STATUS_ID 106 +#define DOT11_MNG_INTERWORKING_ID 107 +#define DOT11_MNG_ADVERTISEMENT_ID 108 #define DOT11_MNG_EXP_BW_REQ_ID 109 #define DOT11_MNG_QOS_MAP_ID 110 -#define DOT11_MNG_ROAM_CONSORT_ID 111 -#define DOT11_MNG_EMERGCY_ALERT_ID 112 -#define DOT11_MNG_EXT_CAP_ID 127 -#define DOT11_MNG_VHT_CAP_ID 191 -#define DOT11_MNG_VHT_OPERATION_ID 192 -#define DOT11_MNG_WIDE_BW_CHANNEL_SWITCH_ID 194 -#define DOT11_MNG_VHT_TRANSMIT_POWER_ENVELOPE_ID 195 -#define DOT11_MNG_CHANNEL_SWITCH_WRAPPER_ID 196 -#define DOT11_MNG_AID_ID 197 -#define DOT11_MNG_OPER_MODE_NOTIF_ID 199 +#define DOT11_MNG_ROAM_CONSORT_ID 111 +#define DOT11_MNG_EMERGCY_ALERT_ID 112 +#define DOT11_MNG_EXT_CAP_ID 127 +#define DOT11_MNG_VHT_CAP_ID 191 +#define DOT11_MNG_VHT_OPERATION_ID 192 +#define DOT11_MNG_WIDE_BW_CHANNEL_SWITCH_ID 194 +#define DOT11_MNG_VHT_TRANSMIT_POWER_ENVELOPE_ID 195 +#define DOT11_MNG_CHANNEL_SWITCH_WRAPPER_ID 196 +#define DOT11_MNG_AID_ID 197 +#define DOT11_MNG_OPER_MODE_NOTIF_ID 199 -#define DOT11_MNG_WPA_ID 221 -#define DOT11_MNG_PROPR_ID 221 +#define DOT11_MNG_WPA_ID 221 +#define DOT11_MNG_PROPR_ID 221 #define DOT11_MNG_VS_ID 221 @@ -1189,31 +1189,31 @@ typedef struct ti_ie ti_ie_t; -#define DOT11_RATE_1M 2 -#define DOT11_RATE_2M 4 -#define DOT11_RATE_5M5 11 -#define DOT11_RATE_11M 22 -#define DOT11_RATE_6M 12 -#define DOT11_RATE_9M 18 -#define DOT11_RATE_12M 24 -#define DOT11_RATE_18M 36 -#define DOT11_RATE_24M 48 -#define DOT11_RATE_36M 72 -#define DOT11_RATE_48M 96 -#define DOT11_RATE_54M 108 -#define DOT11_RATE_MAX 108 +#define DOT11_RATE_1M 2 +#define DOT11_RATE_2M 4 +#define DOT11_RATE_5M5 11 +#define DOT11_RATE_11M 22 +#define DOT11_RATE_6M 12 +#define DOT11_RATE_9M 18 +#define DOT11_RATE_12M 24 +#define DOT11_RATE_18M 36 +#define DOT11_RATE_24M 48 +#define DOT11_RATE_36M 72 +#define DOT11_RATE_48M 96 +#define DOT11_RATE_54M 108 +#define DOT11_RATE_MAX 108 -#define DOT11_RATE_BASIC 0x80 -#define DOT11_RATE_MASK 0x7F +#define DOT11_RATE_BASIC 0x80 +#define DOT11_RATE_MASK 0x7F -#define DOT11_BSS_MEMBERSHIP_HT 0xFF -#define DOT11_BSS_MEMBERSHIP_VHT 0xFE +#define DOT11_BSS_MEMBERSHIP_HT 0xFF +#define DOT11_BSS_MEMBERSHIP_VHT 0xFE -#define DOT11_MNG_ERP_LEN 1 -#define DOT11_MNG_NONERP_PRESENT 0x01 +#define DOT11_MNG_ERP_LEN 1 +#define DOT11_MNG_NONERP_PRESENT 0x01 #define DOT11_MNG_USE_PROTECTION 0x02 #define DOT11_MNG_BARKER_PREAMBLE 0x04 @@ -1228,15 +1228,15 @@ typedef struct ti_ie ti_ie_t; #define DOT11_CAP_PRIVACY 0x0010 #define DOT11_CAP_SHORT 0x0020 #define DOT11_CAP_PBCC 0x0040 -#define DOT11_CAP_AGILITY 0x0080 -#define DOT11_CAP_SPECTRUM 0x0100 -#define DOT11_CAP_QOS 0x0200 -#define DOT11_CAP_SHORTSLOT 0x0400 -#define DOT11_CAP_APSD 0x0800 -#define DOT11_CAP_RRM 0x1000 -#define DOT11_CAP_CCK_OFDM 0x2000 -#define DOT11_CAP_DELAY_BA 0x4000 -#define DOT11_CAP_IMMEDIATE_BA 0x8000 +#define DOT11_CAP_AGILITY 0x0080 +#define DOT11_CAP_SPECTRUM 0x0100 +#define DOT11_CAP_QOS 0x0200 +#define DOT11_CAP_SHORTSLOT 0x0400 +#define DOT11_CAP_APSD 0x0800 +#define DOT11_CAP_RRM 0x1000 +#define DOT11_CAP_CCK_OFDM 0x2000 +#define DOT11_CAP_DELAY_BA 0x4000 +#define DOT11_CAP_IMMEDIATE_BA 0x8000 @@ -1318,11 +1318,11 @@ typedef struct dot11_oper_mode_notif_ie dot11_oper_mode_notif_ie_t; #define DOT11_OPER_MODE_NOTIF_IE_LEN 1 -#define DOT11_OBSS_COEX_MNG_SUPPORT 0x01 +#define DOT11_OBSS_COEX_MNG_SUPPORT 0x01 -#define DOT11_ACTION_HDR_LEN 2 -#define DOT11_ACTION_CAT_OFF 0 +#define DOT11_ACTION_HDR_LEN 2 +#define DOT11_ACTION_CAT_OFF 0 #define DOT11_ACTION_ACT_OFF 1 @@ -1336,14 +1336,14 @@ typedef struct dot11_oper_mode_notif_ie dot11_oper_mode_notif_ie_t; #define DOT11_ACTION_CAT_RRM 5 #define DOT11_ACTION_CAT_FBT 6 #define DOT11_ACTION_CAT_HT 7 -#define DOT11_ACTION_CAT_SA_QUERY 8 -#define DOT11_ACTION_CAT_PDPA 9 -#define DOT11_ACTION_CAT_WNM 10 -#define DOT11_ACTION_CAT_UWNM 11 +#define DOT11_ACTION_CAT_SA_QUERY 8 +#define DOT11_ACTION_CAT_PDPA 9 +#define DOT11_ACTION_CAT_WNM 10 +#define DOT11_ACTION_CAT_UWNM 11 #define DOT11_ACTION_NOTIFICATION 17 -#define DOT11_ACTION_CAT_VHT 21 -#define DOT11_ACTION_CAT_VSP 126 -#define DOT11_ACTION_CAT_VS 127 +#define DOT11_ACTION_CAT_VHT 21 +#define DOT11_ACTION_CAT_VSP 126 +#define DOT11_ACTION_CAT_VS 127 #define DOT11_SM_ACTION_M_REQ 0 @@ -1386,9 +1386,9 @@ typedef struct dot11_oper_mode_notif_ie dot11_oper_mode_notif_ie_t; #define DOT11_FT_ACTION_FT_ACK 4 -#define DOT11_DLS_ACTION_REQ 0 -#define DOT11_DLS_ACTION_RESP 1 -#define DOT11_DLS_ACTION_TD 2 +#define DOT11_DLS_ACTION_REQ 0 +#define DOT11_DLS_ACTION_RESP 1 +#define DOT11_DLS_ACTION_TD 2 #define DOT11_WNM_ACTION_EVENT_REQ 0 @@ -1427,15 +1427,15 @@ typedef struct dot11_oper_mode_notif_ie dot11_oper_mode_notif_ie_t; #define DOT11_MNG_COUNTRY_ID_LEN 3 -#define DOT11_VHT_ACTION_CBF 0 -#define DOT11_VHT_ACTION_GID_MGMT 1 -#define DOT11_VHT_ACTION_OPER_MODE_NOTIF 2 +#define DOT11_VHT_ACTION_CBF 0 +#define DOT11_VHT_ACTION_GID_MGMT 1 +#define DOT11_VHT_ACTION_OPER_MODE_NOTIF 2 BWL_PRE_PACKED_STRUCT struct dot11_dls_req { - uint8 category; - uint8 action; - struct ether_addr da; + uint8 category; + uint8 action; + struct ether_addr da; struct ether_addr sa; uint16 cap; uint16 timeout; @@ -1461,28 +1461,28 @@ typedef struct dot11_dls_resp dot11_dls_resp_t; BWL_PRE_PACKED_STRUCT struct dot11_bsstrans_query { - uint8 category; - uint8 action; - uint8 token; - uint8 reason; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 reason; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_bsstrans_query dot11_bsstrans_query_t; -#define DOT11_BSSTRANS_QUERY_LEN 4 +#define DOT11_BSSTRANS_QUERY_LEN 4 BWL_PRE_PACKED_STRUCT struct dot11_bsstrans_req { - uint8 category; - uint8 action; - uint8 token; - uint8 reqmode; - uint16 disassoc_tmr; - uint8 validity_intrvl; - uint8 data[1]; - + uint8 category; + uint8 action; + uint8 token; + uint8 reqmode; + uint16 disassoc_tmr; + uint8 validity_intrvl; + uint8 data[1]; + } BWL_POST_PACKED_STRUCT; typedef struct dot11_bsstrans_req dot11_bsstrans_req_t; -#define DOT11_BSSTRANS_REQ_LEN 7 +#define DOT11_BSSTRANS_REQ_LEN 7 #define DOT11_BSSTRANS_REQMODE_PREF_LIST_INCL 0x01 @@ -1493,15 +1493,15 @@ typedef struct dot11_bsstrans_req dot11_bsstrans_req_t; BWL_PRE_PACKED_STRUCT struct dot11_bsstrans_resp { - uint8 category; - uint8 action; - uint8 token; - uint8 status; - uint8 term_delay; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 status; + uint8 term_delay; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_bsstrans_resp dot11_bsstrans_resp_t; -#define DOT11_BSSTRANS_RESP_LEN 5 +#define DOT11_BSSTRANS_RESP_LEN 5 #define DOT11_BSSTRANS_RESP_STATUS_ACCEPT 0 @@ -1517,47 +1517,47 @@ typedef struct dot11_bsstrans_resp dot11_bsstrans_resp_t; BWL_PRE_PACKED_STRUCT struct dot11_bss_max_idle_period_ie { - uint8 id; + uint8 id; uint8 len; - uint16 max_idle_period; + uint16 max_idle_period; uint8 idle_opt; } BWL_POST_PACKED_STRUCT; typedef struct dot11_bss_max_idle_period_ie dot11_bss_max_idle_period_ie_t; -#define DOT11_BSS_MAX_IDLE_PERIOD_IE_LEN 3 -#define DOT11_BSS_MAX_IDLE_PERIOD_OPT_PROTECTED 1 +#define DOT11_BSS_MAX_IDLE_PERIOD_IE_LEN 3 +#define DOT11_BSS_MAX_IDLE_PERIOD_OPT_PROTECTED 1 BWL_PRE_PACKED_STRUCT struct dot11_timbc_req_ie { - uint8 id; + uint8 id; uint8 len; - uint8 interval; + uint8 interval; } BWL_POST_PACKED_STRUCT; typedef struct dot11_timbc_req_ie dot11_timbc_req_ie_t; -#define DOT11_TIMBC_REQ_IE_LEN 1 +#define DOT11_TIMBC_REQ_IE_LEN 1 BWL_PRE_PACKED_STRUCT struct dot11_timbc_req { - uint8 category; - uint8 action; - uint8 token; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_timbc_req dot11_timbc_req_t; -#define DOT11_TIMBC_REQ_LEN 3 +#define DOT11_TIMBC_REQ_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_timbc_resp_ie { - uint8 id; + uint8 id; uint8 len; - uint8 status; - uint8 interval; - int32 offset; - uint16 high_rate; - uint16 low_rate; + uint8 status; + uint8 interval; + int32 offset; + uint16 high_rate; + uint16 low_rate; } BWL_POST_PACKED_STRUCT; typedef struct dot11_timbc_resp_ie dot11_timbc_resp_ie_t; -#define DOT11_TIMBC_DENY_RESP_IE_LEN 1 -#define DOT11_TIMBC_ACCEPT_RESP_IE_LEN 10 +#define DOT11_TIMBC_DENY_RESP_IE_LEN 1 +#define DOT11_TIMBC_ACCEPT_RESP_IE_LEN 10 #define DOT11_TIMBC_STATUS_ACCEPT 0 #define DOT11_TIMBC_STATUS_ACCEPT_TSTAMP 1 @@ -1566,39 +1566,39 @@ typedef struct dot11_timbc_resp_ie dot11_timbc_resp_ie_t; BWL_PRE_PACKED_STRUCT struct dot11_timbc_resp { - uint8 category; - uint8 action; - uint8 token; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_timbc_resp dot11_timbc_resp_t; -#define DOT11_TIMBC_RESP_LEN 3 +#define DOT11_TIMBC_RESP_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_tim_ie { - uint8 id; - uint8 len; - uint8 dtim_count; - uint8 dtim_period; - uint8 bitmap_control; - uint8 pvb[1]; + uint8 id; + uint8 len; + uint8 dtim_count; + uint8 dtim_period; + uint8 bitmap_control; + uint8 pvb[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tim_ie dot11_tim_ie_t; -#define DOT11_TIM_IE_FIXED_LEN 3 -#define DOT11_TIM_IE_FIXED_TOTAL_LEN 5 +#define DOT11_TIM_IE_FIXED_LEN 3 +#define DOT11_TIM_IE_FIXED_TOTAL_LEN 5 BWL_PRE_PACKED_STRUCT struct dot11_timbc { - uint8 category; - uint8 action; - uint8 check_beacon; - uint8 tsf[8]; - dot11_tim_ie_t tim_ie; + uint8 category; + uint8 action; + uint8 check_beacon; + uint8 tsf[8]; + dot11_tim_ie_t tim_ie; } BWL_POST_PACKED_STRUCT; typedef struct dot11_timbc dot11_timbc_t; #define DOT11_TIMBC_HDR_LEN (sizeof(dot11_timbc_t) - sizeof(dot11_tim_ie_t)) -#define DOT11_TIMBC_FIXED_LEN (sizeof(dot11_timbc_t) - 1) -#define DOT11_TIMBC_LEN 11 +#define DOT11_TIMBC_FIXED_LEN (sizeof(dot11_timbc_t) - 1) +#define DOT11_TIMBC_LEN 11 BWL_PRE_PACKED_STRUCT struct dot11_tclas_fc_hdr { @@ -1607,7 +1607,7 @@ BWL_PRE_PACKED_STRUCT struct dot11_tclas_fc_hdr { uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tclas_fc_hdr dot11_tclas_fc_hdr_t; -#define DOT11_TCLAS_FC_HDR_LEN 2 +#define DOT11_TCLAS_FC_HDR_LEN 2 #define DOT11_TCLAS_MASK_0 0x1 #define DOT11_TCLAS_MASK_1 0x2 @@ -1721,41 +1721,41 @@ typedef union dot11_tclas_fc dot11_tclas_fc_t; BWL_PRE_PACKED_STRUCT struct dot11_tclas_ie { - uint8 id; + uint8 id; uint8 len; uint8 user_priority; dot11_tclas_fc_t fc; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tclas_ie dot11_tclas_ie_t; -#define DOT11_TCLAS_IE_LEN 3 +#define DOT11_TCLAS_IE_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_tclas_proc_ie { - uint8 id; + uint8 id; uint8 len; uint8 process; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tclas_proc_ie dot11_tclas_proc_ie_t; -#define DOT11_TCLAS_PROC_IE_LEN 3 +#define DOT11_TCLAS_PROC_IE_LEN 3 -#define DOT11_TCLAS_PROC_MATCHALL 0 -#define DOT11_TCLAS_PROC_MATCHONE 1 -#define DOT11_TCLAS_PROC_NONMATCH 2 +#define DOT11_TCLAS_PROC_MATCHALL 0 +#define DOT11_TCLAS_PROC_MATCHONE 1 +#define DOT11_TCLAS_PROC_NONMATCH 2 -#define DOT11_TSPEC_IE_LEN 57 +#define DOT11_TSPEC_IE_LEN 57 BWL_PRE_PACKED_STRUCT struct dot11_tfs_req_ie { - uint8 id; + uint8 id; uint8 len; uint8 tfs_id; uint8 tfs_actcode; uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tfs_req_ie dot11_tfs_req_ie_t; -#define DOT11_TFS_REQ_IE_LEN 4 +#define DOT11_TFS_REQ_IE_LEN 4 #define DOT11_TFS_ACTCODE_DELETE 1 #define DOT11_TFS_ACTCODE_MODIFY 2 @@ -1774,31 +1774,31 @@ BWL_PRE_PACKED_STRUCT struct dot11_tfs_se { uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tfs_se dot11_tfs_se_t; -#define DOT11_TFS_REQ_SUBELEM_LEN 2 +#define DOT11_TFS_REQ_SUBELEM_LEN 2 #define DOT11_TFS_SUBELEM_ID_TFS 1 #define DOT11_TFS_SUBELEM_ID_VENDOR 221 BWL_PRE_PACKED_STRUCT struct dot11_tfs_resp_ie { - uint8 id; + uint8 id; uint8 len; uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tfs_resp_ie dot11_tfs_resp_ie_t; -#define DOT11_TFS_RESP_IE_LEN 2 +#define DOT11_TFS_RESP_IE_LEN 2 BWL_PRE_PACKED_STRUCT struct dot11_tfs_status_se { - uint8 id; + uint8 id; uint8 len; uint8 resp_st; uint8 tfs_id; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tfs_status_se dot11_tfs_status_se_t; -#define DOT11_TFS_STATUS_SE_LEN 4 -#define DOT11_TFS_STATUS_SE_DATA_LEN 2 +#define DOT11_TFS_STATUS_SE_LEN 4 +#define DOT11_TFS_STATUS_SE_DATA_LEN 2 #define DOT11_TFS_STATUS_SE_ID_TFS_ST 1 #define DOT11_TFS_STATUS_SE_ID_TFS 2 @@ -1813,57 +1813,57 @@ typedef struct dot11_tfs_status_se dot11_tfs_status_se_t; BWL_PRE_PACKED_STRUCT struct dot11_tfs_req { - uint8 category; - uint8 action; - uint8 token; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tfs_req dot11_tfs_req_t; -#define DOT11_TFS_REQ_LEN 3 +#define DOT11_TFS_REQ_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_tfs_resp { - uint8 category; - uint8 action; - uint8 token; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tfs_resp dot11_tfs_resp_t; -#define DOT11_TFS_RESP_LEN 3 +#define DOT11_TFS_RESP_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_tfs_notify { - uint8 category; - uint8 action; - uint8 num_tfs_id; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 num_tfs_id; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_tfs_notify dot11_tfs_notify_t; -#define DOT11_TFS_NOTIFY_LEN 3 +#define DOT11_TFS_NOTIFY_LEN 3 #define DOT11_TFS_NOTIFY_ACT_DEL 1 #define DOT11_TFS_NOTIFY_ACT_NOTIFY 2 BWL_PRE_PACKED_STRUCT struct dot11_wnm_sleep_req { - uint8 category; - uint8 action; - uint8 token; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_wnm_sleep_req dot11_wnm_sleep_req_t; -#define DOT11_WNM_SLEEP_REQ_LEN 3 +#define DOT11_WNM_SLEEP_REQ_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_wnm_sleep_resp { - uint8 category; - uint8 action; - uint8 token; - uint16 key_len; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint16 key_len; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_wnm_sleep_resp dot11_wnm_sleep_resp_t; -#define DOT11_WNM_SLEEP_RESP_LEN 5 +#define DOT11_WNM_SLEEP_RESP_LEN 5 #define DOT11_WNM_SLEEP_SUBELEM_ID_GTK 0 #define DOT11_WNM_SLEEP_SUBELEM_ID_IGTK 1 @@ -1877,8 +1877,8 @@ BWL_PRE_PACKED_STRUCT struct dot11_wnm_sleep_subelem_gtk { uint8 key[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_wnm_sleep_subelem_gtk dot11_wnm_sleep_subelem_gtk_t; -#define DOT11_WNM_SLEEP_SUBELEM_GTK_FIXED_LEN 11 -#define DOT11_WNM_SLEEP_SUBELEM_GTK_MAX_LEN 43 +#define DOT11_WNM_SLEEP_SUBELEM_GTK_FIXED_LEN 11 +#define DOT11_WNM_SLEEP_SUBELEM_GTK_MAX_LEN 43 BWL_PRE_PACKED_STRUCT struct dot11_wnm_sleep_subelem_igtk { uint8 sub_id; @@ -1888,17 +1888,17 @@ BWL_PRE_PACKED_STRUCT struct dot11_wnm_sleep_subelem_igtk { uint8 key[16]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_wnm_sleep_subelem_igtk dot11_wnm_sleep_subelem_igtk_t; -#define DOT11_WNM_SLEEP_SUBELEM_IGTK_LEN 24 +#define DOT11_WNM_SLEEP_SUBELEM_IGTK_LEN 24 BWL_PRE_PACKED_STRUCT struct dot11_wnm_sleep_ie { - uint8 id; + uint8 id; uint8 len; uint8 act_type; uint8 resp_status; uint16 interval; } BWL_POST_PACKED_STRUCT; typedef struct dot11_wnm_sleep_ie dot11_wnm_sleep_ie_t; -#define DOT11_WNM_SLEEP_IE_LEN 4 +#define DOT11_WNM_SLEEP_IE_LEN 4 #define DOT11_WNM_SLEEP_ACT_TYPE_ENTER 0 #define DOT11_WNM_SLEEP_ACT_TYPE_EXIT 1 @@ -1913,41 +1913,41 @@ typedef struct dot11_wnm_sleep_ie dot11_wnm_sleep_ie_t; BWL_PRE_PACKED_STRUCT struct dot11_dms_req { - uint8 category; - uint8 action; - uint8 token; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_dms_req dot11_dms_req_t; -#define DOT11_DMS_REQ_LEN 3 +#define DOT11_DMS_REQ_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_dms_resp { - uint8 category; - uint8 action; - uint8 token; - uint8 data[1]; + uint8 category; + uint8 action; + uint8 token; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_dms_resp dot11_dms_resp_t; -#define DOT11_DMS_RESP_LEN 3 +#define DOT11_DMS_RESP_LEN 3 BWL_PRE_PACKED_STRUCT struct dot11_dms_req_ie { - uint8 id; + uint8 id; uint8 len; uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_dms_req_ie dot11_dms_req_ie_t; -#define DOT11_DMS_REQ_IE_LEN 2 +#define DOT11_DMS_REQ_IE_LEN 2 BWL_PRE_PACKED_STRUCT struct dot11_dms_resp_ie { - uint8 id; + uint8 id; uint8 len; uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_dms_resp_ie dot11_dms_resp_ie_t; -#define DOT11_DMS_RESP_IE_LEN 2 +#define DOT11_DMS_RESP_IE_LEN 2 BWL_PRE_PACKED_STRUCT struct dot11_dms_req_desc { @@ -1957,7 +1957,7 @@ BWL_PRE_PACKED_STRUCT struct dot11_dms_req_desc { uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_dms_req_desc dot11_dms_req_desc_t; -#define DOT11_DMS_REQ_DESC_LEN 3 +#define DOT11_DMS_REQ_DESC_LEN 3 #define DOT11_DMS_REQ_TYPE_ADD 0 #define DOT11_DMS_REQ_TYPE_REMOVE 1 @@ -1972,7 +1972,7 @@ BWL_PRE_PACKED_STRUCT struct dot11_dms_resp_st { uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_dms_resp_st dot11_dms_resp_st_t; -#define DOT11_DMS_RESP_STATUS_LEN 5 +#define DOT11_DMS_RESP_STATUS_LEN 5 #define DOT11_DMS_RESP_TYPE_ACCEPT 0 #define DOT11_DMS_RESP_TYPE_DENY 1 @@ -1981,9 +1981,9 @@ typedef struct dot11_dms_resp_st dot11_dms_resp_st_t; #define DOT11_DMS_RESP_LSC_UNSUPPORTED 0xFFFF BWL_PRE_PACKED_STRUCT struct dot11_addba_req { - uint8 category; - uint8 action; - uint8 token; + uint8 category; + uint8 action; + uint8 token; uint16 addba_param_set; uint16 timeout; uint16 start_seqnum; @@ -2048,11 +2048,11 @@ typedef struct dot11_ft_res dot11_ft_res_t; BWL_PRE_PACKED_STRUCT struct dot11_rde_ie { - uint8 id; + uint8 id; uint8 length; - uint8 rde_id; - uint8 rd_count; - uint16 status; + uint8 rde_id; + uint8 rd_count; + uint16 status; } BWL_POST_PACKED_STRUCT; typedef struct dot11_rde_ie dot11_rde_ie_t; @@ -2064,7 +2064,7 @@ typedef struct dot11_rde_ie dot11_rde_ie_t; -#define DOT11_RRM_CAP_LEN 5 +#define DOT11_RRM_CAP_LEN 5 #define RCPI_IE_LEN 1 #define RSNI_IE_LEN 1 BWL_PRE_PACKED_STRUCT struct dot11_rrm_cap_ie { @@ -2096,8 +2096,8 @@ BWL_PRE_PACKED_STRUCT struct do11_ap_chrep { typedef struct do11_ap_chrep dot11_ap_chrep_t; -#define DOT11_RM_ACTION_RM_REQ 0 -#define DOT11_RM_ACTION_RM_REP 1 +#define DOT11_RM_ACTION_RM_REQ 0 +#define DOT11_RM_ACTION_RM_REP 1 #define DOT11_RM_ACTION_LM_REQ 2 #define DOT11_RM_ACTION_LM_REP 3 #define DOT11_RM_ACTION_NR_REQ 4 @@ -2116,8 +2116,8 @@ typedef struct dot11_rm_action dot11_rm_action_t; BWL_PRE_PACKED_STRUCT struct dot11_rmreq { uint8 category; uint8 action; - uint8 token; - uint16 reps; + uint8 token; + uint16 reps; uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_rmreq dot11_rmreq_t; @@ -2189,8 +2189,8 @@ typedef struct dot11_rmrep_bcn dot11_rmrep_bcn_t; #define DOT11_RMREQ_BCN_APCHREP_ID DOT11_MNG_AP_CHREP_ID -#define DOT11_RMREQ_BCN_REPDET_FIXED 0 -#define DOT11_RMREQ_BCN_REPDET_REQUEST 1 +#define DOT11_RMREQ_BCN_REPDET_FIXED 0 +#define DOT11_RMREQ_BCN_REPDET_REQUEST 1 #define DOT11_RMREQ_BCN_REPDET_ALL 2 @@ -2424,18 +2424,18 @@ BWL_PRE_PACKED_STRUCT struct dot11_neighbor_rep_ie { uint8 len; struct ether_addr bssid; uint32 bssid_info; - uint8 reg; + uint8 reg; uint8 channel; uint8 phytype; - uint8 data[1]; + uint8 data[1]; } BWL_POST_PACKED_STRUCT; typedef struct dot11_neighbor_rep_ie dot11_neighbor_rep_ie_t; #define DOT11_NEIGHBOR_REP_IE_FIXED_LEN 13 -#define DOT11_BSSTYPE_INFRASTRUCTURE 0 -#define DOT11_BSSTYPE_INDEPENDENT 1 +#define DOT11_BSSTYPE_INFRASTRUCTURE 0 +#define DOT11_BSSTYPE_INDEPENDENT 1 #define DOT11_BSSTYPE_ANY 2 #define DOT11_SCANTYPE_ACTIVE 0 #define DOT11_SCANTYPE_PASSIVE 1 @@ -2503,30 +2503,30 @@ typedef struct dot11_lmrep dot11_lmrep_t; #define HT_T_GF_STF 8 #define HT_T_SYML 4 -#define HT_N_SERVICE 16 -#define HT_N_TAIL 6 +#define HT_N_SERVICE 16 +#define HT_N_TAIL 6 -#define APHY_SLOT_TIME 9 -#define APHY_SIFS_TIME 16 -#define APHY_DIFS_TIME (APHY_SIFS_TIME + (2 * APHY_SLOT_TIME)) -#define APHY_PREAMBLE_TIME 16 -#define APHY_SIGNAL_TIME 4 -#define APHY_SYMBOL_TIME 4 -#define APHY_SERVICE_NBITS 16 -#define APHY_TAIL_NBITS 6 -#define APHY_CWMIN 15 +#define APHY_SLOT_TIME 9 +#define APHY_SIFS_TIME 16 +#define APHY_DIFS_TIME (APHY_SIFS_TIME + (2 * APHY_SLOT_TIME)) +#define APHY_PREAMBLE_TIME 16 +#define APHY_SIGNAL_TIME 4 +#define APHY_SYMBOL_TIME 4 +#define APHY_SERVICE_NBITS 16 +#define APHY_TAIL_NBITS 6 +#define APHY_CWMIN 15 -#define BPHY_SLOT_TIME 20 -#define BPHY_SIFS_TIME 10 -#define BPHY_DIFS_TIME 50 -#define BPHY_PLCP_TIME 192 -#define BPHY_PLCP_SHORT_TIME 96 -#define BPHY_CWMIN 31 +#define BPHY_SLOT_TIME 20 +#define BPHY_SIFS_TIME 10 +#define BPHY_DIFS_TIME 50 +#define BPHY_PLCP_TIME 192 +#define BPHY_PLCP_SHORT_TIME 96 +#define BPHY_CWMIN 31 -#define DOT11_OFDM_SIGNAL_EXTENSION 6 +#define DOT11_OFDM_SIGNAL_EXTENSION 6 #define PHY_CWMAX 1023 @@ -2584,8 +2584,8 @@ typedef int vht_group_id_t; #define VHT_T_SIG_B 4 #define VHT_T_SYML 4 -#define VHT_N_SERVICE 16 -#define VHT_N_TAIL 6 +#define VHT_N_SERVICE 16 +#define VHT_N_TAIL 6 @@ -2611,10 +2611,10 @@ typedef struct d11cnt { -#define BRCM_SYSCAP_WET_TUNNEL 0x0100 +#define BRCM_SYSCAP_WET_TUNNEL 0x0100 -#define BRCM_OUI "\x00\x10\x18" +#define BRCM_OUI "\x00\x10\x18" BWL_PRE_PACKED_STRUCT struct brcm_ie { @@ -2641,9 +2641,9 @@ typedef struct brcm_ie brcm_ie_t; #define BRF1_WMEPS 0x4 #define BRF1_PSOFIX 0x8 #define BRF1_RX_LARGE_AGG 0x10 -#define BRF1_RFAWARE_DCS 0x20 -#define BRF1_SOFTAP 0x40 -#define BRF1_DWDS 0x80 +#define BRF1_RFAWARE_DCS 0x20 +#define BRF1_SOFTAP 0x40 +#define BRF1_DWDS 0x80 BWL_PRE_PACKED_STRUCT struct vndr_ie { @@ -2654,23 +2654,23 @@ BWL_PRE_PACKED_STRUCT struct vndr_ie { } BWL_POST_PACKED_STRUCT; typedef struct vndr_ie vndr_ie_t; -#define VNDR_IE_HDR_LEN 2 -#define VNDR_IE_MIN_LEN 3 +#define VNDR_IE_HDR_LEN 2 +#define VNDR_IE_MIN_LEN 3 #define VNDR_IE_FIXED_LEN (VNDR_IE_HDR_LEN + VNDR_IE_MIN_LEN) -#define VNDR_IE_MAX_LEN 255 +#define VNDR_IE_MAX_LEN 255 BWL_PRE_PACKED_STRUCT struct member_of_brcm_prop_ie { uchar id; uchar len; uchar oui[3]; - uint8 type; - struct ether_addr ea; + uint8 type; + struct ether_addr ea; } BWL_POST_PACKED_STRUCT; typedef struct member_of_brcm_prop_ie member_of_brcm_prop_ie_t; -#define MEMBER_OF_BRCM_PROP_IE_LEN 10 +#define MEMBER_OF_BRCM_PROP_IE_LEN 10 #define MEMBER_OF_BRCM_PROP_IE_TYPE 54 @@ -2678,19 +2678,19 @@ BWL_PRE_PACKED_STRUCT struct relmcast_brcm_prop_ie { uchar id; uchar len; uchar oui[3]; - uint8 type; - struct ether_addr ea; - struct ether_addr mcast_ea; - uint8 updtmo; + uint8 type; + struct ether_addr ea; + struct ether_addr mcast_ea; + uint8 updtmo; } BWL_POST_PACKED_STRUCT; typedef struct relmcast_brcm_prop_ie relmcast_brcm_prop_ie_t; -#define RELMCAST_BRCM_PROP_IE_LEN (sizeof(relmcast_brcm_prop_ie_t)-2) +#define RELMCAST_BRCM_PROP_IE_LEN (sizeof(relmcast_brcm_prop_ie_t)-2) #define RELMCAST_BRCM_PROP_IE_TYPE 55 -#define MCSSET_LEN 16 -#define MAX_MCS_NUM (128) +#define MCSSET_LEN 16 +#define MAX_MCS_NUM (128) BWL_PRE_PACKED_STRUCT struct ht_cap_ie { uint16 cap; @@ -2712,7 +2712,7 @@ typedef struct dot11_ht_cap_ie dot11_ht_cap_ie_t; BWL_PRE_PACKED_STRUCT struct ht_prop_cap_ie { - uint8 id; + uint8 id; uint8 len; uint8 oui[3]; uint8 type; @@ -2748,7 +2748,7 @@ typedef struct ht_prop_cap_ie ht_prop_cap_ie_t; #define HT_CAP_RX_STBC_NO 0x0 #define HT_CAP_RX_STBC_ONE_STREAM 0x1 #define HT_CAP_RX_STBC_TWO_STREAM 0x2 -#define HT_CAP_RX_STBC_THREE_STREAM 0x3 +#define HT_CAP_RX_STBC_THREE_STREAM 0x3 #define HT_CAP_TXBF_CAP_IMPLICIT_TXBF_RX 0x1 @@ -2781,8 +2781,8 @@ typedef struct ht_prop_cap_ie ht_prop_cap_ie_t; #define HT_CAP_TX_BF_CAP_EXPLICIT_COMPRESSED_FB_MASK 0x18000 #define HT_CAP_TX_BF_CAP_EXPLICIT_COMPRESSED_FB_SHIFT 15 -#define VHT_MAX_MPDU 11454 -#define VHT_MPDU_MSDU_DELTA 56 +#define VHT_MAX_MPDU 11454 +#define VHT_MPDU_MSDU_DELTA 56 #define VHT_MAX_AMSDU (VHT_MAX_MPDU - VHT_MPDU_MSDU_DELTA) @@ -2945,7 +2945,7 @@ typedef struct dot11_obss_ie dot11_obss_ie_t; BWL_PRE_PACKED_STRUCT struct vht_cap_ie { uint32 vht_cap_info; - + uint16 rx_mcs_map; uint16 rx_max_rate; uint16 tx_mcs_map; @@ -2991,8 +2991,8 @@ typedef struct vht_cap_ie vht_cap_ie_t; #define VHT_CAP_MCS_MAP_0_8 1 #define VHT_CAP_MCS_MAP_0_9 2 #define VHT_CAP_MCS_MAP_NONE 3 -#define VHT_CAP_MCS_MAP_S 2 -#define VHT_CAP_MCS_MAP_M 0x3 +#define VHT_CAP_MCS_MAP_S 2 +#define VHT_CAP_MCS_MAP_M 0x3 #define VHT_CAP_MCS_MAP_NONE_ALL 0xffff @@ -3069,9 +3069,9 @@ typedef enum vht_op_chan_width { #define VHT_FEATURES_IE_TYPE 0x4 BWL_PRE_PACKED_STRUCT struct vht_features_ie_hdr { - uint8 oui[3]; - uint8 type; - uint8 rate_mask; + uint8 oui[3]; + uint8 type; + uint8 rate_mask; } BWL_POST_PACKED_STRUCT; typedef struct vht_features_ie_hdr vht_features_ie_hdr_t; @@ -3089,8 +3089,8 @@ typedef struct vht_features_ie_hdr vht_features_ie_hdr_t; -#define WPA_OUI "\x00\x50\xF2" -#define WPA_OUI_LEN 3 +#define WPA_OUI "\x00\x50\xF2" +#define WPA_OUI_LEN 3 #define WPA_OUI_TYPE 1 #define WPA_VERSION 1 #define WPA2_OUI "\x00\x0F\xAC" @@ -3120,15 +3120,15 @@ typedef struct vht_features_ie_hdr vht_features_ie_hdr_t; #define WFA_OUI_TYPE_TPC 8 #ifdef WLTDLS -#define WFA_OUI_TYPE_TPQ 4 -#define WFA_OUI_TYPE_TPS 5 +#define WFA_OUI_TYPE_TPQ 4 +#define WFA_OUI_TYPE_TPS 5 #define WFA_OUI_TYPE_WFD 10 -#endif +#endif #define WFA_OUI_TYPE_HS20 0x10 -#define RSN_AKM_NONE 0 -#define RSN_AKM_UNSPECIFIED 1 +#define RSN_AKM_NONE 0 +#define RSN_AKM_UNSPECIFIED 1 #define RSN_AKM_PSK 2 #define RSN_AKM_FBT_1X 3 #define RSN_AKM_FBT_PSK 4 @@ -3156,13 +3156,13 @@ typedef struct vht_features_ie_hdr vht_features_ie_hdr_t; #define TKIP_MIC_SUP_RX TKIP_MIC_AUTH_TX #define TKIP_MIC_SUP_TX TKIP_MIC_AUTH_RX #define AES_KEY_SIZE 16 -#define AES_MIC_SIZE 8 -#define BIP_KEY_SIZE 16 -#define BIP_MIC_SIZE 8 +#define AES_MIC_SIZE 8 +#define BIP_KEY_SIZE 16 +#define BIP_MIC_SIZE 8 -#define WCN_OUI "\x00\x50\xf2" -#define WCN_TYPE 4 +#define WCN_OUI "\x00\x50\xf2" +#define WCN_TYPE 4 #ifdef BCMWAPI_WPI #define SMS4_KEY_LEN 16 @@ -3219,11 +3219,11 @@ typedef struct dot11_gtk_ie dot11_gtk_ie_t; BWL_PRE_PACKED_STRUCT struct mmic_ie { - uint8 id; - uint8 len; - uint16 key_id; - uint8 ipn[6]; - uint8 mic[BIP_MIC_SIZE]; + uint8 id; + uint8 len; + uint16 key_id; + uint8 ipn[6]; + uint8 mic[BIP_MIC_SIZE]; } BWL_POST_PACKED_STRUCT; typedef struct mmic_ie mmic_ie_t; @@ -3454,9 +3454,9 @@ BWL_PRE_PACKED_STRUCT struct hs20_ie { uint8 config; } BWL_POST_PACKED_STRUCT; typedef struct hs20_ie hs20_ie_t; -#define HS20_IE_LEN 5 +#define HS20_IE_LEN 5 #include -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h b/drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h index e06f9088f78..ee7f9593ca4 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h +++ b/drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h @@ -2,7 +2,7 @@ * BT-AMP (BlueTooth Alternate Mac and Phy) 802.11 PAL (Protocol Adaptation Layer) * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/proto/802.11e.h b/drivers/net/wireless/bcmdhd/include/proto/802.11e.h index 795eb171969..6f0114e7fda 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/802.11e.h +++ b/drivers/net/wireless/bcmdhd/include/proto/802.11e.h @@ -2,7 +2,7 @@ * 802.11e protocol header file * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/proto/802.1d.h b/drivers/net/wireless/bcmdhd/include/proto/802.1d.h index 9b98cefa2b6..3324f7b6744 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/802.1d.h +++ b/drivers/net/wireless/bcmdhd/include/proto/802.1d.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/proto/bcmeth.h b/drivers/net/wireless/bcmdhd/include/proto/bcmeth.h index 9d542db2c33..d03bf7d4bea 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/bcmeth.h +++ b/drivers/net/wireless/bcmdhd/include/proto/bcmeth.h @@ -2,7 +2,7 @@ * Broadcom Ethernettype protocol definitions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/proto/bcmevent.h b/drivers/net/wireless/bcmdhd/include/proto/bcmevent.h index 51030b37b93..cafbc1df7ce 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/bcmevent.h +++ b/drivers/net/wireless/bcmdhd/include/proto/bcmevent.h @@ -2,7 +2,7 @@ * Broadcom Event protocol definitions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -41,7 +41,7 @@ #include -#define BCM_EVENT_MSG_VERSION 2 +#define BCM_EVENT_MSG_VERSION 2 #define BCM_MSG_IFNAME_MAX 16 @@ -141,23 +141,23 @@ typedef BWL_PRE_PACKED_STRUCT struct bcm_event { #define WLC_E_PSK_SUP 46 #define WLC_E_COUNTRY_CODE_CHANGED 47 #define WLC_E_EXCEEDED_MEDIUM_TIME 48 -#define WLC_E_ICV_ERROR 49 -#define WLC_E_UNICAST_DECODE_ERROR 50 -#define WLC_E_MULTICAST_DECODE_ERROR 51 +#define WLC_E_ICV_ERROR 49 +#define WLC_E_UNICAST_DECODE_ERROR 50 +#define WLC_E_MULTICAST_DECODE_ERROR 51 #define WLC_E_TRACE 52 #ifdef WLBTAMP -#define WLC_E_BTA_HCI_EVENT 53 +#define WLC_E_BTA_HCI_EVENT 53 #endif #define WLC_E_IF 54 #define WLC_E_P2P_DISC_LISTEN_COMPLETE 55 -#define WLC_E_RSSI 56 -#define WLC_E_PFN_SCAN_COMPLETE 57 +#define WLC_E_RSSI 56 +#define WLC_E_PFN_SCAN_COMPLETE 57 #define WLC_E_PFN_BEST_BATCHING 57 #define WLC_E_EXTLOG_MSG 58 -#define WLC_E_ACTION_FRAME 59 -#define WLC_E_ACTION_FRAME_COMPLETE 60 -#define WLC_E_PRE_ASSOC_IND 61 +#define WLC_E_ACTION_FRAME 59 +#define WLC_E_ACTION_FRAME_COMPLETE 60 +#define WLC_E_PRE_ASSOC_IND 61 #define WLC_E_PRE_REASSOC_IND 62 #define WLC_E_CHANNEL_ADOPTED 63 #define WLC_E_AP_STARTED 64 @@ -168,68 +168,68 @@ typedef BWL_PRE_PACKED_STRUCT struct bcm_event { #define WLC_E_ESCAN_RESULT 69 #define WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE 70 #define WLC_E_PROBRESP_MSG 71 -#define WLC_E_P2P_PROBREQ_MSG 72 +#define WLC_E_P2P_PROBREQ_MSG 72 #define WLC_E_DCS_REQUEST 73 -#define WLC_E_FIFO_CREDIT_MAP 74 -#define WLC_E_ACTION_FRAME_RX 75 -#define WLC_E_WAKE_EVENT 76 -#define WLC_E_RM_COMPLETE 77 -#define WLC_E_HTSFSYNC 78 +#define WLC_E_FIFO_CREDIT_MAP 74 +#define WLC_E_ACTION_FRAME_RX 75 +#define WLC_E_WAKE_EVENT 76 +#define WLC_E_RM_COMPLETE 77 +#define WLC_E_HTSFSYNC 78 #define WLC_E_OVERLAY_REQ 79 #define WLC_E_CSA_COMPLETE_IND 80 -#define WLC_E_EXCESS_PM_WAKE_EVENT 81 -#define WLC_E_PFN_SCAN_NONE 82 +#define WLC_E_EXCESS_PM_WAKE_EVENT 81 +#define WLC_E_PFN_SCAN_NONE 82 #define WLC_E_PFN_BSSID_NET_FOUND 82 -#define WLC_E_PFN_SCAN_ALLGONE 83 +#define WLC_E_PFN_SCAN_ALLGONE 83 #define WLC_E_PFN_BSSID_NET_LOST 83 #define WLC_E_GTK_PLUMBED 84 -#define WLC_E_ASSOC_IND_NDIS 85 -#define WLC_E_REASSOC_IND_NDIS 86 +#define WLC_E_ASSOC_IND_NDIS 85 +#define WLC_E_REASSOC_IND_NDIS 86 #define WLC_E_ASSOC_REQ_IE 87 #define WLC_E_ASSOC_RESP_IE 88 -#define WLC_E_ASSOC_RECREATED 89 -#define WLC_E_ACTION_FRAME_RX_NDIS 90 -#define WLC_E_AUTH_REQ 91 -#define WLC_E_TDLS_PEER_EVENT 92 -#define WLC_E_SPEEDY_RECREATE_FAIL 93 -#define WLC_E_NATIVE 94 -#define WLC_E_PKTDELAY_IND 95 -#define WLC_E_AWDL_AW 96 -#define WLC_E_AWDL_ROLE 97 -#define WLC_E_AWDL_EVENT 98 +#define WLC_E_ASSOC_RECREATED 89 +#define WLC_E_ACTION_FRAME_RX_NDIS 90 +#define WLC_E_AUTH_REQ 91 +#define WLC_E_TDLS_PEER_EVENT 92 +#define WLC_E_SPEEDY_RECREATE_FAIL 93 +#define WLC_E_NATIVE 94 +#define WLC_E_PKTDELAY_IND 95 +#define WLC_E_AWDL_AW 96 +#define WLC_E_AWDL_ROLE 97 +#define WLC_E_AWDL_EVENT 98 #ifdef WLNIC -#define WLC_E_NIC_AF_TXS 99 -#define WLC_E_NIC_NIC_REPORT 100 +#define WLC_E_NIC_AF_TXS 99 +#define WLC_E_NIC_NIC_REPORT 100 #endif #define WLC_E_BEACON_FRAME_RX 101 -#define WLC_E_SERVICE_FOUND 102 -#define WLC_E_GAS_FRAGMENT_RX 103 -#define WLC_E_GAS_COMPLETE 104 -#define WLC_E_P2PO_ADD_DEVICE 105 -#define WLC_E_P2PO_DEL_DEVICE 106 -#define WLC_E_WNM_STA_SLEEP 107 -#define WLC_E_NONE 108 -#define WLC_E_PROXD 109 -#define WLC_E_IBSS_COALESCE 110 -#define WLC_E_AIBSS_TXFAIL 110 -#define WLC_E_AWDL_AW_EXT_END 111 -#define WLC_E_AWDL_AW_EXT_START 112 -#define WLC_E_AWDL_AW_START 113 -#define WLC_E_AWDL_RADIO_OFF 114 -#define WLC_E_AWDL_PEER_STATE 115 -#define WLC_E_AWDL_SYNC_STATE_CHANGED 116 -#define WLC_E_AWDL_CHIP_RESET 117 +#define WLC_E_SERVICE_FOUND 102 +#define WLC_E_GAS_FRAGMENT_RX 103 +#define WLC_E_GAS_COMPLETE 104 +#define WLC_E_P2PO_ADD_DEVICE 105 +#define WLC_E_P2PO_DEL_DEVICE 106 +#define WLC_E_WNM_STA_SLEEP 107 +#define WLC_E_NONE 108 +#define WLC_E_PROXD 109 +#define WLC_E_IBSS_COALESCE 110 +#define WLC_E_AIBSS_TXFAIL 110 +#define WLC_E_AWDL_AW_EXT_END 111 +#define WLC_E_AWDL_AW_EXT_START 112 +#define WLC_E_AWDL_AW_START 113 +#define WLC_E_AWDL_RADIO_OFF 114 +#define WLC_E_AWDL_PEER_STATE 115 +#define WLC_E_AWDL_SYNC_STATE_CHANGED 116 +#define WLC_E_AWDL_CHIP_RESET 117 #define WLC_E_AWDL_INTERLEAVED_SCAN_START 118 #define WLC_E_AWDL_INTERLEAVED_SCAN_STOP 119 #define WLC_E_AWDL_PEER_CACHE_CONTROL 120 #define WLC_E_CSA_START_IND 121 #define WLC_E_CSA_DONE_IND 122 #define WLC_E_CSA_FAILURE_IND 123 -#define WLC_E_CCA_CHAN_QUAL 124 +#define WLC_E_CCA_CHAN_QUAL 124 #define WLC_E_CCX_S69_RESP_RX 129 -#define WLC_E_LAST 130 +#define WLC_E_LAST 130 @@ -254,62 +254,62 @@ extern const int bcmevent_names_size; #define WLC_E_STATUS_NEWSCAN 9 #define WLC_E_STATUS_NEWASSOC 10 #define WLC_E_STATUS_11HQUIET 11 -#define WLC_E_STATUS_SUPPRESS 12 -#define WLC_E_STATUS_NOCHANS 13 +#define WLC_E_STATUS_SUPPRESS 12 +#define WLC_E_STATUS_NOCHANS 13 #ifdef BCMCCX -#define WLC_E_STATUS_CCXFASTRM 14 -#endif -#define WLC_E_STATUS_CS_ABORT 15 -#define WLC_E_STATUS_ERROR 16 +#define WLC_E_STATUS_CCXFASTRM 14 +#endif +#define WLC_E_STATUS_CS_ABORT 15 +#define WLC_E_STATUS_ERROR 16 #define WLC_E_REASON_INITIAL_ASSOC 0 #define WLC_E_REASON_LOW_RSSI 1 #define WLC_E_REASON_DEAUTH 2 -#define WLC_E_REASON_DISASSOC 3 -#define WLC_E_REASON_BCNS_LOST 4 +#define WLC_E_REASON_DISASSOC 3 +#define WLC_E_REASON_BCNS_LOST 4 -#define WLC_E_REASON_FAST_ROAM_FAILED 5 -#define WLC_E_REASON_DIRECTED_ROAM 6 -#define WLC_E_REASON_TSPEC_REJECTED 7 -#define WLC_E_REASON_BETTER_AP 8 -#define WLC_E_REASON_MINTXRATE 9 -#define WLC_E_REASON_TXFAIL 10 +#define WLC_E_REASON_FAST_ROAM_FAILED 5 +#define WLC_E_REASON_DIRECTED_ROAM 6 +#define WLC_E_REASON_TSPEC_REJECTED 7 +#define WLC_E_REASON_BETTER_AP 8 +#define WLC_E_REASON_MINTXRATE 9 +#define WLC_E_REASON_TXFAIL 10 -#define WLC_E_REASON_REQUESTED_ROAM 11 +#define WLC_E_REASON_REQUESTED_ROAM 11 -#define WLC_E_PRUNE_ENCR_MISMATCH 1 -#define WLC_E_PRUNE_BCAST_BSSID 2 -#define WLC_E_PRUNE_MAC_DENY 3 -#define WLC_E_PRUNE_MAC_NA 4 +#define WLC_E_PRUNE_ENCR_MISMATCH 1 +#define WLC_E_PRUNE_BCAST_BSSID 2 +#define WLC_E_PRUNE_MAC_DENY 3 +#define WLC_E_PRUNE_MAC_NA 4 #define WLC_E_PRUNE_REG_PASSV 5 #define WLC_E_PRUNE_SPCT_MGMT 6 #define WLC_E_PRUNE_RADAR 7 #define WLC_E_RSN_MISMATCH 8 -#define WLC_E_PRUNE_NO_COMMON_RATES 9 -#define WLC_E_PRUNE_BASIC_RATES 10 +#define WLC_E_PRUNE_NO_COMMON_RATES 9 +#define WLC_E_PRUNE_BASIC_RATES 10 #ifdef BCMCCX -#define WLC_E_PRUNE_CCXFAST_PREVAP 11 -#endif -#define WLC_E_PRUNE_CIPHER_NA 12 -#define WLC_E_PRUNE_KNOWN_STA 13 +#define WLC_E_PRUNE_CCXFAST_PREVAP 11 +#endif +#define WLC_E_PRUNE_CIPHER_NA 12 +#define WLC_E_PRUNE_KNOWN_STA 13 #ifdef BCMCCX -#define WLC_E_PRUNE_CCXFAST_DROAM 14 -#endif -#define WLC_E_PRUNE_WDS_PEER 15 -#define WLC_E_PRUNE_QBSS_LOAD 16 -#define WLC_E_PRUNE_HOME_AP 17 +#define WLC_E_PRUNE_CCXFAST_DROAM 14 +#endif +#define WLC_E_PRUNE_WDS_PEER 15 +#define WLC_E_PRUNE_QBSS_LOAD 16 +#define WLC_E_PRUNE_HOME_AP 17 #ifdef BCMCCX -#define WLC_E_PRUNE_AP_BLOCKED 18 -#define WLC_E_PRUNE_NO_DIAG_SUPPORT 19 -#endif +#define WLC_E_PRUNE_AP_BLOCKED 18 +#define WLC_E_PRUNE_NO_DIAG_SUPPORT 19 +#endif -#define WLC_E_SUP_OTHER 0 -#define WLC_E_SUP_DECRYPT_KEY_DATA 1 +#define WLC_E_SUP_OTHER 0 +#define WLC_E_SUP_DECRYPT_KEY_DATA 1 #define WLC_E_SUP_BAD_UCAST_WEP128 2 #define WLC_E_SUP_BAD_UCAST_WEP40 3 #define WLC_E_SUP_UNSUP_KEY_LEN 4 @@ -328,8 +328,8 @@ extern const int bcmevent_names_size; #ifdef WLAWDL -#define WLC_E_AWDL_SCAN_START 1 -#define WLC_E_AWDL_SCAN_DONE 0 +#define WLC_E_AWDL_SCAN_START 1 +#define WLC_E_AWDL_SCAN_DONE 0 #define WLC_E_AWDL_RX_ACT_FRAME 1 #define WLC_E_AWDL_RX_PRB_RESP 2 @@ -337,7 +337,7 @@ extern const int bcmevent_names_size; #endif typedef BWL_PRE_PACKED_STRUCT struct wl_event_rx_frame_data { uint16 version; - uint16 channel; + uint16 channel; int32 rssi; uint32 mactime; uint32 rate; @@ -347,11 +347,11 @@ typedef BWL_PRE_PACKED_STRUCT struct wl_event_rx_frame_data { typedef struct wl_event_data_if { - uint8 ifidx; - uint8 opcode; - uint8 reserved; - uint8 bssidx; - uint8 role; + uint8 ifidx; + uint8 opcode; + uint8 reserved; + uint8 bssidx; + uint8 role; } wl_event_data_if_t; @@ -378,13 +378,13 @@ typedef struct wl_event_data_rssi { } wl_event_data_rssi_t; -#define WLC_E_IF_FLAGS_BSSCFG_NOIF 0x1 +#define WLC_E_IF_FLAGS_BSSCFG_NOIF 0x1 -#define WLC_E_LINK_BCN_LOSS 1 -#define WLC_E_LINK_DISASSOC 2 -#define WLC_E_LINK_ASSOC_REC 3 -#define WLC_E_LINK_BSSCFG_DIS 4 +#define WLC_E_LINK_BCN_LOSS 1 +#define WLC_E_LINK_DISASSOC 2 +#define WLC_E_LINK_ASSOC_REC 3 +#define WLC_E_LINK_BSSCFG_DIS 4 #define WLC_E_OVL_DOWNLOAD 0 @@ -405,50 +405,50 @@ typedef struct wl_event_data_rssi { #define WLC_E_AWDL_OOB_AF_STATUS 5 -#define WLC_E_AWDL_SCAN_START 1 -#define WLC_E_AWDL_SCAN_DONE 0 -#define WLC_E_AWDL_PHYCAL_START 1 -#define WLC_E_AWDL_PHYCAL_DONE 0 +#define WLC_E_AWDL_SCAN_START 1 +#define WLC_E_AWDL_SCAN_DONE 0 +#define WLC_E_AWDL_PHYCAL_START 1 +#define WLC_E_AWDL_PHYCAL_DONE 0 #endif typedef BWL_PRE_PACKED_STRUCT struct wl_event_gas { - uint16 channel; - uint8 dialog_token; - uint8 fragment_id; - uint16 status_code; - uint16 data_len; - uint8 data[1]; + uint16 channel; + uint8 dialog_token; + uint8 fragment_id; + uint16 status_code; + uint16 data_len; + uint8 data[1]; } BWL_POST_PACKED_STRUCT wl_event_gas_t; typedef BWL_PRE_PACKED_STRUCT struct wl_sd_tlv { - uint16 length; - uint8 protocol; - uint8 transaction_id; - uint8 status_code; - uint8 data[1]; + uint16 length; + uint8 protocol; + uint8 transaction_id; + uint8 status_code; + uint8 data[1]; } BWL_POST_PACKED_STRUCT wl_sd_tlv_t; typedef BWL_PRE_PACKED_STRUCT struct wl_event_sd { - uint16 channel; - uint8 count; - wl_sd_tlv_t tlv[1]; + uint16 channel; + uint8 count; + wl_sd_tlv_t tlv[1]; } BWL_POST_PACKED_STRUCT wl_event_sd_t; -#define WLC_E_PROXD_FOUND 1 -#define WLC_E_PROXD_GONE 2 +#define WLC_E_PROXD_FOUND 1 +#define WLC_E_PROXD_GONE 2 typedef BWL_PRE_PACKED_STRUCT struct awdl_aws_event_data { - uint32 fw_time; - struct ether_addr current_master; - uint16 aw_counter; - uint8 aw_ext_count; - uint8 aw_role; - uint8 flags; + uint32 fw_time; + struct ether_addr current_master; + uint16 aw_counter; + uint8 aw_ext_count; + uint8 aw_role; + uint8 flags; uint16 aw_chan; } BWL_POST_PACKED_STRUCT awdl_aws_event_data_t; @@ -458,4 +458,4 @@ typedef BWL_PRE_PACKED_STRUCT struct awdl_aws_event_data { #include -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/include/proto/bcmip.h b/drivers/net/wireless/bcmdhd/include/proto/bcmip.h index f75c48e8555..e89bed9951d 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/bcmip.h +++ b/drivers/net/wireless/bcmdhd/include/proto/bcmip.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -52,20 +52,20 @@ #define IP_PROT_ICMP6 0x3a -#define IPV4_VER_HL_OFFSET 0 -#define IPV4_TOS_OFFSET 1 -#define IPV4_PKTLEN_OFFSET 2 -#define IPV4_PKTFLAG_OFFSET 6 -#define IPV4_PROT_OFFSET 9 -#define IPV4_CHKSUM_OFFSET 10 -#define IPV4_SRC_IP_OFFSET 12 -#define IPV4_DEST_IP_OFFSET 16 -#define IPV4_OPTIONS_OFFSET 20 -#define IPV4_MIN_HEADER_LEN 20 +#define IPV4_VER_HL_OFFSET 0 +#define IPV4_TOS_OFFSET 1 +#define IPV4_PKTLEN_OFFSET 2 +#define IPV4_PKTFLAG_OFFSET 6 +#define IPV4_PROT_OFFSET 9 +#define IPV4_CHKSUM_OFFSET 10 +#define IPV4_SRC_IP_OFFSET 12 +#define IPV4_DEST_IP_OFFSET 16 +#define IPV4_OPTIONS_OFFSET 20 +#define IPV4_MIN_HEADER_LEN 20 -#define IPV4_VER_MASK 0xf0 -#define IPV4_VER_SHIFT 4 +#define IPV4_VER_MASK 0xf0 +#define IPV4_VER_SHIFT 4 #define IPV4_HLEN_MASK 0x0f #define IPV4_HLEN(ipv4_body) (4 * (((uint8 *)(ipv4_body))[IPV4_VER_HL_OFFSET] & IPV4_HLEN_MASK)) @@ -210,4 +210,4 @@ ipv6_exthdr_len(uint8 *h, uint8 *proto) #include -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/include/proto/bcmipv6.h b/drivers/net/wireless/bcmdhd/include/proto/bcmipv6.h index 7aa1b5f649e..e5f10d11559 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/bcmipv6.h +++ b/drivers/net/wireless/bcmdhd/include/proto/bcmipv6.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h b/drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h index 0cbfe7b4013..d56b10b7cdc 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h +++ b/drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h @@ -2,7 +2,7 @@ * BT-AMP (BlueTooth Alternate Mac and Phy) HCI (Host/Controller Interface) * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/proto/ethernet.h b/drivers/net/wireless/bcmdhd/include/proto/ethernet.h index ec1f903f123..a85fd656f6c 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/ethernet.h +++ b/drivers/net/wireless/bcmdhd/include/proto/ethernet.h @@ -2,7 +2,7 @@ * From FreeBSD 2.2.7: Fundamental constants relating to ethernet. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -24,7 +24,7 @@ * $Id: ethernet.h 384540 2013-02-12 04:28:58Z $ */ -#ifndef _NET_ETHERNET_H_ +#ifndef _NET_ETHERNET_H_ #define _NET_ETHERNET_H_ #ifndef _TYPEDEFS_H_ @@ -65,21 +65,21 @@ #define ETHER_TYPE_ARP 0x0806 #define ETHER_TYPE_8021Q 0x8100 #define ETHER_TYPE_IPV6 0x86dd -#define ETHER_TYPE_BRCM 0x886c -#define ETHER_TYPE_802_1X 0x888e +#define ETHER_TYPE_BRCM 0x886c +#define ETHER_TYPE_802_1X 0x888e #ifdef PLC -#define ETHER_TYPE_88E1 0x88e1 -#define ETHER_TYPE_8912 0x8912 -#define ETHER_TYPE_GIGLED 0xffff -#endif -#define ETHER_TYPE_802_1X_PREAUTH 0x88c7 -#define ETHER_TYPE_WAI 0x88b4 -#define ETHER_TYPE_89_0D 0x890d +#define ETHER_TYPE_88E1 0x88e1 +#define ETHER_TYPE_8912 0x8912 +#define ETHER_TYPE_GIGLED 0xffff +#endif +#define ETHER_TYPE_802_1X_PREAUTH 0x88c7 +#define ETHER_TYPE_WAI 0x88b4 +#define ETHER_TYPE_89_0D 0x890d -#define ETHER_TYPE_PPP_SES 0x8864 +#define ETHER_TYPE_PPP_SES 0x8864 -#define ETHER_BRCM_SUBTYPE_LEN 4 +#define ETHER_BRCM_SUBTYPE_LEN 4 #define ETHER_DEST_OFFSET (0 * ETHER_ADDR_LEN) @@ -99,7 +99,7 @@ ((uint8 *)ea)[5] = ((mgrp_ip) >> 0) & 0xff; \ } -#ifndef __INCif_etherh +#ifndef __INCif_etherh BWL_PRE_PACKED_STRUCT struct ether_header { uint8 ether_dhost[ETHER_ADDR_LEN]; @@ -187,4 +187,4 @@ do { \ #include -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/include/proto/p2p.h b/drivers/net/wireless/bcmdhd/include/proto/p2p.h index f3485228631..adb3f30dfee 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/p2p.h +++ b/drivers/net/wireless/bcmdhd/include/proto/p2p.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -374,9 +374,9 @@ typedef struct wifi_p2p_pub_act_frame wifi_p2p_pub_act_frame_t; #define P2P_PAF_INVITE_RSP 4 #define P2P_PAF_DEVDIS_REQ 5 #define P2P_PAF_DEVDIS_RSP 6 -#define P2P_PAF_PROVDIS_REQ 7 -#define P2P_PAF_PROVDIS_RSP 8 -#define P2P_PAF_SUBTYPE_INVALID 255 +#define P2P_PAF_PROVDIS_REQ 7 +#define P2P_PAF_PROVDIS_RSP 8 +#define P2P_PAF_SUBTYPE_INVALID 255 #define P2P_TYPE_MNREQ P2P_PAF_GON_REQ @@ -403,12 +403,12 @@ typedef struct wifi_p2p_noa_se wifi_p2p_noa_se_t; #define P2P_NOA_SE_FIXED_LEN 5 -#define P2P_NOA_SE_MAX_DESC 2 +#define P2P_NOA_SE_MAX_DESC 2 -#define P2P_NOA_DESC_CNT_RESERVED 0 -#define P2P_NOA_DESC_CNT_REPEAT 255 -#define P2P_NOA_DESC_TYPE_PREFERRED 1 +#define P2P_NOA_DESC_CNT_RESERVED 0 +#define P2P_NOA_DESC_CNT_REPEAT 255 +#define P2P_NOA_DESC_TYPE_PREFERRED 1 #define P2P_NOA_DESC_TYPE_ACCEPTABLE 2 diff --git a/drivers/net/wireless/bcmdhd/include/proto/sdspi.h b/drivers/net/wireless/bcmdhd/include/proto/sdspi.h index 216ed818205..6263f40a8ae 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/sdspi.h +++ b/drivers/net/wireless/bcmdhd/include/proto/sdspi.h @@ -2,7 +2,7 @@ * SD-SPI Protocol Standard * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/proto/vlan.h b/drivers/net/wireless/bcmdhd/include/proto/vlan.h index 6be3fcd4494..8de18698929 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/vlan.h +++ b/drivers/net/wireless/bcmdhd/include/proto/vlan.h @@ -2,7 +2,7 @@ * 802.1Q VLAN protocol definitions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -35,46 +35,46 @@ #include #ifndef VLAN_VID_MASK -#define VLAN_VID_MASK 0xfff +#define VLAN_VID_MASK 0xfff #endif -#define VLAN_CFI_SHIFT 12 -#define VLAN_PRI_SHIFT 13 +#define VLAN_CFI_SHIFT 12 +#define VLAN_PRI_SHIFT 13 -#define VLAN_PRI_MASK 7 +#define VLAN_PRI_MASK 7 -#define VLAN_TPID_OFFSET 12 -#define VLAN_TCI_OFFSET 14 +#define VLAN_TPID_OFFSET 12 +#define VLAN_TCI_OFFSET 14 #define VLAN_TAG_LEN 4 -#define VLAN_TAG_OFFSET (2 * ETHER_ADDR_LEN) +#define VLAN_TAG_OFFSET (2 * ETHER_ADDR_LEN) -#define VLAN_TPID 0x8100 +#define VLAN_TPID 0x8100 struct vlan_header { - uint16 vlan_type; - uint16 vlan_tag; + uint16 vlan_type; + uint16 vlan_tag; }; struct ethervlan_header { uint8 ether_dhost[ETHER_ADDR_LEN]; uint8 ether_shost[ETHER_ADDR_LEN]; - uint16 vlan_type; + uint16 vlan_type; uint16 vlan_tag; uint16 ether_type; }; struct dot3_mac_llc_snapvlan_header { - uint8 ether_dhost[ETHER_ADDR_LEN]; - uint8 ether_shost[ETHER_ADDR_LEN]; - uint16 length; - uint8 dsap; - uint8 ssap; - uint8 ctl; - uint8 oui[3]; - uint16 vlan_type; - uint16 vlan_tag; - uint16 ether_type; + uint8 ether_dhost[ETHER_ADDR_LEN]; + uint8 ether_shost[ETHER_ADDR_LEN]; + uint16 length; + uint8 dsap; + uint8 ssap; + uint8 ctl; + uint8 oui[3]; + uint16 vlan_type; + uint16 vlan_tag; + uint16 ether_type; }; #define ETHERVLAN_HDR_LEN (ETHER_HDR_LEN + VLAN_TAG_LEN) diff --git a/drivers/net/wireless/bcmdhd/include/proto/wpa.h b/drivers/net/wireless/bcmdhd/include/proto/wpa.h index 63a2028cc7d..3ceae2b5f6d 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/wpa.h +++ b/drivers/net/wireless/bcmdhd/include/proto/wpa.h @@ -2,7 +2,7 @@ * Fundamental types and constants relating to WPA * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -113,12 +113,12 @@ typedef BWL_PRE_PACKED_STRUCT struct #define WPA_CIPHER_AES_OCB 3 #define WPA_CIPHER_AES_CCM 4 #define WPA_CIPHER_WEP_104 5 -#define WPA_CIPHER_BIP 6 -#define WPA_CIPHER_TPK 7 +#define WPA_CIPHER_BIP 6 +#define WPA_CIPHER_TPK 7 #ifdef BCMCCX -#define WPA_CIPHER_CKIP 8 -#define WPA_CIPHER_CKIP_MMH 9 -#define WPA_CIPHER_WEP_MMH 10 +#define WPA_CIPHER_CKIP 8 +#define WPA_CIPHER_CKIP_MMH 9 +#define WPA_CIPHER_WEP_MMH 10 #define IS_CCX_CIPHER(cipher) ((cipher) == WPA_CIPHER_CKIP || \ (cipher) == WPA_CIPHER_CKIP_MMH || \ diff --git a/drivers/net/wireless/bcmdhd/include/proto/wps.h b/drivers/net/wireless/bcmdhd/include/proto/wps.h index 79b23117e89..184220d40e8 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/wps.h +++ b/drivers/net/wireless/bcmdhd/include/proto/wps.h @@ -2,7 +2,7 @@ * WPS IE definitions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/sbchipc.h b/drivers/net/wireless/bcmdhd/include/sbchipc.h index cd4e7023179..cfdfbd12fa7 100644 --- a/drivers/net/wireless/bcmdhd/include/sbchipc.h +++ b/drivers/net/wireless/bcmdhd/include/sbchipc.h @@ -8,7 +8,7 @@ * $Id: sbchipc.h 385540 2013-02-15 23:14:50Z $ * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -287,17 +287,17 @@ typedef volatile struct { uint32 regcontrol_data; uint32 pllcontrol_addr; uint32 pllcontrol_data; - uint32 pmustrapopt; - uint32 pmu_xtalfreq; - uint32 retention_ctl; + uint32 pmustrapopt; + uint32 pmu_xtalfreq; + uint32 retention_ctl; uint32 PAD[3]; - uint32 retention_grpidx; - uint32 retention_grpctl; + uint32 retention_grpidx; + uint32 retention_grpctl; uint32 PAD[94]; - uint16 sromotp[512]; + uint16 sromotp[512]; #ifdef NFLASH_SUPPORT - - uint32 nand_revision; + + uint32 nand_revision; uint32 nand_cmd_start; uint32 nand_cmd_addr_x; uint32 nand_cmd_addr; @@ -358,61 +358,61 @@ typedef volatile struct { uint32 nand_cache_data; uint32 nand_ctrl_config; uint32 nand_ctrl_status; -#endif - uint32 gci_corecaps0; +#endif + uint32 gci_corecaps0; uint32 gci_corecaps1; uint32 gci_corecaps2; uint32 gci_corectrl; - uint32 gci_corestat; - uint32 gci_intstat; - uint32 gci_intmask; - uint32 gci_wakemask; - uint32 gci_levelintstat; - uint32 gci_eventintstat; + uint32 gci_corestat; + uint32 gci_intstat; + uint32 gci_intmask; + uint32 gci_wakemask; + uint32 gci_levelintstat; + uint32 gci_eventintstat; uint32 PAD[6]; - uint32 gci_indirect_addr; - uint32 gci_gpioctl; + uint32 gci_indirect_addr; + uint32 gci_gpioctl; uint32 PAD; - uint32 gci_gpiomask; + uint32 gci_gpiomask; uint32 PAD; - uint32 gci_miscctl; + uint32 gci_miscctl; uint32 PAD[2]; - uint32 gci_input[32]; - uint32 gci_event[32]; - uint32 gci_output[4]; - uint32 gci_control_0; - uint32 gci_control_1; - uint32 gci_level_polreg; - uint32 gci_levelintmask; - uint32 gci_eventintmask; + uint32 gci_input[32]; + uint32 gci_event[32]; + uint32 gci_output[4]; + uint32 gci_control_0; + uint32 gci_control_1; + uint32 gci_level_polreg; + uint32 gci_levelintmask; + uint32 gci_eventintmask; uint32 PAD[3]; - uint32 gci_inbandlevelintmask; - uint32 gci_inbandeventintmask; + uint32 gci_inbandlevelintmask; + uint32 gci_inbandeventintmask; uint32 PAD[2]; - uint32 gci_seciauxtx; - uint32 gci_seciauxrx; - uint32 gci_secitx_datatag; - uint32 gci_secirx_datatag; - uint32 gci_secitx_datamask; - uint32 gci_seciusef0tx_reg; - uint32 gci_secif0tx_offset; - uint32 gci_secif0rx_offset; - uint32 gci_secif1tx_offset; + uint32 gci_seciauxtx; + uint32 gci_seciauxrx; + uint32 gci_secitx_datatag; + uint32 gci_secirx_datatag; + uint32 gci_secitx_datamask; + uint32 gci_seciusef0tx_reg; + uint32 gci_secif0tx_offset; + uint32 gci_secif0rx_offset; + uint32 gci_secif1tx_offset; uint32 PAD[3]; - uint32 gci_uartescval; + uint32 gci_uartescval; uint32 PAD[3]; - uint32 gci_secibauddiv; - uint32 gci_secifcr; - uint32 gci_secilcr; - uint32 gci_secimcr; + uint32 gci_secibauddiv; + uint32 gci_secifcr; + uint32 gci_secilcr; + uint32 gci_secimcr; uint32 PAD[2]; - uint32 gci_baudadj; + uint32 gci_baudadj; uint32 PAD; - uint32 gci_chipctrl; - uint32 gci_chipsts; + uint32 gci_chipctrl; + uint32 gci_chipsts; } chipcregs_t; -#endif +#endif #define CC_CHIPID 0 @@ -455,7 +455,7 @@ typedef volatile struct { #define PMU_REG_CONTROL_DATA 0x65C #define PMU_PLL_CONTROL_ADDR 0x660 #define PMU_PLL_CONTROL_DATA 0x664 -#define CC_SROM_OTP 0x800 +#define CC_SROM_OTP 0x800 #define CC_GCI_INDIRECT_ADDR_REG 0xC40 #define CC_GCI_CHIP_CTRL_REG 0xE00 #define CC_GCI_CC_OFFSET_2 2 @@ -515,16 +515,16 @@ typedef volatile struct { #define CC_CAP2_GSIO 0x00000002 -#define CC_CAP_EXT_SECI_PRESENT 0x00000001 -#define CC_CAP_EXT_GCI_PRESENT 0x00000004 +#define CC_CAP_EXT_SECI_PRESENT 0x00000001 +#define CC_CAP_EXT_GCI_PRESENT 0x00000004 #define GCI_WL_CHN_INFO_MASK (0xFF00) #define PLL_NONE 0x00000000 -#define PLL_TYPE1 0x00010000 -#define PLL_TYPE2 0x00020000 -#define PLL_TYPE3 0x00030000 +#define PLL_TYPE1 0x00010000 +#define PLL_TYPE2 0x00020000 +#define PLL_TYPE3 0x00030000 #define PLL_TYPE4 0x00008000 #define PLL_TYPE5 0x00018000 #define PLL_TYPE6 0x00028000 @@ -556,7 +556,7 @@ typedef volatile struct { #define NS_FAST_MEM_CLOCK 800000000 #define NS_MEM_CLOCK 533000000 #define NS_SLOW_MEM_CLOCK 400000000 -#endif +#endif #define HT_CLOCK 80000000 @@ -967,13 +967,13 @@ typedef volatile struct { #define SFLASH_ST 0x100 #define SFLASH_AT 0x200 #define NFLASH 0x300 -#define PFLASH 0x700 +#define PFLASH 0x700 #define QSPIFLASH_ST 0x800 #define QSPIFLASH_AT 0x900 -#define CC_CFG_EN 0x0001 -#define CC_CFG_EM_MASK 0x000e +#define CC_CFG_EN 0x0001 +#define CC_CFG_EM_MASK 0x000e #define CC_CFG_EM_ASYNC 0x0000 #define CC_CFG_EM_SYNC 0x0002 #define CC_CFG_EM_PCMCIA 0x0004 @@ -1161,7 +1161,7 @@ typedef volatile struct { #define PMU_CHIPCTL0 0 -#define PMU43143_CC0_SDIO_DRSTR_OVR (1 << 31) +#define PMU43143_CC0_SDIO_DRSTR_OVR (1 << 31) #define PMU_CC1_CLKREQ_TYPE_SHIFT 19 @@ -1584,14 +1584,14 @@ typedef volatile struct { #define CCTRL43217_EXTPA_C1 (1<<8) -#define CCTRL43228_EXTPA_C0 (1<<14) -#define CCTRL43228_EXTPA_C1 (1<<9) +#define CCTRL43228_EXTPA_C0 (1<<14) +#define CCTRL43228_EXTPA_C1 (1<<9) -#define RES4328_EXT_SWITCHER_PWM 0 -#define RES4328_BB_SWITCHER_PWM 1 -#define RES4328_BB_SWITCHER_BURST 2 -#define RES4328_BB_EXT_SWITCHER_BURST 3 +#define RES4328_EXT_SWITCHER_PWM 0 +#define RES4328_BB_SWITCHER_PWM 1 +#define RES4328_BB_SWITCHER_BURST 2 +#define RES4328_BB_EXT_SWITCHER_BURST 3 #define RES4328_ILP_REQUEST 4 #define RES4328_RADIO_SWITCHER_PWM 5 #define RES4328_RADIO_SWITCHER_BURST 6 @@ -2133,7 +2133,7 @@ typedef volatile struct { #define PMU_VREG4_LPLDO2_1p15V 1 #define PMU_VREG4_LPLDO2_1p20V 2 #define PMU_VREG4_LPLDO2_1p10V 3 -#define PMU_VREG4_LPLDO2_0p90V 4 +#define PMU_VREG4_LPLDO2_0p90V 4 #define PMU_VREG4_HSICLDO_BYPASS_SHIFT 27 #define PMU_VREG4_HSICLDO_BYPASS_MASK 0x1 @@ -2216,59 +2216,59 @@ typedef volatile struct { #define CCTRL43341_BT_ISO_SEL (1 << 16) -#define CCTRL1_4334_GPIO_SEL (1 << 0) -#define CCTRL1_4334_ERCX_SEL (1 << 1) -#define CCTRL1_4334_SDIO_HOST_WAKE (1 << 2) -#define CCTRL1_4334_JTAG_DISABLE (1 << 3) -#define CCTRL1_4334_UART_ON_4_5 (1 << 28) +#define CCTRL1_4334_GPIO_SEL (1 << 0) +#define CCTRL1_4334_ERCX_SEL (1 << 1) +#define CCTRL1_4334_SDIO_HOST_WAKE (1 << 2) +#define CCTRL1_4334_JTAG_DISABLE (1 << 3) +#define CCTRL1_4334_UART_ON_4_5 (1 << 28) -#define CCTRL1_4324_GPIO_SEL (1 << 0) -#define CCTRL1_4324_SDIO_HOST_WAKE (1 << 2) +#define CCTRL1_4324_GPIO_SEL (1 << 0) +#define CCTRL1_4324_SDIO_HOST_WAKE (1 << 2) -#define CST43143_REMAP_TO_ROM (3 << 0) -#define CST43143_SDIO_EN (1 << 2) -#define CST43143_SDIO_ISO (1 << 3) -#define CST43143_USB_CPU_LESS (1 << 4) -#define CST43143_CBUCK_MODE (3 << 6) -#define CST43143_POK_CBUCK (1 << 8) +#define CST43143_REMAP_TO_ROM (3 << 0) +#define CST43143_SDIO_EN (1 << 2) +#define CST43143_SDIO_ISO (1 << 3) +#define CST43143_USB_CPU_LESS (1 << 4) +#define CST43143_CBUCK_MODE (3 << 6) +#define CST43143_POK_CBUCK (1 << 8) #define CST43143_PMU_OVRSPIKE (1 << 9) #define CST43143_PMU_OVRTEMP (0xF << 10) #define CST43143_SR_FLL_CAL_DONE (1 << 14) #define CST43143_USB_PLL_LOCKDET (1 << 15) #define CST43143_PMU_PLL_LOCKDET (1 << 16) -#define CST43143_CHIPMODE_SDIOD(cs) (((cs) & CST43143_SDIO_EN) != 0) +#define CST43143_CHIPMODE_SDIOD(cs) (((cs) & CST43143_SDIO_EN) != 0) #define CCTRL_43143_SECI (1<<0) #define CCTRL_43143_BT_LEGACY (1<<1) -#define CCTRL_43143_I2S_MODE (1<<2) -#define CCTRL_43143_I2S_MASTER (1<<3) -#define CCTRL_43143_I2S_FULL (1<<4) -#define CCTRL_43143_GSIO (1<<5) -#define CCTRL_43143_RF_SWCTRL_MASK (7<<6) +#define CCTRL_43143_I2S_MODE (1<<2) +#define CCTRL_43143_I2S_MASTER (1<<3) +#define CCTRL_43143_I2S_FULL (1<<4) +#define CCTRL_43143_GSIO (1<<5) +#define CCTRL_43143_RF_SWCTRL_MASK (7<<6) #define CCTRL_43143_RF_SWCTRL_0 (1<<6) #define CCTRL_43143_RF_SWCTRL_1 (2<<6) #define CCTRL_43143_RF_SWCTRL_2 (4<<6) -#define CCTRL_43143_RF_XSWCTRL (1<<9) -#define CCTRL_43143_HOST_WAKE0 (1<<11) -#define CCTRL_43143_HOST_WAKE1 (1<<12) +#define CCTRL_43143_RF_XSWCTRL (1<<9) +#define CCTRL_43143_HOST_WAKE0 (1<<11) +#define CCTRL_43143_HOST_WAKE1 (1<<12) -#define RES43143_EXT_SWITCHER_PWM 0 -#define RES43143_XTAL_PU 1 -#define RES43143_ILP_REQUEST 2 -#define RES43143_ALP_AVAIL 3 -#define RES43143_WL_CORE_READY 4 -#define RES43143_BBPLL_PWRSW_PU 5 -#define RES43143_HT_AVAIL 6 -#define RES43143_RADIO_PU 7 -#define RES43143_MACPHY_CLK_AVAIL 8 -#define RES43143_OTP_PU 9 -#define RES43143_LQ_AVAIL 10 +#define RES43143_EXT_SWITCHER_PWM 0 +#define RES43143_XTAL_PU 1 +#define RES43143_ILP_REQUEST 2 +#define RES43143_ALP_AVAIL 3 +#define RES43143_WL_CORE_READY 4 +#define RES43143_BBPLL_PWRSW_PU 5 +#define RES43143_HT_AVAIL 6 +#define RES43143_RADIO_PU 7 +#define RES43143_MACPHY_CLK_AVAIL 8 +#define RES43143_OTP_PU 9 +#define RES43143_LQ_AVAIL 10 #define PMU43143_XTAL_CORE_SIZE_MASK 0x3F @@ -2462,14 +2462,14 @@ typedef volatile struct { #define CST4335_RES_INIT_MODE_SHIFT 7 #define CST4335_RES_INIT_MODE_MASK 0x00000180 #define CST4335_CHIPMODE_MASK 0xF -#define CST4335_CHIPMODE_SDIOD(cs) (((cs) & (1 << 0)) != 0) -#define CST4335_CHIPMODE_GSPI(cs) (((cs) & (1 << 1)) != 0) -#define CST4335_CHIPMODE_USB20D(cs) (((cs) & (1 << 2)) != 0) -#define CST4335_CHIPMODE_PCIE(cs) (((cs) & (1 << 3)) != 0) +#define CST4335_CHIPMODE_SDIOD(cs) (((cs) & (1 << 0)) != 0) +#define CST4335_CHIPMODE_GSPI(cs) (((cs) & (1 << 1)) != 0) +#define CST4335_CHIPMODE_USB20D(cs) (((cs) & (1 << 2)) != 0) +#define CST4335_CHIPMODE_PCIE(cs) (((cs) & (1 << 3)) != 0) -#define CCTRL1_4335_GPIO_SEL (1 << 0) -#define CCTRL1_4335_SDIO_HOST_WAKE (1 << 2) +#define CCTRL1_4335_GPIO_SEL (1 << 0) +#define CCTRL1_4335_SDIO_HOST_WAKE (1 << 2) #define CR4_4335_RAM_BASE (0x180000) #define PATCHTBL_SIZE (0x800) @@ -2770,7 +2770,7 @@ typedef volatile struct { #define MUXENAB4335_UART_MASK (0x0000000f) #define MUXENAB4335_UART_SHIFT 0 -#define MUXENAB4335_HOSTWAKE_MASK (0x000000f0) +#define MUXENAB4335_HOSTWAKE_MASK (0x000000f0) #define MUXENAB4335_HOSTWAKE_SHIFT 4 #define MUXENAB4335_GETIX(val, name) \ ((((val) & MUXENAB4335_ ## name ## _MASK) >> MUXENAB4335_ ## name ## _SHIFT) - 1) diff --git a/drivers/net/wireless/bcmdhd/include/sbconfig.h b/drivers/net/wireless/bcmdhd/include/sbconfig.h index 31687ce11bd..6c5cffc88b5 100644 --- a/drivers/net/wireless/bcmdhd/include/sbconfig.h +++ b/drivers/net/wireless/bcmdhd/include/sbconfig.h @@ -2,7 +2,7 @@ * Broadcom SiliconBackplane hardware register definitions. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/sbhnddma.h b/drivers/net/wireless/bcmdhd/include/sbhnddma.h index b30ff3ffd2c..3c74668e1ea 100644 --- a/drivers/net/wireless/bcmdhd/include/sbhnddma.h +++ b/drivers/net/wireless/bcmdhd/include/sbhnddma.h @@ -3,7 +3,7 @@ * This supports the following chips: BCM42xx, 44xx, 47xx . * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -256,10 +256,10 @@ typedef volatile struct { #endif -#define D64_XC_XE 0x00000001 -#define D64_XC_SE 0x00000002 -#define D64_XC_LE 0x00000004 -#define D64_XC_FL 0x00000010 +#define D64_XC_XE 0x00000001 +#define D64_XC_SE 0x00000002 +#define D64_XC_LE 0x00000004 +#define D64_XC_FL 0x00000010 #define D64_XC_MR_MASK 0x000000C0 #define D64_XC_MR_SHIFT 6 #define D64_XC_PD 0x00000800 @@ -276,20 +276,20 @@ typedef volatile struct { #define D64_XP_LD_MASK 0x00001fff -#define D64_XS0_CD_MASK (di->d64_xs0_cd_mask) -#define D64_XS0_XS_MASK 0xf0000000 +#define D64_XS0_CD_MASK (di->d64_xs0_cd_mask) +#define D64_XS0_XS_MASK 0xf0000000 #define D64_XS0_XS_SHIFT 28 -#define D64_XS0_XS_DISABLED 0x00000000 -#define D64_XS0_XS_ACTIVE 0x10000000 +#define D64_XS0_XS_DISABLED 0x00000000 +#define D64_XS0_XS_ACTIVE 0x10000000 #define D64_XS0_XS_IDLE 0x20000000 #define D64_XS0_XS_STOPPED 0x30000000 -#define D64_XS0_XS_SUSP 0x40000000 +#define D64_XS0_XS_SUSP 0x40000000 -#define D64_XS1_AD_MASK (di->d64_xs1_ad_mask) -#define D64_XS1_XE_MASK 0xf0000000 +#define D64_XS1_AD_MASK (di->d64_xs1_ad_mask) +#define D64_XS1_XE_MASK 0xf0000000 #define D64_XS1_XE_SHIFT 28 -#define D64_XS1_XE_NOERR 0x00000000 -#define D64_XS1_XE_DPE 0x10000000 +#define D64_XS1_XE_NOERR 0x00000000 +#define D64_XS1_XE_DPE 0x10000000 #define D64_XS1_XE_DFU 0x20000000 #define D64_XS1_XE_DTE 0x30000000 #define D64_XS1_XE_DESRE 0x40000000 @@ -301,12 +301,12 @@ typedef volatile struct { #define D64_RC_RO_SHIFT 1 #define D64_RC_FM 0x00000100 #define D64_RC_SH 0x00000200 -#define D64_RC_OC 0x00000400 -#define D64_RC_PD 0x00000800 -#define D64_RC_GE 0x00004000 -#define D64_RC_AE 0x00030000 +#define D64_RC_OC 0x00000400 +#define D64_RC_PD 0x00000800 +#define D64_RC_GE 0x00004000 +#define D64_RC_AE 0x00030000 #define D64_RC_AE_SHIFT 16 -#define D64_RC_BL_MASK 0x001C0000 +#define D64_RC_BL_MASK 0x001C0000 #define D64_RC_BL_SHIFT 18 #define D64_RC_PC_MASK 0x00E00000 #define D64_RC_PC_SHIFT 21 @@ -325,11 +325,11 @@ typedef volatile struct { #define D64_RP_LD_MASK 0x00001fff -#define D64_RS0_CD_MASK (di->d64_rs0_cd_mask) -#define D64_RS0_RS_MASK 0xf0000000 +#define D64_RS0_CD_MASK (di->d64_rs0_cd_mask) +#define D64_RS0_RS_MASK 0xf0000000 #define D64_RS0_RS_SHIFT 28 -#define D64_RS0_RS_DISABLED 0x00000000 -#define D64_RS0_RS_ACTIVE 0x10000000 +#define D64_RS0_RS_DISABLED 0x00000000 +#define D64_RS0_RS_ACTIVE 0x10000000 #define D64_RS0_RS_IDLE 0x20000000 #define D64_RS0_RS_STOPPED 0x30000000 #define D64_RS0_RS_SUSP 0x40000000 diff --git a/drivers/net/wireless/bcmdhd/include/sbpcmcia.h b/drivers/net/wireless/bcmdhd/include/sbpcmcia.h index 4ce2b163724..f834a4c7d83 100644 --- a/drivers/net/wireless/bcmdhd/include/sbpcmcia.h +++ b/drivers/net/wireless/bcmdhd/include/sbpcmcia.h @@ -2,7 +2,7 @@ * BCM43XX Sonics SiliconBackplane PCMCIA core hardware definitions. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/sbsdio.h b/drivers/net/wireless/bcmdhd/include/sbsdio.h index 7f15c0c1543..51f46c4b498 100644 --- a/drivers/net/wireless/bcmdhd/include/sbsdio.h +++ b/drivers/net/wireless/bcmdhd/include/sbsdio.h @@ -5,7 +5,7 @@ * SDIO core support 1bit, 4 bit SDIO mode as well as SPI mode. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/sbsdpcmdev.h b/drivers/net/wireless/bcmdhd/include/sbsdpcmdev.h index 37bc296c5e6..f655eeb139e 100644 --- a/drivers/net/wireless/bcmdhd/include/sbsdpcmdev.h +++ b/drivers/net/wireless/bcmdhd/include/sbsdpcmdev.h @@ -3,7 +3,7 @@ * device core support * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/sbsocram.h b/drivers/net/wireless/bcmdhd/include/sbsocram.h index a313fc59c38..30543c0e926 100644 --- a/drivers/net/wireless/bcmdhd/include/sbsocram.h +++ b/drivers/net/wireless/bcmdhd/include/sbsocram.h @@ -2,7 +2,7 @@ * BCM47XX Sonics SiliconBackplane embedded ram core * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/sdio.h b/drivers/net/wireless/bcmdhd/include/sdio.h index c8e7063192d..0c0dc472cbf 100644 --- a/drivers/net/wireless/bcmdhd/include/sdio.h +++ b/drivers/net/wireless/bcmdhd/include/sdio.h @@ -3,7 +3,7 @@ * Protocol and standard (common) device definitions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/sdioh.h b/drivers/net/wireless/bcmdhd/include/sdioh.h index 2b2e590e535..80cef235ecc 100644 --- a/drivers/net/wireless/bcmdhd/include/sdioh.h +++ b/drivers/net/wireless/bcmdhd/include/sdioh.h @@ -3,7 +3,7 @@ * Register map and definitions for the Standard Host Controller * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/sdiovar.h b/drivers/net/wireless/bcmdhd/include/sdiovar.h index df6508cdaf7..c2f274aded2 100644 --- a/drivers/net/wireless/bcmdhd/include/sdiovar.h +++ b/drivers/net/wireless/bcmdhd/include/sdiovar.h @@ -3,7 +3,7 @@ * Pulled out separately so dhdu and wlu can both use it. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/siutils.h b/drivers/net/wireless/bcmdhd/include/siutils.h index b8b8aa792b3..622f4bc945e 100644 --- a/drivers/net/wireless/bcmdhd/include/siutils.h +++ b/drivers/net/wireless/bcmdhd/include/siutils.h @@ -3,7 +3,7 @@ * of Broadcom HNBU chips. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -364,4 +364,4 @@ si_update_masks(si_t *sih); void si_force_islanding(si_t *sih, bool enable); -#endif +#endif diff --git a/drivers/net/wireless/bcmdhd/include/spid.h b/drivers/net/wireless/bcmdhd/include/spid.h index 9a4511616c9..c4d8493a207 100644 --- a/drivers/net/wireless/bcmdhd/include/spid.h +++ b/drivers/net/wireless/bcmdhd/include/spid.h @@ -2,13 +2,13 @@ * SPI device spec header file * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), * available at http://www.broadcom.com/licenses/GPLv2.php, with the * following added to such license: - * + * * As a special exception, the copyright holders of this software give you * permission to link this software with independent modules, and to copy and * distribute the resulting executable under terms of your choice, provided that @@ -16,7 +16,7 @@ * the license of that module. An independent module is a module which is not * derived from this software. The special exception does not apply to any * modifications of the software. - * + * * Notwithstanding the above, under no circumstances may you combine this * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. diff --git a/drivers/net/wireless/bcmdhd/include/trxhdr.h b/drivers/net/wireless/bcmdhd/include/trxhdr.h index ce98d959ade..84bd1aecb4f 100644 --- a/drivers/net/wireless/bcmdhd/include/trxhdr.h +++ b/drivers/net/wireless/bcmdhd/include/trxhdr.h @@ -2,7 +2,7 @@ * TRX image file header format. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/typedefs.h b/drivers/net/wireless/bcmdhd/include/typedefs.h index 30f8370dbbf..c928f32f5bb 100644 --- a/drivers/net/wireless/bcmdhd/include/typedefs.h +++ b/drivers/net/wireless/bcmdhd/include/typedefs.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -100,7 +100,7 @@ typedef long unsigned int size_t; #if defined(__GNUC__) && defined(__STRICT_ANSI__) #define TYPEDEF_INT64 #define TYPEDEF_UINT64 -#endif +#endif #if defined(__ICL) diff --git a/drivers/net/wireless/bcmdhd/include/wlfc_proto.h b/drivers/net/wireless/bcmdhd/include/wlfc_proto.h index a6e69ed7d0a..0f94ee21104 100644 --- a/drivers/net/wireless/bcmdhd/include/wlfc_proto.h +++ b/drivers/net/wireless/bcmdhd/include/wlfc_proto.h @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2013, Broadcom Corporation -* +* * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/include/wlioctl.h b/drivers/net/wireless/bcmdhd/include/wlioctl.h index 497f611b77b..74606adadae 100644 --- a/drivers/net/wireless/bcmdhd/include/wlioctl.h +++ b/drivers/net/wireless/bcmdhd/include/wlioctl.h @@ -5,7 +5,7 @@ * Definitions subject to change without notice. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/linux_osl.c b/drivers/net/wireless/bcmdhd/linux_osl.c index 85824ee94af..d2f1f7d9786 100644 --- a/drivers/net/wireless/bcmdhd/linux_osl.c +++ b/drivers/net/wireless/bcmdhd/linux_osl.c @@ -2,7 +2,7 @@ * Linux OS Independent Layer * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -69,7 +69,7 @@ static bcm_static_buf_t *bcm_static_buf = 0; #else #define STATIC_PKT_4PAGE_NUM 0 #define DHD_SKB_MAX_BUFSIZE DHD_SKB_2PAGE_BUFSIZE -#endif +#endif typedef struct bcm_static_pkt { struct sk_buff *skb_4k[STATIC_PKT_MAX_NUM]; @@ -82,7 +82,7 @@ typedef struct bcm_static_pkt { } bcm_static_pkt_t; static bcm_static_pkt_t *bcm_static_skb = 0; -#endif +#endif typedef struct bcm_mem_link { struct bcm_mem_link *prev; @@ -101,7 +101,7 @@ struct osl_info { uint magic; void *pdev; atomic_t malloced; - atomic_t pktalloced; + atomic_t pktalloced; uint failed; uint bustype; bcm_mem_link_t *dbgmem_list; @@ -166,12 +166,12 @@ static int16 linuxbcmerrormap[] = -EIO, -EIO, -ENODEV, - -EINVAL, - -ENODATA, - -EINVAL, - -EINVAL, - -EIO, - -EIO, + -EINVAL, + -ENODATA, + -EINVAL, + -EINVAL, + -EIO, + -EIO, }; @@ -279,7 +279,7 @@ osl_attach(void *pdev, uint bustype, bool pkttag) sema_init(&bcm_static_skb->osl_pkt_sem, 1); } -#endif +#endif spin_lock_init(&(osh->pktalloc_lock)); @@ -315,7 +315,7 @@ static struct sk_buff *osl_alloc_skb(osl_t *osh, unsigned int len) skb = __dev_alloc_skb(len, flags); #else skb = dev_alloc_skb(len); -#endif +#endif return skb; } @@ -349,7 +349,7 @@ osl_ctfpool_add(osl_t *osh) return NULL; } - + skb = osl_alloc_skb(osh, osh->ctfpool->obj_size); if (skb == NULL) { printf("%s: skb alloc of len %d failed\n", __FUNCTION__, @@ -508,7 +508,7 @@ osl_pktfastget(osl_t *osh, uint len) ASSERT(CTFPOOLHEAD(osh, skb) == (struct sock *)osh->ctfpool->head); CTFPOOL_UNLOCK(osh->ctfpool, flags); - + skb->next = skb->prev = NULL; #if defined(__ARM_ARCH_7A__) skb->data = skb->head + NET_SKB_PAD; @@ -516,7 +516,7 @@ osl_pktfastget(osl_t *osh, uint len) #else skb->data = skb->head + 16; skb->tail = skb->head + 16; -#endif +#endif skb->len = 0; skb->cloned = 0; #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14) @@ -529,7 +529,7 @@ osl_pktfastget(osl_t *osh, uint len) return skb; } -#endif +#endif struct sk_buff * BCMFASTPATH osl_pkt_tonative(osl_t *osh, void *pkt) @@ -539,7 +539,7 @@ osl_pkt_tonative(osl_t *osh, void *pkt) if (osh->pub.pkttag) OSL_PKTTAG_CLEAR(pkt); - + for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next) { atomic_sub(PKTISCHAINED(nskb) ? PKTCCNT(nskb) : 1, &osh->pktalloced); @@ -556,7 +556,7 @@ osl_pkt_frmnative(osl_t *osh, void *pkt) if (osh->pub.pkttag) OSL_PKTTAG_CLEAR(pkt); - + for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next) { atomic_add(PKTISCHAINED(nskb) ? PKTCCNT(nskb) : 1, &osh->pktalloced); @@ -571,12 +571,12 @@ osl_pktget(osl_t *osh, uint len) struct sk_buff *skb; #ifdef CTFPOOL - + skb = osl_pktfastget(osh, len); if ((skb != NULL) || ((skb = osl_alloc_skb(osh, len)) != NULL)) { -#else +#else if ((skb = osl_alloc_skb(osh, len))) { -#endif +#endif skb->tail += len; skb->len += len; skb->priority = 0; @@ -602,7 +602,7 @@ osl_pktfastfree(osl_t *osh, struct sk_buff *skb) skb->stamp.tv_sec = 0; #endif - + skb->dev = NULL; #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) skb->dst = NULL; @@ -669,7 +669,7 @@ osl_pktfree(osl_t *osh, void *p, bool send) #endif { if (skb->destructor) - + dev_kfree_skb_any(skb); else @@ -786,7 +786,7 @@ osl_pktfree_static(osl_t *osh, void *p, bool send) up(&bcm_static_skb->osl_pkt_sem); osl_pktfree(osh, p, send); } -#endif +#endif int osh_pktpadtailroom(osl_t *osh, void* p, int pad) { @@ -906,7 +906,7 @@ osl_malloc(osl_t *osh, uint size) void *addr; gfp_t flags; - + if (osh) ASSERT(osh->magic == OS_HANDLE_MAGIC); @@ -942,7 +942,7 @@ osl_malloc(osl_t *osh, uint size) } } original: -#endif +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)) flags = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; @@ -1083,7 +1083,7 @@ osl_dma_map(osl_t *osh, void *va, uint size, int direction, void *p, hnddma_seg_ } return dmah->segs[0].addr; } -#endif +#endif return (pci_map_single(osh->pdev, va, size, dir)); } @@ -1117,7 +1117,7 @@ osl_assert(const char *exp, const char *file, int line) snprintf(tempbuf, 64, "\"%s\": file \"%s\", line %d\n", exp, basename, line); printk("%s", tempbuf); -#endif +#endif } @@ -1154,7 +1154,7 @@ osl_pktdup(osl_t *osh, void *skb) ASSERT(!PKTISCHAINED(skb)); - + PKTCTFMAP(osh, skb); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) @@ -1177,17 +1177,17 @@ osl_pktdup(osl_t *osh, void *skb) } #endif - + PKTSETCLINK(p, NULL); PKTCCLRFLAGS(p); PKTCSETCNT(p, 1); PKTCSETLEN(p, PKTLEN(osh, skb)); - + if (osh->pub.pkttag) OSL_PKTTAG_CLEAR(p); - + atomic_inc(&osh->pktalloced); return (p); } @@ -1247,11 +1247,11 @@ osl_os_image_size(void *image) int len = 0, curroffset; if (image) { - + curroffset = generic_file_llseek(image, 0, 1); - + len = generic_file_llseek(image, 0, 2); - + generic_file_llseek(image, curroffset, 0); } return len; diff --git a/drivers/net/wireless/bcmdhd/sbutils.c b/drivers/net/wireless/bcmdhd/sbutils.c index 652727dafde..a118ecb9c65 100644 --- a/drivers/net/wireless/bcmdhd/sbutils.c +++ b/drivers/net/wireless/bcmdhd/sbutils.c @@ -3,7 +3,7 @@ * of the SiliconBackplane-based Broadcom chips. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/siutils.c b/drivers/net/wireless/bcmdhd/siutils.c index 1a99c6edc08..7f3562a4098 100644 --- a/drivers/net/wireless/bcmdhd/siutils.c +++ b/drivers/net/wireless/bcmdhd/siutils.c @@ -3,7 +3,7 @@ * of the SiliconBackplane-based Broadcom chips. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -22,7 +22,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: siutils.c 444038 2013-12-18 09:35:07Z $ + * $Id: siutils.c 414368 2013-07-24 15:00:23Z $ */ #include @@ -340,7 +340,7 @@ si_doattach(si_info_t *sii, uint devid, osl_t *osh, void *regs, char *pvars = NULL; uint origidx; #if !defined(_CFEZ_) || defined(CFG_WL) -#endif +#endif ASSERT(GOODREGS(regs)); bzero((uchar*)sii, sizeof(si_info_t)); @@ -467,7 +467,7 @@ si_doattach(si_info_t *sii, uint devid, osl_t *osh, void *regs, if (bustype == PCI_BUS) { } -#endif +#endif pvars = NULL; BCM_REFERENCE(pvars); @@ -1155,7 +1155,7 @@ si_watchdog(si_t *sih, uint ticks) si_core_disable(sih, 1); si_setcore(sih, CC_CORE_ID, 0); } -#endif +#endif nb = (sih->ccrev < 26) ? 16 : ((sih->ccrev >= 37) ? 32 : 24); /* The mips compiler uses the sllv instruction, @@ -2304,7 +2304,7 @@ si_chipcontrl_epa4331_wowl(si_t *sih, bool enter_wowl) } si_setcoreidx(sih, origidx); } -#endif +#endif uint si_pll_reset(si_t *sih) diff --git a/drivers/net/wireless/bcmdhd/siutils_priv.h b/drivers/net/wireless/bcmdhd/siutils_priv.h index f9110b0169c..0d6442919eb 100644 --- a/drivers/net/wireless/bcmdhd/siutils_priv.h +++ b/drivers/net/wireless/bcmdhd/siutils_priv.h @@ -2,7 +2,7 @@ * Include file private to the SOC Interconnect support files. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/uamp_api.h b/drivers/net/wireless/bcmdhd/uamp_api.h index 63c0af676c5..31e0d4b020a 100644 --- a/drivers/net/wireless/bcmdhd/uamp_api.h +++ b/drivers/net/wireless/bcmdhd/uamp_api.h @@ -4,7 +4,7 @@ * Description: Universal AMP API * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c index 257233a09d2..a9ffac20345 100644 --- a/drivers/net/wireless/bcmdhd/wl_android.c +++ b/drivers/net/wireless/bcmdhd/wl_android.c @@ -2,7 +2,7 @@ * Linux cfg80211 driver - Android related functions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -361,13 +361,12 @@ extern int set_roamscan_channel_list(struct net_device *dev, unsigned char n, extern int bcm_bt_lock(int cookie); extern void bcm_bt_unlock(int cookie); static int lock_cookie_wifi = 'W' | 'i'<<8 | 'F'<<16 | 'i'<<24; /* cookie is "WiFi" */ -static bool is4335_revb0 = true; #endif /* ENABLE_4335BT_WAR */ extern bool ap_fw_loaded; #if defined(CUSTOMER_HW4) extern char iface_name[IFNAMSIZ]; -#endif +#endif /** * Local (static) functions and variables @@ -3031,39 +3030,10 @@ exit: return ret; } -#ifdef ENABLE_4335BT_WAR -void check_bcm4335_rev(void) -{ - int ret = -1; - struct file *fp = NULL; - char *filepath = "/data/.rev"; - char chip_rev[10]={0,}; - - printk("check BCM4335, check_bcm4335_rev \n"); - fp = filp_open(filepath, O_RDONLY, 0); - if (IS_ERR(fp)) { - printk("/data/.rev file open error\n"); - is4335_revb0 = true; - - } else { - printk("/data/.rev file Found\n"); - ret = kernel_read(fp, 0, (char *)chip_rev, 9); - if(ret != -1 && NULL != strstr(chip_rev,"BCM4335B0")) { - printk("Found BCM4335B0\n"); - is4335_revb0 = true; - } else { - is4335_revb0 = false; - } - filp_close(fp, NULL); - } -} -#endif - int wl_android_init(void) { int ret = 0; - #ifdef ENABLE_INSMOD_NO_FW_LOAD dhd_download_fw_on_driverload = FALSE; #endif /* ENABLE_INSMOD_NO_FW_LOAD */ @@ -3072,11 +3042,7 @@ int wl_android_init(void) memset(iface_name, 0, IFNAMSIZ); bcm_strncpy_s(iface_name, IFNAMSIZ, "wlan", IFNAMSIZ); } -#endif - -#ifdef ENABLE_4335BT_WAR - check_bcm4335_rev(); -#endif +#endif #ifdef WL_GENL wl_genl_init(); @@ -3430,7 +3396,6 @@ int wifi_get_irq_number(unsigned long *irq_flags_ptr) #endif } - int wifi_set_power(int on, unsigned long msec) { int ret = 0; @@ -3450,12 +3415,7 @@ int wifi_set_power(int on, unsigned long msec) bcm_bt_unlock(lock_cookie_wifi); } #endif /* ENABLE_4335BT_WAR */ - -#ifdef ENABLE_4335BT_WAR - ret = wifi_control_data->set_power(on,is4335_revb0); -#else ret = wifi_control_data->set_power(on); -#endif } if (wifi_regulator && !on) diff --git a/drivers/net/wireless/bcmdhd/wl_android.h b/drivers/net/wireless/bcmdhd/wl_android.h index 6a40f2f8130..13b4d935e75 100644 --- a/drivers/net/wireless/bcmdhd/wl_android.h +++ b/drivers/net/wireless/bcmdhd/wl_android.h @@ -2,7 +2,7 @@ * Linux cfg80211 driver - Android related functions * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 81e073efc21..59acd5ce49e 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -3,7 +3,7 @@ * Linux cfg80211 driver * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -10443,7 +10443,7 @@ s32 wl_cfg80211_attach(struct net_device *ndev, void *data) err = wl_cfg80211_btcoex_init(wl); if (err) goto cfg80211_attach_out; -#endif +#endif wlcfg_drv_priv = wl; @@ -10472,7 +10472,7 @@ void wl_cfg80211_detach(void *para) #if defined(COEX_DHCP) wl_cfg80211_btcoex_deinit(wl); -#endif +#endif wl_setup_rfkill(wl, FALSE); #ifdef DEBUGFS_CFG80211 diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.h b/drivers/net/wireless/bcmdhd/wl_cfg80211.h index 42ae3949429..b1fa3acf75d 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.h +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.h @@ -2,7 +2,7 @@ * Linux cfg80211 driver * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c index c8947112078..8b3da7c6cb7 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c +++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c @@ -2,7 +2,7 @@ * Linux cfgp2p driver * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.h b/drivers/net/wireless/bcmdhd/wl_cfgp2p.h index 7986163ce7a..6aa45a160ca 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.h +++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.h @@ -2,7 +2,7 @@ * Linux cfgp2p driver * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wl_dbg.h b/drivers/net/wireless/bcmdhd/wl_dbg.h index f79c1d350dc..c07ae30ee76 100644 --- a/drivers/net/wireless/bcmdhd/wl_dbg.h +++ b/drivers/net/wireless/bcmdhd/wl_dbg.h @@ -3,7 +3,7 @@ * Broadcom 802.11 Networking Adapter. * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wl_iw.c b/drivers/net/wireless/bcmdhd/wl_iw.c index e532e2767f0..af0764f7de6 100644 --- a/drivers/net/wireless/bcmdhd/wl_iw.c +++ b/drivers/net/wireless/bcmdhd/wl_iw.c @@ -2,7 +2,7 @@ * Linux Wireless Extensions support * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), @@ -70,7 +70,7 @@ typedef const struct si_pub si_t; #ifndef IW_AUTH_KEY_MGMT_WAPI_CERT #define IW_AUTH_KEY_MGMT_WAPI_CERT 8 #endif -#endif +#endif #ifndef IW_AUTH_KEY_MGMT_FT_802_1X @@ -134,7 +134,7 @@ extern int dhd_wait_pend8021x(struct net_device *dev); #define DAEMONIZE(a) daemonize(a); \ allow_signal(SIGKILL); \ allow_signal(SIGTERM); -#else +#else #define RAISE_RX_SOFTIRQ() \ cpu_raise_softirq(smp_processor_id(), NET_RX_SOFTIRQ) #define DAEMONIZE(a) daemonize(); \ @@ -446,8 +446,8 @@ wl_iw_set_pm( } #if WIRELESS_EXT > 17 -#endif -#endif +#endif +#endif int wl_iw_send_priv_event( @@ -752,7 +752,7 @@ wl_iw_get_range( rateset.count = dtoh32(rateset.count); range->num_bitrates = rateset.count; for (i = 0; i < rateset.count && i < IW_MAX_BITRATES; i++) - range->bitrate[i] = (rateset.rates[i] & 0x7f) * 500000; + range->bitrate[i] = (rateset.rates[i] & 0x7f) * 500000; if ((error = dev_wlc_intvar_get(dev, "nmode", &nmode))) return error; if ((error = dev_wlc_ioctl(dev, WLC_GET_PHYTYPE, &phytype, sizeof(phytype)))) @@ -784,7 +784,7 @@ wl_iw_get_range( range->num_bitrates += 8; ASSERT(range->num_bitrates < IW_MAX_BITRATES); for (k = 0; i < range->num_bitrates; k++, i++) { - + range->bitrate[i] = (nrate_list[nrate_list2copy][k]) * 500000; } } @@ -851,20 +851,20 @@ wl_iw_get_range( range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP; range->enc_capa |= IW_ENC_CAPA_WPA2; - + if (dev_wlc_intvar_get(dev, "fbt_cap", &fbt_cap) == 0) { if (fbt_cap == WLC_FBT_CAP_DRV_4WAY_AND_REASSOC) { - + range->enc_capa |= IW_ENC_CAPA_4WAY_HANDSHAKE; } } #ifdef BCMFW_ROAM_ENABLE_WEXT - + range->enc_capa |= IW_ENC_CAPA_FW_ROAM_ENABLE; -#endif - +#endif + IW_EVENT_CAPA_SET_KERNEL(range->event_capa); IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP); @@ -1387,7 +1387,7 @@ wl_iw_handle_scanresults_ies(char **event_p, char *end, ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t); while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) { - + if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) { iwe.cmd = IWEVGENIE; iwe.u.data.length = ie->len + 2; @@ -1435,10 +1435,10 @@ wl_iw_handle_scanresults_ies(char **event_p, char *end, wpa_snprintf_hex(buf + 12, 2*ie->len+1, ie->data, ie->len); event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, buf); kfree(buf); -#endif +#endif break; } -#endif +#endif *event_p = event; } @@ -1666,7 +1666,7 @@ wl_iw_iscan_get_scan( iwe.u.data.length = 0; event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, (char *)event); - + if (bi->rateset.count <= sizeof(bi->rateset.rates)) { if (event + IW_MAX_BITRATES*IW_EV_PARAM_LEN >= end) return -E2BIG; @@ -2429,7 +2429,7 @@ wl_iw_set_encodeext( return error; } } - + else if (iwe->alg == IW_ENCODE_ALG_PMK) { int j; wsec_pmk_t pmk; @@ -2708,7 +2708,7 @@ wl_iw_set_wpaauth( if ((error = dev_wlc_intvar_set(dev, "wsec", val))) return error; - + if (dev_wlc_intvar_get(dev, "fbt_cap", &fbt_cap) == 0) { if (fbt_cap == WLC_FBT_CAP_DRV_4WAY_AND_REASSOC) { if ((paramid == IW_AUTH_CIPHER_PAIRWISE) && (val & AES_ENABLED)) { @@ -3036,7 +3036,7 @@ enum { WL_IW_SET_VLANMODE, WL_IW_SET_PM, #if WIRELESS_EXT > 17 -#endif +#endif WL_IW_SET_LAST }; @@ -3045,7 +3045,7 @@ static iw_handler wl_iw_priv_handler[] = { wl_iw_set_vlanmode, wl_iw_set_pm, #if WIRELESS_EXT > 17 -#endif +#endif NULL }; @@ -3069,7 +3069,7 @@ static struct iw_priv_args wl_iw_priv_args[] = { "set_pm" }, #if WIRELESS_EXT > 17 -#endif +#endif { 0, 0, 0, { 0 } } }; @@ -3672,7 +3672,7 @@ static void wl_iw_send_scan_complete(iscan_info_t *iscan) memset(&wrqu, 0, sizeof(wrqu)); - + wireless_send_event(iscan->dev, SIOCGIWSCAN, &wrqu, NULL); } @@ -3710,7 +3710,7 @@ _iscan_sysioc_thread(void *data) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) rtnl_unlock(); #endif - + iscan->timer.expires = jiffies + msecs_to_jiffies(iscan->timer_ms); add_timer(&iscan->timer); iscan->timer_on = 1; @@ -3722,7 +3722,7 @@ _iscan_sysioc_thread(void *data) break; case WL_SCAN_RESULTS_PENDING: WL_TRACE(("iscanresults pending\n")); - + iscan->timer.expires = jiffies + msecs_to_jiffies(iscan->timer_ms); add_timer(&iscan->timer); iscan->timer_on = 1; diff --git a/drivers/net/wireless/bcmdhd/wl_iw.h b/drivers/net/wireless/bcmdhd/wl_iw.h index 2e8a6810464..a35e2cd1b74 100644 --- a/drivers/net/wireless/bcmdhd/wl_iw.h +++ b/drivers/net/wireless/bcmdhd/wl_iw.h @@ -2,7 +2,7 @@ * Linux Wireless Extensions support * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wl_linux_mon.c b/drivers/net/wireless/bcmdhd/wl_linux_mon.c index 0e169919260..117b0abe76d 100644 --- a/drivers/net/wireless/bcmdhd/wl_linux_mon.c +++ b/drivers/net/wireless/bcmdhd/wl_linux_mon.c @@ -2,7 +2,7 @@ * Broadcom Dongle Host Driver (DHD), Linux monitor network interface * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wldev_common.c b/drivers/net/wireless/bcmdhd/wldev_common.c index 66b6921eec9..73b75119f9b 100644 --- a/drivers/net/wireless/bcmdhd/wldev_common.c +++ b/drivers/net/wireless/bcmdhd/wldev_common.c @@ -2,7 +2,7 @@ * Common function shared by Linux WEXT, cfg80211 and p2p drivers * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/net/wireless/bcmdhd/wldev_common.h b/drivers/net/wireless/bcmdhd/wldev_common.h index c95313d2023..ca87b3c0889 100644 --- a/drivers/net/wireless/bcmdhd/wldev_common.h +++ b/drivers/net/wireless/bcmdhd/wldev_common.h @@ -2,7 +2,7 @@ * Common function shared by Linux WEXT, cfg80211 and p2p drivers * * Copyright (C) 1999-2013, Broadcom Corporation - * + * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c index 443e4571fd8..68636f6a253 100644 --- a/drivers/tty/serial/msm_serial_hs.c +++ b/drivers/tty/serial/msm_serial_hs.c @@ -173,7 +173,7 @@ struct msm_hs_port { ktime_t clk_off_delay; enum msm_hs_clk_states_e clk_state; enum msm_hs_clk_req_off_state_e clk_req_off_state; - atomic_t clk_count; + struct msm_hs_wakeup wakeup; struct wake_lock dma_wake_lock; /* held while any DMA active */ @@ -206,54 +206,6 @@ static void msm_hs_start_rx_locked(struct uart_port *uport); #define UARTDM_TO_MSM(uart_port) \ container_of((uart_port), struct msm_hs_port, uport) -static int msm_hs_clock_vote(struct msm_hs_port *msm_uport) -{ - int ret = 0; - if (atomic_inc_return(&msm_uport->clk_count) == 1) { - ret = clk_prepare_enable(msm_uport->clk); - if (ret) { - dev_err(msm_uport->uport.dev, - "%s: could not turn on clk %d \n", __func__, ret); - return ret; - } - if (msm_uport->pclk) { - ret = clk_prepare_enable(msm_uport->pclk); - if (ret) { - clk_disable_unprepare(msm_uport->clk); - dev_err(msm_uport->uport.dev, - "%s: could not turn on pclk %d \n", - __func__, ret); - return ret; - } - } - - msm_uport->clk_state = MSM_HS_CLK_ON; - } - return ret; -} - -static void msm_hs_clock_unvote(struct msm_hs_port *msm_uport) -{ - int ret = 0; - - ret = atomic_read(&msm_uport->clk_count); - if (ret <= 0) { - WARN(ret, "msm_uport->clk_count < 0"); - dev_err(msm_uport->uport.dev, - "%s: clock count invalid %d \n", __func__, - atomic_read(&msm_uport->clk_count)); - return; - } - - ret = atomic_dec_return(&msm_uport->clk_count); - if (ret == 0) { - clk_disable_unprepare(msm_uport->clk); - if (msm_uport->pclk) - clk_disable_unprepare(msm_uport->pclk); - msm_uport->clk_state = MSM_HS_CLK_OFF; - } -} - struct uart_port * msm_hs_get_port_by_id(int num) { struct uart_port *uport; @@ -421,7 +373,9 @@ static int msm_serial_loopback_enable_set(void *data, u64 val) unsigned long flags; int ret = 0; - msm_hs_clock_vote(msm_uport); + clk_prepare_enable(msm_uport->clk); + if (msm_uport->pclk) + clk_prepare_enable(msm_uport->pclk); if (val) { spin_lock_irqsave(&uport->lock, flags); @@ -438,8 +392,9 @@ static int msm_serial_loopback_enable_set(void *data, u64 val) } /* Calling CLOCK API. Hence mb() requires here. */ mb(); - - msm_hs_clock_unvote(msm_uport); + clk_disable_unprepare(msm_uport->clk); + if (msm_uport->pclk) + clk_disable_unprepare(msm_uport->pclk); return 0; } @@ -451,14 +406,17 @@ static int msm_serial_loopback_enable_get(void *data, u64 *val) unsigned long flags; int ret = 0; - msm_hs_clock_vote(msm_uport); + clk_prepare_enable(msm_uport->clk); + if (msm_uport->pclk) + clk_prepare_enable(msm_uport->pclk); spin_lock_irqsave(&uport->lock, flags); ret = msm_hs_read(&msm_uport->uport, UARTDM_MR2_ADDR); spin_unlock_irqrestore(&uport->lock, flags); - - msm_hs_clock_unvote(msm_uport); + clk_disable_unprepare(msm_uport->clk); + if (msm_uport->pclk) + clk_disable_unprepare(msm_uport->pclk); *val = (ret & UARTDM_MR2_LOOP_MODE_BMSK) ? 1 : 0; return 0; @@ -680,11 +638,22 @@ static int msm_hs_init_clk(struct uart_port *uport) return ret; } - ret = msm_hs_clock_vote(msm_uport); + ret = clk_prepare_enable(msm_uport->clk); if (ret) { printk(KERN_ERR "Error could not turn on UART clk\n"); return ret; } + if (msm_uport->pclk) { + ret = clk_prepare_enable(msm_uport->pclk); + if (ret) { + clk_disable_unprepare(msm_uport->clk); + dev_err(uport->dev, + "Error could not turn on UART pclk\n"); + return ret; + } + } + + msm_uport->clk_state = MSM_HS_CLK_ON; return 0; } @@ -900,11 +869,6 @@ static void msm_hs_set_termios(struct uart_port *uport, /* Disable all UART interrupts */ msm_hs_write(uport, UARTDM_IMR_ADDR, 0); - /* Clear the Rx Ready Ctl bit */ - data = msm_hs_read(uport, UARTDM_MR1_ADDR); - data &= ~UARTDM_MR1_RX_RDY_CTL_BMSK; - msm_hs_write(uport, UARTDM_MR1_ADDR, data); - mb(); /* Enable RFR so remote UART doesn't send any data. */ msm_hs_write(uport, UARTDM_CR_ADDR, RFR_HIGH); @@ -1018,6 +982,22 @@ static void msm_hs_set_termios(struct uart_port *uport, /* Set Transmit software time out */ uart_update_timeout(uport, c_cflag, bps); + /* + * Configure HW flow control + * UART Core would see status of CTS line when it is sending data + * to remote uart to confirm that it can receive or not. + * UART Core would trigger RFR if it is not having any space with + * RX FIFO. + */ + data = msm_hs_read(uport, UARTDM_MR1_ADDR); + data &= ~(UARTDM_MR1_CTS_CTL_BMSK | UARTDM_MR1_RX_RDY_CTL_BMSK); + if (c_cflag & CRTSCTS) { + data |= UARTDM_MR1_CTS_CTL_BMSK; + data |= UARTDM_MR1_RX_RDY_CTL_BMSK; + } + + msm_hs_write(uport, UARTDM_MR1_ADDR, data); + /* Enable previously enabled all UART interrupts. */ msm_hs_write(uport, UARTDM_IMR_ADDR, msm_uport->imr_reg); @@ -1062,21 +1042,8 @@ static void msm_hs_set_termios(struct uart_port *uport, /* Start Rx Transfer */ msm_hs_start_rx_locked(&msm_uport->uport); - /* - * Configure HW flow control - * UART Core would see status of CTS line when it is sending data - * to remote uart to confirm that it can receive or not. - * UART Core would trigger RFR if it is not having any space with - * RX FIFO. - */ - data = msm_hs_read(uport, UARTDM_MR1_ADDR); - data &= ~(UARTDM_MR1_CTS_CTL_BMSK | UARTDM_MR1_RX_RDY_CTL_BMSK); - if (c_cflag & CRTSCTS) { - data |= UARTDM_MR1_CTS_CTL_BMSK; - data |= UARTDM_MR1_RX_RDY_CTL_BMSK; - } - - msm_hs_write(uport, UARTDM_MR1_ADDR, data); + /* Disable RFR so remote UART can send data. */ + msm_hs_write(uport, UARTDM_CR_ADDR, RFR_LOW); mb(); msm_uport->termios_in_progress = false; @@ -1093,13 +1060,8 @@ unsigned int msm_hs_tx_empty(struct uart_port *uport) { unsigned int data; unsigned int ret = 0; - struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport); - if (msm_uport->clk_state == MSM_HS_CLK_OFF) { - pr_err("%s: Failing GSBI clocks are OFF\n", __func__); - return 0; - } - data = msm_hs_read(uport, UARTDM_SR_ADDR); + data = msm_hs_read(uport, UARTDM_SR_ADDR); if (data & UARTDM_SR_TXEMT_BMSK) ret = TIOCSER_TEMT; @@ -1130,18 +1092,10 @@ static void msm_hs_stop_tx_locked(struct uart_port *uport) static void msm_hs_stop_rx_locked(struct uart_port *uport) { struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport); - unsigned long data; - - if (msm_uport->clk_state == MSM_HS_CLK_OFF) - return; /* Disable RxStale Event Mechanism */ msm_hs_write(uport, UARTDM_CR_ADDR, STALE_EVENT_DISABLE); - /* Clear the Rx Ready Ctl bit */ - data = msm_hs_read(uport, UARTDM_MR1_ADDR); - data &= ~UARTDM_MR1_RX_RDY_CTL_BMSK; - msm_hs_write(uport, UARTDM_MR1_ADDR, data); /* Enable RFR so remote UART doesn't send any data. */ msm_hs_write(uport, UARTDM_CR_ADDR, RFR_HIGH); @@ -1485,11 +1439,6 @@ static void msm_hs_start_tx_locked(struct uart_port *uport ) if (msm_uport->is_shutdown) return; - if (msm_uport->clk_state == MSM_HS_CLK_OFF) { - pr_err("%s:Failing as GSBI clocks are OFF\n", __func__); - return; - } - if (msm_uport->tx.tx_ready_int_en == 0) { msm_uport->tx.tx_ready_int_en = 1; if (msm_uport->tx.dma_in_flight == 0) @@ -1641,12 +1590,7 @@ void msm_hs_set_mctrl(struct uart_port *uport, unsigned int mctrl) { unsigned long flags; - struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport); - if (msm_uport->clk_state == MSM_HS_CLK_OFF) { - pr_err("%s:Failing as GSBI clocks are OFF\n", __func__); - return; - } spin_lock_irqsave(&uport->lock, flags); msm_hs_set_mctrl_locked(uport, mctrl); spin_unlock_irqrestore(&uport->lock, flags); @@ -1733,7 +1677,6 @@ static int msm_hs_check_clock_off(struct uart_port *uport) { unsigned long sr_status; unsigned long flags; - unsigned int data; int ret; struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport); struct circ_buf *tx_buf = &uport->state->xmit; @@ -1746,13 +1689,6 @@ static int msm_hs_check_clock_off(struct uart_port *uport) if (msm_uport->clk_state != MSM_HS_CLK_REQUEST_OFF || !uart_circ_empty(tx_buf) || msm_uport->tx.dma_in_flight || msm_uport->imr_reg & UARTDM_ISR_TXLEV_BMSK) { - if (msm_uport->clk_req_off_state > CLK_REQ_OFF_START) { - /* Enable auto RFR */ - data = msm_hs_read(uport, UARTDM_MR1_ADDR); - data |= UARTDM_MR1_RX_RDY_CTL_BMSK; - msm_hs_write(uport, UARTDM_MR1_ADDR, data); - mb(); - } spin_unlock_irqrestore(&uport->lock, flags); mutex_unlock(&msm_uport->clk_mutex); return -1; @@ -1769,14 +1705,6 @@ static int msm_hs_check_clock_off(struct uart_port *uport) /* Make sure forced RXSTALE flush complete */ switch (msm_uport->clk_req_off_state) { case CLK_REQ_OFF_START: - data = msm_hs_read(uport, UARTDM_MR1_ADDR); - /*disable auto ready-for-receiving */ - data &= ~UARTDM_MR1_RX_RDY_CTL_BMSK; - msm_hs_write(uport, UARTDM_MR1_ADDR, data); - mb(); - /* set RFR_N to high */ - msm_hs_write(uport, UARTDM_CR_ADDR, RFR_HIGH); - msm_uport->clk_req_off_state = CLK_REQ_OFF_RXSTALE_ISSUED; wake_lock(&msm_uport->rx.wake_lock); msm_hs_write(uport, UARTDM_CR_ADDR, FORCE_STALE_EVENT); @@ -1821,14 +1749,12 @@ static int msm_hs_check_clock_off(struct uart_port *uport) spin_unlock_irqrestore(&uport->lock, flags); - /* Enable auto RFR */ - data = msm_hs_read(uport, UARTDM_MR1_ADDR); - data |= UARTDM_MR1_RX_RDY_CTL_BMSK; - msm_hs_write(uport, UARTDM_MR1_ADDR, data); - mb(); - /* we really want to clock off */ - msm_hs_clock_unvote(msm_uport); + clk_disable_unprepare(msm_uport->clk); + if (msm_uport->pclk) + clk_disable_unprepare(msm_uport->pclk); + + msm_uport->clk_state = MSM_HS_CLK_OFF; spin_lock_irqsave(&uport->lock, flags); if (use_low_power_wakeup(msm_uport)) { @@ -1837,6 +1763,7 @@ static int msm_hs_check_clock_off(struct uart_port *uport) } printk(KERN_INFO "(msm_serial_hs) msm_hs_check_clock_off - dma wake unlock\n"); wake_unlock(&msm_uport->dma_wake_lock); + spin_unlock_irqrestore(&uport->lock, flags); mutex_unlock(&msm_uport->clk_mutex); return 1; @@ -1994,13 +1921,12 @@ void msm_hs_request_clock_off(struct uart_port *uport) { unsigned long flags; struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport); - spin_lock_irqsave(&uport->lock, flags); - if (msm_uport->is_shutdown) { - pr_err("%s:Clock OFF fail.UART port is closed\n", __func__); - spin_unlock_irqrestore(&uport->lock, flags); + if(msm_uport->is_shutdown) { + printk(KERN_INFO "(msm_serial_hs) msm_hs_request_clock_off - uart shutdown, so return..\n"); return; } + spin_lock_irqsave(&uport->lock, flags); if (msm_uport->clk_state == MSM_HS_CLK_ON) { msm_uport->clk_state = MSM_HS_CLK_REQUEST_OFF; msm_uport->clk_req_off_state = CLK_REQ_OFF_START; @@ -2023,23 +1949,21 @@ void msm_hs_request_clock_on(struct uart_port *uport) unsigned int data; int ret = 0; - mutex_lock(&msm_uport->clk_mutex); - spin_lock_irqsave(&uport->lock, flags); - - if (msm_uport->is_shutdown) { - pr_err("%s:Clock ON fail.UART port is closed\n", __func__); - spin_unlock_irqrestore(&uport->lock, flags); - mutex_unlock(&msm_uport->clk_mutex); + if(msm_uport->is_shutdown) { + printk(KERN_INFO "(msm_serial_hs) msm_hs_request_clock_on - uart shutdown, so return..\n"); return; } + mutex_lock(&msm_uport->clk_mutex); + spin_lock_irqsave(&uport->lock, flags); + switch (msm_uport->clk_state) { case MSM_HS_CLK_OFF: printk(KERN_INFO "(msm_serial_hs) msm_hs_check_clock_on - dma wake lock\n"); wake_lock(&msm_uport->dma_wake_lock); disable_irq_nosync(msm_uport->wakeup.irq); spin_unlock_irqrestore(&uport->lock, flags); - ret = msm_hs_clock_vote(msm_uport); + ret = clk_prepare_enable(msm_uport->clk); if (ret) { dev_err(uport->dev, "Clock ON Failure" "For UART CLK Stalling HSUART\n"); @@ -2047,6 +1971,16 @@ void msm_hs_request_clock_on(struct uart_port *uport) break; } + if (msm_uport->pclk) { + ret = clk_prepare_enable(msm_uport->pclk); + if (unlikely(ret)) { + clk_disable_unprepare(msm_uport->clk); + dev_err(uport->dev, "Clock ON Failure" + "For UART Pclk Stalling HSUART\n"); + wake_unlock(&msm_uport->dma_wake_lock); + break; + } + } spin_lock_irqsave(&uport->lock, flags); /* else fall-through */ case MSM_HS_CLK_REQUEST_OFF: @@ -2060,12 +1994,6 @@ void msm_hs_request_clock_on(struct uart_port *uport) mb(); } hrtimer_try_to_cancel(&msm_uport->clk_off_timer); - - /* Enable Auto Ready for recieving */ - data = msm_hs_read(uport, UARTDM_MR1_ADDR); - data |= UARTDM_MR1_RX_RDY_CTL_BMSK; - msm_hs_write(uport, UARTDM_MR1_ADDR, data); - mb(); if (msm_uport->rx.flush == FLUSH_SHUTDOWN) msm_hs_start_rx_locked(uport); if (msm_uport->rx.flush == FLUSH_STOP) @@ -2078,8 +2006,7 @@ void msm_hs_request_clock_on(struct uart_port *uport) break; } - if (!ret) - spin_unlock_irqrestore(&uport->lock, flags); + spin_unlock_irqrestore(&uport->lock, flags); mutex_unlock(&msm_uport->clk_mutex); } EXPORT_SYMBOL(msm_hs_request_clock_on); @@ -2275,11 +2202,8 @@ static int msm_hs_startup(struct uart_port *uport) msm_hs_start_rx_locked(uport); - /* Enable Auto Ready for recieving */ - data = msm_hs_read(uport, UARTDM_MR1_ADDR); - data |= UARTDM_MR1_RX_RDY_CTL_BMSK; - msm_hs_write(uport, UARTDM_MR1_ADDR, data); - mb(); + /* Allow remote UART to send data by setting RFR GPIO to HIGH. */ + msm_hs_write(uport, UARTDM_CR_ADDR, RFR_LOW); spin_unlock_irqrestore(&uport->lock, flags); @@ -2295,7 +2219,9 @@ unconfigure_uart_gpio: if (pdata && pdata->config_gpio) msm_hs_unconfig_uart_gpios(uport); deinit_uart_clk: - msm_hs_clock_unvote(msm_uport); + clk_disable_unprepare(msm_uport->clk); + if (msm_uport->pclk) + clk_disable_unprepare(msm_uport->pclk); printk(KERN_INFO "(msm_serial_hs) msm_hs_startup deinit clk - dma wake unlock\n"); @@ -2561,18 +2487,22 @@ static int __devinit msm_hs_probe(struct platform_device *pdev) INIT_WORK(&msm_uport->clock_off_w, hsuart_clock_off_work); mutex_init(&msm_uport->clk_mutex); - atomic_set(&msm_uport->clk_count, 0); - msm_hs_clock_vote(msm_uport); + clk_prepare_enable(msm_uport->clk); + if (msm_uport->pclk) + clk_prepare_enable(msm_uport->pclk); ret = uartdm_init_port(uport); if (unlikely(ret)) { - msm_hs_clock_unvote(msm_uport); + clk_disable_unprepare(msm_uport->clk); + if (msm_uport->pclk) + clk_disable_unprepare(msm_uport->pclk); return ret; } /* configure the CR Protection to Enable */ msm_hs_write(uport, UARTDM_CR_ADDR, CR_PROTECTION_EN); + /* * Enable Command register protection before going ahead as this hw * configuration makes sure that issued cmd to CR register gets complete @@ -2590,7 +2520,10 @@ static int __devinit msm_hs_probe(struct platform_device *pdev) UARTDM_MR2_RX_ERROR_CHAR_OFF); msm_hs_write(uport, UARTDM_MR2_ADDR, data); mb(); - msm_hs_clock_unvote(msm_uport); + + clk_disable_unprepare(msm_uport->clk); + if (msm_uport->pclk) + clk_disable_unprepare(msm_uport->pclk); msm_uport->clk_state = MSM_HS_CLK_PORT_OFF; hrtimer_init(&msm_uport->clk_off_timer, CLOCK_MONOTONIC, @@ -2656,17 +2589,15 @@ static void msm_hs_shutdown(struct uart_port *uport) pdev->dev.platform_data; + spin_lock_irqsave(&uport->lock, flags); + /* deactivate if any clock off hrtimer is active. */ hrtimer_try_to_cancel(&msm_uport->clk_off_timer); - if (msm_uport->clk_state == MSM_HS_CLK_OFF) - msm_hs_clock_vote(msm_uport); - - spin_lock_irqsave(&uport->lock, flags); - /* disable UART TX interface to DM */ - data = msm_hs_read(uport, UARTDM_DMEN_ADDR); - data &= ~UARTDM_TX_DM_EN_BMSK; - msm_hs_write(uport, UARTDM_DMEN_ADDR, data); + /* disable UART TX interface to DM */ + data = msm_hs_read(uport, UARTDM_DMEN_ADDR); + data &= ~UARTDM_TX_DM_EN_BMSK; + msm_hs_write(uport, UARTDM_DMEN_ADDR, data); mb(); if (msm_uport->tx.dma_in_flight) { @@ -2738,10 +2669,15 @@ static void msm_hs_shutdown(struct uart_port *uport) mb(); if (msm_uport->clk_state != MSM_HS_CLK_OFF) { - msm_hs_clock_unvote(msm_uport); + /* to balance clk_state */ + clk_disable_unprepare(msm_uport->clk); + if (msm_uport->pclk) + clk_disable_unprepare(msm_uport->pclk); printk(KERN_INFO "(msm_serial_hs) msm_hs_shutdown - dma wake unlock\n"); wake_unlock(&msm_uport->dma_wake_lock); } + + msm_uport->clk_state = MSM_HS_CLK_PORT_OFF; dma_unmap_single(uport->dev, msm_uport->tx.dma_base, UART_XMIT_SIZE, DMA_TO_DEVICE); diff --git a/drivers/tty/serial/msm_serial_hs_lite.c b/drivers/tty/serial/msm_serial_hs_lite.c index 6a6dcd73429..6dad7cf1aad 100644 --- a/drivers/tty/serial/msm_serial_hs_lite.c +++ b/drivers/tty/serial/msm_serial_hs_lite.c @@ -1649,7 +1649,7 @@ static int msm_serial_hsl_suspend(struct device *dev) uart_suspend_port(&msm_hsl_uart_driver, port); if (device_may_wakeup(dev)) enable_irq_wake(port->irq); -#if !defined(CONFIG_MACH_MELIUS) + if (max77693_get_jig_state() && gpio_get_value(msm_hsl_port->wakeup.rx_gpio)) { /* Enable wakeup_irq @@ -1669,7 +1669,6 @@ static int msm_serial_hsl_suspend(struct device *dev) msm_hsl_port->wakeup.wakeup_set = 0; //uart_connecting = 0; } -#endif } return 0; @@ -1696,7 +1695,6 @@ static int msm_serial_hsl_resume(struct device *dev) console_stop(port->cons); msm_hsl_init_clock(port); } -#if !defined(CONFIG_MACH_MELIUS) if (max77693_get_jig_state() || msm_hsl_port->wakeup.wakeup_set) { /* disable wakeup_irq */ if (msm_hsl_port->wakeup.irq > 0) { @@ -1709,7 +1707,6 @@ static int msm_serial_hsl_resume(struct device *dev) disable_irq(msm_hsl_port->wakeup.irq); } } -#endif } return 0; diff --git a/include/linux/wlan_plat.h b/include/linux/wlan_plat.h index 159dfa917ef..40ec3482d1e 100644 --- a/include/linux/wlan_plat.h +++ b/include/linux/wlan_plat.h @@ -16,7 +16,7 @@ #define _LINUX_WLAN_PLAT_H_ struct wifi_platform_data { - int (*set_power)(int val,bool b0rev); + int (*set_power)(int val); int (*set_reset)(int val); int (*set_carddetect)(int val); void *(*mem_prealloc)(int section, unsigned long size); diff --git a/include/media/msm_camera.h b/include/media/msm_camera.h index 86c41061b16..4b658cfc048 100644 --- a/include/media/msm_camera.h +++ b/include/media/msm_camera.h @@ -10,6 +10,10 @@ * GNU General Public License for more details. * */ +#if defined(CONFIG_MACH_JACTIVE_ATT) || defined(CONFIG_MACH_JACTIVE_EUR) +#include +#else + #ifdef CONFIG_MACH_JF #include #else @@ -2526,3 +2530,5 @@ struct intf_mctl_mapping_cfg { #endif /* __LINUX_MSM_CAMERA_H */ #endif +#endif + diff --git a/include/media/msm_camera_jactive.h b/include/media/msm_camera_jactive.h new file mode 100644 index 00000000000..d7f49993a3f --- /dev/null +++ b/include/media/msm_camera_jactive.h @@ -0,0 +1,2461 @@ +/* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved. +* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * 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. + * + */ +#ifndef __LINUX_MSM_CAMERA_H +#define __LINUX_MSM_CAMERA_H + +#ifdef MSM_CAMERA_BIONIC +#include +#endif +#include +#include +#include +#ifdef __KERNEL__ +#include +#endif +#ifdef MSM_CAMERA_GCC +#include +#else +#include +#endif + +#include + +#define BIT(nr) (1UL << (nr)) + +#define MSM_CAM_IOCTL_MAGIC 'm' + +#define MAX_SERVER_PAYLOAD_LENGTH 8192 + +#define MSM_CAM_IOCTL_GET_SENSOR_INFO \ + _IOR(MSM_CAM_IOCTL_MAGIC, 1, struct msm_camsensor_info *) + +#define MSM_CAM_IOCTL_REGISTER_PMEM \ + _IOW(MSM_CAM_IOCTL_MAGIC, 2, struct msm_pmem_info *) + +#define MSM_CAM_IOCTL_UNREGISTER_PMEM \ + _IOW(MSM_CAM_IOCTL_MAGIC, 3, unsigned) + +#define MSM_CAM_IOCTL_CTRL_COMMAND \ + _IOW(MSM_CAM_IOCTL_MAGIC, 4, struct msm_ctrl_cmd *) + +#define MSM_CAM_IOCTL_CONFIG_VFE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 5, struct msm_camera_vfe_cfg_cmd *) + +#define MSM_CAM_IOCTL_GET_STATS \ + _IOR(MSM_CAM_IOCTL_MAGIC, 6, struct msm_camera_stats_event_ctrl *) + +#define MSM_CAM_IOCTL_GETFRAME \ + _IOR(MSM_CAM_IOCTL_MAGIC, 7, struct msm_camera_get_frame *) + +#define MSM_CAM_IOCTL_ENABLE_VFE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 8, struct camera_enable_cmd *) + +#define MSM_CAM_IOCTL_CTRL_CMD_DONE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 9, struct camera_cmd *) + +#define MSM_CAM_IOCTL_CONFIG_CMD \ + _IOW(MSM_CAM_IOCTL_MAGIC, 10, struct camera_cmd *) + +#define MSM_CAM_IOCTL_DISABLE_VFE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 11, struct camera_enable_cmd *) + +#define MSM_CAM_IOCTL_PAD_REG_RESET2 \ + _IOW(MSM_CAM_IOCTL_MAGIC, 12, struct camera_enable_cmd *) + +#define MSM_CAM_IOCTL_VFE_APPS_RESET \ + _IOW(MSM_CAM_IOCTL_MAGIC, 13, struct camera_enable_cmd *) + +#define MSM_CAM_IOCTL_RELEASE_FRAME_BUFFER \ + _IOW(MSM_CAM_IOCTL_MAGIC, 14, struct camera_enable_cmd *) + +#define MSM_CAM_IOCTL_RELEASE_STATS_BUFFER \ + _IOW(MSM_CAM_IOCTL_MAGIC, 15, struct msm_stats_buf *) + +#define MSM_CAM_IOCTL_AXI_CONFIG \ + _IOW(MSM_CAM_IOCTL_MAGIC, 16, struct msm_camera_vfe_cfg_cmd *) + +#define MSM_CAM_IOCTL_GET_PICTURE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 17, struct msm_frame *) + +#define MSM_CAM_IOCTL_SET_CROP \ + _IOW(MSM_CAM_IOCTL_MAGIC, 18, struct crop_info *) + +#define MSM_CAM_IOCTL_PICT_PP \ + _IOW(MSM_CAM_IOCTL_MAGIC, 19, uint8_t *) + +#define MSM_CAM_IOCTL_PICT_PP_DONE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 20, struct msm_snapshot_pp_status *) + +#define MSM_CAM_IOCTL_SENSOR_IO_CFG \ + _IOW(MSM_CAM_IOCTL_MAGIC, 21, struct sensor_cfg_data *) + +#define MSM_CAM_IOCTL_FLASH_LED_CFG \ + _IOW(MSM_CAM_IOCTL_MAGIC, 22, unsigned *) + +#define MSM_CAM_IOCTL_UNBLOCK_POLL_FRAME \ + _IO(MSM_CAM_IOCTL_MAGIC, 23) + +#define MSM_CAM_IOCTL_CTRL_COMMAND_2 \ + _IOW(MSM_CAM_IOCTL_MAGIC, 24, struct msm_ctrl_cmd *) + +#define MSM_CAM_IOCTL_AF_CTRL \ + _IOR(MSM_CAM_IOCTL_MAGIC, 25, struct msm_ctrl_cmt_t *) + +#define MSM_CAM_IOCTL_AF_CTRL_DONE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 26, struct msm_ctrl_cmt_t *) + +#define MSM_CAM_IOCTL_CONFIG_VPE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 27, struct msm_camera_vpe_cfg_cmd *) + +#define MSM_CAM_IOCTL_AXI_VPE_CONFIG \ + _IOW(MSM_CAM_IOCTL_MAGIC, 28, struct msm_camera_vpe_cfg_cmd *) + +#define MSM_CAM_IOCTL_STROBE_FLASH_CFG \ + _IOW(MSM_CAM_IOCTL_MAGIC, 29, uint32_t *) + +#define MSM_CAM_IOCTL_STROBE_FLASH_CHARGE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 30, uint32_t *) + +#define MSM_CAM_IOCTL_STROBE_FLASH_RELEASE \ + _IO(MSM_CAM_IOCTL_MAGIC, 31) + +#define MSM_CAM_IOCTL_FLASH_CTRL \ + _IOW(MSM_CAM_IOCTL_MAGIC, 32, struct flash_ctrl_data *) + +#define MSM_CAM_IOCTL_ERROR_CONFIG \ + _IOW(MSM_CAM_IOCTL_MAGIC, 33, uint32_t *) + +#define MSM_CAM_IOCTL_ABORT_CAPTURE \ + _IO(MSM_CAM_IOCTL_MAGIC, 34) + +#define MSM_CAM_IOCTL_SET_FD_ROI \ + _IOW(MSM_CAM_IOCTL_MAGIC, 35, struct fd_roi_info *) + +#define MSM_CAM_IOCTL_GET_CAMERA_INFO \ + _IOR(MSM_CAM_IOCTL_MAGIC, 36, struct msm_camera_info *) + +#define MSM_CAM_IOCTL_UNBLOCK_POLL_PIC_FRAME \ + _IO(MSM_CAM_IOCTL_MAGIC, 37) + +#define MSM_CAM_IOCTL_RELEASE_PIC_BUFFER \ + _IOW(MSM_CAM_IOCTL_MAGIC, 38, struct camera_enable_cmd *) + +#define MSM_CAM_IOCTL_PUT_ST_FRAME \ + _IOW(MSM_CAM_IOCTL_MAGIC, 39, struct msm_camera_st_frame *) + +#define MSM_CAM_IOCTL_V4L2_EVT_NOTIFY \ + _IOW(MSM_CAM_IOCTL_MAGIC, 40, struct v4l2_event_and_payload) + +#define MSM_CAM_IOCTL_SET_MEM_MAP_INFO \ + _IOR(MSM_CAM_IOCTL_MAGIC, 41, struct msm_mem_map_info *) + +#define MSM_CAM_IOCTL_ACTUATOR_IO_CFG \ + _IOW(MSM_CAM_IOCTL_MAGIC, 42, struct msm_actuator_cfg_data *) + +#define MSM_CAM_IOCTL_MCTL_POST_PROC \ + _IOW(MSM_CAM_IOCTL_MAGIC, 43, struct msm_mctl_post_proc_cmd *) + +#define MSM_CAM_IOCTL_RESERVE_FREE_FRAME \ + _IOW(MSM_CAM_IOCTL_MAGIC, 44, struct msm_cam_evt_divert_frame *) + +#define MSM_CAM_IOCTL_RELEASE_FREE_FRAME \ + _IOR(MSM_CAM_IOCTL_MAGIC, 45, struct msm_cam_evt_divert_frame *) + +#define MSM_CAM_IOCTL_PICT_PP_DIVERT_DONE \ + _IOR(MSM_CAM_IOCTL_MAGIC, 46, struct msm_pp_frame *) + +#define MSM_CAM_IOCTL_SENSOR_V4l2_S_CTRL \ + _IOR(MSM_CAM_IOCTL_MAGIC, 47, struct v4l2_control) + +#define MSM_CAM_IOCTL_SENSOR_V4l2_QUERY_CTRL \ + _IOR(MSM_CAM_IOCTL_MAGIC, 48, struct v4l2_queryctrl) + +#define MSM_CAM_IOCTL_GET_KERNEL_SYSTEM_TIME \ + _IOW(MSM_CAM_IOCTL_MAGIC, 49, struct timeval *) + +#define MSM_CAM_IOCTL_SET_VFE_OUTPUT_TYPE \ + _IOW(MSM_CAM_IOCTL_MAGIC, 50, uint32_t *) + +#define MSM_CAM_IOCTL_MCTL_DIVERT_DONE \ + _IOR(MSM_CAM_IOCTL_MAGIC, 51, struct msm_cam_evt_divert_frame *) + +#define MSM_CAM_IOCTL_GET_ACTUATOR_INFO \ + _IOW(MSM_CAM_IOCTL_MAGIC, 52, struct msm_actuator_cfg_data *) + +#define MSM_CAM_IOCTL_EEPROM_IO_CFG \ + _IOW(MSM_CAM_IOCTL_MAGIC, 53, struct msm_eeprom_cfg_data *) + +#define MSM_CAM_IOCTL_ISPIF_IO_CFG \ + _IOR(MSM_CAM_IOCTL_MAGIC, 54, struct ispif_cfg_data *) + +#define MSM_CAM_IOCTL_STATS_REQBUF \ + _IOR(MSM_CAM_IOCTL_MAGIC, 55, struct msm_stats_reqbuf *) + +#define MSM_CAM_IOCTL_STATS_ENQUEUEBUF \ + _IOR(MSM_CAM_IOCTL_MAGIC, 56, struct msm_stats_buf_info *) + +#define MSM_CAM_IOCTL_STATS_FLUSH_BUFQ \ + _IOR(MSM_CAM_IOCTL_MAGIC, 57, struct msm_stats_flush_bufq *) + +#define MSM_CAM_IOCTL_SET_MCTL_SDEV \ + _IOW(MSM_CAM_IOCTL_MAGIC, 58, struct msm_mctl_set_sdev_data *) + +#define MSM_CAM_IOCTL_UNSET_MCTL_SDEV \ + _IOW(MSM_CAM_IOCTL_MAGIC, 59, struct msm_mctl_set_sdev_data *) + +#define MSM_CAM_IOCTL_GET_INST_HANDLE \ + _IOR(MSM_CAM_IOCTL_MAGIC, 60, uint32_t *) + +#define MSM_CAM_IOCTL_STATS_UNREG_BUF \ + _IOR(MSM_CAM_IOCTL_MAGIC, 61, struct msm_stats_flush_bufq *) + +#define MSM_CAM_IOCTL_CSIC_IO_CFG \ + _IOWR(MSM_CAM_IOCTL_MAGIC, 62, struct csic_cfg_data *) + +#define MSM_CAM_IOCTL_CSID_IO_CFG \ + _IOWR(MSM_CAM_IOCTL_MAGIC, 63, struct csid_cfg_data *) + +#define MSM_CAM_IOCTL_CSIPHY_IO_CFG \ + _IOR(MSM_CAM_IOCTL_MAGIC, 64, struct csiphy_cfg_data *) + +#define MSM_CAM_IOCTL_OEM \ + _IOW(MSM_CAM_IOCTL_MAGIC, 65, struct sensor_cfg_data *) + +#define MSM_CAM_IOCTL_AXI_INIT \ + _IOWR(MSM_CAM_IOCTL_MAGIC, 66, uint8_t *) + +#define MSM_CAM_IOCTL_AXI_RELEASE \ + _IO(MSM_CAM_IOCTL_MAGIC, 67) + +#define MSM_CAM_IOCTL_V4L2_EVT_NATIVE_CMD \ + _IOWR(MSM_CAM_IOCTL_MAGIC, 68, struct msm_camera_v4l2_ioctl_t) + +#define MSM_CAM_IOCTL_V4L2_EVT_NATIVE_FRONT_CMD \ + _IOWR(MSM_CAM_IOCTL_MAGIC, 69, struct msm_camera_v4l2_ioctl_t) + +#define MSM_CAM_IOCTL_AXI_LOW_POWER_MODE \ + _IOWR(MSM_CAM_IOCTL_MAGIC, 70, uint8_t *) + +#ifndef QCT_TEMP /* QCT 10112012 - IOCTL call*/ +#define MSM_CAM_IOCTL_INTF_MCTL_MAPPING_CFG \ + _IOR(MSM_CAM_IOCTL_MAGIC, 71, struct intf_mctl_mapping_cfg *) +#endif + +#define MSM_CAM_IOCTL_VFE_STATS_VERSION\ + _IOWR(MSM_CAM_IOCTL_MAGIC, 72, uint32_t *) + +struct ioctl_native_cmd { + unsigned short mode; + unsigned short address; + unsigned short value_1; + unsigned short value_2; + unsigned short value_3; +}; + +struct v4l2_event_and_payload { + struct v4l2_event evt; + uint32_t payload_length; + uint32_t transaction_id; + void *payload; +}; + +struct msm_stats_reqbuf { + int num_buf; /* how many buffers requested */ + int stats_type; /* stats type */ +}; + +struct msm_stats_flush_bufq { + int stats_type; /* enum msm_stats_enum_type */ +}; + +struct msm_mctl_pp_cmd { + int32_t id; + uint16_t length; + void *value; +}; + +struct msm_mctl_post_proc_cmd { + int32_t type; + struct msm_mctl_pp_cmd cmd; +}; + +#define MSM_CAMERA_LED_OFF 0 +#define MSM_CAMERA_LED_LOW 1 +#define MSM_CAMERA_LED_HIGH 2 +#define MSM_CAMERA_LED_INIT 3 +#define MSM_CAMERA_LED_RELEASE 4 + +#define MSM_CAMERA_STROBE_FLASH_NONE 0 +#define MSM_CAMERA_STROBE_FLASH_XENON 1 + +#define MSM_MAX_CAMERA_SENSORS 5 +#define MAX_SENSOR_NAME 32 +#define MAX_CAM_NAME_SIZE 32 +#define MAX_ACT_MOD_NAME_SIZE 32 +#define MAX_ACT_NAME_SIZE 32 +#define NUM_ACTUATOR_DIR 2 +#define MAX_ACTUATOR_SCENARIO 8 +#define MAX_ACTUATOR_REGION 5 +#define MAX_ACTUATOR_INIT_SET 12 +#define MAX_ACTUATOR_TYPE_SIZE 32 +#define MAX_ACTUATOR_REG_TBL_SIZE 8 + + +#define MSM_MAX_CAMERA_CONFIGS 2 + +#define PP_SNAP 0x01 +#define PP_RAW_SNAP ((0x01)<<1) +#define PP_PREV ((0x01)<<2) +#define PP_THUMB ((0x01)<<3) +#if defined(CONFIG_MACH_JACTIVE_ATT) || defined(CONFIG_MACH_JACTIVE_EUR) +#define PP_RDI_PREV ((0x01)<<4) //Kim +#define PP_MASK (PP_SNAP|PP_RAW_SNAP|PP_PREV|PP_THUMB|PP_RDI_PREV) +#else +#define PP_MASK (PP_SNAP|PP_RAW_SNAP|PP_PREV|PP_THUMB) +#endif + +#define MSM_CAM_CTRL_CMD_DONE 0 +#define MSM_CAM_SENSOR_VFE_CMD 1 + +/* Should be same as VIDEO_MAX_PLANES in videodev2.h */ +#define MAX_PLANES 8 + +/***************************************************** + * structure + *****************************************************/ + +/* define five type of structures for userspace <==> kernel + * space communication: + * command 1 - 2 are from userspace ==> kernel + * command 3 - 4 are from kernel ==> userspace + * + * 1. control command: control command(from control thread), + * control status (from config thread); + */ +struct msm_ctrl_cmd { + uint16_t type; + uint16_t length; + void *value; + uint16_t status; + uint32_t timeout_ms; + int resp_fd; /* FIXME: to be used by the kernel, pass-through for now */ + int vnode_id; /* video dev id. Can we overload resp_fd? */ + int queue_idx; + uint32_t evt_id; + uint32_t stream_type; /* used to pass value to qcamera server */ + int config_ident; /*used as identifier for config node*/ +}; + +struct msm_cam_evt_msg { + unsigned short type; /* 1 == event (RPC), 0 == message (adsp) */ + unsigned short msg_id; + unsigned int len; /* size in, number of bytes out */ + uint32_t frame_id; + void *data; + struct timespec timestamp; +}; + +struct msm_pp_frame_sp { + /* phy addr of the buffer */ + unsigned long phy_addr; + uint32_t y_off; + uint32_t cbcr_off; + /* buffer length */ + uint32_t length; + int32_t fd; + uint32_t addr_offset; + /* mapped addr */ + unsigned long vaddr; +}; + +struct msm_pp_frame_mp { + /* phy addr of the plane */ + unsigned long phy_addr; + /* offset of plane data */ + uint32_t data_offset; + /* plane length */ + uint32_t length; + int32_t fd; + uint32_t addr_offset; + /* mapped addr */ + unsigned long vaddr; +}; + +struct msm_pp_frame { + uint32_t handle; /* stores vb cookie */ + uint32_t frame_id; + unsigned short buf_idx; + int path; + unsigned short image_type; + unsigned short num_planes; /* 1 for sp */ + struct timeval timestamp; + union { + struct msm_pp_frame_sp sp; + struct msm_pp_frame_mp mp[MAX_PLANES]; + }; + int node_type; + uint32_t inst_handle; +}; + +struct msm_pp_crop { + uint32_t src_x; + uint32_t src_y; + uint32_t src_w; + uint32_t src_h; + uint32_t dst_x; + uint32_t dst_y; + uint32_t dst_w; + uint32_t dst_h; + uint8_t update_flag; +}; + +struct msm_mctl_pp_frame_cmd { + uint32_t cookie; + uint8_t vpe_output_action; + struct msm_pp_frame src_frame; + struct msm_pp_frame dest_frame; + struct msm_pp_crop crop; + int path; +}; + +struct msm_cam_evt_divert_frame { + unsigned short image_mode; + unsigned short op_mode; + unsigned short inst_idx; + unsigned short node_idx; + struct msm_pp_frame frame; + int do_pp; +}; + +struct msm_mctl_pp_cmd_ack_event { + uint32_t cmd; /* VPE_CMD_ZOOM? */ + int status; /* 0 done, < 0 err */ + uint32_t cookie; /* daemon's cookie */ +}; + +struct msm_mctl_pp_event_info { + int32_t event; + union { + struct msm_mctl_pp_cmd_ack_event ack; + }; +}; + +struct msm_isp_event_ctrl { + unsigned short resptype; + union { + struct msm_cam_evt_msg isp_msg; + struct msm_ctrl_cmd ctrl; + struct msm_cam_evt_divert_frame div_frame; + struct msm_mctl_pp_event_info pp_event_info; + } isp_data; +}; + +#define MSM_CAM_RESP_CTRL 0 +#define MSM_CAM_RESP_STAT_EVT_MSG 1 +#define MSM_CAM_RESP_STEREO_OP_1 2 +#define MSM_CAM_RESP_STEREO_OP_2 3 +#define MSM_CAM_RESP_V4L2 4 +#define MSM_CAM_RESP_DIV_FRAME_EVT_MSG 5 +#define MSM_CAM_RESP_DONE_EVENT 6 +#define MSM_CAM_RESP_MCTL_PP_EVENT 7 +#define MSM_CAM_RESP_MAX 8 + +#define MSM_CAM_APP_NOTIFY_EVENT 0 +#define MSM_CAM_APP_NOTIFY_ERROR_EVENT 1 + +/* this one is used to send ctrl/status up to config thread */ + +struct msm_stats_event_ctrl { + /* 0 - ctrl_cmd from control thread, + * 1 - stats/event kernel, + * 2 - V4L control or read request */ + int resptype; + int timeout_ms; + struct msm_ctrl_cmd ctrl_cmd; + /* struct vfe_event_t stats_event; */ + struct msm_cam_evt_msg stats_event; +}; + +/* 2. config command: config command(from config thread); */ +struct msm_camera_cfg_cmd { + /* what to config: + * 1 - sensor config, 2 - vfe config */ + uint16_t cfg_type; + + /* sensor config type */ + uint16_t cmd_type; + uint16_t queue; + uint16_t length; + void *value; +}; + +#define CMD_GENERAL 0 +#define CMD_AXI_CFG_OUT1 1 +#define CMD_AXI_CFG_SNAP_O1_AND_O2 2 +#define CMD_AXI_CFG_OUT2 3 +#define CMD_PICT_T_AXI_CFG 4 +#define CMD_PICT_M_AXI_CFG 5 +#define CMD_RAW_PICT_AXI_CFG 6 + +#define CMD_FRAME_BUF_RELEASE 7 +#define CMD_PREV_BUF_CFG 8 +#define CMD_SNAP_BUF_RELEASE 9 +#define CMD_SNAP_BUF_CFG 10 +#define CMD_STATS_DISABLE 11 +#define CMD_STATS_AEC_AWB_ENABLE 12 +#define CMD_STATS_AF_ENABLE 13 +#define CMD_STATS_AEC_ENABLE 14 +#define CMD_STATS_AWB_ENABLE 15 +#define CMD_STATS_ENABLE 16 + +#define CMD_STATS_AXI_CFG 17 +#define CMD_STATS_AEC_AXI_CFG 18 +#define CMD_STATS_AF_AXI_CFG 19 +#define CMD_STATS_AWB_AXI_CFG 20 +#define CMD_STATS_RS_AXI_CFG 21 +#define CMD_STATS_CS_AXI_CFG 22 +#define CMD_STATS_IHIST_AXI_CFG 23 +#define CMD_STATS_SKIN_AXI_CFG 24 + +#define CMD_STATS_BUF_RELEASE 25 +#define CMD_STATS_AEC_BUF_RELEASE 26 +#define CMD_STATS_AF_BUF_RELEASE 27 +#define CMD_STATS_AWB_BUF_RELEASE 28 +#define CMD_STATS_RS_BUF_RELEASE 29 +#define CMD_STATS_CS_BUF_RELEASE 30 +#define CMD_STATS_IHIST_BUF_RELEASE 31 +#define CMD_STATS_SKIN_BUF_RELEASE 32 + +#define UPDATE_STATS_INVALID 33 +#define CMD_AXI_CFG_SNAP_GEMINI 34 +#define CMD_AXI_CFG_SNAP 35 +#define CMD_AXI_CFG_PREVIEW 36 +#define CMD_AXI_CFG_VIDEO 37 + +#define CMD_STATS_IHIST_ENABLE 38 +#define CMD_STATS_RS_ENABLE 39 +#define CMD_STATS_CS_ENABLE 40 +#define CMD_VPE 41 +#define CMD_AXI_CFG_VPE 42 +#define CMD_AXI_CFG_ZSL 43 +#define CMD_AXI_CFG_SNAP_VPE 44 +#define CMD_AXI_CFG_SNAP_THUMB_VPE 45 + +#define CMD_CONFIG_PING_ADDR 46 +#define CMD_CONFIG_PONG_ADDR 47 +#define CMD_CONFIG_FREE_BUF_ADDR 48 +#define CMD_AXI_CFG_ZSL_ALL_CHNLS 49 +#define CMD_AXI_CFG_VIDEO_ALL_CHNLS 50 +#define CMD_VFE_BUFFER_RELEASE 51 +#define CMD_VFE_PROCESS_IRQ 52 +#define CMD_STATS_BG_ENABLE 53 +#define CMD_STATS_BF_ENABLE 54 +#define CMD_STATS_BHIST_ENABLE 55 +#define CMD_STATS_BG_BUF_RELEASE 56 +#define CMD_STATS_BF_BUF_RELEASE 57 +#define CMD_STATS_BHIST_BUF_RELEASE 58 +#define CMD_VFE_PIX_SOF_COUNT_UPDATE 59 +#define CMD_VFE_COUNT_PIX_SOF_ENABLE 60 + +#define CMD_AXI_CFG_PRIM BIT(8) +#define CMD_AXI_CFG_PRIM_ALL_CHNLS BIT(9) +#define CMD_AXI_CFG_SEC BIT(10) +#define CMD_AXI_CFG_SEC_ALL_CHNLS BIT(11) +#define CMD_AXI_CFG_TERT1 BIT(12) +#define CMD_AXI_CFG_TERT2 BIT(13) +#define CMD_AXI_CFG_TERT3 BIT(14) + +#define CMD_AXI_START 0xE1 +#define CMD_AXI_STOP 0xE2 +#define CMD_AXI_RESET 0xE3 +#define CMD_AXI_ABORT 0xE4 + + + +#define AXI_CMD_PREVIEW BIT(0) +#define AXI_CMD_CAPTURE BIT(1) +#define AXI_CMD_RECORD BIT(2) +#define AXI_CMD_ZSL BIT(3) +#define AXI_CMD_RAW_CAPTURE BIT(4) +#define AXI_CMD_LIVESHOT BIT(5) + +/* vfe config command: config command(from config thread)*/ +struct msm_vfe_cfg_cmd { + int cmd_type; + uint16_t length; + void *value; +}; + +struct msm_vpe_cfg_cmd { + int cmd_type; + uint16_t length; + void *value; +}; + +#define MAX_CAMERA_ENABLE_NAME_LEN 32 +struct camera_enable_cmd { + char name[MAX_CAMERA_ENABLE_NAME_LEN]; +}; + +#define MSM_PMEM_OUTPUT1 0 +#define MSM_PMEM_OUTPUT2 1 +#define MSM_PMEM_OUTPUT1_OUTPUT2 2 +#define MSM_PMEM_THUMBNAIL 3 +#define MSM_PMEM_MAINIMG 4 +#define MSM_PMEM_RAW_MAINIMG 5 +#define MSM_PMEM_AEC_AWB 6 +#define MSM_PMEM_AF 7 +#define MSM_PMEM_AEC 8 +#define MSM_PMEM_AWB 9 +#define MSM_PMEM_RS 10 +#define MSM_PMEM_CS 11 +#define MSM_PMEM_IHIST 12 +#define MSM_PMEM_SKIN 13 +#define MSM_PMEM_VIDEO 14 +#define MSM_PMEM_PREVIEW 15 +#define MSM_PMEM_VIDEO_VPE 16 +#define MSM_PMEM_C2D 17 +#define MSM_PMEM_MAINIMG_VPE 18 +#define MSM_PMEM_THUMBNAIL_VPE 19 +#define MSM_PMEM_BAYER_GRID 20 +#define MSM_PMEM_BAYER_FOCUS 21 +#define MSM_PMEM_BAYER_HIST 22 +#define MSM_PMEM_MAX 23 + +#define STAT_AEAW 0 +#define STAT_AEC 1 +#define STAT_AF 2 +#define STAT_AWB 3 +#define STAT_RS 4 +#define STAT_CS 5 +#define STAT_IHIST 6 +#define STAT_SKIN 7 +#define STAT_BG 8 +#define STAT_BF 9 +#define STAT_BHIST 10 +#define STAT_MAX 11 + +#define FRAME_PREVIEW_OUTPUT1 0 +#define FRAME_PREVIEW_OUTPUT2 1 +#define FRAME_SNAPSHOT 2 +#define FRAME_THUMBNAIL 3 +#define FRAME_RAW_SNAPSHOT 4 +#define FRAME_MAX 5 + +enum msm_stats_enum_type { + MSM_STATS_TYPE_AEC, /* legacy based AEC */ + MSM_STATS_TYPE_AF, /* legacy based AF */ + MSM_STATS_TYPE_AWB, /* legacy based AWB */ + MSM_STATS_TYPE_RS, /* legacy based RS */ + MSM_STATS_TYPE_CS, /* legacy based CS */ + MSM_STATS_TYPE_IHIST, /* legacy based HIST */ + MSM_STATS_TYPE_SKIN, /* legacy based SKIN */ + MSM_STATS_TYPE_BG, /* Bayer Grids */ + MSM_STATS_TYPE_BF, /* Bayer Focus */ + MSM_STATS_TYPE_BHIST, /* Bayer Hist */ + MSM_STATS_TYPE_AE_AW, /* legacy stats for vfe 2.x*/ + MSM_STATS_TYPE_COMP, /* Composite stats */ + MSM_STATS_TYPE_MAX /* MAX */ +}; + +struct msm_stats_buf_info { + int type; /* msm_stats_enum_type */ + int fd; + void *vaddr; + uint32_t offset; + uint32_t len; + uint32_t y_off; + uint32_t cbcr_off; + uint32_t planar0_off; + uint32_t planar1_off; + uint32_t planar2_off; + uint8_t active; + int buf_idx; +}; + +struct msm_pmem_info { + int type; + int fd; + void *vaddr; + uint32_t offset; + uint32_t len; + uint32_t y_off; + uint32_t cbcr_off; + uint32_t planar0_off; + uint32_t planar1_off; + uint32_t planar2_off; + uint8_t active; +}; + +struct outputCfg { + uint32_t height; + uint32_t width; + + uint32_t window_height_firstline; + uint32_t window_height_lastline; +}; + +#define VIDEO_NODE 0 +#define MCTL_NODE 1 + +#define OUTPUT_1 0 +#define OUTPUT_2 1 +#define OUTPUT_1_AND_2 2 /* snapshot only */ +#define OUTPUT_1_AND_3 3 /* video */ +#define CAMIF_TO_AXI_VIA_OUTPUT_2 4 +#define OUTPUT_1_AND_CAMIF_TO_AXI_VIA_OUTPUT_2 5 +#define OUTPUT_2_AND_CAMIF_TO_AXI_VIA_OUTPUT_1 6 +#define OUTPUT_1_2_AND_3 7 +#define OUTPUT_ALL_CHNLS 8 +#define OUTPUT_VIDEO_ALL_CHNLS 9 +#define OUTPUT_ZSL_ALL_CHNLS 10 +#define LAST_AXI_OUTPUT_MODE_ENUM = OUTPUT_ZSL_ALL_CHNLS + +#define OUTPUT_PRIM BIT(8) +#define OUTPUT_PRIM_ALL_CHNLS BIT(9) +#define OUTPUT_SEC BIT(10) +#define OUTPUT_SEC_ALL_CHNLS BIT(11) +#define OUTPUT_TERT1 BIT(12) +#define OUTPUT_TERT2 BIT(13) +#define OUTPUT_TERT3 BIT(14) + +#define MSM_FRAME_PREV_1 0 +#define MSM_FRAME_PREV_2 1 +#define MSM_FRAME_ENC 2 + +#define OUTPUT_TYPE_P BIT(0) +#define OUTPUT_TYPE_T BIT(1) +#define OUTPUT_TYPE_S BIT(2) +#define OUTPUT_TYPE_V BIT(3) +#define OUTPUT_TYPE_L BIT(4) +#define OUTPUT_TYPE_ST_L BIT(5) +#define OUTPUT_TYPE_ST_R BIT(6) +#define OUTPUT_TYPE_ST_D BIT(7) +#define OUTPUT_TYPE_R BIT(8) +#define OUTPUT_TYPE_R1 BIT(9) +#define OUTPUT_TYPE_SAEC BIT(10) +#define OUTPUT_TYPE_SAFC BIT(11) +#define OUTPUT_TYPE_SAWB BIT(12) +#define OUTPUT_TYPE_IHST BIT(13) +#define OUTPUT_TYPE_CSTA BIT(14) +#define OUTPUT_TYPE_R2 BIT(15) + +struct fd_roi_info { + void *info; + int info_len; +}; + +struct msm_mem_map_info { + uint32_t cookie; + uint32_t length; + uint32_t mem_type; +}; + +#define MSM_MEM_MMAP 0 +#define MSM_MEM_USERPTR 1 +#define MSM_PLANE_MAX 8 +#define MSM_PLANE_Y 0 +#define MSM_PLANE_UV 1 + +struct msm_frame { + struct timespec ts; + int path; + int type; + unsigned long buffer; + uint32_t phy_offset; + uint32_t y_off; + uint32_t cbcr_off; + uint32_t planar0_off; + uint32_t planar1_off; + uint32_t planar2_off; + int fd; + + void *cropinfo; + int croplen; + uint32_t error_code; + struct fd_roi_info roi_info; + uint32_t frame_id; + int stcam_quality_ind; + uint32_t stcam_conv_value; + + struct ion_allocation_data ion_alloc; + struct ion_fd_data fd_data; + int ion_dev_fd; +}; + +enum msm_st_frame_packing { + SIDE_BY_SIDE_HALF, + SIDE_BY_SIDE_FULL, + TOP_DOWN_HALF, + TOP_DOWN_FULL, +}; + +struct msm_st_crop { + uint32_t in_w; + uint32_t in_h; + uint32_t out_w; + uint32_t out_h; +}; + +struct msm_st_half { + uint32_t buf_p0_off; + uint32_t buf_p1_off; + uint32_t buf_p0_stride; + uint32_t buf_p1_stride; + uint32_t pix_x_off; + uint32_t pix_y_off; + struct msm_st_crop stCropInfo; +}; + +struct msm_st_frame { + struct msm_frame buf_info; + int type; + enum msm_st_frame_packing packing; + struct msm_st_half L; + struct msm_st_half R; + int frame_id; +}; + +#define MSM_CAMERA_ERR_MASK (0xFFFFFFFF & 1) + +struct stats_buff { + unsigned long buff; + int fd; +}; + +struct msm_stats_buf { + uint8_t awb_ymin; + struct stats_buff aec; + struct stats_buff awb; + struct stats_buff af; + struct stats_buff ihist; + struct stats_buff rs; + struct stats_buff cs; + struct stats_buff skin; + int type; + uint32_t status_bits; + unsigned long buffer; + int fd; + int length; + struct ion_handle *handle; + uint32_t frame_id; + int buf_idx; +}; +#define MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT 0 +/* video capture mode in VIDIOC_S_PARM */ +#define MSM_V4L2_EXT_CAPTURE_MODE_PREVIEW \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+1) +/* extendedmode for video recording in VIDIOC_S_PARM */ +#define MSM_V4L2_EXT_CAPTURE_MODE_VIDEO \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+2) +/* extendedmode for the full size main image in VIDIOC_S_PARM */ +#define MSM_V4L2_EXT_CAPTURE_MODE_MAIN (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+3) +/* extendedmode for the thumb nail image in VIDIOC_S_PARM */ +#define MSM_V4L2_EXT_CAPTURE_MODE_THUMBNAIL \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+4) +/* ISP_PIX_OUTPUT1: no pp, directly send output1 buf to user */ +#define MSM_V4L2_EXT_CAPTURE_MODE_ISP_PIX_OUTPUT1 \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+5) +/* ISP_PIX_OUTPUT2: no pp, directly send output2 buf to user */ +#define MSM_V4L2_EXT_CAPTURE_MODE_ISP_PIX_OUTPUT2 \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+6) +/* raw image type */ +#define MSM_V4L2_EXT_CAPTURE_MODE_RAW \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+7) +/* RDI dump */ +#define MSM_V4L2_EXT_CAPTURE_MODE_RDI \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+8) +/* RDI dump 1 */ +#define MSM_V4L2_EXT_CAPTURE_MODE_RDI1 \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+9) +/* RDI dump 2 */ +#define MSM_V4L2_EXT_CAPTURE_MODE_RDI2 \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+10) +#define MSM_V4L2_EXT_CAPTURE_MODE_AEC \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+11) +#define MSM_V4L2_EXT_CAPTURE_MODE_AWB \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+12) +#define MSM_V4L2_EXT_CAPTURE_MODE_AF \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+13) +#define MSM_V4L2_EXT_CAPTURE_MODE_IHIST \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+14) +#define MSM_V4L2_EXT_CAPTURE_MODE_CS \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+15) +#define MSM_V4L2_EXT_CAPTURE_MODE_RS \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+16) +#define MSM_V4L2_EXT_CAPTURE_MODE_CSTA \ + (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+17) +#define MSM_V4L2_EXT_CAPTURE_MODE_MAX (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+18) + +#define MSM_V4L2_PID_MOTION_ISO V4L2_CID_PRIVATE_BASE +#define MSM_V4L2_PID_EFFECT (V4L2_CID_PRIVATE_BASE+1) +#define MSM_V4L2_PID_HJR (V4L2_CID_PRIVATE_BASE+2) +#define MSM_V4L2_PID_LED_MODE (V4L2_CID_PRIVATE_BASE+3) +#define MSM_V4L2_PID_PREP_SNAPSHOT (V4L2_CID_PRIVATE_BASE+4) +#define MSM_V4L2_PID_EXP_METERING (V4L2_CID_PRIVATE_BASE+5) +#define MSM_V4L2_PID_ISO (V4L2_CID_PRIVATE_BASE+6) +#define MSM_V4L2_PID_CAM_MODE (V4L2_CID_PRIVATE_BASE+7) +#define MSM_V4L2_PID_LUMA_ADAPTATION (V4L2_CID_PRIVATE_BASE+8) +#define MSM_V4L2_PID_BEST_SHOT (V4L2_CID_PRIVATE_BASE+9) +#define MSM_V4L2_PID_FOCUS_MODE (V4L2_CID_PRIVATE_BASE+10) +#define MSM_V4L2_PID_BL_DETECTION (V4L2_CID_PRIVATE_BASE+11) +#define MSM_V4L2_PID_SNOW_DETECTION (V4L2_CID_PRIVATE_BASE+12) +#define MSM_V4L2_PID_CTRL_CMD (V4L2_CID_PRIVATE_BASE+13) +#define MSM_V4L2_PID_EVT_SUB_INFO (V4L2_CID_PRIVATE_BASE+14) +#define MSM_V4L2_PID_STROBE_FLASH (V4L2_CID_PRIVATE_BASE+15) +#define MSM_V4L2_PID_INST_HANDLE (V4L2_CID_PRIVATE_BASE+16) +#define MSM_V4L2_PID_MMAP_INST (V4L2_CID_PRIVATE_BASE+17) +#define MSM_V4L2_PID_PP_PLANE_INFO (V4L2_CID_PRIVATE_BASE+18) +#define MSM_V4L2_PID_PREVIEW_SIZE (V4L2_CID_PRIVATE_BASE+19) +#define MSM_V4L2_PID_MAX MSM_V4L2_PID_PREVIEW_SIZE + +/* camera operation mode for video recording - two frame output queues */ +#define MSM_V4L2_CAM_OP_DEFAULT 0 +/* camera operation mode for video recording - two frame output queues */ +#define MSM_V4L2_CAM_OP_PREVIEW (MSM_V4L2_CAM_OP_DEFAULT+1) +/* camera operation mode for video recording - two frame output queues */ +#define MSM_V4L2_CAM_OP_VIDEO (MSM_V4L2_CAM_OP_DEFAULT+2) +/* camera operation mode for standard shapshot - two frame output queues */ +#define MSM_V4L2_CAM_OP_CAPTURE (MSM_V4L2_CAM_OP_DEFAULT+3) +/* camera operation mode for zsl shapshot - three output queues */ +#define MSM_V4L2_CAM_OP_ZSL (MSM_V4L2_CAM_OP_DEFAULT+4) +/* camera operation mode for raw snapshot - one frame output queue */ +#define MSM_V4L2_CAM_OP_RAW (MSM_V4L2_CAM_OP_DEFAULT+5) +/* camera operation mode for jpeg snapshot - one frame output queue */ +#define MSM_V4L2_CAM_OP_JPEG_CAPTURE (MSM_V4L2_CAM_OP_DEFAULT+6) + + +#define MSM_V4L2_VID_CAP_TYPE 0 +#define MSM_V4L2_STREAM_ON 1 +#define MSM_V4L2_STREAM_OFF 2 +#define MSM_V4L2_SNAPSHOT 3 +#define MSM_V4L2_QUERY_CTRL 4 +#define MSM_V4L2_GET_CTRL 5 +#define MSM_V4L2_SET_CTRL 6 +#define MSM_V4L2_QUERY 7 +#define MSM_V4L2_GET_CROP 8 +#define MSM_V4L2_SET_CROP 9 +#define MSM_V4L2_OPEN 10 +#define MSM_V4L2_CLOSE 11 +#define MSM_V4L2_SET_CTRL_CMD 12 +#define MSM_V4L2_EVT_SUB_MASK 13 +#define MSM_V4L2_PRIVATE_CMD 14 +#define MSM_V4L2_MAX 15 +#define V4L2_CAMERA_EXIT 43 + +struct crop_info { + void *info; + int len; +}; + +struct msm_postproc { + int ftnum; + struct msm_frame fthumnail; + int fmnum; + struct msm_frame fmain; +}; + +struct msm_snapshot_pp_status { + void *status; +}; + +#define CFG_SET_MODE 0 +#define CFG_SET_EFFECT 1 +#define CFG_START 2 +#define CFG_PWR_UP 3 +#define CFG_PWR_DOWN 4 +#define CFG_WRITE_EXPOSURE_GAIN 5 +#define CFG_SET_DEFAULT_FOCUS 6 +#define CFG_MOVE_FOCUS 7 +#define CFG_REGISTER_TO_REAL_GAIN 8 +#define CFG_REAL_TO_REGISTER_GAIN 9 +#define CFG_SET_FPS 10 +#define CFG_SET_PICT_FPS 11 +#define CFG_SET_BRIGHTNESS 12 +#define CFG_SET_CONTRAST 13 +#define CFG_SET_ZOOM 14 +#define CFG_SET_EXPOSURE_MODE 15 +#define CFG_SET_WB 16 +#define CFG_SET_ANTIBANDING 17 +#define CFG_SET_EXP_GAIN 18 +#define CFG_SET_PICT_EXP_GAIN 19 +#define CFG_SET_LENS_SHADING 20 +#define CFG_GET_PICT_FPS 21 +#define CFG_GET_PREV_L_PF 22 +#define CFG_GET_PREV_P_PL 23 +#define CFG_GET_PICT_L_PF 24 +#define CFG_GET_PICT_P_PL 25 +#define CFG_GET_AF_MAX_STEPS 26 +#define CFG_GET_PICT_MAX_EXP_LC 27 +#define CFG_SEND_WB_INFO 28 +#define CFG_SENSOR_INIT 29 +#define CFG_GET_3D_CALI_DATA 30 +#define CFG_GET_CALIB_DATA 31 +#define CFG_GET_OUTPUT_INFO 32 +#define CFG_GET_EEPROM_INFO 33 +#define CFG_GET_EEPROM_DATA 34 +#define CFG_SET_ACTUATOR_INFO 35 +#define CFG_GET_ACTUATOR_INFO 36 +/* TBD: QRD */ +#define CFG_SET_SATURATION 37 +#define CFG_SET_SHARPNESS 38 +#define CFG_SET_TOUCHAEC 39 +#define CFG_SET_AUTO_FOCUS 40 +#define CFG_SET_AUTOFLASH 41 +#define CFG_SET_EXPOSURE_COMPENSATION 42 +#define CFG_SET_ISO 43 +#define CFG_START_STREAM 44 +#define CFG_STOP_STREAM 45 +#define CFG_GET_CSI_PARAMS 46 +#define CFG_POWER_UP 47 +#define CFG_POWER_DOWN 48 +#define CFG_WRITE_I2C_ARRAY 49 +#define CFG_READ_I2C_ARRAY 50 +#define CFG_PCLK_CHANGE 51 +#define CFG_CONFIG_VREG_ARRAY 52 +#define CFG_CONFIG_CLK_ARRAY 53 +#define CFG_GPIO_OP 54 +#define CFG_EEPROM_DIRECT_DATA_READ 55 +#define CFG_EEPROM_DIRECT_DATA_WRITE 56 +#define CFG_EEPROM_DIRECT_DATA_ERASE 57 +#define CFG_SET_STREAMING_MODE 58 +#define CFG_SET_VISION_AE 59 +#define CFG_FINAL_AF 60 //SEMCO Request by Lizk +#define CFG_MAX 61 + + + +#define MOVE_NEAR 0 +#define MOVE_FAR 1 + + +#define CAMERA_MODE_INIT 0 +#define CAMERA_MODE_PREVIEW 1 +#define CAMERA_MODE_CAPTURE 2 +#define CAMERA_MODE_RECORDING 3 + +#define SENSOR_SNAPSHOT_MODE 0 +#define SENSOR_RAW_SNAPSHOT_MODE 1 +#define SENSOR_PREVIEW_MODE 2 +#define SENSOR_VIDEO_MODE 3 +#define SENSOR_HFR_60FPS_MODE 4 +#define SENSOR_HFR_90FPS_MODE 5 +#define SENSOR_HFR_120FPS_MODE 6 +#define SENSOR_INVALID_MODE 7 + +#define SENSOR_QTR_SIZE 0 +#define SENSOR_FULL_SIZE 1 +#define SENSOR_QVGA_SIZE 2 +#define SENSOR_INVALID_SIZE 3 + +#define CAMERA_EFFECT_OFF 0 +#define CAMERA_EFFECT_MONO 1 +#define CAMERA_EFFECT_NEGATIVE 2 +#define CAMERA_EFFECT_SOLARIZE 3 +#define CAMERA_EFFECT_SEPIA 4 +#define CAMERA_EFFECT_POSTERIZE 5 +#define CAMERA_EFFECT_WHITEBOARD 6 +#define CAMERA_EFFECT_BLACKBOARD 7 +#define CAMERA_EFFECT_AQUA 8 +#define CAMERA_EFFECT_EMBOSS 9 +#define CAMERA_EFFECT_SKETCH 10 +#define CAMERA_EFFECT_NEON 11 +#define CAMERA_EFFECT_WARM 12 +#define CAMERA_EFFECT_COLD 13 +#define CAMERA_EFFECT_WASHED 14 +#define CAMERA_EFFECT_VINTAGE_WARM 15 //13 +#define CAMERA_EFFECT_VINTAGE_COLD 16 //14 +#define CAMERA_EFFECT_POINT_COLOR_1 17 //15 +#define CAMERA_EFFECT_POINT_COLOR_2 18 //16 +#define CAMERA_EFFECT_POINT_COLOR_3 19 //17 +#define CAMERA_EFFECT_POINT_COLOR_4 20 //18 +#define CAMERA_EFFECT_USER_DEFINED1 21 //19 +#define CAMERA_EFFECT_USER_DEFINED2 22 //20 +#define CAMERA_EFFECT_USER_DEFINED3 23 //21 +#define CAMERA_EFFECT_USER_DEFINED4 24 //22 +#define CAMERA_EFFECT_USER_DEFINED5 25 //23 +#define CAMERA_EFFECT_USER_DEFINED6 26 //24 +#define CAMERA_EFFECT_MAX 27 //25 + +#define CAMERA_WHITE_BALANCE_AUTO 1 +#define CAMERA_WHITE_BALANCE_INCANDESCENT 3 +#define CAMERA_WHITE_BALANCE_FLUORESCENT 4 +#define CAMERA_WHITE_BALANCE_DAYLIGHT 5 +#define CAMERA_WHITE_BALANCE_CLOUDY_DAYLIGHT 6 + +#define CAMERA_FLASH_OFF 0 +#define CAMERA_FLASH_ON 2 +#define CAMERA_FLASH_AUTO 1 +#define CAMERA_FLASH_TORCH 3 + +#define CAMERA_EV_M4 0 +#define CAMERA_EV_M3 1 +#define CAMERA_EV_M2 2 +#define CAMERA_EV_M1 3 +#define CAMERA_EV_DEFAULT 4 +#define CAMERA_EV_P1 5 +#define CAMERA_EV_P2 6 +#define CAMERA_EV_P3 7 +#define CAMERA_EV_P4 8 + +#define CAMERA_ISO_MODE_AUTO 0 +#define CAMERA_ISO_MODE_50 1 +#define CAMERA_ISO_MODE_100 2 +#define CAMERA_ISO_MODE_200 3 +#define CAMERA_ISO_MODE_400 4 +#define CAMERA_ISO_MODE_800 5 + +#define CAMERA_AVERAGE 0 +#define CAMERA_CENTER_WEIGHT 1 +#define CAMERA_SPOT 2 +#define CAMERA_SCENE_AUTO 1 +#define CAMERA_SCENE_LANDSCAPE 2 +#define CAMERA_SCENE_BEACH 4 +#define CAMERA_SCENE_SUNSET 5 +#define CAMERA_SCENE_NIGHT 6 +#define CAMERA_SCENE_PORTRAIT 7 +#define CAMERA_SCENE_AGAINST_LIGHT 8 +#define CAMERA_SCENE_SPORT 9 +#define CAMERA_SCENE_CANDLE 12 +#define CAMERA_SCENE_FIRE 13 +#define CAMERA_SCENE_PARTY 14 +#define CAMERA_SCENE_TEXT 19 +#define CAMERA_SCENE_FALL 20 +#define CAMERA_SCENE_DAWN 21 + +#define CAMERA_AF_MACRO 1 +#define CAMERA_AF_AUTO 2 + + + + +/* QRD */ +#define CAMERA_EFFECT_BW 10 +#define CAMERA_EFFECT_BLUISH 12 +#define CAMERA_EFFECT_REDDISH 13 +#define CAMERA_EFFECT_GREENISH 14 + +/* QRD */ +#define CAMERA_ANTIBANDING_OFF 0 +#define CAMERA_ANTIBANDING_50HZ 2 +#define CAMERA_ANTIBANDING_60HZ 1 +#define CAMERA_ANTIBANDING_AUTO 3 + +#define CAMERA_CONTRAST_LV0 0 +#define CAMERA_CONTRAST_LV1 1 +#define CAMERA_CONTRAST_LV2 2 +#define CAMERA_CONTRAST_LV3 3 +#define CAMERA_CONTRAST_LV4 4 +#define CAMERA_CONTRAST_LV5 5 +#define CAMERA_CONTRAST_LV6 6 +#define CAMERA_CONTRAST_LV7 7 +#define CAMERA_CONTRAST_LV8 8 +#define CAMERA_CONTRAST_LV9 9 + +#define CAMERA_BRIGHTNESS_LV0 0 +#define CAMERA_BRIGHTNESS_LV1 1 +#define CAMERA_BRIGHTNESS_LV2 2 +#define CAMERA_BRIGHTNESS_LV3 3 +#define CAMERA_BRIGHTNESS_LV4 4 +#define CAMERA_BRIGHTNESS_LV5 5 +#define CAMERA_BRIGHTNESS_LV6 6 +#define CAMERA_BRIGHTNESS_LV7 7 +#define CAMERA_BRIGHTNESS_LV8 8 + + +#define CAMERA_SATURATION_LV0 0 +#define CAMERA_SATURATION_LV1 1 +#define CAMERA_SATURATION_LV2 2 +#define CAMERA_SATURATION_LV3 3 +#define CAMERA_SATURATION_LV4 4 +#define CAMERA_SATURATION_LV5 5 +#define CAMERA_SATURATION_LV6 6 +#define CAMERA_SATURATION_LV7 7 +#define CAMERA_SATURATION_LV8 8 + +#define CAMERA_SHARPNESS_LV0 0 +#define CAMERA_SHARPNESS_LV1 3 +#define CAMERA_SHARPNESS_LV2 6 +#define CAMERA_SHARPNESS_LV3 9 +#define CAMERA_SHARPNESS_LV4 12 +#define CAMERA_SHARPNESS_LV5 15 +#define CAMERA_SHARPNESS_LV6 18 +#define CAMERA_SHARPNESS_LV7 21 +#define CAMERA_SHARPNESS_LV8 24 +#define CAMERA_SHARPNESS_LV9 27 +#define CAMERA_SHARPNESS_LV10 30 + +#define CAMERA_SETAE_AVERAGE 0 +#define CAMERA_SETAE_CENWEIGHT 1 + +#define CAMERA_WB_AUTO 1 /* This list must match aeecamera.h */ +#define CAMERA_WB_CUSTOM 2 +#define CAMERA_WB_INCANDESCENT 3 +#define CAMERA_WB_FLUORESCENT 4 +#define CAMERA_WB_DAYLIGHT 5 +#define CAMERA_WB_CLOUDY_DAYLIGHT 6 +#define CAMERA_WB_TWILIGHT 7 +#define CAMERA_WB_SHADE 8 + +#define CAMERA_EXPOSURE_COMPENSATION_LV0 12 +#define CAMERA_EXPOSURE_COMPENSATION_LV1 6 +#define CAMERA_EXPOSURE_COMPENSATION_LV2 0 +#define CAMERA_EXPOSURE_COMPENSATION_LV3 -6 +#define CAMERA_EXPOSURE_COMPENSATION_LV4 -12 + +enum msm_v4l2_saturation_level { + MSM_V4L2_SATURATION_L0, + MSM_V4L2_SATURATION_L1, + MSM_V4L2_SATURATION_L2, + MSM_V4L2_SATURATION_L3, + MSM_V4L2_SATURATION_L4, + MSM_V4L2_SATURATION_L5, + MSM_V4L2_SATURATION_L6, + MSM_V4L2_SATURATION_L7, + MSM_V4L2_SATURATION_L8, + MSM_V4L2_SATURATION_L9, + MSM_V4L2_SATURATION_L10, +}; + +enum msm_v4l2_contrast_level { + MSM_V4L2_CONTRAST_L0, + MSM_V4L2_CONTRAST_L1, + MSM_V4L2_CONTRAST_L2, + MSM_V4L2_CONTRAST_L3, + MSM_V4L2_CONTRAST_L4, + MSM_V4L2_CONTRAST_L5, + MSM_V4L2_CONTRAST_L6, + MSM_V4L2_CONTRAST_L7, + MSM_V4L2_CONTRAST_L8, + MSM_V4L2_CONTRAST_L9, + MSM_V4L2_CONTRAST_L10, +}; + + +enum msm_v4l2_exposure_level { + MSM_V4L2_EXPOSURE_N2, + MSM_V4L2_EXPOSURE_N1, + MSM_V4L2_EXPOSURE_D, + MSM_V4L2_EXPOSURE_P1, + MSM_V4L2_EXPOSURE_P2, +}; + +enum msm_v4l2_sharpness_level { + MSM_V4L2_SHARPNESS_L0, + MSM_V4L2_SHARPNESS_L1, + MSM_V4L2_SHARPNESS_L2, + MSM_V4L2_SHARPNESS_L3, + MSM_V4L2_SHARPNESS_L4, + MSM_V4L2_SHARPNESS_L5, + MSM_V4L2_SHARPNESS_L6, +}; + +enum msm_v4l2_expo_metering_mode { + MSM_V4L2_EXP_FRAME_AVERAGE, + MSM_V4L2_EXP_CENTER_WEIGHTED, + MSM_V4L2_EXP_SPOT_METERING, +}; + +enum msm_v4l2_iso_mode { + MSM_V4L2_ISO_AUTO = 0, + MSM_V4L2_ISO_DEBLUR, + MSM_V4L2_ISO_100, + MSM_V4L2_ISO_200, + MSM_V4L2_ISO_400, + MSM_V4L2_ISO_800, + MSM_V4L2_ISO_1600, +}; + +enum msm_v4l2_wb_mode { + MSM_V4L2_WB_OFF, + MSM_V4L2_WB_AUTO , + MSM_V4L2_WB_CUSTOM, + MSM_V4L2_WB_INCANDESCENT, + MSM_V4L2_WB_FLUORESCENT, + MSM_V4L2_WB_DAYLIGHT, + MSM_V4L2_WB_CLOUDY_DAYLIGHT, +}; + +enum msm_v4l2_special_effect { + MSM_V4L2_EFFECT_OFF, + MSM_V4L2_EFFECT_MONO, + MSM_V4L2_EFFECT_NEGATIVE, + MSM_V4L2_EFFECT_SOLARIZE, + MSM_V4L2_EFFECT_SEPIA, + MSM_V4L2_EFFECT_POSTERAIZE, + MSM_V4L2_EFFECT_WHITEBOARD, + MSM_V4L2_EFFECT_BLACKBOARD, + MSM_V4L2_EFFECT_AQUA, + MSM_V4L2_EFFECT_EMBOSS, + MSM_V4L2_EFFECT_SKETCH, + MSM_V4L2_EFFECT_NEON, + MSM_V4L2_EFFECT_MAX, +}; + +enum msm_v4l2_power_line_frequency { + MSM_V4L2_POWER_LINE_OFF, + MSM_V4L2_POWER_LINE_60HZ, + MSM_V4L2_POWER_LINE_50HZ, + MSM_V4L2_POWER_LINE_AUTO, +}; + +enum msm_v4l2_fw_control_mode { + CAM_FW_MODE_NONE = 0, + CAM_FW_MODE_VERSION, + CAM_FW_MODE_UPDATE, + CAM_FW_MODE_DUMP, + CAM_FW_MODE_MAX, +}; + +#define CAMERA_ISO_TYPE_AUTO 0 +#define CAMEAR_ISO_TYPE_HJR 1 +#define CAMEAR_ISO_TYPE_100 2 +#define CAMERA_ISO_TYPE_200 3 +#define CAMERA_ISO_TYPE_400 4 +#define CAMEAR_ISO_TYPE_800 5 +#define CAMERA_ISO_TYPE_1600 6 + +struct sensor_pict_fps { + uint16_t prevfps; + uint16_t pictfps; +}; + +struct exp_gain_cfg { +/* uint16_t gain;*/ + uint32_t gain; + uint32_t line; +}; + +struct focus_cfg { + int32_t steps; + int dir; +}; + +struct fps_cfg { + uint16_t f_mult; + uint16_t fps_div; + uint32_t pict_fps_div; +}; +struct wb_info_cfg { + uint16_t red_gain; + uint16_t green_gain; + uint16_t blue_gain; +}; +struct sensor_3d_exp_cfg { + uint16_t gain; + uint32_t line; + uint16_t r_gain; + uint16_t b_gain; + uint16_t gr_gain; + uint16_t gb_gain; + uint16_t gain_adjust; +}; +struct sensor_3d_cali_data_t { + unsigned char left_p_matrix[3][4][8]; + unsigned char right_p_matrix[3][4][8]; + unsigned char square_len[8]; + unsigned char focal_len[8]; + unsigned char pixel_pitch[8]; + uint16_t left_r; + uint16_t left_b; + uint16_t left_gb; + uint16_t left_af_far; + uint16_t left_af_mid; + uint16_t left_af_short; + uint16_t left_af_5um; + uint16_t left_af_50up; + uint16_t left_af_50down; + uint16_t right_r; + uint16_t right_b; + uint16_t right_gb; + uint16_t right_af_far; + uint16_t right_af_mid; + uint16_t right_af_short; + uint16_t right_af_5um; + uint16_t right_af_50up; + uint16_t right_af_50down; +}; +struct sensor_init_cfg { + uint8_t prev_res; + uint8_t pict_res; +}; + +struct sensor_calib_data { + /* Color Related Measurements */ + uint16_t r_over_g; + uint16_t b_over_g; + uint16_t gr_over_gb; + + /* Lens Related Measurements */ + uint16_t macro_2_inf; + uint16_t inf_2_macro; + uint16_t stroke_amt; + uint16_t af_pos_1m; + uint16_t af_pos_inf; +}; + +enum msm_sensor_resolution_t { + MSM_SENSOR_RES_FULL, + MSM_SENSOR_RES_QTR, + MSM_SENSOR_RES_2, + MSM_SENSOR_RES_3, + MSM_SENSOR_RES_4, + MSM_SENSOR_RES_5, + MSM_SENSOR_RES_6, + MSM_SENSOR_RES_7, + MSM_SENSOR_INVALID_RES, +}; + +struct msm_sensor_output_info_t { + uint16_t x_output; + uint16_t y_output; + uint16_t line_length_pclk; + uint16_t frame_length_lines; + uint32_t vt_pixel_clk; + uint32_t op_pixel_clk; + uint16_t binning_factor; +}; + +struct sensor_output_info_t { + struct msm_sensor_output_info_t *output_info; + uint16_t num_info; +}; + +struct msm_sensor_exp_gain_info_t { + uint16_t coarse_int_time_addr; + uint16_t global_gain_addr; + uint16_t vert_offset; +}; + +struct msm_sensor_output_reg_addr_t { + uint16_t x_output; + uint16_t y_output; + uint16_t line_length_pclk; + uint16_t frame_length_lines; +}; + +struct sensor_driver_params_type { + struct msm_camera_i2c_reg_setting *init_settings; + uint16_t init_settings_size; + struct msm_camera_i2c_reg_setting *mode_settings; + uint16_t mode_settings_size; + struct msm_sensor_output_reg_addr_t *sensor_output_reg_addr; + struct msm_camera_i2c_reg_setting *start_settings; + struct msm_camera_i2c_reg_setting *stop_settings; + struct msm_camera_i2c_reg_setting *groupon_settings; + struct msm_camera_i2c_reg_setting *groupoff_settings; + struct msm_sensor_exp_gain_info_t *sensor_exp_gain_info; + struct msm_sensor_output_info_t *output_info; +}; + +struct mirror_flip { + int32_t x_mirror; + int32_t y_flip; +}; + +struct cord { + uint32_t x; + uint32_t y; +}; + +struct msm_eeprom_data_t { + void *eeprom_data; + uint16_t index; +}; + +struct msm_camera_csid_vc_cfg { + uint8_t cid; + uint8_t dt; + uint8_t decode_format; +}; + +struct csi_lane_params_t { + uint16_t csi_lane_assign; + uint8_t csi_lane_mask; + uint8_t csi_if; + uint8_t csid_core[2]; + uint8_t csi_phy_sel; +}; + +struct msm_camera_csid_lut_params { + uint8_t num_cid; + struct msm_camera_csid_vc_cfg *vc_cfg; +}; + +struct msm_camera_csid_params { + uint8_t lane_cnt; + uint16_t lane_assign; + uint8_t phy_sel; + struct msm_camera_csid_lut_params lut_params; +}; + +struct msm_camera_csiphy_params { + uint8_t lane_cnt; + uint8_t settle_cnt; + uint16_t lane_mask; + uint8_t combo_mode; +}; + +struct msm_camera_csi2_params { + struct msm_camera_csid_params csid_params; + struct msm_camera_csiphy_params csiphy_params; +}; + +enum msm_camera_csi_data_format { + CSI_8BIT, + CSI_10BIT, + CSI_12BIT, +}; + +struct msm_camera_csi_params { + enum msm_camera_csi_data_format data_format; + uint8_t lane_cnt; + uint8_t lane_assign; + uint8_t settle_cnt; + uint8_t dpcm_scheme; +}; + +enum csic_cfg_type_t { + CSIC_INIT, + CSIC_CFG, +}; + +struct csic_cfg_data { + enum csic_cfg_type_t cfgtype; + struct msm_camera_csi_params *csic_params; +}; + +enum csid_cfg_type_t { + CSID_INIT, + CSID_CFG, +}; + +struct csid_cfg_data { + enum csid_cfg_type_t cfgtype; + union { + uint32_t csid_version; + struct msm_camera_csid_params *csid_params; + } cfg; +}; + +enum csiphy_cfg_type_t { + CSIPHY_INIT, + CSIPHY_CFG, +}; + +struct csiphy_cfg_data { + enum csiphy_cfg_type_t cfgtype; + struct msm_camera_csiphy_params *csiphy_params; +}; + +#define CSI_EMBED_DATA 0x12 +#define CSI_RESERVED_DATA_0 0x13 +#define CSI_YUV422_8 0x1E +#define CSI_RAW8 0x2A +#define CSI_RAW10 0x2B +#define CSI_RAW12 0x2C +#define CSI_YUV420_Y_8 0x30 +#define CSI_YUV420_UV_8 0x31 +#define CSI_YUV420_JM_8 0x32 + +#define CSI_DECODE_6BIT 0 +#define CSI_DECODE_8BIT 1 +#define CSI_DECODE_10BIT 2 +#define CSI_DECODE_DPCM_10_8_10 5 + +#define ISPIF_STREAM(intf, action, vfe) (((intf)<> 24) : 0xFF) + +#define CLR_IMG_MODE(handle) (handle &= 0xFF00FFFF) +#define SET_IMG_MODE(handle, data) \ + (handle |= ((0x1 << 23) | ((data & 0x7F) << 16))) +#define GET_IMG_MODE(handle) \ + ((handle & 0x800000) ? ((handle & 0x7F0000) >> 16) : 0xFF) + +#define CLR_MCTLPP_INST_IDX(handle) (handle &= 0xFFFF00FF) +#define SET_MCTLPP_INST_IDX(handle, data) \ + (handle |= ((0x1 << 15) | ((data & 0x7F) << 8))) +#define GET_MCTLPP_INST_IDX(handle) \ + ((handle & 0x8000) ? ((handle & 0x7F00) >> 8) : 0xFF) + +#define CLR_VIDEO_INST_IDX(handle) (handle &= 0xFFFFFF00) +#define GET_VIDEO_INST_IDX(handle) \ + ((handle & 0x80) ? (handle & 0x7F) : 0xFF) +#define SET_VIDEO_INST_IDX(handle, data) \ + (handle |= (0x1 << 7) | (data & 0x7F)) + +/* Samsung native cmd code */ +#define EXT_CAM_SNAPSHOT_MODE 1 +#define EXT_CAM_AF 2 +#define EXT_CAM_PREVIEW_SIZE 3 +#define EXT_CAM_CAPTURE_SIZE 4 +#define EXT_CAM_METERING 5 +#define EXT_CAM_WB 6 +#define EXT_CAM_EFFECT 7 +#define EXT_CAM_QUALITY 8 +#define EXT_CAM_ISO 9 +#define EXT_CAM_EV 10 +#define EXT_CAM_HJ_REDUCTION 11 +#define EXT_CAM_LED 12 +#define EXT_CAM_SCENEMODE 13 +#define EXT_CAM_SET_PREVIEW_SIZE 14 +#define EXT_CAM_SET_CAPTURE_SIZE 15 +#define EXT_CAM_FOCUS_MODE 16 +#define EXT_CAM_SET_WDR 17 +#define EXT_CAM_SET_MOVIE_MODE 18 +#define EXT_CAM_SET_ZOOM 19 +#define EXT_CAM_FD_MODE 20 +#define EXT_CAM_SET_TOUCHAF_POS 21 +#define EXT_CAM_MOVIE_MODE 22 +#define EXT_CAM_SET_FPS 23 +#define EXT_CAM_START_AE_AWB_LOCK 24 +#define EXT_CAM_SET_ANTIBANDING 25 +#define EXT_CAM_SET_ANTI_STREAMOFF 26 +#define EXT_CAM_SET_OCR_FOCUS_MODE 27 +#if defined(CONFIG_MACH_JACTIVE_ATT) || defined(CONFIG_MACH_JACTIVE_EUR) +#define EXT_CAM_SET_ORIENTATION 28 +#endif +#define EXT_CAM_SET_AF_WINDOW 29 +#define EXT_CAM_SET_HDR 33 +#define EXT_CAM_START_HDR 34 +#define EXT_CAM_RESET_HDR 35 +#define EXT_CAM_SET_LLS 36 +#define EXT_CAM_SET_BEST 37 +#define EXT_CAM_SET_HW_VDIS 38 +#define EXT_CAM_SET_SHOT_MODE 39 +#define EXT_CAM_UPDATE_FW 42 +#define EXT_CAM_GET_ISP_DBG_LOG 43 +#define EXT_CAM_SET_RAW 44 +#define EXT_CAM_RESUME_PREVIEW 45 +#define EXT_CAM_SET_FACTORY_BIN 46 +#define EXT_CAM_START_GOLF_SHOT 47 +#define EXT_CAM_STOP_GOLF_SHOT 48 + +#endif /* __LINUX_MSM_CAMERA_H */ diff --git a/include/media/msm_camera_jf.h b/include/media/msm_camera_jf.h index d7f49993a3f..59ae00fc314 100644 --- a/include/media/msm_camera_jf.h +++ b/include/media/msm_camera_jf.h @@ -1030,9 +1030,7 @@ struct msm_snapshot_pp_status { #define CFG_EEPROM_DIRECT_DATA_ERASE 57 #define CFG_SET_STREAMING_MODE 58 #define CFG_SET_VISION_AE 59 -#define CFG_FINAL_AF 60 //SEMCO Request by Lizk -#define CFG_MAX 61 - +#define CFG_MAX 60 #define MOVE_NEAR 0 @@ -1331,8 +1329,7 @@ struct sensor_pict_fps { }; struct exp_gain_cfg { -/* uint16_t gain;*/ - uint32_t gain; + uint16_t gain; uint32_t line; }; @@ -1938,7 +1935,6 @@ struct msm_calib_af { uint16_t inf_dac2; /*1.05M*/ uint16_t start_dac; uint16_t pid_dac; /* Randy PID */ - uint16_t cal_offset_dac ; /* SEMCO by Liz 05112013 */ }; struct msm_calib_lsc { @@ -2455,7 +2451,5 @@ struct intf_mctl_mapping_cfg { #define EXT_CAM_SET_RAW 44 #define EXT_CAM_RESUME_PREVIEW 45 #define EXT_CAM_SET_FACTORY_BIN 46 -#define EXT_CAM_START_GOLF_SHOT 47 -#define EXT_CAM_STOP_GOLF_SHOT 48 #endif /* __LINUX_MSM_CAMERA_H */ diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index e74912f1258..219df5ca811 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -283,8 +283,6 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock, if (flags & (MSG_OOB)) return -EOPNOTSUPP; - msg->msg_namelen = 0; - skb = skb_recv_datagram(sk, flags, noblock, &err); if (!skb) { if (sk->sk_shutdown & RCV_SHUTDOWN) @@ -292,6 +290,8 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock, return err; } + msg->msg_namelen = 0; + copied = skb->len; if (len < copied) { msg->msg_flags |= MSG_TRUNC; @@ -349,6 +349,8 @@ int bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock, if (flags & MSG_OOB) return -EOPNOTSUPP; + msg->msg_namelen = 0; + BT_DBG("sk %p size %zu", sk, size); lock_sock(sk); diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index d369e4c772b..7ecbc70df4c 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1457,7 +1457,7 @@ int hci_register_dev(struct hci_dev *hdev) head = p; id++; } - snprintf(hdev->name, sizeof(hdev->name), "hci%d", id); + sprintf(hdev->name, "hci%d", id); hdev->id = id; list_add(&hdev->list, head);