[kernel] r6334 - people/waldi/linux-kbuild-2.6/src/mod
Bastian Blank
waldi at costa.debian.org
Wed Mar 29 14:53:34 UTC 2006
Author: waldi
Date: Wed Mar 29 14:53:34 2006
New Revision: 6334
Modified:
people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.tpp
people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.cpp
people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.hpp
Log:
src/mod/module_devicetable.tpp,
src/mod/module_devicetable_impl_2_6_16.cpp,
src/mod/module_devicetable_impl_2_6_16.hpp: Add stubs for missing device types.
Modified: people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.tpp
==============================================================================
--- people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.tpp (original)
+++ people/waldi/linux-kbuild-2.6/src/mod/module_devicetable.tpp Wed Mar 29 14:53:34 2006
@@ -31,17 +31,17 @@
void table_create (std::list<table_base *> &list, const module_real *m, const Elf::file *file) throw (std::runtime_error)
{
list.push_back (table<module_devicetable::device_ccw, Elf_class, Elf_data>::create (m, file));
-// list.push_back (table<module_devicetable::device_i2c, Elf_class, Elf_data>::create (m, file));
+ list.push_back (table<module_devicetable::device_i2c, Elf_class, Elf_data>::create (m, file));
list.push_back (table<module_devicetable::device_ieee1394, Elf_class, Elf_data>::create (m, file));
-// list.push_back (table<module_devicetable::device_input, Elf_class, Elf_data>::create (m, file));
-// list.push_back (table<module_devicetable::device_of, Elf_class, Elf_data>::create (m, file));
+ list.push_back (table<module_devicetable::device_input, Elf_class, Elf_data>::create (m, file));
+ list.push_back (table<module_devicetable::device_of, Elf_class, Elf_data>::create (m, file));
list.push_back (table<module_devicetable::device_pci, Elf_class, Elf_data>::create (m, file));
-// list.push_back (table<module_devicetable::device_pcmcia, Elf_class, Elf_data>::create (m, file));
+ list.push_back (table<module_devicetable::device_pcmcia, Elf_class, Elf_data>::create (m, file));
list.push_back (table<module_devicetable::device_pnp, Elf_class, Elf_data>::create (m, file));
list.push_back (table<module_devicetable::device_pnp_card, Elf_class, Elf_data>::create (m, file));
-// list.push_back (table<module_devicetable::device_serio, Elf_class, Elf_data>::create (m, file));
+ list.push_back (table<module_devicetable::device_serio, Elf_class, Elf_data>::create (m, file));
list.push_back (table<module_devicetable::device_usb, Elf_class, Elf_data>::create (m, file));
-// list.push_back (table<module_devicetable::device_vio, Elf_class, Elf_data>::create (m, file));
+ list.push_back (table<module_devicetable::device_vio, Elf_class, Elf_data>::create (m, file));
}
template<typename device, typename Elf_class, typename Elf_data>
Modified: people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.cpp
==============================================================================
--- people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.cpp (original)
+++ people/waldi/linux-kbuild-2.6/src/mod/module_devicetable_impl_2_6_16.cpp Wed Mar 29 14:53:34 2006
@@ -66,6 +66,14 @@
dev_model.write (out, match_flags & CCW_DEVICE_ID_MATCH_DEVICE_TYPE);
}
+table_entry_version<device_i2c, version_2_6_16>::table_entry_version () throw ()
+{
+}
+
+void table_entry_version<device_i2c, version_2_6_16>::write (std::ostream &out) const throw (std::runtime_error)
+{
+}
+
table_entry_version<device_ieee1394, version_2_6_16>::table_entry_version () throw () :
vendor_id ("ven"),
model_id ("mo"),
@@ -82,6 +90,22 @@
version.write (out, match_flags & IEEE1394_MATCH_VERSION, true);
}
+table_entry_version<device_input, version_2_6_16>::table_entry_version () throw ()
+{
+}
+
+void table_entry_version<device_input, version_2_6_16>::write (std::ostream &out) const throw (std::runtime_error)
+{
+}
+
+table_entry_version<device_of, version_2_6_16>::table_entry_version () throw ()
+{
+}
+
+void table_entry_version<device_of, version_2_6_16>::write (std::ostream &out) const throw (std::runtime_error)
+{
+}
+
table_entry_version<device_pci, version_2_6_16>::table_entry_version () throw () :
vendor ("v"),
device ("d"),
@@ -114,6 +138,14 @@
interface.write (out, interface_mask == 0xFF, true);
}
+table_entry_version<device_pcmcia, version_2_6_16>::table_entry_version () throw ()
+{
+}
+
+void table_entry_version<device_pcmcia, version_2_6_16>::write (std::ostream &out) const throw (std::runtime_error)
+{
+}
+
void table_entry_version<device_pnp, version_2_6_16>::write (std::ostream &out) const throw (std::runtime_error)
{
out << "pnp:" << str << '*';
@@ -124,6 +156,14 @@
out << "pnp:" << str << '*';
}
+table_entry_version<device_serio, version_2_6_16>::table_entry_version () throw ()
+{
+}
+
+void table_entry_version<device_serio, version_2_6_16>::write (std::ostream &out) const throw (std::runtime_error)
+{
+}
+
table_entry_version<device_usb, version_2_6_16>::table_entry_version () throw () :
idVendor ("v"),
idProduct ("p"),
@@ -164,6 +204,14 @@
bInterfaceProtocol.write (out, match_flags & USB_DEVICE_ID_MATCH_INT_PROTOCOL, true);
}
+table_entry_version<device_vio, version_2_6_16>::table_entry_version () throw ()
+{
+}
+
+void table_entry_version<device_vio, version_2_6_16>::write (std::ostream &out) const throw (std::runtime_error)
+{
+}
+
#define _do_convert(name) name = Elf::convert<Elf_data, typeof (id.name)> () (id.name)
template<typename Elf_class, typename Elf_data>
@@ -177,6 +225,12 @@
}
template<typename Elf_class, typename Elf_data>
+table_entry_data<device_i2c, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_i2c, Elf_class> &id) throw ()
+{
+ throw std::runtime_error ("Not implemented: I2C");
+}
+
+template<typename Elf_class, typename Elf_data>
table_entry_data<device_ieee1394, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_ieee1394, Elf_class> &id) throw ()
{
_do_convert (match_flags);
@@ -187,6 +241,18 @@
}
template<typename Elf_class, typename Elf_data>
+table_entry_data<device_input, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_input, Elf_class> &id) throw ()
+{
+ throw std::runtime_error ("Not implemented: INPUT");
+}
+
+template<typename Elf_class, typename Elf_data>
+table_entry_data<device_of, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_of, Elf_class> &id) throw ()
+{
+ throw std::runtime_error ("Not implemented: OF");
+}
+
+template<typename Elf_class, typename Elf_data>
table_entry_data<device_pci, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_pci, Elf_class> &id) throw ()
{
_do_convert (vendor);
@@ -198,6 +264,12 @@
}
template<typename Elf_class, typename Elf_data>
+table_entry_data<device_pcmcia, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_pcmcia, Elf_class> &id) throw ()
+{
+ throw std::runtime_error ("Not implemented: PCMCIA");
+}
+
+template<typename Elf_class, typename Elf_data>
table_entry_data<device_pnp, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_pnp, Elf_class> &id) throw ()
{
std::stringstream s;
@@ -223,6 +295,12 @@
}
template<typename Elf_class, typename Elf_data>
+table_entry_data<device_serio, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_serio, Elf_class> &id) throw ()
+{
+ throw std::runtime_error ("Not implemented: SERIO");
+}
+
+template<typename Elf_class, typename Elf_data>
table_entry_data<device_usb, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_usb, Elf_class> &id, uint16_t _bcdDevice_initial, int _bcdDevice_initial_digits, unsigned char _range_lo, unsigned char _range_hi) throw ()
{
_do_convert (match_flags);
@@ -287,6 +365,12 @@
}
}
+template<typename Elf_class, typename Elf_data>
+table_entry_data<device_vio, version_2_6_16, Elf_class, Elf_data>::table_entry_data (const device_id<device_vio, Elf_class> &id) throw ()
+{
+ throw std::runtime_error ("Not implemented: VIO");
+}
+
template<typename device, typename Elf_class, typename Elf_data>
table_data<device, version_2_6_16, Elf_class, Elf_data>::table_data (const void *mem, size_t size) throw (std::runtime_error)
{
@@ -306,8 +390,14 @@
template class table_data<name, version_2_6_16, Elf::file_class_64, Elf::file_data_2LSB>; \
template class table_data<name, version_2_6_16, Elf::file_class_64, Elf::file_data_2MSB>
make_templates(device_ccw);
+make_templates(device_i2c);
make_templates(device_ieee1394);
+make_templates(device_input);
+make_templates(device_of);
make_templates(device_pci);
+make_templates(device_pcmcia);
make_templates(device_pnp);
make_templates(device_pnp_card);
+make_templates(device_serio);
make_templates(device_usb);
+make_templates(device_vio);
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 Wed Mar 29 14:53:34 2006
@@ -249,6 +249,27 @@
};
template<>
+ class table_entry_version<device_i2c, version_2_6_16> : public table_entry
+ {
+ public:
+ table_entry_version () throw ();
+ void write (std::ostream &) const throw (std::runtime_error);
+ };
+
+ template<typename Elf_class, typename Elf_data>
+ class table_entry_data<device_i2c, version_2_6_16, Elf_class, Elf_data> : public table_entry_version<device_i2c, version_2_6_16>
+ {
+ protected:
+ table_entry_data (const device_id<device_i2c, Elf_class> &) throw ();
+
+ public:
+ static void add (const device_id<device_i2c, Elf_class> &id, std::list<table_entry *> &table) throw ()
+ {
+ table.push_back (new table_entry_data<device_i2c, version_2_6_16, Elf_class, Elf_data> (id));
+ }
+ };
+
+ template<>
class table_entry_version<device_ieee1394, version_2_6_16> : public table_entry
{
public:
@@ -276,6 +297,48 @@
};
template<>
+ class table_entry_version<device_input, version_2_6_16> : public table_entry
+ {
+ public:
+ table_entry_version () throw ();
+ void write (std::ostream &) const throw (std::runtime_error);
+ };
+
+ template<typename Elf_class, typename Elf_data>
+ class table_entry_data<device_input, version_2_6_16, Elf_class, Elf_data> : public table_entry_version<device_input, version_2_6_16>
+ {
+ protected:
+ table_entry_data (const device_id<device_input, Elf_class> &) throw ();
+
+ public:
+ static void add (const device_id<device_input, Elf_class> &id, std::list<table_entry *> &table) throw ()
+ {
+ table.push_back (new table_entry_data<device_input, version_2_6_16, Elf_class, Elf_data> (id));
+ }
+ };
+
+ template<>
+ class table_entry_version<device_of, version_2_6_16> : public table_entry
+ {
+ public:
+ table_entry_version () throw ();
+ void write (std::ostream &) const throw (std::runtime_error);
+ };
+
+ template<typename Elf_class, typename Elf_data>
+ class table_entry_data<device_of, version_2_6_16, Elf_class, Elf_data> : public table_entry_version<device_of, version_2_6_16>
+ {
+ protected:
+ table_entry_data (const device_id<device_of, Elf_class> &) throw ();
+
+ public:
+ static void add (const device_id<device_of, Elf_class> &id, std::list<table_entry *> &table) throw ()
+ {
+ table.push_back (new table_entry_data<device_of, version_2_6_16, Elf_class, Elf_data> (id));
+ }
+ };
+
+ template<>
class table_entry_version<device_pci, version_2_6_16> : public table_entry
{
public:
@@ -301,6 +364,27 @@
};
template<>
+ class table_entry_version<device_pcmcia, version_2_6_16> : public table_entry
+ {
+ public:
+ table_entry_version () throw ();
+ void write (std::ostream &) const throw (std::runtime_error);
+ };
+
+ template<typename Elf_class, typename Elf_data>
+ class table_entry_data<device_pcmcia, version_2_6_16, Elf_class, Elf_data> : public table_entry_version<device_pcmcia, version_2_6_16>
+ {
+ protected:
+ table_entry_data (const device_id<device_pcmcia, Elf_class> &) throw ();
+
+ public:
+ static void add (const device_id<device_pcmcia, Elf_class> &id, std::list<table_entry *> &table) throw ()
+ {
+ table.push_back (new table_entry_data<device_pcmcia, version_2_6_16, Elf_class, Elf_data> (id));
+ }
+ };
+
+ template<>
class table_entry_version<device_pnp, version_2_6_16> : public table_entry
{
public:
@@ -345,6 +429,27 @@
};
template<>
+ class table_entry_version<device_serio, version_2_6_16> : public table_entry
+ {
+ public:
+ table_entry_version () throw ();
+ void write (std::ostream &) const throw (std::runtime_error);
+ };
+
+ template<typename Elf_class, typename Elf_data>
+ class table_entry_data<device_serio, version_2_6_16, Elf_class, Elf_data> : public table_entry_version<device_serio, version_2_6_16>
+ {
+ protected:
+ table_entry_data (const device_id<device_serio, Elf_class> &) throw ();
+
+ public:
+ static void add (const device_id<device_serio, Elf_class> &id, std::list<table_entry *> &table) throw ()
+ {
+ table.push_back (new table_entry_data<device_serio, version_2_6_16, Elf_class, Elf_data> (id));
+ }
+ };
+
+ template<>
class table_entry_version<device_usb, version_2_6_16> : public table_entry
{
public:
@@ -376,6 +481,27 @@
static void add (const device_id<device_usb, Elf_class> &, std::list<table_entry *> &table) throw ();
};
+ template<>
+ class table_entry_version<device_vio, version_2_6_16> : public table_entry
+ {
+ public:
+ table_entry_version () throw ();
+ void write (std::ostream &) const throw (std::runtime_error);
+ };
+
+ template<typename Elf_class, typename Elf_data>
+ class table_entry_data<device_vio, version_2_6_16, Elf_class, Elf_data> : public table_entry_version<device_vio, version_2_6_16>
+ {
+ protected:
+ table_entry_data (const device_id<device_vio, Elf_class> &) throw ();
+
+ public:
+ static void add (const device_id<device_vio, Elf_class> &id, std::list<table_entry *> &table) throw ()
+ {
+ table.push_back (new table_entry_data<device_vio, version_2_6_16, Elf_class, Elf_data> (id));
+ }
+ };
+
template<typename device, typename Elf_class, typename Elf_data>
class table_data<device, version_2_6_16, Elf_class, Elf_data> : public table<device, Elf_class, Elf_data>
{
More information about the Kernel-svn-changes
mailing list