Commit 52bb0598 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.3/sony' into for-linus 

- enforce DS4 controllers to use hid-playstation (Roderick Colenbrander)
- various hid-playstation gyro fixes (Roderick Colenbrander)
parents c21c9fee 6f7dbbd5

drivers/hid/hid-playstation.c

+22 −19
Original line number Diff line number Diff line
@@ -993,19 +993,22 @@ static int dualsense_get_calibration_data(struct dualsense *ds) 
	 */

	speed_2x = (gyro_speed_plus + gyro_speed_minus);

	ds->gyro_calib_data[0].abs_code = ABS_RX;

	ds->gyro_calib_data[0].bias = gyro_pitch_bias;

	ds->gyro_calib_data[0].bias = 0;

	ds->gyro_calib_data[0].sens_numer = speed_2x*DS_GYRO_RES_PER_DEG_S;

	ds->gyro_calib_data[0].sens_denom = gyro_pitch_plus - gyro_pitch_minus;

	ds->gyro_calib_data[0].sens_denom = abs(gyro_pitch_plus - gyro_pitch_bias) +

			abs(gyro_pitch_minus - gyro_pitch_bias);



	ds->gyro_calib_data[1].abs_code = ABS_RY;

	ds->gyro_calib_data[1].bias = gyro_yaw_bias;

	ds->gyro_calib_data[1].bias = 0;

	ds->gyro_calib_data[1].sens_numer = speed_2x*DS_GYRO_RES_PER_DEG_S;

	ds->gyro_calib_data[1].sens_denom = gyro_yaw_plus - gyro_yaw_minus;

	ds->gyro_calib_data[1].sens_denom = abs(gyro_yaw_plus - gyro_yaw_bias) +

			abs(gyro_yaw_minus - gyro_yaw_bias);



	ds->gyro_calib_data[2].abs_code = ABS_RZ;

	ds->gyro_calib_data[2].bias = gyro_roll_bias;

	ds->gyro_calib_data[2].bias = 0;

	ds->gyro_calib_data[2].sens_numer = speed_2x*DS_GYRO_RES_PER_DEG_S;

	ds->gyro_calib_data[2].sens_denom = gyro_roll_plus - gyro_roll_minus;

	ds->gyro_calib_data[2].sens_denom = abs(gyro_roll_plus - gyro_roll_bias) +

			abs(gyro_roll_minus - gyro_roll_bias);



	/*

	 * Sanity check gyro calibration data. This is needed to prevent crashes
@@ -1388,8 +1391,7 @@ static int dualsense_parse_report(struct ps_device *ps_dev, struct hid_report *r 
	for (i = 0; i < ARRAY_SIZE(ds_report->gyro); i++) {

		int raw_data = (short)le16_to_cpu(ds_report->gyro[i]);

		int calib_data = mult_frac(ds->gyro_calib_data[i].sens_numer,

					   raw_data - ds->gyro_calib_data[i].bias,

					   ds->gyro_calib_data[i].sens_denom);

					   raw_data, ds->gyro_calib_data[i].sens_denom);



		input_report_abs(ds->sensors, ds->gyro_calib_data[i].abs_code, calib_data);

	}
@@ -1792,11 +1794,10 @@ static int dualshock4_get_calibration_data(struct dualshock4 *ds4) 
				if (retries < 2) {

					hid_warn(hdev, "Retrying DualShock 4 get calibration report (0x02) request\n");

					continue;

				} else {

					ret = -EILSEQ;

					goto err_free;

				}



				hid_err(hdev, "Failed to retrieve DualShock4 calibration info: %d\n", ret);

				ret = -EILSEQ;

				goto err_free;

			} else {

				break;
@@ -1849,19 +1850,22 @@ static int dualshock4_get_calibration_data(struct dualshock4 *ds4) 
	 */

	speed_2x = (gyro_speed_plus + gyro_speed_minus);

	ds4->gyro_calib_data[0].abs_code = ABS_RX;

	ds4->gyro_calib_data[0].bias = gyro_pitch_bias;

	ds4->gyro_calib_data[0].bias = 0;

	ds4->gyro_calib_data[0].sens_numer = speed_2x*DS4_GYRO_RES_PER_DEG_S;

	ds4->gyro_calib_data[0].sens_denom = gyro_pitch_plus - gyro_pitch_minus;

	ds4->gyro_calib_data[0].sens_denom = abs(gyro_pitch_plus - gyro_pitch_bias) +

			abs(gyro_pitch_minus - gyro_pitch_bias);



	ds4->gyro_calib_data[1].abs_code = ABS_RY;

	ds4->gyro_calib_data[1].bias = gyro_yaw_bias;

	ds4->gyro_calib_data[1].bias = 0;

	ds4->gyro_calib_data[1].sens_numer = speed_2x*DS4_GYRO_RES_PER_DEG_S;

	ds4->gyro_calib_data[1].sens_denom = gyro_yaw_plus - gyro_yaw_minus;

	ds4->gyro_calib_data[1].sens_denom = abs(gyro_yaw_plus - gyro_yaw_bias) +

			abs(gyro_yaw_minus - gyro_yaw_bias);



	ds4->gyro_calib_data[2].abs_code = ABS_RZ;

	ds4->gyro_calib_data[2].bias = gyro_roll_bias;

	ds4->gyro_calib_data[2].bias = 0;

	ds4->gyro_calib_data[2].sens_numer = speed_2x*DS4_GYRO_RES_PER_DEG_S;

	ds4->gyro_calib_data[2].sens_denom = gyro_roll_plus - gyro_roll_minus;

	ds4->gyro_calib_data[2].sens_denom = abs(gyro_roll_plus - gyro_roll_bias) +

			abs(gyro_roll_minus - gyro_roll_bias);



	/*

	 * Sanity check gyro calibration data. This is needed to prevent crashes
@@ -2242,8 +2246,7 @@ static int dualshock4_parse_report(struct ps_device *ps_dev, struct hid_report * 
	for (i = 0; i < ARRAY_SIZE(ds4_report->gyro); i++) {

		int raw_data = (short)le16_to_cpu(ds4_report->gyro[i]);

		int calib_data = mult_frac(ds4->gyro_calib_data[i].sens_numer,

					   raw_data - ds4->gyro_calib_data[i].bias,

					   ds4->gyro_calib_data[i].sens_denom);

					   raw_data, ds4->gyro_calib_data[i].sens_denom);



		input_report_abs(ds4->sensors, ds4->gyro_calib_data[i].abs_code, calib_data);

	}

drivers/hid/hid-sony.c

+40 −981

File changed.

Preview size limit exceeded, changes collapsed.