[kernel] r6310 - people/waldi/linux-kbuild-2.6/src/mod

[Bastian Blank]

Author: waldi
Date: Tue Mar 28 13:47:17 2006
New Revision: 6310

Modified:
   people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.hpp
   people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp
Log:
src/mod/module_devicetable.hpp,
src/mod/module_devicetable_impl_2_6_16.hpp: Add specs for new device types.


Modified: people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.hpp
==============================================================================
--- people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.hpp	(original)
+++ people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.hpp	Tue Mar 28 13:47:17 2006
@@ -1,7 +1,7 @@
 /*
  * module_devicetable.hpp
  *
- * Copyright (C) 2005 Bastian Blank <waldi at debian.org>
+ * Copyright (C) 2005, 2006 Bastian Blank <waldi at debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,11 +34,17 @@
   namespace module_devicetable
   {
     class device_ccw { };
+    class device_i2c { };
     class device_ieee1394 { };
+    class device_input { };
+    class device_of { };
     class device_pci { };
+    class device_pcmcia { };
     class device_pnp { };
     class device_pnp_card { };
+    class device_serio { };
     class device_usb { };
+    class device_vio { };
 
     class version_2_6_16 { };
 
@@ -52,11 +58,26 @@
           static const std::string symbol;
         };
       template<>
+        struct def<device_i2c>
+        {
+          static const std::string symbol;
+        };
+      template<>
         struct def<device_ieee1394>
         {
           static const std::string symbol;
         };
       template<>
+        struct def<device_input>
+        {
+          static const std::string symbol;
+        };
+      template<>
+        struct def<device_of>
+        {
+          static const std::string symbol;
+        };
+      template<>
         struct def<device_pci>
         {
           static const std::string symbol;
@@ -72,10 +93,20 @@
           static const std::string symbol;
         };
       template<>
+        struct def<device_serio>
+        {
+          static const std::string symbol;
+        };
+      template<>
         struct def<device_usb>
         {
           static const std::string symbol;
         };
+      template<>
+        struct def<device_vio>
+        {
+          static const std::string symbol;
+        };
     }
 
     class table_entry

Modified: people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp
==============================================================================
--- people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp	(original)
+++ people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp	Tue Mar 28 13:47:17 2006
@@ -1,7 +1,7 @@
 /*
  * module_devicetable_impl_2_6_16.hpp
  *
- * Copyright (C) 2005 Bastian Blank <waldi at debian.org>
+ * Copyright (C) 2005, 2006 Bastian Blank <waldi at debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,6 +69,12 @@
   };
 
   template<typename Elf_class>
+    struct device_id<device_i2c, Elf_class>
+    {
+      uint16_t id;
+    };
+
+  template<typename Elf_class>
     struct device_id<device_ieee1394, Elf_class>
     {
       uint32_t match_flags;
@@ -120,6 +126,20 @@
     };
 
   template <typename Elf_class>
+    struct device_id<device_serio, Elf_class>
+    {
+      uint8_t type;
+      uint8_t extra;
+      uint8_t id;
+      uint8_t proto;
+    };
+
+  enum
+  {
+    SERIO_DEVICE_ID_ANY = 0xff,
+  };
+
+  template <typename Elf_class>
     struct device_id<device_usb, Elf_class>
     {
       uint16_t match_flags;