debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge /people/waldi/linux-kbuild-2.6. 

r6334:  waldi | 2006-03-29 14:53:34 +0000
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.

svn path=/dists/trunk/linux-kbuild-2.6/; revision=6349
This commit is contained in:
Bastian Blank 2006-03-30 12:29:24 +00:00
parent 4b9ae46e44
commit 73c211949c
3 changed files with 222 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/module_devicetable.tpp
View File

@ -31,17 +31,17 @@ namespace linuxkernel
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>

90
src/mod/module_devicetable_impl_2_6_16.cpp
View File

@ -66,6 +66,14 @@ void table_entry_version<device_ccw, version_2_6_16>::write (std::ostream &out)
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 @@ void table_entry_version<device_ieee1394, version_2_6_16>::write (std::ostream &
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 @@ void table_entry_version<device_pci, version_2_6_16>::write (std::ostream &out)
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 @@ void table_entry_version<device_pnp_card, version_2_6_16>::write (std::ostream &
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 @@ void table_entry_version<device_usb, version_2_6_16>::write (std::ostream &out)
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>
@ -176,6 +224,12 @@ table_entry_data<device_ccw, version_2_6_16, Elf_class, Elf_data>::table_entry_d
_do_convert (dev_model);
}
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 ()
{
@ -186,6 +240,18 @@ table_entry_data<device_ieee1394, version_2_6_16, Elf_class, Elf_data>::table_en
_do_convert (version);
}
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 ()
{
@ -197,6 +263,12 @@ table_entry_data<device_pci, version_2_6_16, Elf_class, Elf_data>::table_entry_d
_do_convert (class_mask);
}
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 ()
{
@ -222,6 +294,12 @@ table_entry_data<device_pnp_card, version_2_6_16, Elf_class, Elf_data>::table_en
str = s.str ();
}
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 ()
{
@ -287,6 +365,12 @@ void table_entry_data<device_usb, version_2_6_16, Elf_class, Elf_data>::add (con
}
}
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_32, Elf::file_da
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);

126
src/mod/module_devicetable_impl_2_6_16.hpp
View File

@ -248,6 +248,27 @@ namespace linuxkernel
}
};
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
{
@ -275,6 +296,48 @@ namespace linuxkernel
}
};
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
{
@ -300,6 +363,27 @@ namespace linuxkernel
}
};
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
{
@ -344,6 +428,27 @@ namespace linuxkernel
}
};
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
{
@ -376,6 +481,27 @@ namespace linuxkernel
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>
{