Skip to content

Commit 6b0ccc1

Browse files
Ping ChengPinglinux
authored andcommitted
Remove hardcoded TabletSetFeature(common, WCM_LCD)
Rely on INPUT_PROP_DIRECT which is passed directly from the kernel driver. Keep the WCM_LCD flag as defined for feature verification. Signed-Off-By: Ping Cheng <[email protected]>
1 parent 31d3b74 commit 6b0ccc1

File tree

1 file changed

+0
-57
lines changed

1 file changed

+0
-57
lines changed

src/wcmConfig.c

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -729,8 +729,6 @@ static void wcmSpecialTypeKeys(WacomCommonPtr common)
729729
case 0x398: /* MobileStudio Pro 13 */
730730
case 0x399: /* MobileStudio Pro 16 */
731731
case 0x3AA: /* MobileStudio Pro 16 */
732-
TabletSetFeature(common, WCM_LCD);
733-
_fallthrough_;
734732
case 0x357: /* Intuos Pro 2 M */
735733
case 0x358: /* Intuos Pro 2 L */
736734
case 0x360: /* Intuos Pro 2 M (Bluetooth) */
@@ -774,38 +772,13 @@ static void wcmSpecialTypeKeys(WacomCommonPtr common)
774772
TabletSetFeature(common, WCM_DUALINPUT);
775773
break;
776774

777-
/* P4 display tablets */
778-
case 0x30: /* PL400 */
779-
case 0x31: /* PL500 */
780-
case 0x32: /* PL600 */
781-
case 0x33: /* PL600SX */
782-
case 0x34: /* PL550 */
783-
case 0x35: /* PL800 */
784-
case 0x37: /* PL700 */
785-
case 0x38: /* PL510 */
786-
case 0x39: /* PL710 */
787-
case 0x3A: /* DTI520 */
788-
case 0xC0: /* DTF720 */
789-
case 0xC2: /* DTF720a */
790-
case 0xC4: /* DTF521 */
791-
case 0xC7: /* DTU1931 */
792-
case 0xCE: /* DTU2231 */
793-
case 0xF0: /* DTU1631 */
794-
795-
/* Wacom One display tablet */
796-
case 0x3A6: /* DTC133 */
797-
TabletSetFeature(common, WCM_LCD);
798-
break;
799-
800775
/* tablets support menu strips */
801776
case 0x3F: /* CintiqV5 */
802777
case 0xC5: /* CintiqV5 */
803778
case 0xC6: /* CintiqV5 */
804779
case 0xCC: /* CinitqV5 */
805780
case 0xFA: /* Cintiq 22HD */
806781
case 0x5B: /* Cintiq 22HDT Pen */
807-
TabletSetFeature(common, WCM_LCD);
808-
_fallthrough_;
809782
case 0xB0: /* I3 */
810783
case 0xB1: /* I3 */
811784
case 0xB2: /* I3 */
@@ -858,36 +831,6 @@ static void wcmSpecialTypeKeys(WacomCommonPtr common)
858831
case 0x3AE:/* Cintiq 16 */
859832
case 0x3B0:/* DTK-1660E */
860833
TabletSetFeature(common, WCM_ROTATION);
861-
_fallthrough_;
862-
case 0xF6: /* Cintiq 24HDT Touch */
863-
case 0x57: /* DTK2241 */
864-
case 0x59: /* DTH2242 Pen */
865-
case 0x5D: /* DTH2242 Touch */
866-
case 0x5E: /* Cintiq 22HDT Touch */
867-
case 0x309:/* Cintiq Companion Hybrid Touch */
868-
case 0x30C:/* Cintiq Companion Touch */
869-
case 0x326:/* Cintiq Companion 2 Touch */
870-
case 0x32C:/* Cintiq 27QHDT Touch */
871-
case 0x32F:/* DTU-1031X */
872-
case 0x335:/* Cintiq 13HDT Touch */
873-
case 0x336:/* DTU-1141 */
874-
case 0x343:/* DTK-1651 */
875-
case 0x34A:/* MobileStudio Pro 13 Touch */
876-
case 0x34B:/* MobileStudio Pro 16 Touch */
877-
case 0x353:/* Cintiq Pro 13 FHD Touch */
878-
case 0x354:/* Cintiq Pro 13 UHD Touch */
879-
case 0x355:/* Cintiq Pro 24 Touch */
880-
case 0x356:/* Cintiq Pro 32 Touch */
881-
case 0x359:/* DTU-1141B */
882-
case 0x35A:/* DTH-1152*/
883-
case 0x368:/* DTH-1152 Touch */
884-
case 0x382:/* DTK-2451 */
885-
case 0x37D:/* DTH-2452 */
886-
case 0x37E:/* DTH-2452 Touch */
887-
case 0x39A:/* MobileStudio Pro 13 Touch */
888-
case 0x39B:/* MobileStudio Pro 16 Touch */
889-
case 0x3AC:/* MobileStudio Pro 16 Touch */
890-
TabletSetFeature(common, WCM_LCD);
891834
break;
892835
}
893836
}

0 commit comments

Comments
 (0)