introducing virtual modules, reducing symbols/inet, b.fd.o#14665

diff --git a/ChangeLog b/ChangeLog
index 1529656..d106e58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-01  Sergey Udaltsov
+
+       * rules/base.lists.part, rules/base.m_s.part, rules/base.xml.in,
+       symbols/inet: reorganizing keyboard in symbols/inet. Some models are
+       now implemented as "virtual" (by rules only).
+       http://bugs.freedesktop.org/show_bug.cgi?id=14665
+
 2008-02-28  Sergey Udaltsov
 
        * rules/base.xml.in, symbols/in: added in(jhelum), other indian fixes,

diff --git a/rules/base.lists.part b/rules/base.lists.part
index 6afb405..a46a2a0 100644 (file)
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -43,9 +43,10 @@
               hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
               hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
               ipaq inspiron intel latitude \
-              logiaccess logicd logicda logicink \
+              logiaccess logicda logicink \
               logiex110 logiclx300 \
-              logiinkse logiinkseusb logiitc logiik itouch logiultrax \
+              logiinkse logiinkseusb logiitc logiik \
+              logitech_base itouch logiultrax \
               logitech_g15 \
              logidinovo logidinovoedge \
               microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \

diff --git a/rules/base.m_s.part b/rules/base.m_s.part
index 9c520d2..def3aed 100644 (file)
--- a/rules/base.m_s.part
+++ b/rules/base.m_s.part
@@ -1,3 +1,17 @@
+  benqx730      =       +inet(benqx)
+  benqx800      =       +inet(benqx)
+  dellsk8125    =       +inet(dell)
+  dellsk8135    =       +inet(dell)
+  hpnx9020      =       +inet(hp5185)
+  logicd        =       +inet(logitech_base)
+  logicd_it     =       +inet(logitech_base)
+  logicd_nav    =       +inet(logitech_base)
+  logicd_opt    =       +inet(logitech_base)
+  logiultrax    =       +inet(logitech_base)
+  logiclx300    =       +inet(logiex110)
+  logii350      =       +inet(logiex110)
+  logimel       =       +inet(logiex110)
+  vsonku306     =       +inet(microsoftprooem)
   $inetkbds     =       +inet(%m)
   acer_tm_800   =       +inet(acer_laptop)
   benqx730      =       +inet(benqx)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index e2938a3..d70b13c 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -332,6 +332,20 @@
     </model>
     <model>
       <configItem>
+        <name>dellsk8125</name>
+        <_description>Dell SK-8125</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8135</name>
+        <_description>Dell SK-8135</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>dellusbmm</name>
         <_description>Dell USB Multimedia Keybard</_description>
         <vendor>Dell</vendor>
@@ -422,6 +436,13 @@
     </model>
     <model>
       <configItem>
+        <name>logitech_base</name>
+        <_description>Logitech Generic Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>logitech_g15</name>
         <_description>Logitech G15 extra keys via G15daemon</_description>
         <vendor>Logitech</vendor>
@@ -492,6 +513,27 @@
     </model>
     <model>
       <configItem>
+        <name>hp5181</name>
+        <_description>Hewlett-Packard Internet Keyboard 5181</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5185</name>
+        <_description>Hewlett-Packard Internet Keyboard 5185</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpnx9020</name>
+        <_description>Hewlett-Packard nx9020</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>hp6000</name>
         <_description>Hewlett-Packard Omnibook 6000/6100</_description>
         <vendor>Hewlett-Packard</vendor>
@@ -562,6 +604,20 @@
     </model>
     <model>
       <configItem>
+        <name>logii350</name>
+        <_description>Logitech Internet 350 Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logimel</name>
+        <_description>Logitech Media Elite Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>logicd</name>
         <_description>Logitech Cordless Desktop</_description>
         <vendor>Logitech</vendor>
@@ -569,6 +625,27 @@
     </model>
     <model>
       <configItem>
+        <name>logicd_it</name>
+        <_description>Logitech Cordless Desktop iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_nav</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_opt</name>
+        <_description>Logitech Cordless Desktop Optical</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>logicda</name>
         <_description>Logitech Cordless Desktop (alternate option)</_description>
         <vendor>Logitech</vendor>
@@ -723,6 +800,13 @@
     </model>
     <model>
       <configItem>
+        <name>vsonku306</name>
+        <_description>ViewSonic KU-306 Internet Keyboard</_description>
+        <vendor>ViewSonic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>microsoftprose</name>
         <_description>Microsoft Internet Keyboard Pro, Swedish</_description>
         <vendor>Microsoft Inc.</vendor>
@@ -975,6 +1059,20 @@
     </model>
     <model>
       <configItem>
+       <name>benqx730</name>
+       <_description>BenQ X-Touch 730</_description>
+       <vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+       <name>benqx800</name>
+       <_description>BenQ X-Touch 800</_description>
+       <vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
        <name>hhk</name>
        <_description>Happy Hacking Keyboard</_description>
        <vendor>Fujitsu</vendor>

diff --git a/symbols/inet b/symbols/inet
index 7c36916..c07f548 100644 (file)
--- a/symbols/inet
+++ b/symbols/inet
@@ -1268,7 +1268,7 @@ xkb_symbols "thinkpad60" {
 // Logitech
 
 // Logitech common definitions
-partial hidden alphanumeric_keys
+partial alphanumeric_keys
 xkb_symbols "logitech_base" {
 
     include "inet(media_nav_common)"
@@ -1323,12 +1323,6 @@ xkb_symbols "logiaccess" {
     key <I65>  {       [ XF86Search            ]       }; 
 };
 
-// Logitech Cordless Desktop
-partial alphanumeric_keys
-xkb_symbols "logicd" {
-    include "inet(logitech_base)"
-};
-
 // Logitech Cordless Desktop (alternate option)
 partial alphanumeric_keys
 xkb_symbols "logicda" {
@@ -1346,14 +1340,6 @@ xkb_symbols "logicink" {
     key <I14>  {       [ XF86Start             ]       };
 };
 
-// Logitech Cordless Desktop LX-300
-partial alphanumeric_keys
-xkb_symbols "logiclx300" {
-    include "inet(logitech_base)"
-
-    key <I21>  {       [ XF86Calculator        ]       };
-};
-
 // Logitech Cordless Desktop EX110
 partial alphanumeric_keys
 xkb_symbols "logiex110" {
@@ -1449,11 +1435,6 @@ xkb_symbols "itouch" {
     key <I2D>  {       [ XF86AudioRaiseVolume  ]       };
 };
 
-partial alphanumeric_keys
-xkb_symbols "logiultrax" {
-    include "inet(logitech_base)"
-};
-
 // Logitech UltraX Cordless Media Desktop
 partial alphanumeric_keys
 xkb_symbols "logiultraxc" {