[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/sun Remove now unused Mod...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/ac236cfba4d4
branches:  trunk
changeset: 10519:ac236cfba4d4
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jul 30 14:32:52 2020 +0000

description:
Remove now unused ModMap data for each keyboard.

diffstat:

 external/mit/xorg-server/dist/hw/sun/sun.h       |    2 -
 external/mit/xorg-server/dist/hw/sun/sunInit.c   |    1 -
 external/mit/xorg-server/dist/hw/sun/sunKeyMap.c |  344 -----------------------
 3 files changed, 0 insertions(+), 347 deletions(-)

diffs (truncated from 763 to 300 lines):

diff -r 40b89943ecfb -r ac236cfba4d4 external/mit/xorg-server/dist/hw/sun/sun.h
--- a/external/mit/xorg-server/dist/hw/sun/sun.h        Thu Jul 30 14:15:49 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sun.h        Thu Jul 30 14:32:52 2020 +0000
@@ -304,10 +304,8 @@
 
 /* sunKeyMap.c */
 extern KeySymsRec      sunKeySyms[];
-extern const SunModmapRec *sunModMaps[];
 extern const int       sunMaxLayout;
 extern KeySym          *sunType4KeyMaps[];
-extern const SunModmapRec *sunType4ModMaps[];
 
 /* sunKbd.c */
 extern long            sunAutoRepeatInitiate;
diff -r 40b89943ecfb -r ac236cfba4d4 external/mit/xorg-server/dist/hw/sun/sunInit.c
--- a/external/mit/xorg-server/dist/hw/sun/sunInit.c    Thu Jul 30 14:15:49 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunInit.c    Thu Jul 30 14:32:52 2020 +0000
@@ -510,7 +510,6 @@
                FatalError ("Unsupported keyboard type 4 layout %d\n",
                            sunKbdPriv.layout);
            sunKeySyms[KB_SUN4].map = sunType4KeyMaps[sunKbdPriv.layout];
-           sunModMaps[KB_SUN4] = sunType4ModMaps[sunKbdPriv.layout];
         }
        inited = 1;
     }
diff -r 40b89943ecfb -r ac236cfba4d4 external/mit/xorg-server/dist/hw/sun/sunKeyMap.c
--- a/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c  Thu Jul 30 14:15:49 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c  Thu Jul 30 14:32:52 2020 +0000
@@ -243,19 +243,9 @@
        NoSymbol,       NoSymbol,               /* 0x7f */
 };
 
-static const SunModmapRec US2Modmap[] = {
-       {  99,  ShiftMask },
-       { 110,  ShiftMask },
-       {  76,  ControlMask },
-       { 120,  Meta_Mask },
-       { 122,  Meta_Mask },
-       {   0,  0 }
-};
-
 #else
 
 #define US2Keymap NULL
-#define US2Modmap NULL
 
 #endif /* US2 */
 
@@ -391,20 +381,9 @@
        NoSymbol,       NoSymbol,               /* 0x7f */
 };
 
-static const SunModmapRec US3Modmap[] = {
-       {  99,  ShiftMask },
-       { 110,  ShiftMask },
-       {  76,  ControlMask },
-       { 119,  LockMask },
-       { 120,  Meta_Mask },
-       { 122,  Meta_Mask },
-       {   0,  0 }
-};
-
 #else
 
 #define US3Keymap NULL
-#define US3Modmap NULL
 
 #endif /* US3 */
 
@@ -417,78 +396,6 @@
     { NULL,            1,      0x7d,   4 }
 };
 
-const SunModmapRec *sunModMaps[] = {
-    NULL,
-    NULL,
-    US2Modmap,
-    US3Modmap,
-    NULL
-};
-
-static const SunModmapRec Generic5Modmap[] = {
-       {  99,  ShiftMask },
-       { 110,  ShiftMask },
-       { 119,  LockMask },
-       {  76,  ControlMask },
-       { 120,  Meta_Mask },
-       { 122,  Meta_Mask },
-       {  13,  Mode_switch_Mask },
-       {  98,  Num_Lock_Mask },
-       {  19,  Alt_Mask },
-       {   0,  0}
-};
-
-#if defined(DEN4) || defined(SWEDFIN4) || defined(SWFR4) || defined(SWGE4)
-
-static const SunModmapRec DenSwedFinSw4Modmap[] = {
-        {  99, ShiftMask },
-        { 110, ShiftMask },
-        {  76, LockMask },
-        { 119, ControlMask },
-        { 120, Meta_Mask },
-        { 122, Meta_Mask },
-        {  67, Mode_switch_Mask },
-        {  98, Num_Lock_Mask },
-        {  19, Alt_Mask },
-        {   0, 0 }
-};
-
-#endif
-
-#if defined(FRBE4) || defined(NETH4)
-
-static const SunModmapRec FrBeNeth4Modmap[] = {
-       {  99,  ShiftMask },
-       { 110,  ShiftMask },
-       {  13,  LockMask },
-       {  76,  ControlMask },
-       { 120,  Meta_Mask },
-       { 122,  Meta_Mask },
-       { 119,  Mode_switch_Mask },
-       {  98,  Num_Lock_Mask },
-       {  19,  Alt_Mask },
-       {   0,  0 }
-};
-
-#endif
-
-#if defined(ITALY4) || defined(NORW4) || defined(PORT4) || defined(SPAINLATAM4)
-
-static const SunModmapRec ItNorPortSp4Modmap[] = {
-       {  99,  ShiftMask },
-       { 110,  ShiftMask },
-       {  76,  LockMask },
-       { 119,  ControlMask },
-       { 120,  Meta_Mask },
-       { 122,  Meta_Mask },
-       {  13,  Mode_switch_Mask },
-       {  98,  Num_Lock_Mask },
-       {  19,  Alt_Mask },
-       {   0,  0 }
-};
-
-#endif
-
 #ifdef CAN4
 
 static KeySym Canada4Keymap[] = {
@@ -619,23 +526,9 @@
        XK_KP_Add,      NoSymbol,       NoSymbol,       NoSymbol,       /*125*/
 };
 
-static const SunModmapRec Canada4Modmap[] = {
-       {  99,  ShiftMask },
-       { 110,  ShiftMask },
-       {  76,  LockMask },
-       {  13,  ControlMask },
-       { 120,  Meta_Mask },
-       { 122,  Meta_Mask },
-       { 119,  Mode_switch_Mask },
-       {  98,  Num_Lock_Mask },
-       {  19,  Alt_Mask },
-       {   0,  0}
-};
-
 #else
 
 #define Canada4Keymap NULL
-#define Canada4Modmap NULL
 
 #endif /* CANADA4 */
 
@@ -769,12 +662,9 @@
        XK_KP_Add,      NoSymbol,       NoSymbol,       NoSymbol,       /*125*/
 };
 
-#define CanadaFr5Modmap Generic5Modmap
-
 #else
 
 #define CanadaFr5Keymap NULL
-#define CanadaFr5Modmap NULL
 
 #endif /* CANFR5 */
 
@@ -909,12 +799,9 @@
        XK_KP_Add,      NoSymbol,       NoSymbol,       NoSymbol,       /*125*/
 };
 
-#define Denmark4Modmap DenSwedFinSw4Modmap
-
 #else
 
 #define Denmark4Keymap NULL
-#define Denmark4Modmap NULL
 
 #endif /* DENMARK4 */
 
@@ -1049,12 +936,9 @@
        XK_KP_Add,      NoSymbol,       NoSymbol,       NoSymbol,       /*125*/
 };
 
-#define Denmark5Modmap Generic5Modmap
-
 #else
 
 #define Denmark5Keymap NULL
-#define Denmark5Modmap NULL
 
 #endif /* DEN5 */
 
@@ -1189,12 +1073,9 @@
        XK_KP_Add,      NoSymbol,       NoSymbol,       NoSymbol,       /*125*/
 };
 
-#define France5Modmap Generic5Modmap
-
 #else
 
 #define France5Keymap NULL
-#define France5Modmap NULL
 
 #endif /* FRANCE5 */
 
@@ -1329,12 +1210,9 @@
        XK_KP_Add,      XK_KP_Add,      NoSymbol,       NoSymbol,       /*125*/
 };
 
-#define FranceBelg4Modmap FrBeNeth4Modmap
-
 #else
 
 #define FranceBelg4Keymap NULL
-#define FranceBelg4Modmap NULL
 
 #endif /* FRANCEBELG4 */
 
@@ -1469,23 +1347,9 @@
        XK_KP_Add,      NoSymbol,       NoSymbol,       NoSymbol,       /*125*/
 };
 
-static const SunModmapRec Germany4Modmap[] = {
-       {  99,  ShiftMask },
-       { 110,  ShiftMask },
-       {  76,  LockMask },
-       { 119,  ControlMask },
-       { 120,  Meta_Mask },
-       { 122,  Meta_Mask },
-       {  19,  Mode_switch_Mask },
-       {  98,  Num_Lock_Mask },
-       {  13,  Alt_Mask },
-       {   0,  0 }
-};
-
 #else
 
 #define Germany4Keymap NULL
-#define Germany4Modmap NULL
 
 #endif /* GERMANY4 */
 
@@ -1620,12 +1484,9 @@
        XK_KP_Add,      XK_KP_Add,      NoSymbol,       NoSymbol,       /*125*/
 };
 
-#define Germany5Modmap Generic5Modmap
-
 #else
 
 #define Germany5Keymap NULL
-#define Germany5Modmap NULL
 
 #endif /* GERMANY5 */
 
@@ -1760,12 +1621,9 @@
        XK_KP_Add,      NoSymbol,       NoSymbol,       NoSymbol,       /*125*/
 };
 
-#define Italy4Modmap ItNorPortSp4Modmap
-
 #else
 
 #define Italy4Keymap NULL
-#define Italy4Modmap NULL
 
 #endif /* ITALY4 */
 
@@ -1900,12 +1758,9 @@
        XK_KP_Add,      XK_KP_Add,      NoSymbol,       NoSymbol,       /*125*/
 };
 
-#define Italy5Modmap Generic5Modmap
-
 #else
 
 #define Italy5Keymap NULL
-#define Italy5Modmap NULL
 
 #endif /* ITALY5 */